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

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 499995375..a762aca09 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);