Revert "XiaomiParts: add separate microphone and noise control (works…

… only with XiaomiParts)" This reverts commit 106a6a5.
freemarkw · Aug 1, 2019 · cc15eee · cc15eee
1 parent 106a6a5
commit cc15eee
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 106 deletions.
diff --git a/XiaomiParts/res/values-ru/strings.xml b/XiaomiParts/res/values-ru/strings.xml
@@ -45,5 +45,4 @@
     <string name="headphone_gain">Усиление наушников</string>
     <string name="speaker_gain">Усиление динамика</string>
     <string name="mic_gain">Усиление микрофона</string>
-    <string name="mic2_gain">Увеличение диапазона чувствительности шумодава</string>
 </resources>
diff --git a/XiaomiParts/res/values-uk/strings.xml b/XiaomiParts/res/values-uk/strings.xml
@@ -45,5 +45,4 @@
     <string name="headphone_gain">Підсилення навушників</string>
     <string name="speaker_gain">Підсилення динаміка</string>
     <string name="mic_gain">Підсилення мікрофону</string>
-    <string name="mic2_gain">Збільшення діапазону чутливості шумодава</string>
 </resources>
diff --git a/XiaomiParts/res/values/strings.xml b/XiaomiParts/res/values/strings.xml
@@ -45,5 +45,4 @@
     <string name="headphone_gain">Headphone gain</string>
     <string name="speaker_gain">Speaker gain</string>
     <string name="mic_gain">Microphone gain</string>
-    <string name="mic2_gain">Increase the noise sensitivity range</string>
 </resources>
diff --git a/XiaomiParts/res/xml/sound_control.xml b/XiaomiParts/res/xml/sound_control.xml
@@ -22,8 +22,5 @@
     <com.mdroid.settings.device.sound.MicGainPreference
         android:key="mic_gain"
         android:title="@string/mic_gain" />
-    <com.mdroid.settings.device.sound.Mic2GainPreference
-        android:key="mic2_gain"
-        android:title="@string/mic2_gain" />
 
 </PreferenceScreen>
diff --git a/XiaomiParts/src/com/mdroid/settings/device/Startup.java b/XiaomiParts/src/com/mdroid/settings/device/Startup.java
@@ -28,7 +28,6 @@
 import com.mdroid.settings.device.sound.HeadphoneGainPreference;
 import com.mdroid.settings.device.sound.SpeakerGainPreference;
 import com.mdroid.settings.device.sound.MicGainPreference;
-import com.mdroid.settings.device.sound.Mic2GainPreference;
 
 public class Startup extends BroadcastReceiver {
 
@@ -59,6 +58,5 @@ public void onReceive(final Context context, final Intent bootintent) {
         HeadphoneGainPreference.restore(context);
         SpeakerGainPreference.restore(context);
         MicGainPreference.restore(context);
-        Mic2GainPreference.restore(context);
     }
 }
diff --git a/XiaomiParts/src/com/mdroid/settings/device/sound/Mic2GainPreference.java b/XiaomiParts/src/com/mdroid/settings/device/sound/Mic2GainPreference.java
diff --git a/XiaomiParts/src/com/mdroid/settings/device/sound/SoundControlSettings.java b/XiaomiParts/src/com/mdroid/settings/device/sound/SoundControlSettings.java
@@ -28,12 +28,10 @@ public class SoundControlSettings extends PreferenceFragment {
     public static final String KEY_HEADPHONE_GAIN = "headphone_gain";
     public static final String KEY_SPEAKER_GAIN = "speaker_gain";
     public static final String KEY_MICROPHONE_GAIN = "mic_gain";
-    public static final String KEY_MICROPHONE2_GAIN = "mic2_gain";
 
     private HeadphoneGainPreference mHeadphoneGain;
     private SpeakerGainPreference mSpeakerGain;
     private MicGainPreference mMicGain;
-    private Mic2GainPreference mMic2Gain;
 
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
@@ -53,10 +51,5 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         if (mMicGain != null) {
             mMicGain.setEnabled(MicGainPreference.isSupported());
         }
-
-        mMic2Gain = (Mic2GainPreference) findPreference(KEY_MICROPHONE2_GAIN);
-        if (mMic2Gain != null) {
-            mMic2Gain.setEnabled(Mic2GainPreference.isSupported());
-        }
     }
 }
diff --git a/rootdir/init.target.rc b/rootdir/init.target.rc
@@ -48,7 +48,6 @@ on property:sys.boot_completed=1
     chown system system /sys/kernel/sound_control/headphone_gain
     chown system system /sys/kernel/sound_control/speaker_gain
     chown system system /sys/kernel/sound_control/mic_gain
-    chown system system /sys/kernel/sound_control/mic2_gain
     restorecon_recursive /sys/kernel/sound_control
 
 on post-fs-data