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

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

Merge "Work toggle improvements" into ub-launcher3-master

parents d4d704e7 8f6d141d

quickstep/recents_ui_overrides/res/layout/predicted_hotseat_edu.xml

+1 −1
Original line number Diff line number Diff line
@@ -34,10 +34,10 @@ 
        android:orientation="vertical">



        <TextView

            style="@style/TextHeadline"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginTop="18dp"

            android:fontFamily="google-sans"

            android:paddingLeft="@dimen/bottom_sheet_edu_padding"

            android:paddingRight="@dimen/bottom_sheet_edu_padding"

            android:text="@string/hotseat_migrate_title"

res/drawable/ic_corp.xml

+1 −5
Original line number Diff line number Diff line
@@ -19,9 +19,5 @@ 
    android:viewportWidth="24.0"

    android:viewportHeight="24.0"

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

    <path

        android:pathData="M20 6h-4V4c0-1.11-0.89-2-2-2h-4c-1.11 0-2 0.89-2 2v2H4c-1.11 0-1.99 0.89 -1.99

2L2 19c0 1.11 0.89 2 2 2h16c1.11 0 2-0.89 2-2V8c0-1.11-0.89-2-2-2zM10

4h4v2h-4V4zm10 15H4V8h16v11z"

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

    <path android:fillColor="@android:color/white" android:pathData="M20 6h-4V4c0-1.11-.89-2-2-2h-4c-1.11 0-2 .89-2 2v2H4c-1.11 0-1.99.89-1.99 2L2 19c0 1.11.89 2 2 2h16c1.11 0 2-.89 2-2V8c0-1.11-.89-2-2-2zm-8 9c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2zm2-9h-4V4h4v2z"/>

</vector>
 
 No newline at end of file

res/drawable/ic_corp_off.xml

0 → 100644
+25 −0
Original line number Diff line number Diff line 
<?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.

     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.

-->

<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: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"/>

</vector>
 
 No newline at end of file

res/layout/work_apps_paused.xml

0 → 100644
+50 −0
Original line number Diff line number Diff line 
<?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.

     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.

-->

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:padding="8dp"

    android:orientation="vertical"

    android:background="?attr/allAppsScrimColor"

    android:gravity="center">



    <ImageView

        android:id="@+id/icon"

        android:contentDescription="@string/work_apps_paused_title"

        android:layout_width="48dp"

        android:layout_height="48dp"

        android:tint="?attr/folderTextColor"

        android:src="@drawable/ic_corp_off" />



    <TextView

        style="@style/TextHeadline"

        android:textColor="?attr/folderTextColor"

        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:text="@string/work_apps_paused_title"

        android:textAlignment="center"

        android:textSize="24sp" />



    <TextView

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:textColor="?attr/folderTextColor"

        android:text="@string/work_apps_paused_body"

        android:textAlignment="center"

        android:textSize="16sp" />

</LinearLayout>
 
 No newline at end of file

res/layout/work_profile_edu.xml

+1 −1
Original line number Diff line number Diff line
@@ -35,12 +35,12 @@ 
        android:paddingRight="@dimen/bottom_sheet_edu_padding">



        <TextView

            style="@style/TextHeadline"

            android:id="@+id/content_text"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginTop="48dp"

            android:layout_marginBottom="48dp"

            android:fontFamily="google-sans"

            android:text="@string/work_profile_edu_personal_apps"

            android:textAlignment="center"

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