Hide search box if it is called in initial setup wizard
- Search box is hidden if user set intent extra isSetupFlow true Fixes: 135717823 Test: search box is hidden in the following command adb shell am start -a android.settings.SETTINGS --ez isSetupFlow true Change-Id: Ia3d955c9390d6b0eef9391b9b35b6a483eb63d26
This commit is contained in:
@@ -74,6 +74,8 @@ import com.android.settingslib.RestrictedPreference;
|
||||
import com.android.settingslib.drawable.CircleFramedDrawable;
|
||||
import com.android.settingslib.search.SearchIndexable;
|
||||
|
||||
import com.google.android.setupcompat.util.WizardManagerHelper;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.util.ArrayList;
|
||||
@@ -224,7 +226,7 @@ public class UserSettings extends SettingsPreferenceFragment
|
||||
super.onCreate(icicle);
|
||||
addPreferencesFromResource(R.xml.user_settings);
|
||||
final Activity activity = getActivity();
|
||||
if (!Utils.isDeviceProvisioned(activity)) {
|
||||
if (!WizardManagerHelper.isDeviceProvisioned(activity)) {
|
||||
activity.finish();
|
||||
return;
|
||||
}
|
||||
@@ -977,7 +979,8 @@ public class UserSettings extends SettingsPreferenceFragment
|
||||
|
||||
private void updateAddUser(Context context) {
|
||||
if ((mUserCaps.mCanAddUser || mUserCaps.mDisallowAddUserSetByAdmin)
|
||||
&& Utils.isDeviceProvisioned(context) && mUserCaps.mUserSwitcherEnabled) {
|
||||
&& WizardManagerHelper.isDeviceProvisioned(context)
|
||||
&& mUserCaps.mUserSwitcherEnabled) {
|
||||
mAddUser.setVisible(true);
|
||||
final boolean moreUsers = mUserManager.canAddMoreUsers();
|
||||
mAddUser.setEnabled(moreUsers && !mAddingUser && mUserManager.canSwitchUsers());
|
||||
|
Reference in New Issue
Block a user