diff --git a/res/values/strings.xml b/res/values/strings.xml
index 60d98f8e1..537211193 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -163,9 +163,6 @@
Compact Layout
Show icons at a smaller size
Show icons at regular size
- Small screen
- Adapt layouts to smaller screens
- Use normal layouts
Theme
Unsigned
URL
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 3d4b3922d..7b8cbd11e 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -25,9 +25,6 @@
-
initialized = new HashMap();
private List compactLayoutListeners = new ArrayList();
- private List smallDensityListeners = new ArrayList();
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;
diff --git a/src/org/fdroid/fdroid/PreferencesActivity.java b/src/org/fdroid/fdroid/PreferencesActivity.java
index 39fcb7e35..f66066d76 100644
--- a/src/org/fdroid/fdroid/PreferencesActivity.java
+++ b/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) {
diff --git a/src/org/fdroid/fdroid/views/AppListAdapter.java b/src/org/fdroid/fdroid/views/AppListAdapter.java
index df2157724..d1ad13000 100644
--- a/src/org/fdroid/fdroid/views/AppListAdapter.java
+++ b/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.setVisibility(View.GONE);
- } 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);
- }
+ holder.status.setText(getVersionInfo(app));
+ holder.license.setText(app.license);
// Disable it all if it isn't compatible...
View[] views = {
diff --git a/src/org/fdroid/fdroid/views/fragments/AppListFragment.java b/src/org/fdroid/fdroid/views/fragments/AppListFragment.java
index a0095d2c3..98ee1d9b4 100644
--- a/src/org/fdroid/fdroid/views/fragments/AppListFragment.java
+++ b/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