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

Commit f892e216 authored by Andy Hung's avatar Andy Hung
Browse files

Remove mono audio from SoundSettings 

Mono audio will move to AccessibilitySettings only.
This reverts commit 0863ea40.

Bug: 15283594
Change-Id: I2cc744c96a9f6a6454b0bf533a44bb2eb56b745a
parent 24264eb2

res/values/strings.xml

+0 −9
Original line number Diff line number Diff line
@@ -5823,15 +5823,6 @@ 
    <!-- Sound: Title for the option managing whether or not to vibrate when ringing. [CHAR LIMIT=30] -->

    <string name="vibrate_when_ringing_title">Also vibrate for calls</string>









    <!-- Sound: Title for the option managing mono audio output. [CHAR LIMIT=30] -->









    <string name="master_mono_title">Mono playback</string>

















    <!-- Sound: Mono audio: Summary for mono audio output when enabled.  [CHAR LIMIT=40] -->









    <string name="master_mono_on">Always play back audio in mono</string>

















    <!-- Sound: Mono audio: Summary for mono audio output when disabled.  [CHAR LIMIT=40] -->









    <string name="master_mono_off">Always play back audio in mono</string>

















    <!-- Sound: Title for the other sounds option and associated settings page. [CHAR LIMIT=30] -->









    <string name="other_sound_settings">Other sounds</string>








































res/xml/sound_settings.xml



+0
−6






























Original line number
Diff line number
Diff line







@@ -49,12 +49,6 @@







                android:key="vibrate_when_ringing"









                android:title="@string/vibrate_when_ringing_title" />



















        <!-- Master mono -->









        <SwitchPreference









                android:key="master_mono"









                android:title="@string/master_mono_title"









                android:summaryOn="@string/master_mono_on"









                android:summaryOff="@string/master_mono_off" />



















        <!-- Interruptions -->









        <com.android.settingslib.RestrictedPreference
































src/com/android/settings/notification/SoundSettings.java



+1
−38






























Original line number
Diff line number
Diff line







@@ -80,7 +80,6 @@ public class SoundSettings extends SettingsPreferenceFragment implements Indexab







    private static final String KEY_NOTIFICATION_RINGTONE = "notification_ringtone";









    private static final String KEY_ALARM_RINGTONE = "alarm_ringtone";









    private static final String KEY_VIBRATE_WHEN_RINGING = "vibrate_when_ringing";









    private static final String KEY_MASTER_MONO = "master_mono";









    private static final String KEY_WIFI_DISPLAY = "wifi_display";









    private static final String KEY_ZEN_MODE = "zen_mode";









    private static final String KEY_CELL_BROADCAST_SETTINGS = "cell_broadcast_settings";








@@ -111,7 +110,6 @@ public class SoundSettings extends SettingsPreferenceFragment implements Indexab







    private Preference mNotificationRingtonePreference;









    private Preference mAlarmRingtonePreference;









    private TwoStatePreference mVibrateWhenRinging;









    private TwoStatePreference mMasterMono;









    private ComponentName mSuppressor;









    private int mRingerMode = -1;


















@@ -176,7 +174,6 @@ public class SoundSettings extends SettingsPreferenceFragment implements Indexab







        }









        initRingtones();









        initVibrateWhenRinging();









        initMasterMono();









        updateRingerMode();









        updateEffectsSuppressor();









    }








@@ -451,33 +448,6 @@ public class SoundSettings extends SettingsPreferenceFragment implements Indexab







                Settings.System.VIBRATE_WHEN_RINGING, 0) != 0);









    }



















    // === Master mono ===



















    private void initMasterMono() {









        mMasterMono =









                (TwoStatePreference) getPreferenceScreen().findPreference(KEY_MASTER_MONO);









        if (mMasterMono == null) {









            Log.i(TAG, "Preference not found: " + KEY_MASTER_MONO);









            return;









        }



















        mMasterMono.setPersistent(false);









        updateMasterMono();









        mMasterMono.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {









            @Override









            public boolean onPreferenceChange(Preference preference, Object newValue) {









                final boolean val = (Boolean) newValue;









                mAudioManager.setMasterMono(val);









                return true;









            }









        });









    }



















    private void updateMasterMono() {









        if (mMasterMono == null) return;









        mMasterMono.setChecked(mAudioManager.isMasterMono());









    }



















    // === Callbacks ===



















    private final class SettingsObserver extends ContentObserver {








@@ -512,8 +482,7 @@ public class SoundSettings extends SettingsPreferenceFragment implements Indexab







        private static final int STOP_SAMPLE = 3;









        private static final int UPDATE_EFFECTS_SUPPRESSOR = 4;









        private static final int UPDATE_RINGER_MODE = 5;









        private static final int UPDATE_MASTER_MONO = 6;









        private static final int UPDATE_ALARM_RINGTONE = 7;









        private static final int UPDATE_ALARM_RINGTONE = 6;



















        private H() {









            super(Looper.getMainLooper());








@@ -537,9 +506,6 @@ public class SoundSettings extends SettingsPreferenceFragment implements Indexab







                case UPDATE_RINGER_MODE:









                    updateRingerMode();









                    break;









                case UPDATE_MASTER_MONO:









                    updateMasterMono();









                    break;









                case UPDATE_ALARM_RINGTONE:









                    mAlarmRingtonePreference.setSummary((CharSequence) msg.obj);









                    break;








@@ -556,7 +522,6 @@ public class SoundSettings extends SettingsPreferenceFragment implements Indexab







                final IntentFilter filter = new IntentFilter();









                filter.addAction(NotificationManager.ACTION_EFFECTS_SUPPRESSOR_CHANGED);









                filter.addAction(AudioManager.INTERNAL_RINGER_MODE_CHANGED_ACTION);









                filter.addAction(AudioManager.MASTER_MONO_CHANGED_ACTION);









                mContext.registerReceiver(this, filter);









            } else {









                mContext.unregisterReceiver(this);








@@ -571,8 +536,6 @@ public class SoundSettings extends SettingsPreferenceFragment implements Indexab







                mHandler.sendEmptyMessage(H.UPDATE_EFFECTS_SUPPRESSOR);









            } else if (AudioManager.INTERNAL_RINGER_MODE_CHANGED_ACTION.equals(action)) {









                mHandler.sendEmptyMessage(H.UPDATE_RINGER_MODE);









            } else if (AudioManager.MASTER_MONO_CHANGED_ACTION.equals(action)) {









                mHandler.sendEmptyMessage(H.UPDATE_MASTER_MONO);









            }









        }









    }