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

Commit 78f1e3de authored by Bernard Chau's avatar Bernard Chau Committed by Android (Google) Code Review
Browse files

Merge "Fixed typos "QuiteMode"" into nyc-dev

parents 2b131e58 88d523bc

src/com/android/settings/SecuritySettings.java

+3 −3
Original line number Diff line number Diff line
@@ -625,7 +625,7 @@ public class SecuritySettings extends SettingsPreferenceFragment 
            startFragment(this, "com.android.settings.ChooseLockGeneric$ChooseLockGenericFragment",

                    R.string.lock_settings_picker_title, SET_OR_CHANGE_LOCK_METHOD_REQUEST, null);

        } else if (KEY_UNLOCK_SET_OR_CHANGE_PROFILE.equals(key)) {

            if (Utils.startQuiteModeDialogIfNecessary(this.getActivity(), mUm,

            if (Utils.startQuietModeDialogIfNecessary(this.getActivity(), mUm,

                    mProfileChallengeUserId)) {

                return false;

            }
@@ -750,13 +750,13 @@ public class SecuritySettings extends SettingsPreferenceFragment 
        final String key = preference.getKey();

        final LockPatternUtils lockPatternUtils = mChooseLockSettingsHelper.utils();

        if (KEY_VISIBLE_PATTERN_PROFILE.equals(key)) {

            if (Utils.startQuiteModeDialogIfNecessary(this.getActivity(), mUm,

            if (Utils.startQuietModeDialogIfNecessary(this.getActivity(), mUm,

                    mProfileChallengeUserId)) {

                return false;

            }

            lockPatternUtils.setVisiblePatternEnabled((Boolean) value, mProfileChallengeUserId);

        } else if (KEY_UNIFICATION.equals(key)) {

            if (Utils.startQuiteModeDialogIfNecessary(this.getActivity(), mUm,

            if (Utils.startQuietModeDialogIfNecessary(this.getActivity(), mUm,

                    mProfileChallengeUserId)) {

                return false;

            }

src/com/android/settings/Utils.java

+1 −1
Original line number Diff line number Diff line
@@ -1107,7 +1107,7 @@ public final class Utils extends com.android.settingslib.Utils { 
                Settings.Global.DEVICE_PROVISIONED, 0) != 0;

    }



    public static boolean startQuiteModeDialogIfNecessary(Context context, UserManager um,

    public static boolean startQuietModeDialogIfNecessary(Context context, UserManager um,

            int userId) {

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

            final Intent intent = UnlaunchableAppActivity.createInQuietModeDialogIntent(userId);

src/com/android/settings/fingerprint/FingerprintSettings.java

+1 −1
Original line number Diff line number Diff line
@@ -837,7 +837,7 @@ public class FingerprintSettings extends SubSettings { 
            public boolean onPreferenceClick(Preference preference) {

                final Context context = preference.getContext();

                final UserManager userManager = UserManager.get(context);

                if (Utils.startQuiteModeDialogIfNecessary(context, userManager,

                if (Utils.startQuietModeDialogIfNecessary(context, userManager,

                        userId)) {

                    return false;

                }