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 
am: cbb128a5d8

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

Change-Id: Ifa111f4caee8bce0892f76dba1ac2267895f3a80
This commit is contained in:
Jaewan Kim
2016-04-29 06:03:42 +00:00
committed by android-build-merger
parent 6884651554 cbb128a5d8
commit 89fcf299e5
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) {
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()) {