From a46b8e8663a5a285f80b7741fabe9b2d6ab83660 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Thu, 11 Jul 2013 12:45:13 +0200
Subject: [PATCH] Revert all the fast scroll always enabled changes

---
 res/layout/applistitem.xml                                | 8 ++++----
 src/org/fdroid/fdroid/SearchResults.java                  | 7 +------
 .../fdroid/fdroid/views/fragments/AppListFragment.java    | 7 +------
 3 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/res/layout/applistitem.xml b/res/layout/applistitem.xml
index 3137b5ab9..295f996b5 100644
--- a/res/layout/applistitem.xml
+++ b/res/layout/applistitem.xml
@@ -7,8 +7,8 @@
 		android:paddingBottom="4dp"
 		android:paddingLeft="6dp"
 		android:paddingStart="6dp"
-		android:paddingRight="4dp"
-		android:paddingEnd="4dp">
+		android:paddingRight="10dp"
+		android:paddingEnd="10dp">
 
   <ImageView android:id="@+id/icon"
 	     android:scaleType="fitCenter"
@@ -85,7 +85,7 @@
 	    android:layout_width="fill_parent"
 	    android:layout_height="wrap_content"
 	    android:layout_below="@id/icon"
-	    android:paddingLeft="4dp"
-	    android:paddingStart="4dp"/>
+	    android:paddingLeft="6dp"
+	    android:paddingStart="6dp"/>
 
 </RelativeLayout>
diff --git a/src/org/fdroid/fdroid/SearchResults.java b/src/org/fdroid/fdroid/SearchResults.java
index ef564f3d8..365181d06 100644
--- a/src/org/fdroid/fdroid/SearchResults.java
+++ b/src/org/fdroid/fdroid/SearchResults.java
@@ -131,12 +131,7 @@ public class SearchResults extends ListActivity {
         for (DB.App app : apps) {
             applist.addItem(app);
         }
-        if (Utils.hasApi(11)) {
-            getListView().setFastScrollAlwaysVisible(true);
-            getListView().setScrollBarStyle(View.SCROLLBARS_INSIDE_INSET);
-        } else {
-            getListView().setFastScrollEnabled(true);
-        }
+        getListView().setFastScrollEnabled(true);
         applist.notifyDataSetChanged();
         setListAdapter(applist);
 
diff --git a/src/org/fdroid/fdroid/views/fragments/AppListFragment.java b/src/org/fdroid/fdroid/views/fragments/AppListFragment.java
index 135b2516f..249b2f438 100644
--- a/src/org/fdroid/fdroid/views/fragments/AppListFragment.java
+++ b/src/org/fdroid/fdroid/views/fragments/AppListFragment.java
@@ -49,12 +49,7 @@ abstract class AppListFragment extends Fragment implements AdapterView.OnItemCli
 
     protected ListView createAppListView() {
         ListView list = new ListView(getActivity());
-        if (Utils.hasApi(11)) {
-            list.setFastScrollAlwaysVisible(true);
-            list.setScrollBarStyle(View.SCROLLBARS_INSIDE_INSET);
-        } else {
-            list.setFastScrollEnabled(true);
-        }
+        list.setFastScrollEnabled(true);
         list.setOnItemClickListener(this);
         list.setAdapter(getAppListAdapter());
         return list;