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

Merge "Fix randomly showing anomaly icon"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-05-05 03:13:56 +00:00
committed by Android (Google) Code Review
parent dd1339f412 3bd2420911
commit 78a3f9a748
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/fuelgauge/PowerGaugePreference.java
View File

@@ -111,8 +111,9 @@ public class PowerGaugePreference extends TintablePreference {
if (mShowAnomalyIcon) {
subtitle.setCompoundDrawablesRelativeWithIntrinsicBounds(R.drawable.ic_warning_24dp, 0,
0, 0);
} else {
subtitle.setCompoundDrawablesRelativeWithIntrinsicBounds(0, 0, 0, 0);
}
((TextView) view.findViewById(R.id.widget_summary)).setText(mProgress);
if (mContentDescription != null) {
final TextView titleView = (TextView) view.findViewById(android.R.id.title);
titleView.setContentDescription(mContentDescription);

13
tests/robotests/src/com/android/settings/fuelgauge/PowerGaugePreferenceTest.java
View File

@@ -82,7 +82,7 @@ public class PowerGaugePreferenceTest {
}
@Test
public void testOnBindViewHolder_bindAnomalyIcon() {
public void testOnBindViewHolder_showAnomaly_bindAnomalyIcon() {
mPowerGaugePreference.shouldShowAnomalyIcon(true);
mPowerGaugePreference.onBindViewHolder(mPreferenceViewHolder);
@@ -92,6 +92,17 @@ public class PowerGaugePreferenceTest {
assertThat(drawables[0]).isInstanceOf(VectorDrawable.class);
}
@Test
public void testOnBindViewHolder_notShowAnomaly_bindAnomalyIcon() {
mPowerGaugePreference.shouldShowAnomalyIcon(false);
mPowerGaugePreference.onBindViewHolder(mPreferenceViewHolder);
final Drawable[] drawables = ((TextView) mPreferenceViewHolder.findViewById(
R.id.widget_summary)).getCompoundDrawablesRelative();
assertThat(drawables[0]).isNull();
}
@Test
public void testOnBindViewHolder_bindContentDescription() {
mPowerGaugePreference.setContentDescription(CONTENT_DESCRIPTION);