summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJorge Ruesga <jorge@ruesga.com>2013-05-11 01:32:21 +0200
committerJorge Ruesga <jorge@ruesga.com>2013-05-11 02:26:19 +0200
commit3cae499900cb00ab7186a40fe69df5d64d0800f0 (patch)
treeb2ee2dd4e472919965a5ce95d3fda9a8decdd726
parent05a9189bdfd3eb5159a0ec2aaf2c84ab50682bd2 (diff)
downloadandroid_packages_apps_Trebuchet-3cae499900cb00ab7186a40fe69df5d64d0800f0.tar.gz
android_packages_apps_Trebuchet-3cae499900cb00ab7186a40fe69df5d64d0800f0.tar.bz2
android_packages_apps_Trebuchet-3cae499900cb00ab7186a40fe69df5d64d0800f0.zip
Trebuchet: Properly remove grid preference on isLargeScreen devices
Actually, the preference is not been removed. Change-Id: Icdb94526f120501c6e5faa22bd912b0bd0f00f4f Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
-rw-r--r--res/xml/preferences_homescreen.xml4
-rw-r--r--src/com/cyanogenmod/trebuchet/preference/Preferences.java11
2 files changed, 11 insertions, 4 deletions
diff --git a/res/xml/preferences_homescreen.xml b/res/xml/preferences_homescreen.xml
index 0574da1cd..b89ebe646 100644
--- a/res/xml/preferences_homescreen.xml
+++ b/res/xml/preferences_homescreen.xml
@@ -18,7 +18,9 @@
xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet"
android:key="ui_homescreen"
android:title="@string/preferences_interface_homescreen_title">
- <PreferenceCategory android:title="@string/preferences_interface_homescreen_general_category">
+ <PreferenceCategory
+ android:key="ui_homescreen_general"
+ android:title="@string/preferences_interface_homescreen_general_category">
<com.cyanogenmod.trebuchet.preference.DoubleNumberPickerPreference android:key="ui_homescreen_grid"
android:title="@string/preferences_interface_homescreen_general_grid_title"
android:summary="@string/preferences_interface_homescreen_general_grid_summary"
diff --git a/src/com/cyanogenmod/trebuchet/preference/Preferences.java b/src/com/cyanogenmod/trebuchet/preference/Preferences.java
index 45174e10f..6e4b29b05 100644
--- a/src/com/cyanogenmod/trebuchet/preference/Preferences.java
+++ b/src/com/cyanogenmod/trebuchet/preference/Preferences.java
@@ -22,6 +22,7 @@ import android.content.res.Resources;
import android.os.Bundle;
import android.preference.Preference;
import android.preference.PreferenceActivity;
+import android.preference.PreferenceCategory;
import android.preference.PreferenceFragment;
import android.preference.PreferenceScreen;
import android.text.TextUtils;
@@ -127,9 +128,13 @@ public class Preferences extends PreferenceActivity
addPreferencesFromResource(R.xml.preferences_homescreen);
- PreferenceScreen preferenceScreen = getPreferenceScreen();
- if (LauncherApplication.isScreenLarge()) {
- preferenceScreen.removePreference(findPreference("ui_homescreen_grid"));
+ PreferenceCategory general = (PreferenceCategory)findPreference("ui_homescreen_general");
+ boolean workspaceTabletGrid = getResources().getBoolean(R.bool.config_workspaceTabletGrid);
+ if (general != null && (LauncherApplication.isScreenLarge() || workspaceTabletGrid == false)) {
+ Preference grid = findPreference("ui_homescreen_grid");
+ if (grid != null) {
+ general.removePreference(grid);
+ }
}
}
}