【mt67xx_11.0】去掉设置--声音--阻止响铃的快捷方式下的“振动”字样 & 去掉设置--声音--充电提示音和振动中的“振动”字样

修改记录

diff --git a/alps/vendor/mediatek/proprietary/packages/apps/MtkSettings/src/com/android/settings/gestures/PreventRingingGesturePreferenceController.java b/alps/vendor/mediatek/proprietary/packages/apps/MtkSettings/src/com/android/settings/gestures/PreventRingingGesturePreferenceController.java
index 541bfe45760..4163b40f763 100644
--- a/alps/vendor/mediatek/proprietary/packages/apps/MtkSettings/src/com/android/settings/gestures/PreventRingingGesturePreferenceController.java
+++ b/alps/vendor/mediatek/proprietary/packages/apps/MtkSettings/src/com/android/settings/gestures/PreventRingingGesturePreferenceController.java
@@ -42,8 +42,8 @@ public class PreventRingingGesturePreferenceController extends AbstractPreferenc
         implements RadioButtonPreference.OnClickListener, LifecycleObserver,
         OnResume, OnPause, PreferenceControllerMixin {
 
-    @VisibleForTesting
-    static final String KEY_VIBRATE = "prevent_ringing_option_vibrate";
+    // @VisibleForTesting
+    // static final String KEY_VIBRATE = "prevent_ringing_option_vibrate";
 
     @VisibleForTesting
     static final String KEY_MUTE = "prevent_ringing_option_mute";
@@ -56,8 +56,8 @@ public class PreventRingingGesturePreferenceController extends AbstractPreferenc
 
     @VisibleForTesting
     PreferenceCategory mPreferenceCategory;
-    @VisibleForTesting
-    RadioButtonPreference mVibratePref;
+    // @VisibleForTesting
+    // RadioButtonPreference mVibratePref;
     @VisibleForTesting
     RadioButtonPreference mMutePref;
 
@@ -79,7 +79,7 @@ public class PreventRingingGesturePreferenceController extends AbstractPreferenc
             return;
         }
         mPreferenceCategory = screen.findPreference(getPreferenceKey());
-        mVibratePref = makeRadioPreference(KEY_VIBRATE, R.string.prevent_ringing_option_vibrate);
+        // mVibratePref = makeRadioPreference(KEY_VIBRATE, R.string.prevent_ringing_option_vibrate);
         mMutePref = makeRadioPreference(KEY_MUTE, R.string.prevent_ringing_option_mute);
 
         if (mPreferenceCategory != null) {
@@ -108,7 +108,7 @@ public class PreventRingingGesturePreferenceController extends AbstractPreferenc
     public void onRadioButtonClicked(RadioButtonPreference preference) {
         int preventRingingSetting = keyToSetting(preference.getKey());
         if (preventRingingSetting != Settings.Secure.getInt(mContext.getContentResolver(),
-                Settings.Secure.VOLUME_HUSH_GESTURE, Settings.Secure.VOLUME_HUSH_VIBRATE)) {
+                Settings.Secure.VOLUME_HUSH_GESTURE, Settings.Secure.VOLUME_HUSH_MUTE)) {
             Settings.Secure.putInt(mContext.getContentResolver(),
                     Settings.Secure.VOLUME_HUSH_GESTURE, preventRingingSetting);
         }
@@ -117,21 +117,21 @@ public class PreventRingingGesturePreferenceController extends AbstractPreferenc
     @Override
     public void updateState(Preference preference) {
         int preventRingingSetting = Settings.Secure.getInt(mContext.getContentResolver(),
-                Settings.Secure.VOLUME_HUSH_GESTURE, Settings.Secure.VOLUME_HUSH_VIBRATE);
+                Settings.Secure.VOLUME_HUSH_GESTURE, Settings.Secure.VOLUME_HUSH_MUTE);
         final boolean isVibrate = preventRingingSetting == Settings.Secure.VOLUME_HUSH_VIBRATE;
         final boolean isMute = preventRingingSetting == Settings.Secure.VOLUME_HUSH_MUTE;
-        if (mVibratePref != null && mVibratePref.isChecked() != isVibrate) {
-            mVibratePref.setChecked(isVibrate);
-        }
+        // if (mVibratePref != null && mVibratePref.isChecked() != isVibrate) {
+        //     mVibratePref.setChecked(isVibrate);
+        // }
         if (mMutePref != null && mMutePref.isChecked() != isMute) {
             mMutePref.setChecked(isMute);
         }
 
         if (preventRingingSetting == Settings.Secure.VOLUME_HUSH_OFF) {
-            mVibratePref.setEnabled(false);
+            // mVibratePref.setEnabled(false);
             mMutePref.setEnabled(false);
         } else {
-            mVibratePref.setEnabled(true);
+            // mVibratePref.setEnabled(true);
             mMutePref.setEnabled(true);
         }
     }
@@ -163,8 +163,8 @@ public class PreventRingingGesturePreferenceController extends AbstractPreferenc
         switch (key) {
             case KEY_MUTE:
                 return Settings.Secure.VOLUME_HUSH_MUTE;
-            case KEY_VIBRATE:
-                return Settings.Secure.VOLUME_HUSH_VIBRATE;
+            // case KEY_VIBRATE:
+            //     return Settings.Secure.VOLUME_HUSH_VIBRATE;
             default:
                 return Settings.Secure.VOLUME_HUSH_OFF;
         }
diff --git a/alps/vendor/mediatek/proprietary/packages/apps/MtkSettings/src/com/android/settings/gestures/PreventRingingParentPreferenceController.java b/alps/vendor/mediatek/proprietary/packages/apps/MtkSettings/src/com/android/settings/gestures/PreventRingingParentPreferenceController.java
index 7c7be096841..bbf1cdd2613 100644
--- a/alps/vendor/mediatek/proprietary/packages/apps/MtkSettings/src/com/android/settings/gestures/PreventRingingParentPreferenceController.java
+++ b/alps/vendor/mediatek/proprietary/packages/apps/MtkSettings/src/com/android/settings/gestures/PreventRingingParentPreferenceController.java
@@ -44,7 +44,7 @@ public class PreventRingingParentPreferenceController extends BasePreferenceCont
     @Override
     public CharSequence getSummary() {
         int value = Settings.Secure.getInt(
-                mContext.getContentResolver(), SECURE_KEY, VOLUME_HUSH_VIBRATE);
+                mContext.getContentResolver(), SECURE_KEY, VOLUME_HUSH_MUTE);
         int summary;
         switch (value) {
             case VOLUME_HUSH_VIBRATE:
diff --git a/alps/vendor/mediatek/proprietary/packages/apps/MtkSettings/src/com/android/settings/gestures/PreventRingingSwitchPreferenceController.java b/alps/vendor/mediatek/proprietary/packages/apps/MtkSettings/src/com/android/settings/gestures/PreventRingingSwitchPreferenceController.java
index 9545939255b..b0b481e80a2 100644
--- a/alps/vendor/mediatek/proprietary/packages/apps/MtkSettings/src/com/android/settings/gestures/PreventRingingSwitchPreferenceController.java
+++ b/alps/vendor/mediatek/proprietary/packages/apps/MtkSettings/src/com/android/settings/gestures/PreventRingingSwitchPreferenceController.java
@@ -64,12 +64,12 @@ public class PreventRingingSwitchPreferenceController extends AbstractPreference
                 pref.setOnPreferenceClickListener(preference -> {
                     int preventRinging = Settings.Secure.getInt(mContext.getContentResolver(),
                             Settings.Secure.VOLUME_HUSH_GESTURE,
-                            Settings.Secure.VOLUME_HUSH_VIBRATE);
+                            Settings.Secure.VOLUME_HUSH_MUTE);
                     boolean isChecked = preventRinging != Settings.Secure.VOLUME_HUSH_OFF;
                     Settings.Secure.putInt(mContext.getContentResolver(),
                             Settings.Secure.VOLUME_HUSH_GESTURE, isChecked
                                     ? Settings.Secure.VOLUME_HUSH_OFF
-                                    : Settings.Secure.VOLUME_HUSH_VIBRATE);
+                                    : Settings.Secure.VOLUME_HUSH_MUTE);
                     return true;
                 });
                 mSwitch = pref.findViewById(R.id.switch_bar);
@@ -90,7 +90,7 @@ public class PreventRingingSwitchPreferenceController extends AbstractPreference
     @Override
     public void updateState(Preference preference) {
         int preventRingingSetting = Settings.Secure.getInt(mContext.getContentResolver(),
-                Settings.Secure.VOLUME_HUSH_GESTURE, Settings.Secure.VOLUME_HUSH_VIBRATE);
+                Settings.Secure.VOLUME_HUSH_GESTURE, Settings.Secure.VOLUME_HUSH_MUTE);
         setChecked(preventRingingSetting != Settings.Secure.VOLUME_HUSH_OFF);
     }
 
@@ -103,9 +103,9 @@ public class PreventRingingSwitchPreferenceController extends AbstractPreference
     @Override
     public void onSwitchChanged(Switch switchView, boolean isChecked) {
         final int preventRingingSetting = Settings.Secure.getInt(mContext.getContentResolver(),
-                Settings.Secure.VOLUME_HUSH_GESTURE, Settings.Secure.VOLUME_HUSH_VIBRATE);
+                Settings.Secure.VOLUME_HUSH_GESTURE, Settings.Secure.VOLUME_HUSH_MUTE);
         final int newRingingSetting = preventRingingSetting == Settings.Secure.VOLUME_HUSH_OFF
-                ? Settings.Secure.VOLUME_HUSH_VIBRATE
+                ? Settings.Secure.VOLUME_HUSH_MUTE
                 : preventRingingSetting;
 
         Settings.Secure.putInt(mContext.getContentResolver(),
diff --git a/alps/vendor/mediatek/proprietary/packages/apps/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/alps/vendor/mediatek/proprietary/packages/apps/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
index d6ac4d666a4..28cac2ab8c6 100644
--- a/alps/vendor/mediatek/proprietary/packages/apps/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
+++ b/alps/vendor/mediatek/proprietary/packages/apps/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
@@ -4283,7 +4283,7 @@ public class SettingsProvider extends ContentProvider {
                     if (currentSetting.isNull()) {
                         secureSettings.insertSettingOverrideableByRestoreLocked(
                                 Secure.VOLUME_HUSH_GESTURE,
-                                Integer.toString(Secure.VOLUME_HUSH_VIBRATE),
+                                Integer.toString(Secure.VOLUME_HUSH_MUTE),
                                 null, true, SettingsState.SYSTEM_PACKAGE_NAME);
                     }
 

  • 0
    点赞
  • 2
    收藏
    觉得还不错? 一键收藏
  • 1
    评论
评论 1
添加红包

请填写红包祝福语或标题

红包个数最小为10个

红包金额最低5元

当前余额3.43前往充值 >
需支付:10.00
成就一亿技术人!
领取后你会自动成为博主和红包主的粉丝 规则
hope_wisdom
发出的红包
实付
使用余额支付
点击重新获取
扫码支付
钱包余额 0

抵扣说明:

1.余额是钱包充值的虚拟货币,按照1:1的比例进行支付金额的抵扣。
2.余额无法直接购买下载,可以购买VIP、付费专栏及课程。

余额充值