Revert "New setting: "Small screen" to avoid ellipsizing on small screens"

This reverts commit a5c66a8c6ed9c9fd174aeb448e428d288e52f1e1.

Conflicts:
	src/org/fdroid/fdroid/AppDetails.java

res/values/strings.xml

@@ -163,9 +163,6 @@
 	<string name="compactlayout">Compact Layout</string>
 	<string name="compactlayout_on">Show icons at a smaller size</string>
 	<string name="compactlayout_off">Show icons at regular size</string>
-	<string name="small_density">Small screen</string>
-	<string name="small_density_on">Adapt layouts to smaller screens</string>
-	<string name="small_density_off">Use normal layouts</string>
     <string name="theme">Theme</string>
     <string name="unsigned">Unsigned</string>
     <string name="repo_url">URL</string>

res/xml/preferences.xml

@@ -25,9 +25,6 @@
         <CheckBoxPreference android:title="@string/compactlayout"
             android:defaultValue="false"
             android:key="compactlayout"/>
-        <CheckBoxPreference android:title="@string/small_density"
-            android:defaultValue="false"
-            android:key="smallDensity"/>
 		<ListPreference android:title="@string/theme"
 			android:key="theme"
 			android:defaultValue="dark"

src/org/fdroid/fdroid/AppDetails.java

@@ -327,7 +327,6 @@ public class AppDetails extends ListActivity {
 
         SharedPreferences prefs = PreferenceManager
                 .getDefaultSharedPreferences(getBaseContext());
-        pref_smallDensity = prefs.getBoolean(Preferences.PREF_SMALL_DENSITY, false);
         pref_expert = prefs.getBoolean(Preferences.PREF_EXPERT, false);
         pref_permissions = prefs.getBoolean(Preferences.PREF_PERMISSIONS, false);
         pref_incompatibleVersions = prefs.getBoolean(
@@ -344,7 +343,6 @@ public class AppDetails extends ListActivity {
 
     }
 
-    private boolean pref_smallDensity;
     private boolean pref_expert;
     private boolean pref_permissions;
     private boolean pref_incompatibleVersions;

src/org/fdroid/fdroid/Preferences.java

@@ -35,7 +35,6 @@ public class Preferences implements SharedPreferences.OnSharedPreferenceChangeLi
     public static final String PREF_THEME = "theme";
     public static final String PREF_PERMISSIONS = "showPermissions";
     public static final String PREF_COMPACT_LAYOUT = "compactlayout";
-    public static final String PREF_SMALL_DENSITY = "smallDensity";
     public static final String PREF_IGN_TOUCH = "ignoreTouchscreen";
     public static final String PREF_CACHE_APK = "cacheDownloaded";
     public static final String PREF_EXPERT = "expert";
@@ -43,14 +42,11 @@ public class Preferences implements SharedPreferences.OnSharedPreferenceChangeLi
     public static final String PREF_UPD_LAST = "lastUpdateCheck";
 
     private static final boolean DEFAULT_COMPACT_LAYOUT = false;
-    private static final boolean DEFAULT_SMALL_DENSITY = false;
 
     private boolean compactLayout = DEFAULT_COMPACT_LAYOUT;
-    private boolean smallDensity = DEFAULT_SMALL_DENSITY;
 
     private Map<String,Boolean> initialized = new HashMap<String,Boolean>();
     private List<ChangeListener> compactLayoutListeners = new ArrayList<ChangeListener>();
-    private List<ChangeListener> smallDensityListeners = new ArrayList<ChangeListener>();
 
     private boolean isInitialized(String key) {
         return initialized.containsKey(key) && initialized.get(key);
@@ -72,14 +68,6 @@ public class Preferences implements SharedPreferences.OnSharedPreferenceChangeLi
         return compactLayout;
     }
 
-    public boolean hasSmallDensity() {
-        if (!isInitialized(PREF_SMALL_DENSITY)) {
-            initialize(PREF_SMALL_DENSITY);
-            smallDensity = preferences.getBoolean(PREF_SMALL_DENSITY, DEFAULT_SMALL_DENSITY);
-        }
-        return smallDensity;
-    }
-
     public void registerCompactLayoutChangeListener(ChangeListener listener) {
         compactLayoutListeners.add(listener);
     }
@@ -88,14 +76,6 @@ public class Preferences implements SharedPreferences.OnSharedPreferenceChangeLi
         compactLayoutListeners.remove(listener);
     }
 
-    public void registerSmallDensityChangeListener(ChangeListener listener) {
-        smallDensityListeners.add(listener);
-    }
-
-    public void unregisterSmallDensityChangeListener(ChangeListener listener) {
-        smallDensityListeners.remove(listener);
-    }
-
     @Override
     public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
         Log.d("FDroid", "Invalidating preference '" + key + "'.");
@@ -106,12 +86,6 @@ public class Preferences implements SharedPreferences.OnSharedPreferenceChangeLi
                 listener.onPreferenceChange();
             }
         }
-
-        if (key.equals(PREF_SMALL_DENSITY)) {
-            for ( ChangeListener listener : smallDensityListeners )  {
-                listener.onPreferenceChange();
-            }
-        }
     }
 
     private static Preferences instance;

src/org/fdroid/fdroid/PreferencesActivity.java

@@ -51,7 +51,6 @@ public class PreferencesActivity extends PreferenceActivity implements
         Preferences.PREF_THEME,
         Preferences.PREF_PERMISSIONS,
         Preferences.PREF_COMPACT_LAYOUT,
-        Preferences.PREF_SMALL_DENSITY,
         Preferences.PREF_IGN_TOUCH,
         Preferences.PREF_CACHE_APK,
         Preferences.PREF_EXPERT,
@@ -68,7 +67,11 @@ public class PreferencesActivity extends PreferenceActivity implements
 
     protected void onoffSummary(String key, int on, int off) {
         CheckBoxPreference pref = (CheckBoxPreference)findPreference(key);
-        pref.setSummary(pref.isChecked() ? on : off);
+        if (pref.isChecked()) {
+            pref.setSummary(on);
+        } else {
+            pref.setSummary(off);
+        }
     }
 
     protected void entrySummary(String key) {
@@ -116,10 +119,6 @@ public class PreferencesActivity extends PreferenceActivity implements
             onoffSummary(key, R.string.compactlayout_on,
                 R.string.compactlayout_off);
 
-        } else if (key.equals(Preferences.PREF_SMALL_DENSITY)) {
-            onoffSummary(key, R.string.small_density_on,
-                R.string.small_density_off);
-
         } else if (key.equals(Preferences.PREF_THEME)) {
             entrySummary(key);
             if (changing) {

src/org/fdroid/fdroid/views/AppListAdapter.java

@@ -91,7 +91,6 @@ abstract public class AppListAdapter extends BaseAdapter {
     public View getView(int position, View convertView, ViewGroup parent) {
 
         boolean compact = Preferences.get().hasCompactLayout();
-        boolean small = Preferences.get().hasSmallDensity();
         DB.App app = items.get(position);
         ViewHolder holder;
 
@@ -117,19 +116,8 @@ abstract public class AppListAdapter extends BaseAdapter {
         ImageLoader.getInstance().displayImage(app.iconUrl, holder.icon,
             displayImageOptions);
 
-        if (small) {
+        holder.status.setText(getVersionInfo(app));
-            holder.status.setVisibility(View.GONE);
+        holder.license.setText(app.license);
-        } else {
-            holder.status.setVisibility(View.VISIBLE);
-            holder.status.setText(getVersionInfo(app));
-        }
-
-        if (small) {
-            holder.license.setVisibility(View.GONE);
-        } else {
-            holder.license.setVisibility(View.VISIBLE);
-            holder.license.setText(app.license);
-        }
 
         // Disable it all if it isn't compatible...
         View[] views = {

src/org/fdroid/fdroid/views/fragments/AppListFragment.java

@@ -26,14 +26,12 @@ abstract class AppListFragment extends Fragment implements AdapterView.OnItemCli
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         Preferences.get().registerCompactLayoutChangeListener(this);
-        Preferences.get().registerSmallDensityChangeListener(this);
     }
 
     @Override
     public void onDestroy() {
         super.onDestroy();
         Preferences.get().unregisterCompactLayoutChangeListener(this);
-        Preferences.get().unregisterSmallDensityChangeListener(this);
     }
 
     @Override