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

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

Merge "Add secondaryContentAlpha"

parents adb52057 aa4f7e2a

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -1119,6 +1119,7 @@ package android { 
    field public static final int searchSuggestSelection = 16843224; // 0x10101d8

    field public static final int searchSuggestThreshold = 16843373; // 0x101026d

    field public static final int searchViewStyle = 16843904; // 0x1010480

    field public static final int secondaryContentAlpha = 16843688; // 0x10103a8

    field public static final int secondaryProgress = 16843064; // 0x1010138

    field public static final int secondaryProgressTint = 16843879; // 0x1010467

    field public static final int secondaryProgressTintMode = 16843880; // 0x1010468

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -1235,6 +1235,7 @@ package android { 
    field public static final int searchSuggestSelection = 16843224; // 0x10101d8

    field public static final int searchSuggestThreshold = 16843373; // 0x101026d

    field public static final int searchViewStyle = 16843904; // 0x1010480

    field public static final int secondaryContentAlpha = 16843688; // 0x10103a8

    field public static final int secondaryProgress = 16843064; // 0x1010138

    field public static final int secondaryProgressTint = 16843879; // 0x1010467

    field public static final int secondaryProgressTintMode = 16843880; // 0x1010468

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -1119,6 +1119,7 @@ package android { 
    field public static final int searchSuggestSelection = 16843224; // 0x10101d8

    field public static final int searchSuggestThreshold = 16843373; // 0x101026d

    field public static final int searchViewStyle = 16843904; // 0x1010480

    field public static final int secondaryContentAlpha = 16843688; // 0x10103a8

    field public static final int secondaryProgress = 16843064; // 0x1010138

    field public static final int secondaryProgressTint = 16843879; // 0x1010467

    field public static final int secondaryProgressTintMode = 16843880; // 0x1010468

core/res/res/color/text_color_secondary.xml

0 → 100644
+23 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2017 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



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

    <item android:state_enabled="false"

        android:alpha="?attr/disabledAlpha"

        android:color="?attr/colorForeground"/>

    <item android:alpha="?attr/secondaryContentAlpha"

        android:color="?attr/colorForeground"/>

</selector>

core/res/res/values/attrs.xml

+2 −0
Original line number Diff line number Diff line
@@ -64,6 +64,8 @@ 
        <attr name="disabledAlpha" format="float" />

        <!-- The alpha applied to the foreground color to create the primary text color. -->

        <attr name="primaryContentAlpha" format="float" />

        <!-- The alpha applied to the foreground color to create the secondary text color. -->

        <attr name="secondaryContentAlpha" format="float" />

        <!-- Default background dim amount when a menu, dialog, or something similar pops up. -->

        <attr name="backgroundDimAmount" format="float" />

        <!-- Control whether dimming behind the window is enabled.  The default