Merge "Misc fixes for settings" into oc-mr1-dev

am: 54d816fd90

Change-Id: I7a015ea3ddd7b7cdd9db6896e6459ce3f491dabc

src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java

@@ -68,7 +68,7 @@ public abstract class ConfirmDeviceCredentialBaseActivity extends SettingsActivi
             LinearLayout layout = (LinearLayout) findViewById(R.id.content_parent);
             layout.setFitsSystemWindows(false);
         }
-
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);
         mIsKeyguardLocked = savedState == null
                 ? getSystemService(KeyguardManager.class).isKeyguardLocked()
                 : savedState.getBoolean(STATE_IS_KEYGUARD_LOCKED, false);

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;
     }