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

Commit af57b3df authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

Merge "Add colorError"

parents 3471880a 58be7a67

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -410,6 +410,7 @@ package android { 
    field public static final int colorControlHighlight = 16843820; // 0x101042c

    field public static final int colorControlNormal = 16843817; // 0x1010429

    field public static final int colorEdgeEffect = 16843982; // 0x10104ce

    field public static final int colorError = 16844100; // 0x1010544

    field public static final int colorFocusedHighlight = 16843663; // 0x101038f

    field public static final int colorForeground = 16842800; // 0x1010030

    field public static final int colorForegroundInverse = 16843270; // 0x1010206
@@ -1316,7 +1317,6 @@ package android { 
    field public static final int textCheckMarkInverse = 16842823; // 0x1010047

    field public static final int textColor = 16842904; // 0x1010098

    field public static final int textColorAlertDialogListItem = 16843526; // 0x1010306

    field public static final int textColorError = 16844100; // 0x1010544

    field public static final int textColorHighlight = 16842905; // 0x1010099

    field public static final int textColorHighlightInverse = 16843599; // 0x101034f

    field public static final int textColorHint = 16842906; // 0x101009a

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -523,6 +523,7 @@ package android { 
    field public static final int colorControlHighlight = 16843820; // 0x101042c

    field public static final int colorControlNormal = 16843817; // 0x1010429

    field public static final int colorEdgeEffect = 16843982; // 0x10104ce

    field public static final int colorError = 16844100; // 0x1010544

    field public static final int colorFocusedHighlight = 16843663; // 0x101038f

    field public static final int colorForeground = 16842800; // 0x1010030

    field public static final int colorForegroundInverse = 16843270; // 0x1010206
@@ -1433,7 +1434,6 @@ package android { 
    field public static final int textCheckMarkInverse = 16842823; // 0x1010047

    field public static final int textColor = 16842904; // 0x1010098

    field public static final int textColorAlertDialogListItem = 16843526; // 0x1010306

    field public static final int textColorError = 16844100; // 0x1010544

    field public static final int textColorHighlight = 16842905; // 0x1010099

    field public static final int textColorHighlightInverse = 16843599; // 0x101034f

    field public static final int textColorHint = 16842906; // 0x101009a

api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -410,6 +410,7 @@ package android { 
    field public static final int colorControlHighlight = 16843820; // 0x101042c

    field public static final int colorControlNormal = 16843817; // 0x1010429

    field public static final int colorEdgeEffect = 16843982; // 0x10104ce

    field public static final int colorError = 16844100; // 0x1010544

    field public static final int colorFocusedHighlight = 16843663; // 0x101038f

    field public static final int colorForeground = 16842800; // 0x1010030

    field public static final int colorForegroundInverse = 16843270; // 0x1010206
@@ -1316,7 +1317,6 @@ package android { 
    field public static final int textCheckMarkInverse = 16842823; // 0x1010047

    field public static final int textColor = 16842904; // 0x1010098

    field public static final int textColorAlertDialogListItem = 16843526; // 0x1010306

    field public static final int textColorError = 16844100; // 0x1010544

    field public static final int textColorHighlight = 16842905; // 0x1010099

    field public static final int textColorHighlightInverse = 16843599; // 0x101034f

    field public static final int textColorHint = 16842906; // 0x101009a

core/java/com/android/internal/widget/LockPatternView.java

+5 −7
Original line number Diff line number Diff line
@@ -278,7 +278,8 @@ public class LockPatternView extends View { 
    public LockPatternView(Context context, AttributeSet attrs) {

        super(context, attrs);



        TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.LockPatternView);

        TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.LockPatternView,

                R.attr.lockPatternStyle, R.style.Widget_LockPatternView);



        final String aspect = a.getString(R.styleable.LockPatternView_aspect);
@@ -298,12 +299,9 @@ public class LockPatternView extends View { 
        mPathPaint.setAntiAlias(true);

        mPathPaint.setDither(true);



        mRegularColor = context.getColor(R.color.lock_pattern_view_regular_color);

        mErrorColor = context.getColor(R.color.lock_pattern_view_error_color);

        mSuccessColor = context.getColor(R.color.lock_pattern_view_success_color);

        mRegularColor = a.getColor(R.styleable.LockPatternView_regularColor, mRegularColor);

        mErrorColor = a.getColor(R.styleable.LockPatternView_errorColor, mErrorColor);

        mSuccessColor = a.getColor(R.styleable.LockPatternView_successColor, mSuccessColor);

        mRegularColor = a.getColor(R.styleable.LockPatternView_regularColor, 0);

        mErrorColor = a.getColor(R.styleable.LockPatternView_errorColor, 0);

        mSuccessColor = a.getColor(R.styleable.LockPatternView_successColor, 0);



        int pathColor = a.getColor(R.styleable.LockPatternView_pathColor, mRegularColor);

        mPathPaint.setColor(pathColor);

core/res/res/layout/app_permission_item_money.xml

+2 −2
Original line number Diff line number Diff line
@@ -57,14 +57,14 @@ 
            android:layout_alignParentStart="true"

            android:layout_alignBottom="@+id/perm_money_label"

            android:scaleType="fitCenter"

            android:tint="@color/perms_costs_money"

            android:tint="?android:attr/colorError"

            android:tintMode="src_in"

            android:src="@android:drawable/ic_coins_s" />

        <TextView

            android:id="@+id/perm_money_label"

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

            android:textSize="16sp"

            android:textColor="@color/perms_costs_money"

            android:textColor="?android:attr/colorError"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_toEndOf="@id/perm_money_icon"