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

Merge "Only try disabling quiet mode" into nyc-dev

Browse Source 
am: 89726fd

* commit '89726fd95209689dea1f82912e85c837fbeb8553':
  Only try disabling quiet mode

Change-Id: I20ae72a682796290796e724f26e2f36280de9ed0
This commit is contained in:
Benjamin Franz
2016-04-15 14:55:11 +00:00
committed by android-build-merger
parent 3256144eba 89726fd952
commit e4a793f02d
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/accounts/AccountSettings.java
View File

@@ -251,7 +251,11 @@ public class AccountSettings extends SettingsPreferenceFragment
ProfileData profileData = mProfiles.valueAt(i);
if (preference == profileData.workModeSwitch) {
final int userId = profileData.userInfo.id;
mUm.setQuietModeEnabled(userId, !((boolean) newValue));
if ((boolean) newValue) {
mUm.trySetQuietModeDisabled(userId, null);
} else {
mUm.setQuietModeEnabled(userId, true);
}
return true;
}
}

2
src/com/android/settings/dashboard/conditional/WorkModeCondition.java
View File

@@ -90,7 +90,7 @@ public class WorkModeCondition extends Condition {
@Override
public void onActionClick(int index) {
if (index == 0) {
mUm.setQuietModeEnabled(mUserHandle.getIdentifier(), false);
mUm.trySetQuietModeDisabled(mUserHandle.getIdentifier(), null);
setActive(false);
} else {
throw new IllegalArgumentException("Unexpected index " + index);