Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2a8860b authored by Jan Nordqvist's avatar Jan Nordqvist Committed by android-build-merger
Browse files

Merge "Change "X over" text color to ColorError" into pi-dev 

am: 22bf690f

Change-Id: I97eef096124f7ad264e1d0d280e471db9d660d70
parents 6ae3fbb4 22bf690f

res/layout/data_usage_summary_preference.xml

+1 −2
Original line number Diff line number Diff line
@@ -59,8 +59,7 @@ 
            android:layout_height="wrap_content"

            android:fontFamily="@*android:string/config_headlineFontFamily"

            android:textAppearance="?android:attr/textAppearanceMedium"

            android:textSize="16sp"

            android:textColor="?android:attr/colorAccent" />

            android:textSize="16sp" />



    </LinearLayout>

src/com/android/settings/datausage/DataUsageSummaryPreference.java

+4 −0
Original line number Diff line number Diff line
@@ -234,10 +234,14 @@ public class DataUsageSummaryPreference extends Preference { 
                usageRemainingField.setText(

                        TextUtils.expandTemplate(getContext().getText(R.string.data_remaining),

                                Formatter.formatFileSize(getContext(), dataRemaining)));

                usageRemainingField.setTextColor(

                        Utils.getColorAttr(getContext(), android.R.attr.colorAccent));

            } else {

                usageRemainingField.setText(

                        TextUtils.expandTemplate(getContext().getText(R.string.data_overusage),

                                Formatter.formatFileSize(getContext(), -dataRemaining)));

                usageRemainingField.setTextColor(

                        Utils.getColorAttr(getContext(), android.R.attr.colorError));

            }

        }

    }

tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java

+4 −0
Original line number Diff line number Diff line
@@ -369,6 +369,8 @@ public class DataUsageSummaryPreferenceTest { 
        bindViewHolder();

        assertThat(mDataUsed.getText().toString()).isEqualTo("1.00 MB used");

        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
@@ -380,6 +382,8 @@ public class DataUsageSummaryPreferenceTest { 
        bindViewHolder();

        assertThat(mDataUsed.getText().toString()).isEqualTo("11.00 MB used");

        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