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

Commit efa5df38 authored by Samuel Fufa's avatar Samuel Fufa Committed by Android (Google) Code Review
Browse files

Merge "Refactor FolderInsetAnimationCallback to be used with any view" into sc-dev

parents 1d5debd6 d04a92d1

res/drawable/ic_corp_off.xml

+6 −7
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

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

<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2020 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.
@@ -16,10 +15,10 @@ 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="24.0"

    android:viewportHeight="24.0"

    android:viewportWidth="24"

    android:viewportHeight="24"

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

    <path

        android:pathData="M22 7.95c.05-1.11-.84-2-1.95-1.95H16V3.95c0-1.11-.84-2-1.95-1.95h-4C8.94 1.95 8 2.84 8 3.95v.32l14 14V7.95zM14 6h-4V4h4v2zm7.54 14.28l-7.56-7.56v.01l-1.7-1.7h.01L7.21 5.95 3.25 1.99 1.99 3.27 4.69 6h-.64c-1.11 0-1.99.86-1.99 1.97l-.01 11.02c0 1.11.89 2.01 2 2.01h15.64l2.05 2.02L23 21.75l-1.46-1.47z"

        android:fillColor="@android:color/white"/>

        android:fillColor="@android:color/white"

        android:pathData="M20,6h-4L16,4c0,-1.11 -0.89,-2 -2,-2h-4c-1.11,0 -2,0.89 -2,2v1.17L10.83,8L20,8v9.17l1.98,1.98c0,-0.05 0.02,-0.1 0.02,-0.16L22,8c0,-1.11 -0.89,-2 -2,-2zM14,6h-4L10,4h4v2zM19,19L8,8 6,6 2.81,2.81 1.39,4.22 3.3,6.13C2.54,6.41 2.01,7.14 2.01,8L2,19c0,1.11 0.89,2 2,2h14.17l1.61,1.61 1.41,-1.41 -0.37,-0.37L19,19zM4,19L4,8h1.17l11,11L4,19z" />

</vector>
 
 No newline at end of file

res/drawable/work_card_btn.xml→res/drawable/rounded_action_button.xml

+3 −3
Original line number Diff line number Diff line
@@ -18,10 +18,10 @@ 
<shape xmlns:android="http://schemas.android.com/apk/res/android"

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

    android:shape="rectangle">

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

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

    <stroke android:width="1dp" android:color="?androidprv:attr/colorAccentPrimaryVariant" />

    <padding

        android:left="@dimen/work_fab_radius"

        android:right="@dimen/work_fab_radius" />

        android:left="@dimen/rounded_button_padding"

        android:right="@dimen/rounded_button_padding" />

</shape>

res/layout/work_apps_edu.xml

+2 −1
Original line number Diff line number Diff line
@@ -47,7 +47,8 @@ 
            android:textColor="?attr/workProfileOverlayTextColor"

            android:text="@string/work_profile_edu_accept"

            android:textAlignment="center"

            android:background="@drawable/work_card_btn"

            android:background="@drawable/rounded_action_button"



            android:textSize="14sp" />

    </LinearLayout>

</com.android.launcher3.allapps.WorkEduCard>
 
 No newline at end of file

res/layout/work_apps_paused.xml

+1 −1
Original line number Diff line number Diff line
@@ -48,6 +48,6 @@ 
        android:textColor="?attr/workProfileOverlayTextColor"

        android:text="@string/work_apps_enable_btn_text"

        android:textAlignment="center"

        android:background="@drawable/work_card_btn"

        android:background="@drawable/rounded_action_button"

        android:textSize="14sp" />

</com.android.launcher3.allapps.WorkPausedCard>
 
 No newline at end of file

res/layout/work_mode_fab.xml

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 
    android:background="@drawable/work_apps_toggle_background"

    android:drawablePadding="16dp"

    android:drawableStart="@drawable/ic_corp_off"

    android:elevation="10dp"

    android:layout_marginBottom="@dimen/work_fab_margin"

    android:layout_marginEnd="@dimen/work_fab_margin"

    android:text="@string/work_apps_pause_btn_text" />
 
 No newline at end of file