Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c8987759 authored by Raff Tsai's avatar Raff Tsai
Browse files

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
parent f28a690a

src/com/android/settings/MasterClearConfirm.java

+2 −1
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ import com.android.settingslib.RestrictedLockUtilsInternal; 
import com.google.android.setupcompat.template.FooterBarMixin;

import com.google.android.setupcompat.template.FooterButton;

import com.google.android.setupcompat.template.FooterButton.ButtonType;

import com.google.android.setupcompat.util.WizardManagerHelper;

import com.google.android.setupdesign.GlifLayout;



/**
@@ -86,7 +87,7 @@ public class MasterClearConfirm extends InstrumentedFragment { 
                    getActivity().getSystemService(Context.OEM_LOCK_SERVICE);



            if (pdbManager != null && !oemLockManager.isOemUnlockAllowed() &&

                    Utils.isDeviceProvisioned(getActivity())) {

                    WizardManagerHelper.isDeviceProvisioned(getActivity())) {

                // if OEM unlock is allowed, the persistent data block will be wiped during FR

                // process. If disabled, it will be wiped here, unless the device is still being

                // provisioned, in which case the persistent data block will be preserved.

src/com/android/settings/SettingsActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ public class SettingsActivity extends SettingsBaseActivity 
            launchSettingFragment(initialFragmentName, intent);

        }



        final boolean deviceProvisioned = Utils.isDeviceProvisioned(this);

        final boolean deviceProvisioned = WizardManagerHelper.isDeviceProvisioned(this);



        final ActionBar actionBar = getActionBar();

        if (actionBar != null) {

src/com/android/settings/Utils.java

+0 −6
Original line number Diff line number Diff line
@@ -73,7 +73,6 @@ import android.provider.ContactsContract.Contacts; 
import android.provider.ContactsContract.Data;

import android.provider.ContactsContract.Profile;

import android.provider.ContactsContract.RawContacts;

import android.provider.Settings;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;

import android.text.Spannable;
@@ -729,11 +728,6 @@ public final class Utils extends com.android.settingslib.Utils { 
        }

    }



    public static boolean isDeviceProvisioned(Context context) {

        return Settings.Global.getInt(context.getContentResolver(),

                Settings.Global.DEVICE_PROVISIONED, 0) != 0;

    }



    public static boolean startQuietModeDialogIfNecessary(Context context, UserManager um,

            int userId) {

        if (um.isQuietModeEnabled(UserHandle.of(userId))) {

src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java

+3 −1
Original line number Diff line number Diff line
@@ -53,6 +53,8 @@ import com.android.settingslib.development.DevelopmentSettingsEnabler; 
import com.android.settingslib.development.SystemPropPoker;

import com.android.settingslib.search.SearchIndexable;



import com.google.android.setupcompat.util.WizardManagerHelper;



import java.util.ArrayList;

import java.util.List;
@@ -166,7 +168,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra 
        super.onActivityCreated(icicle);

        // Apply page-level restrictions

        setIfOnlyAvailableForAdmins(true);

        if (isUiRestricted() || !Utils.isDeviceProvisioned(getActivity())) {

        if (isUiRestricted() || !WizardManagerHelper.isDeviceProvisioned(getActivity())) {

            // Block access to developer options if the user is not the owner, if user policy

            // restricts it, or if the device has not been provisioned

            mIsAvailable = false;

src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java

+3 −1
Original line number Diff line number Diff line
@@ -46,6 +46,8 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; 
import com.android.settingslib.core.lifecycle.events.OnStart;

import com.android.settingslib.development.DevelopmentSettingsEnabler;



import com.google.android.setupcompat.util.WizardManagerHelper;



public class BuildNumberPreferenceController extends BasePreferenceController implements

        LifecycleObserver, OnStart {
@@ -131,7 +133,7 @@ public class BuildNumberPreferenceController extends BasePreferenceController im 
        }



        // Don't enable developer options until device has been provisioned

        if (!Utils.isDeviceProvisioned(mContext)) {

        if (!WizardManagerHelper.isDeviceProvisioned(mContext)) {

            mMetricsFeatureProvider.action(

                    mContext, SettingsEnums.ACTION_SETTINGS_BUILD_NUMBER_PREF);

            return false;