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

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

Merge "Polish work for work profile" into sc-dev

parents 697e51cd ce820f51

res/drawable/work_apps_toggle_background.xml

+6 −2
Original line number Diff line number Diff line
@@ -18,14 +18,18 @@ 
        <shape android:shape="rectangle">

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

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

            <padding android:left="@dimen/work_fab_radius" android:right="@dimen/work_fab_radius" />

            <padding

                android:left="@dimen/work_profile_footer_padding"

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

        </shape>

    </item>

    <item>

        <shape android:shape="rectangle">

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

            <solid android:color="@color/all_apps_tab_background_selected" />

            <padding android:left="@dimen/work_fab_radius" android:right="@dimen/work_fab_radius" />

            <padding

                android:left="@dimen/work_profile_footer_padding"

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

        </shape>

    </item>

</selector>

res/layout/work_apps_edu.xml

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ 


        <Button

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_height="@dimen/rounded_button_height"

            android:id="@+id/action_btn"

            android:textColor="?attr/workProfileOverlayTextColor"

            android:text="@string/work_profile_edu_accept"

res/layout/work_apps_paused.xml

+5 −5
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
    android:layout_height="wrap_content"

    android:padding="@dimen/work_edu_card_margin"

    android:orientation="vertical"

    android:gravity="center">

    android:gravity="center_horizontal">



    <TextView

        style="@style/PrimaryHeadline"
@@ -25,8 +25,7 @@ 
        android:id="@+id/work_apps_paused_title"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginTop="8dp"

        android:layout_marginBottom="8dp"

        android:layout_marginTop="40dp"

        android:text="@string/work_apps_paused_title"

        android:textAlignment="center"

        android:textSize="20sp" />
@@ -38,12 +37,13 @@ 
        android:textColor="?attr/workProfileOverlayTextColor"

        android:text="@string/work_apps_paused_body"

        android:textAlignment="center"

        android:layout_marginBottom="8dp"

        android:layout_marginTop="16dp"

        android:layout_marginBottom="24dp"

        android:textSize="16sp" />



    <Button

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_height="@dimen/rounded_button_height"

        android:id="@+id/enable_work_apps"

        android:textColor="?attr/workProfileOverlayTextColor"

        android:text="@string/work_apps_enable_btn_text"

res/layout/work_mode_fab.xml

+2 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
     limitations under the License.

-->

<com.android.launcher3.allapps.WorkModeSwitch xmlns:android="http://schemas.android.com/apk/res/android"

    style="@style/TextHeadline"

    android:id="@+id/work_mode_toggle"

    android:layout_alignParentBottom="true"

    android:layout_alignParentEnd="true"
@@ -22,6 +23,7 @@ 
    android:includeFontPadding="false"

    android:drawableTint="@color/all_apps_tab_text"

    android:textColor="@color/all_apps_tab_text"

    android:textSize="14sp"

    android:background="@drawable/work_apps_toggle_background"

    android:drawablePadding="16dp"

    android:drawableStart="@drawable/ic_corp_off"

res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -394,7 +394,7 @@ 
    <string name="work_profile_edu_accept">Got it</string>



    <!--- heading shown when user opens work apps tab while work apps are paused -->

    <string name="work_apps_paused_title">Work apps are off</string>

    <string name="work_apps_paused_title">Work apps are paused</string>

    <!--- body shown when user opens work apps tab while work apps are paused -->

    <string name="work_apps_paused_body">Your work apps can’t send you notifications, use your battery, or access your location</string>

    <!-- content description for paused work apps list -->