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

Merge "Fix crash when deleting task" into oc-dev

Browse Source 
am: c6fa8ee018

Change-Id: I65e242e2f3de857c508c9a7c768ef504121acb25
This commit is contained in:
Winson Chung
2017-06-08 20:10:36 +00:00
committed by android-build-merger
parent d7dab0f36f c6fa8ee018
commit b2a93b69a2
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java
View File

@@ -133,6 +133,7 @@ public class TaskView extends FixedSizeFrameLayout implements Task.TaskCallbacks
@ViewDebug.ExportedProperty(deepExport=true, prefix="task_") @ViewDebug.ExportedProperty(deepExport=true, prefix="task_")
private Task mTask; private Task mTask;
private boolean mTaskBound;
@ViewDebug.ExportedProperty(category="recents") @ViewDebug.ExportedProperty(category="recents")
private boolean mClipViewInStack = true; private boolean mClipViewInStack = true;
@ViewDebug.ExportedProperty(category="recents") @ViewDebug.ExportedProperty(category="recents")
@@ -607,6 +608,7 @@ public class TaskView extends FixedSizeFrameLayout implements Task.TaskCallbacks
SystemServicesProxy ssp = Recents.getSystemServices(); SystemServicesProxy ssp = Recents.getSystemServices();
mTouchExplorationEnabled = touchExplorationEnabled; mTouchExplorationEnabled = touchExplorationEnabled;
mTask = t; mTask = t;
mTaskBound = true;
mTask.addCallback(this); mTask.addCallback(this);
mIsDisabledInSafeMode = !mTask.isSystemApp && ssp.isInSafeMode(); mIsDisabledInSafeMode = !mTask.isSystemApp && ssp.isInSafeMode();
mThumbnailView.bindToTask(mTask, mIsDisabledInSafeMode, displayOrientation, displayRect); mThumbnailView.bindToTask(mTask, mIsDisabledInSafeMode, displayOrientation, displayRect);
@@ -627,10 +629,12 @@ public class TaskView extends FixedSizeFrameLayout implements Task.TaskCallbacks
@Override @Override
public void onTaskDataLoaded(Task task, ThumbnailData thumbnailData) { public void onTaskDataLoaded(Task task, ThumbnailData thumbnailData) {
if (mTaskBound) {
// Update each of the views to the new task data // Update each of the views to the new task data
mThumbnailView.onTaskDataLoaded(thumbnailData); mThumbnailView.onTaskDataLoaded(thumbnailData);
mHeaderView.onTaskDataLoaded(); mHeaderView.onTaskDataLoaded();
} }
}
@Override @Override
public void onTaskDataUnloaded() { public void onTaskDataUnloaded() {
@@ -638,6 +642,7 @@ public class TaskView extends FixedSizeFrameLayout implements Task.TaskCallbacks
mTask.removeCallback(this); mTask.removeCallback(this);
mThumbnailView.unbindFromTask(); mThumbnailView.unbindFromTask();
mHeaderView.unbindFromTask(mTouchExplorationEnabled); mHeaderView.unbindFromTask(mTouchExplorationEnabled);
mTaskBound = false;
} }
@Override @Override