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

Merge "Add a null check for the thumbnail image for transition" into nyc-dev

Browse Source
This commit is contained in:
Sid Soundararajan
2016-05-04 17:14:18 +00:00
committed by Android (Google) Code Review
parent 69e0d82994 841fa8ad94
commit 2ff157c027
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
packages/SystemUI/src/com/android/systemui/recents/tv/views/RecentsTvTransitionHelper.java
View File

@@ -103,6 +103,16 @@ public class RecentsTvTransitionHelper {
EventBus.getDefault().send(new LaunchTaskFailedEvent()); EventBus.getDefault().send(new LaunchTaskFailedEvent());
} }
Rect taskRect = taskView.getFocusedThumbnailRect();
// Check both the rect and the thumbnail for null. The rect can be null if the user
// decides to disallow animations, so automatic scrolling does not happen properly.
// The thumbnail can be null if the app was partially launched on TV. In this case
// we do not override the transition.
if (taskRect == null || task.thumbnail == null) {
return;
}
IRemoteCallback.Stub callback = null; IRemoteCallback.Stub callback = null;
if (animStartedListener != null) { if (animStartedListener != null) {
callback = new IRemoteCallback.Stub() { callback = new IRemoteCallback.Stub() {
@@ -120,14 +130,11 @@ public class RecentsTvTransitionHelper {
}; };
} }
try { try {
Rect taskRect = taskView.getFocusedThumbnailRect();
if (taskRect != null) {
Bitmap thumbnail = Bitmap.createScaledBitmap(task.thumbnail, taskRect.width(), Bitmap thumbnail = Bitmap.createScaledBitmap(task.thumbnail, taskRect.width(),
taskRect.height(), false); taskRect.height(), false);
WindowManagerGlobal.getWindowManagerService() WindowManagerGlobal.getWindowManagerService()
.overridePendingAppTransitionAspectScaledThumb(thumbnail, taskRect.left, .overridePendingAppTransitionAspectScaledThumb(thumbnail, taskRect.left,
taskRect.top, taskRect.width(), taskRect.height(), callback, true); taskRect.top, taskRect.width(), taskRect.height(), callback, true);
}
} catch (RemoteException e) { } catch (RemoteException e) {
Log.w(TAG, "Failed to override transition: " + e); Log.w(TAG, "Failed to override transition: " + e);
} }