diff options
author | Doris Ling <dling@google.com> | 2018-07-31 14:04:44 -0700 |
---|---|---|
committer | Doris Ling <dling@google.com> | 2018-08-01 10:18:01 -0700 |
commit | 882bef396295ff7ea1e380f1e05ab07f656e4c3f (patch) | |
tree | 7dd6ad509ad4d4080eea76cb90f75ca81074322b /src/com/android/settings/search | |
parent | f9341c4c0b93bcbf4f2a90646a12aeb82d072758 (diff) | |
download | packages_apps_Settings-882bef396295ff7ea1e380f1e05ab07f656e4c3f.tar.gz packages_apps_Settings-882bef396295ff7ea1e380f1e05ab07f656e4c3f.tar.bz2 packages_apps_Settings-882bef396295ff7ea1e380f1e05ab07f656e4c3f.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
Diffstat (limited to 'src/com/android/settings/search')
-rw-r--r-- | src/com/android/settings/search/actionbar/SearchMenuController.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/settings/search/actionbar/SearchMenuController.java b/src/com/android/settings/search/actionbar/SearchMenuController.java index 2fcc0487e1..54fae7e3a9 100644 --- a/src/com/android/settings/search/actionbar/SearchMenuController.java +++ b/src/com/android/settings/search/actionbar/SearchMenuController.java @@ -24,6 +24,7 @@ import android.view.MenuInflater; import android.view.MenuItem; import com.android.settings.R; +import com.android.settings.Utils; import com.android.settings.overlay.FeatureFactory; import com.android.settings.search.SearchFeatureProvider; import com.android.settingslib.core.lifecycle.LifecycleObserver; @@ -53,6 +54,9 @@ public class SearchMenuController implements LifecycleObserver, OnCreateOptionsM @Override public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { + if (!Utils.isDeviceProvisioned(mHost.getContext())) { + return; + } if (menu == null) { return; } |