diff options
author | Doris Ling <dling@google.com> | 2018-07-31 14:04:44 -0700 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-08-16 16:40:13 +0000 |
commit | af4c772b3083de944c7d71a24aadd703bd1aa79f (patch) | |
tree | a90756926f80ed8c1c03dec7946b21128abacb6f /src/com/android/settings/password | |
parent | 73b36ef8f76c397614b71514bc03e20e5f3d5dcc (diff) | |
download | packages_apps_Settings-af4c772b3083de944c7d71a24aadd703bd1aa79f.tar.gz packages_apps_Settings-af4c772b3083de944c7d71a24aadd703bd1aa79f.tar.bz2 packages_apps_Settings-af4c772b3083de944c7d71a24aadd703bd1aa79f.zip |
Disable changing lock when device is not provisioned.
When the device is not yet provisioned and settings is launched:
- disable the entry point for changing device lock
- remove the search panel from settings home page
- remove the search menu
Bug: 110034419
Test: make RunSettingsRoboTests
Change-Id: Ieb7eb0e8699229ec0824ccc19d7b958ac44965a2
Merged-In: Ieb7eb0e8699229ec0824ccc19d7b958ac44965a2
(cherry picked from commit 770f4abf9de2bb7d74497cc4b5f6795023229ef2)
Diffstat (limited to 'src/com/android/settings/password')
-rw-r--r-- | src/com/android/settings/password/ChooseLockGeneric.java | 9 | ||||
-rw-r--r-- | src/com/android/settings/password/SetupChooseLockGeneric.java | 5 |
2 files changed, 14 insertions, 0 deletions
diff --git a/src/com/android/settings/password/ChooseLockGeneric.java b/src/com/android/settings/password/ChooseLockGeneric.java index 62978b3089..1a8afd02cc 100644 --- a/src/com/android/settings/password/ChooseLockGeneric.java +++ b/src/com/android/settings/password/ChooseLockGeneric.java @@ -164,6 +164,11 @@ public class ChooseLockGeneric extends SettingsActivity { @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + final Activity activity = getActivity(); + if (!Utils.isDeviceProvisioned(activity) && !canRunBeforeDeviceProvisioned()) { + activity.finish(); + return; + } String chooseLockAction = getActivity().getIntent().getAction(); mFingerprintManager = Utils.getFingerprintManagerOrNull(getActivity()); @@ -249,6 +254,10 @@ public class ChooseLockGeneric extends SettingsActivity { addHeaderView(); } + protected boolean canRunBeforeDeviceProvisioned() { + return false; + } + protected void addHeaderView() { if (mForFingerprint) { setHeaderView(R.layout.choose_lock_generic_fingerprint_header); diff --git a/src/com/android/settings/password/SetupChooseLockGeneric.java b/src/com/android/settings/password/SetupChooseLockGeneric.java index 179bd797cb..885f9dfb42 100644 --- a/src/com/android/settings/password/SetupChooseLockGeneric.java +++ b/src/com/android/settings/password/SetupChooseLockGeneric.java @@ -129,6 +129,11 @@ public class SetupChooseLockGeneric extends ChooseLockGeneric { return layout.onCreateRecyclerView(inflater, parent, savedInstanceState); } + @Override + protected boolean canRunBeforeDeviceProvisioned() { + return true; + } + /*** * Disables preferences that are less secure than required quality and shows only secure * screen lock options here. |