Android7.0 合并三个音量条为一个音量条

其他 2018-06-30 13:16:58 阅读次数: 0
hejiangzhou@koridy-Bulider-252:~/M2$ git status
位于分支 M3
您的分支与上游分支 'origin/M3' 一致。
尚未暂存以备提交的变更：
  （使用 "git add <文件>..." 更新要提交的内容）
  （使用 "git checkout -- <文件>..." 丢弃工作区的改动）


        修改：     frameworks/av/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
        修改：     frameworks/base/core/res/res/drawable/ic_audio_media.xml
        修改：     frameworks/base/core/res/res/drawable/ic_audio_media_mute.xml
        修改：     frameworks/base/packages/SystemUI/res/drawable/ic_volume_media.xml
        修改：     frameworks/base/packages/SystemUI/res/drawable/ic_volume_media_mute.xml
        修改：     frameworks/base/packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java
        修改：     frameworks/base/services/core/java/com/android/server/audio/AudioService.java
        修改：     packages/apps/Settings/src/com/android/settings/notification/SoundSettings.java


未跟踪的文件:
  （使用 "git add <文件>..." 以包含要提交的内容）


        frameworks/m2_framework.si4project/




耗费了 3.62 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度，
但您需要小心不要忘了添加新文件（参见 'git help status'）。
修改尚未加入提交（使用 "git add" 和/或 "git commit -a"）
hejiangzhou@koridy-Bulider-252:~/M2$ git diff
diff --git a/frameworks/av/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/frameworks/av/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
old mode 100644
new mode 100755
index 4cc46e4..4e10b75
--- a/frameworks/av/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/frameworks/av/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -2472,10 +2472,11 @@ status_t AudioPolicyManager::setStreamVolumeIndex(audio_stream_type_t stream,
           stream, device, index);
 
     // update other private stream volumes which follow this one
-    for (int curStream = 0; curStream < AUDIO_STREAM_FOR_POLICY_CNT; curStream++) {
-        if (!streamsMatchForvolume(stream, (audio_stream_type_t)curStream)) {
-            continue;
-        }
+    for (int curStream = 0; curStream < AUDIO_STREAM_FOR_POLICY_CNT; curStream++) {  
+               /***     kyd delete streamsMatchForvolume(stream, (audio_stream_type_t)curStream)     ***/
+        //if (!streamsMatchForvolume(stream, (audio_stream_type_t)curStream)) {
+        //  continue;
+        //}
         mVolumeCurves->addCurrentVolumeIndex((audio_stream_type_t)curStream, device, index);
     }
 #if defined(MTK_AUDIO) && defined(MTK_USB_PHONECALL)
diff --git a/frameworks/base/core/res/res/drawable/ic_audio_media.xml b/frameworks/base/core/res/res/drawable/ic_audio_media.xml
index 4ef5340..546f21d 100644
--- a/frameworks/base/core/res/res/drawable/ic_audio_media.xml
+++ b/frameworks/base/core/res/res/drawable/ic_audio_media.xml
@@ -1,28 +1,15 @@
-<!--
-     Copyright (C) 2015 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="32.0dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0"
-    android:width="32.0dp"
-    android:tint="?attr/colorControlNormal">
-
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M12.0,3.0l0.0,9.28c-0.47,-0.17 -0.97,-0.28 -1.5,-0.28C8.01,12.0 6.0,14.01 6.0,16.5S8.01,21.0 10.5,21.0c2.31,0.0 4.2,-1.75 4.45,-4.0L15.0,17.0L15.0,6.0l4.0,0.0L19.0,3.0l-7.0,0.0z" />
-
-</vector>
-
+<vector xmlns:android="http://schemas.android.com/apk/res/android"^M
+    android:width="24dp"^M
+    android:height="24dp"^M
+    android:viewportWidth="24"^M
+    android:viewportHeight="24">^M
+  <path^M
+      android:pathData="M13.269,20.766V2.689C13.22,1.642 12.597,1.4 12.014,1.372c-0.527,-0.024 -1.015,0.433 -1.015,0.433L5.068,7.417H0.857C0.385,7.417 0,7.802 0,8.274v6.822c0,0.474 0.385,0.858 0.857,0.858h4.881c1.512,1.498 4.474,4.457 5.068,5.232c0.832,1.086 1.731,0.77 1.731,0.77C13.348,21.575 13.269,20.766 13.269,20.766z"^M
+      android:fillColor="#1A9578"/>^M
+  <path^M
+      android:pathData="M18.414,20.191c-0.313,0 -0.611,-0.171 -0.764,-0.467c-0.218,-0.42 -0.053,-0.938 0.368,-1.154c2.57,-1.324 4.166,-3.94 4.166,-6.828c0,-2.939 -1.715,-5.661 -4.368,-6.929c-0.429,-0.205 -0.608,-0.717 -0.404,-1.145c0.203,-0.428 0.716,-0.608 1.145,-0.404c3.245,1.554 5.343,4.88 5.343,8.478c0,3.532 -1.951,6.733 -5.093,8.354C18.681,20.16 18.545,20.191 18.414,20.191z"^M
+      android:fillColor="#1A9578"/>^M
+  <path^M
+      android:pathData="M16.441,16.384c-0.311,0 -0.61,-0.17 -0.763,-0.466c-0.217,-0.42 -0.052,-0.938 0.37,-1.154c1.146,-0.592 1.859,-1.76 1.859,-3.05c0,-1.313 -0.767,-2.526 -1.951,-3.092c-0.427,-0.206 -0.607,-0.718 -0.404,-1.146c0.205,-0.428 0.717,-0.607 1.145,-0.404c1.778,0.851 2.926,2.672 2.926,4.642c0,1.935 -1.068,3.687 -2.788,4.573C16.709,16.353 16.574,16.384 16.441,16.384z"^M
+      android:fillColor="#1A9578"/>^M
+</vector>^M
diff --git a/frameworks/base/core/res/res/drawable/ic_audio_media_mute.xml b/frameworks/base/core/res/res/drawable/ic_audio_media_mute.xml
index 2be6dc4..c3a60b7 100644
--- a/frameworks/base/core/res/res/drawable/ic_audio_media_mute.xml
+++ b/frameworks/base/core/res/res/drawable/ic_audio_media_mute.xml
@@ -1,31 +1,21 @@
-<!--
-     Copyright (C) 2015 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="32.0dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0"
-    android:width="32.0dp"
-    android:tint="?attr/colorControlNormal">
-
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M15.0,6.0l4.0,0.0L19.0,3.0l-7.0,0.0l0.0,5.6l3.0,3.0C15.0,8.8 15.0,6.0 15.0,6.0z" />
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M4.8,3.9L3.5,5.1l6.9,6.9C8.0,12.1 6.0,14.0 6.0,16.5C6.0,19.0 8.0,21.0 10.5,21.0c2.7,0.0 4.5,-2.3 4.5,-4.3c0.0,0.0 0.0,-0.1 0.0,-0.1l4.0,4.0l1.3,-1.3L4.8,3.9z" />
-
-</vector>
-
+<vector xmlns:android="http://schemas.android.com/apk/res/android"^M
+    android:width="24dp"^M
+    android:height="24dp"^M
+    android:viewportWidth="24"^M
+    android:viewportHeight="24">^M
+  <path^M
+      android:pathData="M18.414,20.191c-0.313,0 -0.611,-0.171 -0.764,-0.467c-0.218,-0.42 -0.053,-0.938 0.368,-1.154c2.57,-1.324 4.166,-3.94 4.166,-6.828c0,-2.939 -1.715,-5.661 -4.368,-6.929c-0.429,-0.205 -0.608,-0.717 -0.404,-1.145c0.203,-0.428 0.716,-0.608 1.145,-0.404c3.245,1.554 5.343,4.88 5.343,8.478c0,3.532 -1.951,6.733 -5.093,8.354C18.681,20.16 18.545,20.191 18.414,20.191z"^M
+      android:fillColor="#1A9578"/>^M
+  <path^M
+      android:pathData="M16.441,16.384c-0.311,0 -0.61,-0.17 -0.763,-0.466c-0.217,-0.42 -0.052,-0.938 0.37,-1.154c1.146,-0.592 1.859,-1.76 1.859,-3.05c0,-1.313 -0.767,-2.526 -1.951,-3.092c-0.427,-0.206 -0.607,-0.718 -0.404,-1.146c0.205,-0.428 0.717,-0.607 1.145,-0.404c1.778,0.851 2.926,2.672 2.926,4.642c0,1.935 -1.068,3.687 -2.788,4.573C16.709,16.353 16.574,16.384 16.441,16.384z"^M
+      android:fillColor="#1A9578"/>^M
+  <path^M
+      android:pathData="M14.133,9.449l-4.52,9.476c0.947,0.968 1.774,1.838 2.058,2.208c0.832,1.086 1.731,0.77 1.731,0.77c0.81,-0.382 0.73,-1.191 0.73,-1.191V9.449z"^M
+      android:fillColor="#1A9578"/>^M
+  <path^M
+      android:pathData="M6.919,16.215l6.911,-14.49c-0.246,-0.293 -0.604,-0.391 -0.952,-0.407c-0.527,-0.024 -1.015,0.433 -1.015,0.433L5.933,7.362H1.722c-0.473,0 -0.857,0.385 -0.857,0.857v6.822c0,0.474 0.385,0.858 0.857,0.858h4.881C6.698,15.995 6.813,16.109 6.919,16.215z"^M
+      android:fillColor="#1A9578"/>^M
+  <path^M
+      android:pathData="M7.162,22.313l10.166,-21.313l-2.127,0l-10.166,21.313z"^M
+      android:fillColor="#1A9578"/>^M
+</vector>^M
diff --git a/frameworks/base/packages/SystemUI/res/drawable/ic_volume_media.xml b/frameworks/base/packages/SystemUI/res/drawable/ic_volume_media.xml
index 97089f1..00a9044 100644
--- a/frameworks/base/packages/SystemUI/res/drawable/ic_volume_media.xml
+++ b/frameworks/base/packages/SystemUI/res/drawable/ic_volume_media.xml
@@ -1,26 +1,15 @@
-<!--
-     Copyright (C) 2015 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24.0dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0"
-    android:width="24.0dp" >
-
-    <path
-        android:fillColor="@color/volume_icon_color"
-        android:pathData="M12.0,3.0l0.0,9.28c-0.47,-0.17 -0.97,-0.28 -1.5,-0.28C8.01,12.0 6.0,14.01 6.0,16.5S8.01,21.0 10.5,21.0c2.31,0.0 4.2,-1.75 4.45,-4.0L15.0,17.0L15.0,6.0l4.0,0.0L19.0,3.0l-7.0,0.0z" />
-
-</vector>
\ No newline at end of file
+<vector xmlns:android="http://schemas.android.com/apk/res/android"^M
+    android:width="24dp"^M
+    android:height="24dp"^M
+    android:viewportWidth="24"^M
+    android:viewportHeight="24">^M
+  <path^M
+      android:pathData="M13.269,20.766V2.689C13.22,1.642 12.597,1.4 12.014,1.372c-0.527,-0.024 -1.015,0.433 -1.015,0.433L5.068,7.417H0.857C0.385,7.417 0,7.802 0,8.274v6.822c0,0.474 0.385,0.858 0.857,0.858h4.881c1.512,1.498 4.474,4.457 5.068,5.232c0.832,1.086 1.731,0.77 1.731,0.77C13.348,21.575 13.269,20.766 13.269,20.766z"^M
+      android:fillColor="#FFFFFF"/>^M
+  <path^M
+      android:pathData="M18.414,20.191c-0.313,0 -0.611,-0.171 -0.764,-0.467c-0.218,-0.42 -0.053,-0.938 0.368,-1.154c2.57,-1.324 4.166,-3.94 4.166,-6.828c0,-2.939 -1.715,-5.661 -4.368,-6.929c-0.429,-0.205 -0.608,-0.717 -0.404,-1.145c0.203,-0.428 0.716,-0.608 1.145,-0.404c3.245,1.554 5.343,4.88 5.343,8.478c0,3.532 -1.951,6.733 -5.093,8.354C18.681,20.16 18.545,20.191 18.414,20.191z"^M
+      android:fillColor="#FFFFFF"/>^M
+  <path^M
+      android:pathData="M16.441,16.384c-0.311,0 -0.61,-0.17 -0.763,-0.466c-0.217,-0.42 -0.052,-0.938 0.37,-1.154c1.146,-0.592 1.859,-1.76 1.859,-3.05c0,-1.313 -0.767,-2.526 -1.951,-3.092c-0.427,-0.206 -0.607,-0.718 -0.404,-1.146c0.205,-0.428 0.717,-0.607 1.145,-0.404c1.778,0.851 2.926,2.672 2.926,4.642c0,1.935 -1.068,3.687 -2.788,4.573C16.709,16.353 16.574,16.384 16.441,16.384z"^M
+      android:fillColor="#FFFFFF"/>^M
+</vector>^M
diff --git a/frameworks/base/packages/SystemUI/res/drawable/ic_volume_media_mute.xml b/frameworks/base/packages/SystemUI/res/drawable/ic_volume_media_mute.xml
index beb806c..b117363 100644
--- a/frameworks/base/packages/SystemUI/res/drawable/ic_volume_media_mute.xml
+++ b/frameworks/base/packages/SystemUI/res/drawable/ic_volume_media_mute.xml
@@ -1,29 +1,21 @@
-<!--
-     Copyright (C) 2015 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24.0dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0"
-    android:width="24.0dp" >
-
-    <path
-        android:fillColor="@color/volume_icon_color"
-        android:pathData="M15.0,6.0l4.0,0.0L19.0,3.0l-7.0,0.0l0.0,5.6l3.0,3.0C15.0,8.8 15.0,6.0 15.0,6.0z" />
-    <path
-        android:fillColor="@color/volume_icon_color"
-        android:pathData="M4.8,3.9L3.5,5.1l6.9,6.9C8.0,12.1 6.0,14.0 6.0,16.5C6.0,19.0 8.0,21.0 10.5,21.0c2.7,0.0 4.5,-2.3 4.5,-4.3c0.0,0.0 0.0,-0.1 0.0,-0.1l4.0,4.0l1.3,-1.3L4.8,3.9z" />
-
-</vector>
\ No newline at end of file
+<vector xmlns:android="http://schemas.android.com/apk/res/android"^M
+    android:width="24dp"^M
+    android:height="24dp"^M
+    android:viewportWidth="24"^M
+    android:viewportHeight="24">^M
+  <path^M
+      android:pathData="M18.414,20.191c-0.313,0 -0.611,-0.171 -0.764,-0.467c-0.218,-0.42 -0.053,-0.938 0.368,-1.154c2.57,-1.324 4.166,-3.94 4.166,-6.828c0,-2.939 -1.715,-5.661 -4.368,-6.929c-0.429,-0.205 -0.608,-0.717 -0.404,-1.145c0.203,-0.428 0.716,-0.608 1.145,-0.404c3.245,1.554 5.343,4.88 5.343,8.478c0,3.532 -1.951,6.733 -5.093,8.354C18.681,20.16 18.545,20.191 18.414,20.191z"^M
+      android:fillColor="#FFFFFF"/>^M
+  <path^M
+      android:pathData="M16.441,16.384c-0.311,0 -0.61,-0.17 -0.763,-0.466c-0.217,-0.42 -0.052,-0.938 0.37,-1.154c1.146,-0.592 1.859,-1.76 1.859,-3.05c0,-1.313 -0.767,-2.526 -1.951,-3.092c-0.427,-0.206 -0.607,-0.718 -0.404,-1.146c0.205,-0.428 0.717,-0.607 1.145,-0.404c1.778,0.851 2.926,2.672 2.926,4.642c0,1.935 -1.068,3.687 -2.788,4.573C16.709,16.353 16.574,16.384 16.441,16.384z"^M
+      android:fillColor="#FFFFFF"/>^M
+  <path^M
+      android:pathData="M14.133,9.449l-4.52,9.476c0.947,0.968 1.774,1.838 2.058,2.208c0.832,1.086 1.731,0.77 1.731,0.77c0.81,-0.382 0.73,-1.191 0.73,-1.191V9.449z"^M
+      android:fillColor="#FFFFFF"/>^M
+  <path^M
+      android:pathData="M6.919,16.215l6.911,-14.49c-0.246,-0.293 -0.604,-0.391 -0.952,-0.407c-0.527,-0.024 -1.015,0.433 -1.015,0.433L5.933,7.362H1.722c-0.473,0 -0.857,0.385 -0.857,0.857v6.822c0,0.474 0.385,0.858 0.857,0.858h4.881C6.698,15.995 6.813,16.109 6.919,16.215z"^M
+      android:fillColor="#FFFFFF"/>^M
+  <path^M
+      android:pathData="M7.162,22.313l10.166,-21.313l-2.127,0l-10.166,21.313z"^M
+      android:fillColor="#FFFFFF"/>^M
+</vector>^M
diff --git a/frameworks/base/packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java b/frameworks/base/packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java
old mode 100644
new mode 100755
index 1973e05..b0853b9
--- a/frameworks/base/packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java
+++ b/frameworks/base/packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java
@@ -215,6 +215,8 @@ public class VolumeDialog implements TunerService.Tunable {
         mExpanded = false;
         mExpandButton = (ImageButton) mDialogView.findViewById(R.id.volume_expand_button);
         mExpandButton.setOnClickListener(mClickExpand);
+               mExpandButton.setVisibility(View.INVISIBLE);
+               
         updateWindowWidthH();
         updateExpandButtonH();
 
@@ -235,11 +237,11 @@ public class VolumeDialog implements TunerService.Tunable {
                     }
                 });
 
-        if (mRows.isEmpty()) {
-            addRow(AudioManager.STREAM_RING,
-                    R.drawable.ic_volume_ringer, R.drawable.ic_volume_ringer_mute, true);
+       if (mRows.isEmpty()) {  
+               addRow(AudioManager.STREAM_RING,
+                    R.drawable.ic_volume_ringer, R.drawable.ic_volume_ringer_mute, false);
             addRow(AudioManager.STREAM_MUSIC,
-                    R.drawable.ic_volume_media, R.drawable.ic_volume_media_mute, true);
+                    R.drawable.ic_volume_media, R.drawable.ic_volume_media_mute, false);
             addRow(AudioManager.STREAM_ALARM,
                     R.drawable.ic_volume_alarm, R.drawable.ic_volume_alarm_mute, false);
             addRow(AudioManager.STREAM_VOICE_CALL,
diff --git a/frameworks/base/services/core/java/com/android/server/audio/AudioService.java b/frameworks/base/services/core/java/com/android/server/audio/AudioService.java
index e5b466e..76ea18d 100755
--- a/frameworks/base/services/core/java/com/android/server/audio/AudioService.java
+++ b/frameworks/base/services/core/java/com/android/server/audio/AudioService.java
@@ -1469,7 +1469,9 @@ public class AudioService extends IAudioService.Stub {
                        enableSpeaker(true);
                }
                // end linqihan@wisky
-        sendVolumeUpdate(streamType, oldIndex, index, flags);
+       /***    kyd force define  streamType = 3     ***/
+       streamType = 3;
+       sendVolumeUpdate(streamType, oldIndex, index, flags);
     }
        
        // add by linqihan@wisky, control speaker codec power
diff --git a/packages/apps/Settings/src/com/android/settings/notification/SoundSettings.java b/packages/apps/Settings/src/com/android/settings/notification/SoundSettings.java
old mode 100644
new mode 100755
index ad66a4f..96ded19
--- a/packages/apps/Settings/src/com/android/settings/notification/SoundSettings.java
+++ b/packages/apps/Settings/src/com/android/settings/notification/SoundSettings.java
@@ -150,8 +150,9 @@ public class SoundSettings extends SettingsPreferenceFragment implements Indexab
         initVolumePreference(KEY_MEDIA_VOLUME, AudioManager.STREAM_MUSIC,
                 com.android.internal.R.drawable.ic_audio_media_mute);
         initVolumePreference(KEY_ALARM_VOLUME, AudioManager.STREAM_ALARM,
-                com.android.internal.R.drawable.ic_audio_alarm_mute);
-        if (mVoiceCapable) {
+                com.android.internal.R.drawable.ic_audio_media_mute);
+               
+        if (mVoiceCapable) { 
             mRingOrNotificationPreference =
                     initVolumePreference(KEY_RING_VOLUME, AudioManager.STREAM_RING,
                             com.android.internal.R.drawable.ic_audio_ring_notif_mute);
@@ -162,6 +163,9 @@ public class SoundSettings extends SettingsPreferenceFragment implements Indexab
                             com.android.internal.R.drawable.ic_audio_ring_notif_mute);
             removePreference(KEY_RING_VOLUME);
         }
+               removePreference(KEY_RING_VOLUME);
+               removePreference(KEY_NOTIFICATION_VOLUME);
+               removePreference(KEY_ALARM_VOLUME);
 
         // Enable link to CMAS app settings depending on the value in config.xml.
         boolean isCellBroadcastAppLinkEnabled = this.getResources().getBoolean(
@@ -608,7 +612,7 @@ public class SoundSettings extends SettingsPreferenceFragment implements Indexab
         @Override
         public void onReceive(Context context, Intent intent) {
             String percent =  NumberFormat.getPercentInstance().format(
-                    (double) mAudioManager.getStreamVolume(AudioManager.STREAM_RING) / maxVolume);
+                    (double) mAudioManager.getStreamVolume(AudioManager.STREAM_MUSIC) / maxVolume);
             mSummaryLoader.setSummary(this,
                     mContext.getString(R.string.sound_settings_summary, percent));
         }
@@ -639,7 +643,7 @@ public class SoundSettings extends SettingsPreferenceFragment implements Indexab
             final ArrayList<String> rt = new ArrayList<String>();
             if (Utils.isVoiceCapable(context)) {
                 rt.add(KEY_NOTIFICATION_VOLUME);
-            } else {
+                          } else {
                 rt.add(KEY_RING_VOLUME);
                 rt.add(KEY_PHONE_RINGTONE);
                 rt.add(KEY_WIFI_DISPLAY);

猜你喜欢

转载自blog.csdn.net/u014630142/article/details/80743119
今日推荐
基于大语言模型的开源知识库问答系统 MaxKB GitHub Star 数量突破 5,000 个！
美国拟限制 AI 大模型出口中国和俄罗斯
苹果将与 OpenAI 达成协议，将 ChatGPT 应用于 iPhone
openKylin 社区生态委员会第六次会议圆满召开
阿里云正式发布通义千问 2.5
Python 3.13 发布首个 Beta：实验性自由线程模式和 JIT、改进交互式解释器
Stack Overflow 拿我的代码去训练 AI 大模型，还封了我的账号
Pop!_OS 的 COSMIC 桌面完成 App Store 上架工作
《2024 年一季度互联网投融资运行情况》研究报告
报告：Django 仍然是 74% 开发者的首选
15 年前上了“FFmpeg 耻辱柱”，今天他还得谢谢咱——腾讯QQPlayer一雪前耻？
TIOBE 5 月榜单：Fortran “复活”进入 Top 10
周排行
记一下去大梅沙的准备（2018-05-26）
Spring 注解 事务
基于HTTP协议的客户端缓存
阿里云rds 备份和还原
[PHP] 几个拖慢 PHP 程序/API 运行速度的点
python 代码风格------------PEP8规则
js控制json生成菜单——自制菜单（一）
将字符串: 'k:1|k1:2|k2:3|k3:4 ' ,处理成 python 字典: {'k':1, 'k1':2, ...}
微信小程序转支付宝小程序
Qt551.窗口滚动条
每日归档
更多
2024-05-13(18)
2024-05-12(0)
2024-05-11(38)
2024-05-10(38)
2024-05-09(35)
2024-05-08(42)
2024-05-07(14)
2024-05-06(40)
2024-05-05(0)
2024-05-04(7)

代码天地 © 2018 codetd.com

境外服务器   最新电视剧2022