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

Merge "Reset wait for transition state to false when recents goes invisible" into oc-dr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-08-08 00:32:09 +00:00
committed by Android (Google) Code Review
parent c7d24aed82 c422f80cc9
commit 673e3c41ec
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/SystemUI/src/com/android/systemui/recents/Recents.java
View File

@@ -54,6 +54,7 @@ import com.android.systemui.plugins.PluginActivityManager;
import com.android.systemui.recents.events.EventBus;
import com.android.systemui.recents.events.activity.ConfigurationChangedEvent;
import com.android.systemui.recents.events.activity.DockedTopTaskEvent;
import com.android.systemui.recents.events.activity.LaunchTaskFailedEvent;
import com.android.systemui.recents.events.activity.RecentsActivityStartingEvent;
import com.android.systemui.recents.events.component.RecentsVisibilityChangedEvent;
import com.android.systemui.recents.events.component.ScreenPinningRequestEvent;
@@ -613,6 +614,14 @@ public class Recents extends SystemUI
}
});
}
// This will catch the cases when a user launches from recents to another app
// (and vice versa) that is not in the recents stack (such as home or bugreport) and it
// would not reset the wait for transition flag. This will catch it and make sure that the
// flag is reset.
if (!event.visible) {
mImpl.setWaitingForTransitionStart(false);
}
}
/**
@@ -685,6 +694,11 @@ public class Recents extends SystemUI
}
}
public final void onBusEvent(LaunchTaskFailedEvent event) {
// Reset the transition when tasks fail to launch
mImpl.setWaitingForTransitionStart(false);
}
public final void onBusEvent(ConfigurationChangedEvent event) {
// Update the configuration for the Recents component when the activity configuration
// changes as well