PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add content description for battery charging status icon" into main

Browse Source
This commit is contained in:
Haijie Hong
2025-01-02 02:55:58 -08:00
committed by Android (Google) Code Review
parent e380b4e9b3 cc28aba208
commit 967a05a32d
3 changed files with 29 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
tests/robotests/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderControllerTest.java
View File

@@ -329,11 +329,16 @@ public class AdvancedBluetoothDetailsHeaderControllerTest {
mController.refresh();
assertBatteryIcon(mLayoutPreference.findViewById(R.id.layout_left),
R.drawable.ic_battery_alert_24dp);
assertBatteryIcon(mLayoutPreference.findViewById(R.id.layout_right), /* resId= */-1);
assertBatteryIcon(mLayoutPreference.findViewById(R.id.layout_middle),
R.drawable.ic_battery_alert_24dp);
assertBatteryIcon(
mLayoutPreference.findViewById(R.id.layout_left),
R.drawable.ic_battery_alert_24dp,
false);
assertBatteryIcon(
mLayoutPreference.findViewById(R.id.layout_right), /* resId= */ -1, true);
assertBatteryIcon(
mLayoutPreference.findViewById(R.id.layout_middle),
R.drawable.ic_battery_alert_24dp,
false);
}
@Test
@@ -546,10 +551,15 @@ public class AdvancedBluetoothDetailsHeaderControllerTest {
}
}
private void assertBatteryIcon(LinearLayout linearLayout, int resId) {
private void assertBatteryIcon(LinearLayout linearLayout, int resId, boolean charging) {
final ImageView imageView = linearLayout.findViewById(R.id.bt_battery_icon);
assertThat(shadowOf(imageView.getDrawable()).getCreatedFromResId())
.isEqualTo(resId);
if (charging) {
assertThat(imageView.getContentDescription().toString())
.isEqualTo(mContext.getString(R.string.device_details_battery_charging));
} else {
assertThat(imageView.getContentDescription().toString())
.isEqualTo(mContext.getString(R.string.device_details_battery));
}
assertThat(shadowOf(imageView.getDrawable()).getCreatedFromResId()).isEqualTo(resId);
}
}