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

Merge "Change "X over" text color to ColorError" into pi-dev am: 22bf690fdd

Browse Source 
am: b2a8860b3c

Change-Id: Ibc163d39ea4b6708699ba53334d080c8258fde63
This commit is contained in:
Jan Nordqvist
2018-04-05 16:31:40 -07:00
committed by android-build-merger
parent fb2990ac8a b2a8860b3c
commit 087b5797ed
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/layout/data_usage_summary_preference.xml
View File

@@ -59,8 +59,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:fontFamily="@*android:string/config_headlineFontFamily" android:fontFamily="@*android:string/config_headlineFontFamily"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:textSize="16sp" android:textSize="16sp" />
android:textColor="?android:attr/colorAccent" />
</LinearLayout> </LinearLayout>

4
src/com/android/settings/datausage/DataUsageSummaryPreference.java
View File

@@ -234,10 +234,14 @@ public class DataUsageSummaryPreference extends Preference {
usageRemainingField.setText( usageRemainingField.setText(
TextUtils.expandTemplate(getContext().getText(R.string.data_remaining), TextUtils.expandTemplate(getContext().getText(R.string.data_remaining),
Formatter.formatFileSize(getContext(), dataRemaining))); Formatter.formatFileSize(getContext(), dataRemaining)));
usageRemainingField.setTextColor(
Utils.getColorAttr(getContext(), android.R.attr.colorAccent));
} else { } else {
usageRemainingField.setText( usageRemainingField.setText(
TextUtils.expandTemplate(getContext().getText(R.string.data_overusage), TextUtils.expandTemplate(getContext().getText(R.string.data_overusage),
Formatter.formatFileSize(getContext(), -dataRemaining))); Formatter.formatFileSize(getContext(), -dataRemaining)));
usageRemainingField.setTextColor(
Utils.getColorAttr(getContext(), android.R.attr.colorError));
} }
} }
} }

4
tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java
View File

@@ -378,6 +378,8 @@ public class DataUsageSummaryPreferenceTest {
bindViewHolder(); bindViewHolder();
assertThat(mDataUsed.getText().toString()).isEqualTo("1.00 MB used"); assertThat(mDataUsed.getText().toString()).isEqualTo("1.00 MB used");
assertThat(mDataRemaining.getText().toString()).isEqualTo("9.00 MB left"); assertThat(mDataRemaining.getText().toString()).isEqualTo("9.00 MB left");
final int colorId = Utils.getColorAttr(mContext, android.R.attr.colorAccent);
assertThat(mDataRemaining.getCurrentTextColor()).isEqualTo(colorId);
} }
@Test @Test
@@ -389,6 +391,8 @@ public class DataUsageSummaryPreferenceTest {
bindViewHolder(); bindViewHolder();
assertThat(mDataUsed.getText().toString()).isEqualTo("11.00 MB used"); assertThat(mDataUsed.getText().toString()).isEqualTo("11.00 MB used");
assertThat(mDataRemaining.getText().toString()).isEqualTo("1.00 MB over"); assertThat(mDataRemaining.getText().toString()).isEqualTo("1.00 MB over");
final int colorId = Utils.getColorAttr(mContext, android.R.attr.colorError);
assertThat(mDataRemaining.getCurrentTextColor()).isEqualTo(colorId);
} }
@Test @Test