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

Commit b1e9e8d6 authored by Hyunyoung Song's avatar Hyunyoung Song Committed by Android (Google) Code Review
Browse files

Merge "Fix hotseat flicker b/29648104" into ub-launcher3-calgary

parents 2aa31b8f a97c64bf

src/com/android/launcher3/BaseContainerView.java

+13 −6
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ package com.android.launcher3; 


import android.content.Context;

import android.content.res.TypedArray;

import android.graphics.Color;

import android.graphics.drawable.ColorDrawable;

import android.graphics.drawable.Drawable;

import android.graphics.drawable.InsetDrawable;

import android.util.AttributeSet;
@@ -60,6 +62,10 @@ public abstract class BaseContainerView extends FrameLayout { 
            mHorizontalPadding = DeviceProfile.getContainerPadding(context, width);

        }



        if (FeatureFlags.LAUNCHER3_ALL_APPS_PULL_UP && this instanceof AllAppsContainerView) {

            mRevealDrawable = new InsetDrawable(new ColorDrawable(Color.WHITE), mHorizontalPadding,

                    0, mHorizontalPadding, 0);

        } else {

            TypedArray a = context.obtainStyledAttributes(attrs,

                    R.styleable.BaseContainerView, defStyleAttr, 0);

            mRevealDrawable = new InsetDrawable(
@@ -67,6 +73,7 @@ public abstract class BaseContainerView extends FrameLayout { 
                    mHorizontalPadding, 0, mHorizontalPadding, 0);

            a.recycle();

        }

    }



    @Override

    protected void onFinishInflate() {

src/com/android/launcher3/WorkspaceStateTransitionAnimation.java

+2 −1
Original line number Diff line number Diff line
@@ -273,7 +273,8 @@ public class WorkspaceStateTransitionAnimation { 
        // Update the workspace state

        float finalBackgroundAlpha = (states.stateIsSpringLoaded || states.stateIsOverview) ?

                1.0f : 0f;

        float finalHotseatAlpha = (states.stateIsNormal || states.stateIsSpringLoaded) ? 1f : 0f;

        float finalHotseatAlpha = (states.stateIsNormal || states.stateIsSpringLoaded ||

                (FeatureFlags.LAUNCHER3_ALL_APPS_PULL_UP && states.stateIsNormalHidden)) ? 1f : 0f;

        float finalOverviewPanelAlpha = states.stateIsOverview ? 1f : 0f;



        float finalWorkspaceTranslationY = 0;