Prevents drawer menu from showing depending on intent.
When ChooseLockScreenGeneric is started via the set password intents, it should not allow the drawer menu to show. bug:26288300 Change-Id: I10d512e20fedab2be8c725c7d524db0c55666590
This commit is contained in:
@@ -146,6 +146,7 @@ public class ChooseLockPattern extends SettingsActivity {
|
||||
private TextView mFooterLeftButton;
|
||||
private TextView mFooterRightButton;
|
||||
protected List<LockPatternView.Cell> mChosenPattern = null;
|
||||
private boolean mHideDrawer = false;
|
||||
|
||||
/**
|
||||
* The patten used during the help screen to show how to draw a pattern.
|
||||
@@ -384,6 +385,7 @@ public class ChooseLockPattern extends SettingsActivity {
|
||||
w.start(mChooseLockSettingsHelper.utils(), required,
|
||||
false, 0, LockPatternUtils.stringToPattern(current), current, mUserId);
|
||||
}
|
||||
mHideDrawer = getActivity().getIntent().getBooleanExtra(EXTRA_HIDE_DRAWER, false);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -674,6 +676,7 @@ public class ChooseLockPattern extends SettingsActivity {
|
||||
if (!wasSecureBefore) {
|
||||
Intent intent = getRedactionInterstitialIntent(getActivity());
|
||||
if (intent != null) {
|
||||
intent.putExtra(EXTRA_HIDE_DRAWER, mHideDrawer);
|
||||
startActivity(intent);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user