Merge "Update App battery usage page and add tests." into tm-qpr-dev
diff --git a/res/values-or/arrays.xml b/res/values-or/arrays.xml
index f146ad6..09d1a34 100644
--- a/res/values-or/arrays.xml
+++ b/res/values-or/arrays.xml
@@ -366,7 +366,7 @@
<item msgid="2114661179947426734">"ଦିବ୍ୟାଙ୍ଗମାନଙ୍କ ପାଇଁ ସୁବିଧାଗୁଡ଼ିକର ଭଲ୍ୟୁମ୍"</item>
</string-array>
<string-array name="long_press_timeout_selector_titles">
- <item msgid="6926391290986427331">"କମ୍"</item>
+ <item msgid="6926391290986427331">"କମ"</item>
<item msgid="5118829513010894576">"ମଧ୍ୟମ"</item>
<item msgid="6740026006576843477">"ଲମ୍ଵା"</item>
</string-array>
diff --git a/src/com/android/settings/accessibility/HearingAidDialogFragment.java b/src/com/android/settings/accessibility/HearingAidDialogFragment.java
index 107c56d..7f3230f 100644
--- a/src/com/android/settings/accessibility/HearingAidDialogFragment.java
+++ b/src/com/android/settings/accessibility/HearingAidDialogFragment.java
@@ -51,7 +51,7 @@
private void launchBluetoothAddDeviceSetting() {
new SubSettingLauncher(getActivity())
.setDestination(BluetoothPairingDetail.class.getName())
- .setSourceMetricsCategory(SettingsEnums.ACCESSIBILITY)
+ .setSourceMetricsCategory(getMetricsCategory())
.launch();
}
}
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java
index 4598483..2f1fcf3 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java
@@ -31,6 +31,7 @@
import android.util.Log;
import android.view.View;
import android.widget.ImageView;
+import android.widget.ScrollView;
import android.widget.TextView;
import androidx.annotation.NonNull;
@@ -123,6 +124,9 @@
final TextView footerTitle2 = findViewById(R.id.footer_title_2);
footerTitle1.setText(getFooterTitle1());
footerTitle2.setText(getFooterTitle2());
+
+ final ScrollView scrollView = findViewById(R.id.sud_scroll_view);
+ scrollView.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_YES);
}
@Override
diff --git a/src/com/android/settings/bluetooth/HearingAidPairingDialogFragment.java b/src/com/android/settings/bluetooth/HearingAidPairingDialogFragment.java
index ac48217..60a100d 100644
--- a/src/com/android/settings/bluetooth/HearingAidPairingDialogFragment.java
+++ b/src/com/android/settings/bluetooth/HearingAidPairingDialogFragment.java
@@ -54,8 +54,7 @@
@Override
public int getMetricsCategory() {
- // TODO(b/225117454): Need to update SettingsEnums later
- return SettingsEnums.ACCESSIBILITY;
+ return SettingsEnums.DIALOG_ACCESSIBILITY_HEARING_AID_PAIR_ANOTHER;
}
@NonNull
@@ -82,7 +81,7 @@
private void positiveButtonListener() {
new SubSettingLauncher(getActivity())
.setDestination(BluetoothPairingDetail.class.getName())
- .setSourceMetricsCategory(SettingsEnums.ACCESSIBILITY)
+ .setSourceMetricsCategory(getMetricsCategory())
.launch();
}
}