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

Commit d0838d3a authored by Brandon Dayauon's avatar Brandon Dayauon Committed by Android (Google) Code Review
Browse files

Merge "Correctly make to spec the color for "Turn on work apps" button and add... 

Merge "Correctly make to spec the color for "Turn on work apps" button and add stroke" into tm-qpr-dev
parents 90ff89e2 ffc7084b

quickstep/res/values-night/colors.xml

+3 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

<resources>

<resources xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">



    <color name="gesture_tutorial_back_arrow_color">#99000000</color>
@@ -24,4 +24,6 @@ 


    <color name="all_set_page_background">#FF000000</color>



    <!-- Turn on work apps button -->

    <color name="work_turn_on_stroke">?androidprv:attr/colorAccentSecondaryVariant</color>

</resources>
 
 No newline at end of file

quickstep/res/values/colors.xml

+3 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

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

<resources xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">



    <color name="chip_hint_foreground_color">#fff</color>

    <color name="chip_scrim_start_color">#39000000</color>
@@ -95,4 +95,6 @@ 
    <color name="lottie_yellow400">#fcc934</color>

    <color name="lottie_yellow600">#f9ab00</color>



    <!-- Turn on work apps button -->

    <color name="work_turn_on_stroke">?androidprv:attr/colorAccentPrimaryVariant</color>

</resources>
 
 No newline at end of file

res/drawable/bg_work_apps_paused_action_button.xml

+3 −2
Original line number Diff line number Diff line
@@ -21,11 +21,12 @@ 
            <solid android:color="@android:color/white" />

        </shape>

    </item>



    <item android:id="@android:id/background">

        <shape android:shape="rectangle">

            <solid android:color="?android:attr/colorControlHighlight" />

            <corners android:radius="@dimen/rounded_button_radius" />

            <stroke

                android:width="@dimen/work_apps_paused_button_stroke"

                android:color="@color/work_turn_on_stroke" />

        </shape>

    </item>

</ripple>
 
 No newline at end of file

res/layout/work_apps_paused.xml

+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 


    <TextView

        style="@style/PrimaryHeadline"

        android:textColor="?attr/workProfileOverlayTextColor"

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

        android:id="@+id/work_apps_paused_title"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"
@@ -45,7 +45,7 @@ 
        android:layout_width="wrap_content"

        android:layout_height="@dimen/rounded_button_height"

        android:id="@+id/enable_work_apps"

        android:textColor="?attr/workProfileOverlayTextColor"

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

        android:text="@string/work_apps_enable_btn_text"

        android:textAlignment="center"

        android:background="@drawable/bg_work_apps_paused_action_button"

res/values/attrs.xml

+0 −1
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ 
    <attr name="folderTextColor" format="color" />

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

    <attr name="isFolderDarkText" format="boolean" />

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

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

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

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