Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jaewan Kim
2016-04-29 05:57:40 +00:00
committed by Android (Google) Code Review
parent 71619aa437 66fc3ac40a
commit cbb128a5d8
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -134,7 +134,8 @@ public class PipRecentsOverlayManager {
*/ */
public void requestFocus(boolean allowRecentsFocusable) { public void requestFocus(boolean allowRecentsFocusable) {
mRecentsView.setVisibility(allowRecentsFocusable ? View.VISIBLE : View.GONE); mRecentsView.setVisibility(allowRecentsFocusable ? View.VISIBLE : View.GONE);
if (!mIsPipRecentsOverlayShown || !mIsRecentsShown || mIsPipFocusedInRecent) { if (!mIsPipRecentsOverlayShown || !mIsRecentsShown || mIsPipFocusedInRecent
|| !mPipManager.isPipShown()) {
return; return;
} }
mIsPipFocusedInRecent = true; mIsPipFocusedInRecent = true;
@@ -153,7 +154,8 @@ public class PipRecentsOverlayManager {
* This should be called only by {@link com.android.systemui.recents.tv.RecentsTvActivity}. * This should be called only by {@link com.android.systemui.recents.tv.RecentsTvActivity}.
*/ */
public void clearFocus() { public void clearFocus() {
if (!mIsPipRecentsOverlayShown || !mIsRecentsShown || !mIsPipFocusedInRecent) { if (!mIsPipRecentsOverlayShown || !mIsRecentsShown || !mIsPipFocusedInRecent
|| !mPipManager.isPipShown()) {
return; return;
} }
if (!mRecentsView.hasFocus()) { if (!mRecentsView.hasFocus()) {