DO NOT MERGE 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 - set display search menu to false - disallow update to display the search menu Bug: 110034419 Test: make RunSettingsRoboTests Change-Id: Ieb7eb0e8699229ec0824ccc19d7b958ac44965a2
This commit is contained in:
@@ -626,7 +626,7 @@ public class SettingsActivity extends SettingsDrawerActivity
|
||||
// No UP affordance if we are displaying the main Dashboard
|
||||
mDisplayHomeAsUpEnabled = false;
|
||||
// Show Search affordance
|
||||
mDisplaySearch = true;
|
||||
mDisplaySearch = Utils.isDeviceProvisioned(this);
|
||||
mInitialTitleResId = R.string.dashboard_title;
|
||||
|
||||
// add argument to indicate which settings tab should be initially selected
|
||||
@@ -708,7 +708,7 @@ public class SettingsActivity extends SettingsDrawerActivity
|
||||
}
|
||||
|
||||
public void setDisplaySearchMenu(boolean displaySearch) {
|
||||
if (displaySearch != mDisplaySearch) {
|
||||
if (Utils.isDeviceProvisioned(this) && displaySearch != mDisplaySearch) {
|
||||
mDisplaySearch = displaySearch;
|
||||
invalidateOptionsMenu();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user