Merge "Misc fixes for settings" into oc-mr1-dev am: 54d816fd90

am: e809b806f9 Change-Id: I1a1b5f2833389f0e40fe5a3a1e4b8e47db5ec9d3
2017-08-09 18:16:57 +00:00
parent 920493a16b e809b806f9
commit 471f603ea5
3 changed files with 14 additions and 5 deletions
--- a/src/com/android/settings/widget/EntityHeaderController.java
+++ b/src/com/android/settings/widget/EntityHeaderController.java
@@ -215,6 +215,7 @@ public class EntityHeaderController {
        final LayoutPreference pref = new LayoutPreference(uiContext, done(activity));
        // Makes sure it's the first preference onscreen.
        pref.setOrder(-1000);
+        pref.setSelectable(false);
        pref.setKey(PREF_KEY_APP_HEADER);
        return pref;
    }