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

Commit dcf7b59f authored by Alan Viverette's avatar Alan Viverette
Browse files

Update theme colors, fix EditText state transition 

BUG: 11218747
BUG: 15200201
Change-Id: I94368897ea9466ae971b25fc80d6ca43433aadd5
parent 6fbe3982

api/current.txt

+37 −38
Original line number Diff line number Diff line
@@ -266,7 +266,7 @@ package android { 
    field public static final int actionModeSplitBackground = 16843677; // 0x101039d

    field public static final int actionModeStyle = 16843668; // 0x1010394

    field public static final int actionOverflowButtonStyle = 16843510; // 0x10102f6

    field public static final int actionOverflowMenuStyle = 16843848; // 0x1010448

    field public static final int actionOverflowMenuStyle = 16843847; // 0x1010447

    field public static final int actionProviderClass = 16843657; // 0x1010389

    field public static final int actionViewClass = 16843516; // 0x10102fc

    field public static final int activatedBackgroundIndicator = 16843517; // 0x10102fd
@@ -312,7 +312,7 @@ package android { 
    field public static final int autoCompleteTextViewStyle = 16842859; // 0x101006b

    field public static final int autoLink = 16842928; // 0x10100b0

    field public static final int autoMirrored = 16843754; // 0x10103ea

    field public static final int autoRemoveFromRecents = 16843850; // 0x101044a

    field public static final int autoRemoveFromRecents = 16843849; // 0x1010449

    field public static final int autoStart = 16843445; // 0x10102b5

    field public static final deprecated int autoText = 16843114; // 0x101016a

    field public static final int autoUrlDetect = 16843404; // 0x101028c
@@ -385,7 +385,7 @@ package android { 
    field public static final int codes = 16843330; // 0x1010242

    field public static final int collapseColumns = 16843083; // 0x101014b

    field public static final int color = 16843173; // 0x10101a5

    field public static final int colorAccent = 16843833; // 0x1010439

    field public static final int colorAccent = 16843832; // 0x1010438

    field public static final int colorActivatedHighlight = 16843664; // 0x1010390

    field public static final int colorBackground = 16842801; // 0x1010031

    field public static final int colorBackgroundCacheHint = 16843435; // 0x10102ab
@@ -399,9 +399,8 @@ package android { 
    field public static final int colorLongPressedHighlight = 16843662; // 0x101038e

    field public static final int colorMultiSelectHighlight = 16843665; // 0x1010391

    field public static final int colorPressedHighlight = 16843661; // 0x101038d

    field public static final int colorPrimary = 16843831; // 0x1010437

    field public static final int colorPrimaryDark = 16843832; // 0x1010438

    field public static final int colorPrimaryLight = 16843830; // 0x1010436

    field public static final int colorPrimary = 16843830; // 0x1010436

    field public static final int colorPrimaryDark = 16843831; // 0x1010437

    field public static final int columnCount = 16843639; // 0x1010377

    field public static final int columnDelay = 16843215; // 0x10101cf

    field public static final int columnOrderPreserved = 16843640; // 0x1010378
@@ -416,10 +415,10 @@ package android { 
    field public static final int content = 16843355; // 0x101025b

    field public static final int contentAuthority = 16843408; // 0x1010290

    field public static final int contentDescription = 16843379; // 0x1010273

    field public static final int contentInsetEnd = 16843863; // 0x1010457

    field public static final int contentInsetLeft = 16843864; // 0x1010458

    field public static final int contentInsetRight = 16843865; // 0x1010459

    field public static final int contentInsetStart = 16843862; // 0x1010456

    field public static final int contentInsetEnd = 16843862; // 0x1010456

    field public static final int contentInsetLeft = 16843863; // 0x1010457

    field public static final int contentInsetRight = 16843864; // 0x1010458

    field public static final int contentInsetStart = 16843861; // 0x1010455

    field public static final int controlX1 = 16843798; // 0x1010416

    field public static final int controlX2 = 16843800; // 0x1010418

    field public static final int controlY1 = 16843799; // 0x1010417
@@ -464,7 +463,7 @@ package android { 
    field public static final int dividerHorizontal = 16843564; // 0x101032c

    field public static final int dividerPadding = 16843562; // 0x101032a

    field public static final int dividerVertical = 16843530; // 0x101030a

    field public static final int documentLaunchMode = 16843849; // 0x1010449

    field public static final int documentLaunchMode = 16843848; // 0x1010448

    field public static final int drawSelectorOnTop = 16843004; // 0x10100fc

    field public static final int drawable = 16843161; // 0x1010199

    field public static final int drawableBottom = 16843118; // 0x101016e
@@ -493,7 +492,7 @@ package android { 
    field public static final int editTextStyle = 16842862; // 0x101006e

    field public static final deprecated int editable = 16843115; // 0x101016b

    field public static final int editorExtras = 16843300; // 0x1010224

    field public static final int elevation = 16843844; // 0x1010444

    field public static final int elevation = 16843843; // 0x1010443

    field public static final int ellipsize = 16842923; // 0x10100ab

    field public static final int ems = 16843096; // 0x1010158

    field public static final int enabled = 16842766; // 0x101000e
@@ -503,10 +502,10 @@ package android { 
    field public static final int entries = 16842930; // 0x10100b2

    field public static final int entryValues = 16843256; // 0x10101f8

    field public static final int eventsInterceptionEnabled = 16843389; // 0x101027d

    field public static final int excludeClass = 16843846; // 0x1010446

    field public static final int excludeClass = 16843845; // 0x1010445

    field public static final int excludeFromRecents = 16842775; // 0x1010017

    field public static final int excludeId = 16843845; // 0x1010445

    field public static final int excludeViewName = 16843857; // 0x1010451

    field public static final int excludeId = 16843844; // 0x1010444

    field public static final int excludeViewName = 16843856; // 0x1010450

    field public static final int exitFadeDuration = 16843533; // 0x101030d

    field public static final int expandableListPreferredChildIndicatorLeft = 16842834; // 0x1010052

    field public static final int expandableListPreferredChildIndicatorRight = 16842835; // 0x1010053
@@ -568,7 +567,7 @@ package android { 
    field public static final int freezesText = 16843116; // 0x101016c

    field public static final int fromAlpha = 16843210; // 0x10101ca

    field public static final int fromDegrees = 16843187; // 0x10101b3

    field public static final int fromId = 16843853; // 0x101044d

    field public static final int fromId = 16843852; // 0x101044c

    field public static final int fromScene = 16843741; // 0x10103dd

    field public static final int fromXDelta = 16843206; // 0x10101c6

    field public static final int fromXScale = 16843202; // 0x10101c2
@@ -601,7 +600,7 @@ package android { 
    field public static final int headerBackground = 16843055; // 0x101012f

    field public static final int headerDividersEnabled = 16843310; // 0x101022e

    field public static final int height = 16843093; // 0x1010155

    field public static final int hideOnContentScroll = 16843847; // 0x1010447

    field public static final int hideOnContentScroll = 16843846; // 0x1010446

    field public static final int hint = 16843088; // 0x1010150

    field public static final int homeAsUpIndicator = 16843531; // 0x101030b

    field public static final int homeLayout = 16843549; // 0x101031d
@@ -797,7 +796,7 @@ package android { 
    field public static final int manageSpaceActivity = 16842756; // 0x1010004

    field public static final int mapViewStyle = 16842890; // 0x101008a

    field public static final int marqueeRepeatLimit = 16843293; // 0x101021d

    field public static final int matchOrder = 16843858; // 0x1010452

    field public static final int matchOrder = 16843857; // 0x1010451

    field public static final int max = 16843062; // 0x1010136

    field public static final int maxDate = 16843584; // 0x1010340

    field public static final int maxEms = 16843095; // 0x1010157
@@ -830,10 +829,10 @@ package android { 
    field public static final int moreIcon = 16843061; // 0x1010135

    field public static final int multiprocess = 16842771; // 0x1010013

    field public static final int name = 16842755; // 0x1010003

    field public static final int navigationBarColor = 16843861; // 0x1010455

    field public static final int navigationBarColor = 16843860; // 0x1010454

    field public static final int navigationMode = 16843471; // 0x10102cf

    field public static final int negativeButtonText = 16843254; // 0x10101f6

    field public static final int nestedScrollingEnabled = 16843834; // 0x101043a

    field public static final int nestedScrollingEnabled = 16843833; // 0x1010439

    field public static final int nextFocusDown = 16842980; // 0x10100e4

    field public static final int nextFocusForward = 16843580; // 0x101033c

    field public static final int nextFocusLeft = 16842977; // 0x10100e1
@@ -864,7 +863,7 @@ package android { 
    field public static final int paddingBottom = 16842969; // 0x10100d9

    field public static final int paddingEnd = 16843700; // 0x10103b4

    field public static final int paddingLeft = 16842966; // 0x10100d6

    field public static final int paddingMode = 16843866; // 0x101045a

    field public static final int paddingMode = 16843865; // 0x1010459

    field public static final int paddingRight = 16842968; // 0x10100d8

    field public static final int paddingStart = 16843699; // 0x10103b3

    field public static final int paddingTop = 16842967; // 0x10100d7
@@ -960,7 +959,7 @@ package android { 
    field public static final int restoreAnyVersion = 16843450; // 0x10102ba

    field public static final deprecated int restoreNeedsApplication = 16843421; // 0x101029d

    field public static final int restrictedAccountType = 16843733; // 0x10103d5

    field public static final int reversible = 16843854; // 0x101044e

    field public static final int reversible = 16843853; // 0x101044d

    field public static final int right = 16843183; // 0x10101af

    field public static final int ringtonePreferenceStyle = 16842899; // 0x1010093

    field public static final int ringtoneType = 16843257; // 0x10101f9
@@ -1014,10 +1013,10 @@ package android { 
    field public static final int selectAllOnFocus = 16843102; // 0x101015e

    field public static final int selectable = 16843238; // 0x10101e6

    field public static final int selectableItemBackground = 16843534; // 0x101030e

    field public static final int selectableItemBackgroundBorderless = 16843867; // 0x101045b

    field public static final int selectableItemBackgroundBorderless = 16843866; // 0x101045a

    field public static final int selectedDateVerticalBar = 16843591; // 0x1010347

    field public static final int selectedWeekBackgroundColor = 16843586; // 0x1010342

    field public static final int sessionService = 16843841; // 0x1010441

    field public static final int sessionService = 16843840; // 0x1010440

    field public static final int settingsActivity = 16843301; // 0x1010225

    field public static final int setupActivity = 16843766; // 0x10103f6

    field public static final int shadowColor = 16843105; // 0x1010161
@@ -1051,19 +1050,19 @@ package android { 
    field public static final int spinnerStyle = 16842881; // 0x1010081

    field public static final int spinnersShown = 16843595; // 0x101034b

    field public static final int splitMotionEvents = 16843503; // 0x10102ef

    field public static final int splitTrack = 16843855; // 0x101044f

    field public static final int splitTrack = 16843854; // 0x101044e

    field public static final int src = 16843033; // 0x1010119

    field public static final int ssp = 16843747; // 0x10103e3

    field public static final int sspPattern = 16843749; // 0x10103e5

    field public static final int sspPrefix = 16843748; // 0x10103e4

    field public static final int stackFromBottom = 16843005; // 0x10100fd

    field public static final int stackViewStyle = 16843842; // 0x1010442

    field public static final int stackViewStyle = 16843841; // 0x1010441

    field public static final int starStyle = 16842882; // 0x1010082

    field public static final int startColor = 16843165; // 0x101019d

    field public static final int startDelay = 16843746; // 0x10103e2

    field public static final int startOffset = 16843198; // 0x10101be

    field public static final deprecated int startYear = 16843132; // 0x101017c

    field public static final int stateListAnimator = 16843851; // 0x101044b

    field public static final int stateListAnimator = 16843850; // 0x101044a

    field public static final int stateNotNeeded = 16842774; // 0x1010016

    field public static final int state_above_anchor = 16842922; // 0x10100aa

    field public static final int state_accelerated = 16843547; // 0x101031b
@@ -1088,7 +1087,7 @@ package android { 
    field public static final int state_single = 16842915; // 0x10100a3

    field public static final int state_window_focused = 16842909; // 0x101009d

    field public static final int staticWallpaperPreview = 16843569; // 0x1010331

    field public static final int statusBarColor = 16843860; // 0x1010454

    field public static final int statusBarColor = 16843859; // 0x1010453

    field public static final int stepSize = 16843078; // 0x1010146

    field public static final int stopWithTask = 16843626; // 0x101036a

    field public static final int streamType = 16843273; // 0x1010209
@@ -1117,7 +1116,7 @@ package android { 
    field public static final int switchMinWidth = 16843632; // 0x1010370

    field public static final int switchPadding = 16843633; // 0x1010371

    field public static final int switchPreferenceStyle = 16843629; // 0x101036d

    field public static final int switchStyle = 16843843; // 0x1010443

    field public static final int switchStyle = 16843842; // 0x1010442

    field public static final int switchTextAppearance = 16843630; // 0x101036e

    field public static final int switchTextOff = 16843628; // 0x101036c

    field public static final int switchTextOn = 16843627; // 0x101036b
@@ -1133,7 +1132,7 @@ package android { 
    field public static final int targetId = 16843740; // 0x10103dc

    field public static final int targetPackage = 16842785; // 0x1010021

    field public static final int targetSdkVersion = 16843376; // 0x1010270

    field public static final int targetViewName = 16843856; // 0x1010450

    field public static final int targetViewName = 16843855; // 0x101044f

    field public static final int taskAffinity = 16842770; // 0x1010012

    field public static final int taskCloseEnterAnimation = 16842942; // 0x10100be

    field public static final int taskCloseExitAnimation = 16842943; // 0x10100bf
@@ -1223,7 +1222,7 @@ package android { 
    field public static final int titleTextStyle = 16843512; // 0x10102f8

    field public static final int toAlpha = 16843211; // 0x10101cb

    field public static final int toDegrees = 16843188; // 0x10101b4

    field public static final int toId = 16843852; // 0x101044c

    field public static final int toId = 16843851; // 0x101044b

    field public static final int toScene = 16843742; // 0x10103de

    field public static final int toXDelta = 16843207; // 0x10101c7

    field public static final int toXScale = 16843203; // 0x10101c3
@@ -1303,8 +1302,8 @@ package android { 
    field public static final int windowActionBar = 16843469; // 0x10102cd

    field public static final int windowActionBarOverlay = 16843492; // 0x10102e4

    field public static final int windowActionModeOverlay = 16843485; // 0x10102dd

    field public static final int windowAllowEnterTransitionOverlap = 16843840; // 0x1010440

    field public static final int windowAllowExitTransitionOverlap = 16843839; // 0x101043f

    field public static final int windowAllowEnterTransitionOverlap = 16843839; // 0x101043f

    field public static final int windowAllowExitTransitionOverlap = 16843838; // 0x101043e

    field public static final int windowAnimationStyle = 16842926; // 0x10100ae

    field public static final int windowBackground = 16842836; // 0x1010054

    field public static final int windowCloseOnTouchOutside = 16843611; // 0x101035b
@@ -1312,12 +1311,12 @@ package android { 
    field public static final int windowContentTransitionManager = 16843795; // 0x1010413

    field public static final int windowContentTransitions = 16843794; // 0x1010412

    field public static final int windowDisablePreview = 16843298; // 0x1010222

    field public static final int windowDrawsSystemBarBackgrounds = 16843859; // 0x1010453

    field public static final int windowDrawsSystemBarBackgrounds = 16843858; // 0x1010452

    field public static final int windowEnableSplitTouch = 16843543; // 0x1010317

    field public static final int windowEnterAnimation = 16842932; // 0x10100b4

    field public static final int windowEnterTransition = 16843835; // 0x101043b

    field public static final int windowEnterTransition = 16843834; // 0x101043a

    field public static final int windowExitAnimation = 16842933; // 0x10100b5

    field public static final int windowExitTransition = 16843836; // 0x101043c

    field public static final int windowExitTransition = 16843835; // 0x101043b

    field public static final int windowFrame = 16842837; // 0x1010055

    field public static final int windowFullscreen = 16843277; // 0x101020d

    field public static final int windowHideAnimation = 16842935; // 0x10100b7
@@ -1328,8 +1327,8 @@ package android { 
    field public static final int windowNoDisplay = 16843294; // 0x101021e

    field public static final int windowNoTitle = 16842838; // 0x1010056

    field public static final int windowOverscan = 16843727; // 0x10103cf

    field public static final int windowSharedElementEnterTransition = 16843837; // 0x101043d

    field public static final int windowSharedElementExitTransition = 16843838; // 0x101043e

    field public static final int windowSharedElementEnterTransition = 16843836; // 0x101043c

    field public static final int windowSharedElementExitTransition = 16843837; // 0x101043d

    field public static final int windowShowAnimation = 16842934; // 0x10100b6

    field public static final int windowShowWallpaper = 16843410; // 0x1010292

    field public static final int windowSoftInputMode = 16843307; // 0x101022b

core/java/android/widget/EdgeEffect.java

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ public class EdgeEffect { 
        final TypedArray a = context.obtainStyledAttributes(

                com.android.internal.R.styleable.EdgeEffect);

        final int themeColor = a.getColor(

                com.android.internal.R.styleable.EdgeEffect_colorPrimaryLight, 0xff666666);

                com.android.internal.R.styleable.EdgeEffect_colorPrimary, 0xff666666);

        a.recycle();

        mPaint.setColor((themeColor & 0xffffff) | 0x33000000);

        mPaint.setStyle(Paint.Style.FILL);

core/res/res/drawable/edit_text_quantum.xml

+6 −11
Original line number Diff line number Diff line
@@ -15,25 +15,20 @@ 
-->



<ripple xmlns:android="http://schemas.android.com/apk/res/android"

    android:tint="?attr/colorControlActivated">

    android:tint="?attr/colorControlActivated"

    android:tintMode="src_over">

    <item>

        <selector>

            <item android:state_window_focused="false">

                <nine-patch android:src="@drawable/textfield_default_qntm_alpha"

                    android:tint="?attr/colorControlNormal" />

            </item>

            <item android:state_enabled="false">

                <nine-patch android:src="@drawable/textfield_default_qntm_alpha"

                    android:tint="?attr/colorControlNormal" />

            </item>

            <item android:state_focused="false" android:state_activated="false">

                <nine-patch android:src="@drawable/textfield_default_qntm_alpha"

                    android:tint="?attr/colorControlNormal" />

                    android:tint="?attr/colorControlNormal"

                    android:alpha="?attr/disabledAlpha" />

            </item>

            <item>

                <nine-patch android:src="@drawable/textfield_activated_qntm_alpha"

                <nine-patch android:src="@drawable/textfield_default_qntm_alpha"

                    android:tint="?attr/colorControlNormal" />

            </item>

        </selector>

    </item>

    <item android:id="@+id/mask" android:drawable="@drawable/textfield_activated_qntm_alpha" />

</ripple>

core/res/res/values/attrs.xml

+5 −7
Original line number Diff line number Diff line
@@ -963,17 +963,15 @@ 
        <eat-comment />



        <!-- The primary branding color for the app. By default, this is the color applied to the

             action bar background and framework controls (via colorControlActivated). -->

             action bar background. -->

        <attr name="colorPrimary" format="color" />



        <!-- Dark variant of the primary branding color. By default, this is the color applied to

             the status bar (via statusBarColor) and navigation bar (via navigationBarColor). -->

        <attr name="colorPrimaryDark" format="color" />



        <!-- Light variant of the primary branding color. TODO: Not used? -->

        <attr name="colorPrimaryLight" format="color" />



        <!-- Bright complement to the primary branding color. TODO: Not used? -->

        <!-- Bright complement to the primary branding color. By default, this is the color applied

             to framework controls (via colorControlActivated). -->

        <attr name="colorAccent" format="color" />



        <!-- The color applied to framework controls in their normal state. -->
@@ -982,7 +980,7 @@ 
        <!-- The color applied to framework controls in their activated (ex. checked) state. -->

        <attr name="colorControlActivated" format="color" />



        <!-- The color applied to framework control highlights (ex. ripples, selection). -->

        <!-- The color applied to framework control highlights (ex. ripples, list selectors). -->

        <attr name="colorControlHighlight" format="color" />



        <!-- The color applied to framework buttons in their normal state. -->
@@ -6692,7 +6690,7 @@ 


    <!-- Used as a filter array on the theme to pull out only the EdgeEffect-relevant bits. -->

    <declare-styleable name="EdgeEffect">

        <attr name="colorPrimaryLight" />

        <attr name="colorPrimary" />

    </declare-styleable>



    <!-- Use <code>tv-input</code> as the root tag of the XML resource that describes an

core/res/res/values/colors_quantum.xml

+36 −20

File changed.

Preview size limit exceeded, changes collapsed.