Cut work sound prefs when personal ones are gone

For example when:
 - voice calls aren't supported, we hide phone ringtone.
 - audio is single stream, we hide everything.

Bug: 30658854
Change-Id: I8b2ad2fa08b35fa93f10447ef718a767fa389417
This commit is contained in:
Robin Lee
2016-09-02 14:10:37 +01:00
parent 141c20c5e3
commit e51fc163c2

View File

@@ -31,9 +31,7 @@ import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.content.IntentFilter; import android.content.IntentFilter;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
import android.content.pm.ServiceInfo; import android.content.pm.ServiceInfo;
import android.content.pm.UserInfo;
import android.database.ContentObserver; import android.database.ContentObserver;
import android.database.Cursor; import android.database.Cursor;
import android.database.sqlite.SQLiteException; import android.database.sqlite.SQLiteException;
@@ -58,7 +56,6 @@ import android.provider.Settings;
import android.support.v7.preference.Preference; import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceGroup; import android.support.v7.preference.PreferenceGroup;
import android.support.v7.preference.Preference.OnPreferenceChangeListener; import android.support.v7.preference.Preference.OnPreferenceChangeListener;
import android.support.v7.preference.Preference.OnPreferenceClickListener;
import android.support.v7.preference.TwoStatePreference; import android.support.v7.preference.TwoStatePreference;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log; import android.util.Log;
@@ -140,9 +137,9 @@ public class SoundSettings extends SettingsPreferenceFragment
private PreferenceGroup mWorkPreferenceCategory; private PreferenceGroup mWorkPreferenceCategory;
private TwoStatePreference mWorkUsePersonalSounds; private TwoStatePreference mWorkUsePersonalSounds;
private DefaultRingtonePreference mWorkPhoneRingtonePreference; private Preference mWorkPhoneRingtonePreference;
private DefaultRingtonePreference mWorkNotificationRingtonePreference; private Preference mWorkNotificationRingtonePreference;
private DefaultRingtonePreference mWorkAlarmRingtonePreference; private Preference mWorkAlarmRingtonePreference;
private PackageManager mPm; private PackageManager mPm;
private UserManager mUserManager; private UserManager mUserManager;
@@ -187,7 +184,7 @@ public class SoundSettings extends SettingsPreferenceFragment
removePreference(KEY_RING_VOLUME); removePreference(KEY_RING_VOLUME);
} }
if (AudioSystem.isSingleVolume(mContext)) { if (!shouldShowRingtoneSettings()) {
removePreference(KEY_RING_VOLUME); removePreference(KEY_RING_VOLUME);
removePreference(KEY_NOTIFICATION_VOLUME); removePreference(KEY_NOTIFICATION_VOLUME);
removePreference(KEY_ALARM_VOLUME); removePreference(KEY_ALARM_VOLUME);
@@ -257,7 +254,7 @@ public class SoundSettings extends SettingsPreferenceFragment
} }
mManagedProfileId = Utils.getManagedProfileId(mUserManager, UserHandle.myUserId()); mManagedProfileId = Utils.getManagedProfileId(mUserManager, UserHandle.myUserId());
if (hasManagedProfile()) { if (mManagedProfileId != UserHandle.USER_NULL && shouldShowRingtoneSettings()) {
if ((mWorkPreferenceCategory == null)) { if ((mWorkPreferenceCategory == null)) {
// Work preferences not yet set // Work preferences not yet set
addPreferencesFromResource(R.xml.sound_work_settings); addPreferencesFromResource(R.xml.sound_work_settings);
@@ -332,8 +329,7 @@ public class SoundSettings extends SettingsPreferenceFragment
return true; return true;
} }
Context managedProfileContext = Utils.createPackageContextAsUser(mContext, mManagedProfileId); preference.setSummary(updateRingtoneName(getManagedProfileContext(), ringtoneType));
preference.setSummary(updateRingtoneName(managedProfileContext, ringtoneType));
return true; return true;
} }
@@ -430,6 +426,10 @@ public class SoundSettings extends SettingsPreferenceFragment
// === Phone & notification ringtone === // === Phone & notification ringtone ===
private boolean shouldShowRingtoneSettings() {
return !AudioSystem.isSingleVolume(mContext);
}
private void initRingtones() { private void initRingtones() {
mPhoneRingtonePreference = getPreferenceScreen().findPreference(KEY_PHONE_RINGTONE); mPhoneRingtonePreference = getPreferenceScreen().findPreference(KEY_PHONE_RINGTONE);
if (mPhoneRingtonePreference != null && !mVoiceCapable) { if (mPhoneRingtonePreference != null && !mVoiceCapable) {
@@ -736,32 +736,38 @@ public class SoundSettings extends SettingsPreferenceFragment
// === Work Sound Settings === // === Work Sound Settings ===
private boolean hasManagedProfile() { private Context getManagedProfileContext() {
return mManagedProfileId != UserHandle.USER_NULL; if (mManagedProfileId == UserHandle.USER_NULL) {
return null;
}
return Utils.createPackageContextAsUser(mContext, mManagedProfileId);
}
private DefaultRingtonePreference initWorkPreference(String key) {
DefaultRingtonePreference pref =
(DefaultRingtonePreference) getPreferenceScreen().findPreference(key);
pref.setOnPreferenceChangeListener(this);
// Required so that RingtonePickerActivity lists the work profile ringtones
pref.setUserId(mManagedProfileId);
return pref;
} }
private void initWorkPreferences() { private void initWorkPreferences() {
mWorkPreferenceCategory = mWorkPreferenceCategory = (PreferenceGroup) getPreferenceScreen()
(PreferenceGroup) getPreferenceScreen().findPreference(KEY_WORK_CATEGORY); .findPreference(KEY_WORK_CATEGORY);
mWorkUsePersonalSounds = (TwoStatePreference) getPreferenceScreen() mWorkUsePersonalSounds = (TwoStatePreference) getPreferenceScreen()
.findPreference(KEY_WORK_USE_PERSONAL_SOUNDS); .findPreference(KEY_WORK_USE_PERSONAL_SOUNDS);
mWorkPhoneRingtonePreference = (DefaultRingtonePreference) getPreferenceScreen() mWorkPhoneRingtonePreference = initWorkPreference(KEY_WORK_PHONE_RINGTONE);
.findPreference(KEY_WORK_PHONE_RINGTONE); mWorkNotificationRingtonePreference = initWorkPreference(KEY_WORK_NOTIFICATION_RINGTONE);
mWorkNotificationRingtonePreference = (DefaultRingtonePreference) getPreferenceScreen() mWorkAlarmRingtonePreference = initWorkPreference(KEY_WORK_ALARM_RINGTONE);
.findPreference(KEY_WORK_NOTIFICATION_RINGTONE);
mWorkAlarmRingtonePreference = (DefaultRingtonePreference) getPreferenceScreen()
.findPreference(KEY_WORK_ALARM_RINGTONE);
// Required so that RingtonePickerActivity lists the work profile ringtones if (!mVoiceCapable) {
mWorkPhoneRingtonePreference.setUserId(mManagedProfileId); mWorkPreferenceCategory.removePreference(mWorkPhoneRingtonePreference);
mWorkNotificationRingtonePreference.setUserId(mManagedProfileId); mWorkPhoneRingtonePreference = null;
mWorkAlarmRingtonePreference.setUserId(mManagedProfileId); }
mWorkPhoneRingtonePreference.setOnPreferenceChangeListener(this); Context managedProfileContext = getManagedProfileContext();
mWorkNotificationRingtonePreference.setOnPreferenceChangeListener(this);
mWorkAlarmRingtonePreference.setOnPreferenceChangeListener(this);
Context managedProfileContext = Utils.createPackageContextAsUser(mContext, mManagedProfileId);
if (Settings.Secure.getIntForUser(managedProfileContext.getContentResolver(), if (Settings.Secure.getIntForUser(managedProfileContext.getContentResolver(),
Settings.Secure.SYNC_PARENT_SOUNDS, 0, mManagedProfileId) == 1) { Settings.Secure.SYNC_PARENT_SOUNDS, 0, mManagedProfileId) == 1) {
enableWorkSyncSettings(); enableWorkSyncSettings();
@@ -784,31 +790,29 @@ public class SoundSettings extends SettingsPreferenceFragment
} }
private void enableWorkSync() { private void enableWorkSync() {
if(hasManagedProfile()) { RingtoneManager.enableSyncFromParent(getManagedProfileContext());
Context managedProfileContext = Utils.createPackageContextAsUser(mContext, mManagedProfileId); enableWorkSyncSettings();
RingtoneManager.enableSyncFromParent(managedProfileContext);
enableWorkSyncSettings();
}
} }
private void enableWorkSyncSettings() { private void enableWorkSyncSettings() {
mWorkUsePersonalSounds.setChecked(true); mWorkUsePersonalSounds.setChecked(true);
mWorkPhoneRingtonePreference.setSummary(R.string.work_sound_same_as_personal); if (mWorkPhoneRingtonePreference != null) {
mWorkPhoneRingtonePreference.setSummary(R.string.work_sound_same_as_personal);
}
mWorkNotificationRingtonePreference.setSummary(R.string.work_sound_same_as_personal); mWorkNotificationRingtonePreference.setSummary(R.string.work_sound_same_as_personal);
mWorkAlarmRingtonePreference.setSummary(R.string.work_sound_same_as_personal); mWorkAlarmRingtonePreference.setSummary(R.string.work_sound_same_as_personal);
} }
private void disableWorkSync() { private void disableWorkSync() {
if(hasManagedProfile()) { RingtoneManager.disableSyncFromParent(getManagedProfileContext());
Context managedProfileContext = Utils.createPackageContextAsUser(mContext, mManagedProfileId); disableWorkSyncSettings();
RingtoneManager.disableSyncFromParent(managedProfileContext);
disableWorkSyncSettings();
}
} }
private void disableWorkSyncSettings() { private void disableWorkSyncSettings() {
mWorkPhoneRingtonePreference.setEnabled(true); if (mWorkPhoneRingtonePreference != null) {
mWorkPhoneRingtonePreference.setEnabled(true);
}
mWorkNotificationRingtonePreference.setEnabled(true); mWorkNotificationRingtonePreference.setEnabled(true);
mWorkAlarmRingtonePreference.setEnabled(true); mWorkAlarmRingtonePreference.setEnabled(true);
@@ -816,27 +820,18 @@ public class SoundSettings extends SettingsPreferenceFragment
} }
private void updateWorkRingtoneSummaries() { private void updateWorkRingtoneSummaries() {
Context managedProfileContext = Utils.createPackageContextAsUser(mContext, mManagedProfileId); Context managedProfileContext = getManagedProfileContext();
mWorkPhoneRingtonePreference.setSummary( if (mWorkPhoneRingtonePreference != null) {
updateRingtoneName(managedProfileContext, RingtoneManager.TYPE_RINGTONE)); mWorkPhoneRingtonePreference.setSummary(
updateRingtoneName(managedProfileContext, RingtoneManager.TYPE_RINGTONE));
}
mWorkNotificationRingtonePreference.setSummary( mWorkNotificationRingtonePreference.setSummary(
updateRingtoneName(managedProfileContext, RingtoneManager.TYPE_NOTIFICATION)); updateRingtoneName(managedProfileContext, RingtoneManager.TYPE_NOTIFICATION));
mWorkAlarmRingtonePreference.setSummary( mWorkAlarmRingtonePreference.setSummary(
updateRingtoneName(managedProfileContext, RingtoneManager.TYPE_ALARM)); updateRingtoneName(managedProfileContext, RingtoneManager.TYPE_ALARM));
} }
private Context createPackageContextAsUser(int userId) {
try {
return mContext.createPackageContextAsUser(
mContext.getPackageName(), 0 /* flags */, UserHandle.of(userId));
} catch (PackageManager.NameNotFoundException e) {
// Should never happen
Log.e(TAG, "Failed to create managed user context", e);
}
return null;
}
private void maybeRemoveWorkPreferences() { private void maybeRemoveWorkPreferences() {
if (mWorkPreferenceCategory == null) { if (mWorkPreferenceCategory == null) {
// No work preferences to remove // No work preferences to remove