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

Commit 89fcf299 authored by Jaewan Kim's avatar Jaewan Kim Committed by android-build-merger
Browse files

Merge "PIP: Prevent PIP icons in Recents from blinking when PIP is closed" into nyc-dev 

am: cbb128a5

* commit 'cbb128a5':
  PIP: Prevent PIP icons in Recents from blinking when PIP is closed

Change-Id: Ifa111f4caee8bce0892f76dba1ac2267895f3a80
parents 68846515 cbb128a5

packages/SystemUI/src/com/android/systemui/tv/pip/PipRecentsOverlayManager.java

+4 −2
Original line number Diff line number Diff line
@@ -134,7 +134,8 @@ public class PipRecentsOverlayManager { 
     */

    public void requestFocus(boolean allowRecentsFocusable) {

        mRecentsView.setVisibility(allowRecentsFocusable ? View.VISIBLE : View.GONE);

        if (!mIsPipRecentsOverlayShown || !mIsRecentsShown || mIsPipFocusedInRecent) {

        if (!mIsPipRecentsOverlayShown || !mIsRecentsShown || mIsPipFocusedInRecent

                || !mPipManager.isPipShown()) {

            return;

        }

        mIsPipFocusedInRecent = true;
@@ -153,7 +154,8 @@ public class PipRecentsOverlayManager { 
     * This should be called only by {@link com.android.systemui.recents.tv.RecentsTvActivity}.

     */

    public void clearFocus() {

        if (!mIsPipRecentsOverlayShown || !mIsRecentsShown || !mIsPipFocusedInRecent) {

        if (!mIsPipRecentsOverlayShown || !mIsRecentsShown || !mIsPipFocusedInRecent

                || !mPipManager.isPipShown()) {

            return;

        }

        if (!mRecentsView.hasFocus()) {