Merge "Revert fixing the style of Choose screen lock wasn’t consistent in initial setup and deferred setup" into udc-qpr-dev am: 2943132aff am: 624ebae395
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24942007 Change-Id: I0ceb3a5aec8537fa31c821bdee3a78a89d118071 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -256,12 +256,6 @@ public class SetupChooseLockGeneric extends ChooseLockGeneric {
|
||||
return InternalSetupChooseLockGenericFragment.class;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected boolean isToolbarEnabled() {
|
||||
// Hide the action bar from this page.
|
||||
return false;
|
||||
}
|
||||
|
||||
public static class InternalSetupChooseLockGenericFragment
|
||||
extends ChooseLockGenericFragment {
|
||||
@Override
|
||||
|
||||
Reference in New Issue
Block a user