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

Commit f0e704f7 authored by Samuel Fufa's avatar Samuel Fufa Committed by Automerger Merge Worker
Browse files

Merge "Work profile visual polish" into ub-launcher3-rvc-dev am: 25afca44 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/11811209

Change-Id: I27d730ea38833534d58972135dcc85ac350b2a5d
parents 905e155e 25afca44

res/layout/work_apps_paused.xml

+2 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:background="?attr/allAppsScrimColor"

    android:padding="48dp"

    android:orientation="vertical"

    android:gravity="center">
@@ -34,6 +35,7 @@ 
    <TextView

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:id="@+id/work_apps_paused_content"

        android:textColor="?attr/workProfileOverlayTextColor"

        android:text="@string/work_apps_paused_body"

        android:textAlignment="center"

res/layout/work_mode_switch.xml

+5 −5
Original line number Diff line number Diff line
@@ -28,11 +28,11 @@ 
    android:gravity="start"

    android:lines="1"

    android:showText="false"

    android:textSize="16sp"

    android:textSize="@dimen/work_profile_footer_text_size"

    android:background="?attr/allAppsScrimColor"

    android:text="@string/work_profile_toggle_label"

    android:paddingBottom="@dimen/all_apps_work_profile_tab_footer_padding"

    android:paddingLeft="@dimen/all_apps_work_profile_tab_footer_padding"

    android:paddingRight="@dimen/all_apps_work_profile_tab_footer_padding"

    android:paddingTop="@dimen/all_apps_work_profile_tab_footer_padding"

    android:paddingBottom="@dimen/work_profile_footer_padding"

    android:paddingLeft="@dimen/work_profile_footer_padding"

    android:paddingRight="@dimen/work_profile_footer_padding"

    android:paddingTop="@dimen/work_profile_footer_padding"

/>

res/values/dimens.xml

+3 −1
Original line number Diff line number Diff line
@@ -96,7 +96,6 @@ 
    <!-- The size of corner radius of the arrow in the arrow toast. -->

    <dimen name="arrow_toast_corner_radius">2dp</dimen>



    <dimen name="all_apps_work_profile_tab_footer_padding">20dp</dimen>



<!-- Search bar in All Apps -->

    <dimen name="all_apps_header_max_elevation">3dp</dimen>
@@ -105,6 +104,9 @@ 


    <dimen name="all_apps_divider_margin_vertical">8dp</dimen>



    <dimen name="work_profile_footer_padding">20dp</dimen>

    <dimen name="work_profile_footer_text_size">16sp</dimen>



<!-- Widget tray -->

    <dimen name="widget_preview_label_vertical_padding">8dp</dimen>

    <dimen name="widget_preview_label_horizontal_padding">16dp</dimen>

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

+21 −4
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ import static com.android.launcher3.model.BgDataModel.Callbacks.FLAG_QUIET_MODE_ 


import android.animation.ValueAnimator;

import android.content.Context;

import android.content.res.Configuration;

import android.content.res.Resources;

import android.graphics.Canvas;

import android.graphics.Paint;

import android.graphics.Point;
@@ -441,6 +443,15 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo 
        }

    }



    @Override

    protected void onConfigurationChanged(Configuration newConfig) {

        super.onConfigurationChanged(newConfig);

        View overlay = mAH[AdapterHolder.WORK].getOverlayView();

        int v = newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE ? GONE : VISIBLE;

        overlay.findViewById(R.id.work_apps_paused_title).setVisibility(v);

        overlay.findViewById(R.id.work_apps_paused_content).setVisibility(v);

    }



    private void replaceRVContainer(boolean showTabs) {

        for (int i = 0; i < mAH.length; i++) {

            if (mAH[i].recyclerView != null) {
@@ -653,10 +664,12 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo 
            recyclerView.setItemAnimator(new DefaultItemAnimator());

            if (workDisabled) {

                overlayView.setAlpha(0);

                appsList.updateItemFilter((info, cn) -> false);

                recyclerView.addAutoSizedOverlay(overlayView);

                overlayView.animate().alpha(1).withEndAction(

                        () -> recyclerView.setItemAnimator(null)).start();

                        () -> {

                            appsList.updateItemFilter((info, cn) -> false);

                            recyclerView.setItemAnimator(null);

                        }).start();

            } else if (mInfoMatcher != null) {

                appsList.updateItemFilter(mInfoMatcher);

                overlayView.animate().alpha(0).withEndAction(() -> {
@@ -669,8 +682,12 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo 


        void applyPadding() {

            if (recyclerView != null) {

                int bottomOffset =

                        mWorkModeSwitch != null && mIsWork ? mWorkModeSwitch.getHeight() : 0;

                Resources res = getResources();

                int switchH = res.getDimensionPixelSize(R.dimen.work_profile_footer_padding) * 2

                        + mInsets.bottom + Utilities.calculateTextHeight(

                        res.getDimension(R.dimen.work_profile_footer_text_size));



                int bottomOffset = mWorkModeSwitch != null && mIsWork ? switchH : 0;

                recyclerView.setPadding(padding.left, padding.top, padding.right,

                        padding.bottom + bottomOffset);

            }