PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixed typos "QuiteMode"" into nyc-dev am: 78f1e3d

Browse Source 
am: edb4856

* commit 'edb4856ec1c6d6ab5bafbedf155d0c7d3fca31f6':
  Fixed typos "QuiteMode"

Change-Id: I685b1f704f870c2fa8b998a31732f6021ca0a132
This commit is contained in:
Bernard Chau
2016-04-14 20:29:12 +00:00
committed by android-build-merger
parent 006a6b5103 edb4856ec1
commit 2d8b9f8fa8
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/SecuritySettings.java
View File

@@ -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;
}

2
src/com/android/settings/Utils.java
View File

@@ -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);

2
src/com/android/settings/fingerprint/FingerprintSettings.java
View File

@@ -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;
}