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

Commit ea4dcf46 authored by Samuel Fufa's avatar Samuel Fufa
Browse files

Add Tests for work profile toggle 

+ Fix minor style issues

Bug: 140099753
Bug: 112899690
Test: Manual
Change-Id: I1257560be79748abe54a75a74d93caa4390943b5
parent a7c931dd

res/layout/work_apps_paused.xml

+5 −5
Original line number Diff line number Diff line
@@ -23,14 +23,14 @@ 
    <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:layout_width="32dp"

        android:layout_height="32dp"

        android:tint="?attr/workProfileOverlayTextColor"

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



    <TextView

        style="@style/TextHeadline"

        android:textColor="?attr/folderTextColor"

        android:textColor="?attr/workProfileOverlayTextColor"

        android:id="@+id/work_apps_paused_title"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"
@@ -43,7 +43,7 @@ 
    <TextView

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:textColor="?attr/folderTextColor"

        android:textColor="?attr/workProfileOverlayTextColor"

        android:text="@string/work_apps_paused_body"

        android:textAlignment="center"

        android:textSize="16sp" />

res/layout/work_tab_footer.xml

+2 −0
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ 
        android:layout_weight="1"

        android:drawableStart="@drawable/ic_corp"

        android:drawablePadding="3dp"

        android:drawableTint="?attr/workProfileOverlayTextColor"

        android:textColor="?attr/workProfileOverlayTextColor"

        android:layout_height="wrap_content"

        android:ellipsize="end"

        android:gravity="center_vertical"

res/values/attrs.xml

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

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

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

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



    <!-- BubbleTextView specific attributes. -->

    <declare-styleable name="BubbleTextView">

res/values/styles.xml

+3 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ 
        <item name="folderTextColor">#FF212121</item>

        <item name="folderHintColor">#FF616161</item>

        <item name="loadingIconColor">#CCFFFFFF</item>

        <item name="workProfileOverlayTextColor">#FF212121</item>



        <item name="android:windowTranslucentStatus">false</item>

        <item name="android:windowTranslucentNavigation">false</item>
@@ -77,6 +78,7 @@ 
        <item name="folderFillColor">#CDFFFFFF</item>

        <item name="folderIconBorderColor">#FF80868B</item>

        <item name="folderTextColor">?attr/workspaceTextColor</item>



    </style>



    <style name="LauncherTheme.Dark" parent="@style/LauncherTheme">
@@ -100,6 +102,7 @@ 
        <item name="folderHintColor">#FFCCCCCC</item>

        <item name="isMainColorDark">true</item>

        <item name="loadingIconColor">#99FFFFFF</item>

        <item name="workProfileOverlayTextColor">@android:color/white</item>

    </style>



    <style name="LauncherTheme.Dark.DarkMainColor" parent="@style/LauncherTheme.Dark">

src/com/android/launcher3/allapps/AllAppsContainerView.java

+5 −0
Original line number Diff line number Diff line
@@ -153,6 +153,11 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo 
        return mMultiValueAlpha.getProperty(index);

    }



    public WorkFooterContainer getWorkFooterContainer() {

        return mWorkFooterContainer;

    }





    @Override

    protected void setDampedScrollShift(float shift) {

        // Bound the shift amount to avoid content from drawing on top (Y-val) of the QSB.