summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaj Yengisetty <rajesh@cyngn.com>2014-11-10 18:35:00 (GMT)
committerAdnan <adnan@cyngn.com>2014-11-19 23:53:57 (GMT)
commit4c1a4c359ff31552a66453287ecee32940661352 (patch)
treebd6f9286d03ab9cb6501c35e169de23d3bbf7b68
parent4e4db4563a7ddf262993a9312781c66d34485ea4 (diff)
downloadandroid_packages_apps_Trebuchet-4c1a4c359ff31552a66453287ecee32940661352.zip
android_packages_apps_Trebuchet-4c1a4c359ff31552a66453287ecee32940661352.tar.gz
android_packages_apps_Trebuchet-4c1a4c359ff31552a66453287ecee32940661352.tar.bz2
Fixed: Empty status for Protected Apps any other non-state settings don't get cached view information from other settings.
Conflicts: src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java Change-Id: I8be1949ccaad326ce97ed76f0ce8ec328b757a6e
-rw-r--r--src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java13
1 files changed, 13 insertions, 0 deletions
diff --git a/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java b/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java
index 4999953..a762aca 100644
--- a/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java
+++ b/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java
@@ -119,6 +119,19 @@ public class SettingsPinnedHeaderAdapter extends PinnedHeaderListAdapter {
R.string.setting_state_on) : res.getString(
R.string.setting_state_off);
((TextView) v.findViewById(R.id.item_state)).setText(state);
+ } else if (title.equals(res
+ .getString(R.string.search_screen_left_text))) {
+ boolean current = SettingsProvider
+ .getBoolean(
+ mContext,
+ SettingsProvider.SETTINGS_UI_HOMESCREEN_SEARCH_SCREEN_LEFT,
+ R.bool.preferences_interface_homescreen_search_screen_left_default);
+ String state = current ? res.getString(
+ R.string.setting_state_on) : res.getString(
+ R.string.setting_state_off);
+ ((TextView) v.findViewById(R.id.item_state)).setText(state);
+ } else {
+ ((TextView) v.findViewById(R.id.item_state)).setText("");
}
v.setTag(partition);