summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Wenyu Zhang <zhangwenyu@google.com> 2024-10-08 21:23:49 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2024-10-08 21:23:49 +0000
commit21bbfc10eeceb51df846e02e10e9701d32231da0 (patch)
tree3a15fa57d558aeb0d71d8b8047e9aa02b32d394b
parentc7552493cfa4156f541d2c238bd634348671d3ea (diff)
parent5acd27bb73507c93f1a35c1fec9cf58b65b29fec (diff)
Merge "Adjust the default gain in UI" into main
-rw-r--r--packages/SettingsLib/src/com/android/settingslib/media/InputRouteManager.java7
-rw-r--r--packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/InputRouteManagerTest.java4
2 files changed, 6 insertions, 5 deletions
diff --git a/packages/SettingsLib/src/com/android/settingslib/media/InputRouteManager.java b/packages/SettingsLib/src/com/android/settingslib/media/InputRouteManager.java
index 9164b64057fd..a72ba8db848d 100644
--- a/packages/SettingsLib/src/com/android/settingslib/media/InputRouteManager.java
+++ b/packages/SettingsLib/src/com/android/settingslib/media/InputRouteManager.java
@@ -212,13 +212,14 @@ public final class InputRouteManager {
public int getMaxInputGain() {
// TODO (b/357123335): use real input gain implementation.
- // Using 15 for now since it matches the max index for output.
- return 15;
+ // Using 100 for now since it matches the maximum input gain index in classic ChromeOS.
+ return 100;
}
public int getCurrentInputGain() {
// TODO (b/357123335): use real input gain implementation.
- return 8;
+ // Show a fixed full gain in UI before it really works per UX requirement.
+ return 100;
}
public boolean isInputGainFixed() {
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/InputRouteManagerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/InputRouteManagerTest.java
index 16c0c1c71d79..29cc4034d4b4 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/InputRouteManagerTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/InputRouteManagerTest.java
@@ -255,12 +255,12 @@ public class InputRouteManagerTest {
@Test
public void getMaxInputGain_returnMaxInputGain() {
- assertThat(mInputRouteManager.getMaxInputGain()).isEqualTo(15);
+ assertThat(mInputRouteManager.getMaxInputGain()).isEqualTo(100);
}
@Test
public void getCurrentInputGain_returnCurrentInputGain() {
- assertThat(mInputRouteManager.getCurrentInputGain()).isEqualTo(8);
+ assertThat(mInputRouteManager.getCurrentInputGain()).isEqualTo(100);
}
@Test