Merge branch 'develop'0.9.9.2

Conflicts:
	submodules/dslv

6 files changed, 58 insertions, 18 deletions

diff --git a/res/layout/addfeed.xml b/res/layout/addfeed.xml
index 48c89f802..09502eb7b 100644
--- a/res/layout/addfeed.xml
+++ b/res/layout/addfeed.xml
@@ -29,7 +29,7 @@
                 android:layout_height="wrap_content"
                 android:layout_below="@id/txtvFeedurl"
                 android:layout_margin="8dp"
-                android:hint="@string/feedurl_label"
+                android:hint="@string/etxtFeedurlHint"
                 android:inputType="textUri"/>
 
             <Button
diff --git a/res/layout/autoflattr_preference_dialog.xml b/res/layout/autoflattr_preference_dialog.xml
new file mode 100644
index 000000000..fc2df30d7
--- /dev/null
+++ b/res/layout/autoflattr_preference_dialog.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <CheckBox
+        android:id="@+id/chkAutoFlattr"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="4dp"
+        android:text="@string/auto_flattr_enable"
+        android:textColor="?android:attr/textColorPrimary"
+        android:textSize="@dimen/text_size_small" />
+
+    <SeekBar
+        android:id="@+id/skbPercent"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="8dp"
+        android:max="100" />
+
+    <TextView
+        android:id="@+id/txtvStatus"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="8dp"
+        android:ellipsize="end"
+        android:lines="2"
+        android:text="@string/auto_flattr_after_percent"
+        android:textColor="?android:attr/textColorPrimary"
+        android:textSize="@dimen/text_size_small" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/ellipsize_start_listitem.xml b/res/layout/ellipsize_start_listitem.xml
new file mode 100644
index 000000000..161e1aa37
--- /dev/null
+++ b/res/layout/ellipsize_start_listitem.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent">
+
+    <TextView
+        android:id="@+id/txtvTitle"
+        android:textColor="?android:attr/textColorPrimary"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="@dimen/text_size_small"
+        android:lines="1"
+        android:singleLine="true"
+        android:layout_margin="16dp"
+        android:ellipsize="start"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/gpodnetauth_activity.xml b/res/layout/gpodnetauth_activity.xml
index cd428fbdf..c096c20cf 100644
--- a/res/layout/gpodnetauth_activity.xml
+++ b/res/layout/gpodnetauth_activity.xml
@@ -6,5 +6,5 @@
 <ViewFlipper
     android:id="@+id/viewflipper"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"/>
+    android:layout_height="wrap_content"/>
 </ScrollView>
\ No newline at end of file
diff --git a/res/layout/queue_fragment.xml b/res/layout/queue_fragment.xml
index 373975c1c..742411761 100644
--- a/res/layout/queue_fragment.xml
+++ b/res/layout/queue_fragment.xml
@@ -16,8 +16,7 @@
         dslv:drag_scroll_start="0.33"
         dslv:float_alpha="0.6"
         dslv:max_drag_scroll_speed="0.5"
-        dslv:remove_enabled="true"
-        dslv:remove_mode="flingRemove"
+        dslv:remove_enabled="false"
         dslv:slide_shuffle_speed="0.3"
         dslv:sort_enabled="true"
         dslv:track_drag_sort="true"
@@ -40,17 +39,4 @@
         android:indeterminateOnly="true"
         android:visibility="gone"/>
 
-    <LinearLayout
-        android:id="@+id/undobar"
-        style="@style/UndoBar">
-
-        <TextView
-            android:id="@+id/undobar_message"
-            style="@style/UndoBarMessage"/>
-
-        <Button
-            android:id="@+id/undobar_button"
-            style="@style/UndoBarButton"/>
-    </LinearLayout>
-
 </FrameLayout>
\ No newline at end of file
diff --git a/res/layout/time_dialog.xml b/res/layout/time_dialog.xml
index 7e5d869e0..95cc9a5a7 100644
--- a/res/layout/time_dialog.xml
+++ b/res/layout/time_dialog.xml
@@ -20,7 +20,7 @@
             android:inputType="number"
             android:maxLength="2" >
 
-            <requestFocus />
+
         </EditText>
 
         <Spinner