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

This commit is contained in:
TreeHugger Robot
2017-08-09 17:52:49 +00:00
committed by Android (Google) Code Review
3 changed files with 14 additions and 5 deletions

View File

@@ -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);