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

Commit 4936c588 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"... 

Merge "PIP: Prevent PIP icons in Recents from blinking when PIP is closed" into nyc-dev am: cbb128a5 am: 89fcf299
am: 519491b0

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

Change-Id: I4cf6b53854af9601340592db3830545329faa3ce
parents 33f76eec 519491b0

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()) {