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

Merge "Fix input pause without resume." into mnc-dev

Browse Source
This commit is contained in:
George Mount
2015-07-15 14:12:26 +00:00
committed by Android (Google) Code Review
parent 94666b7698 80141d1c8b
commit 503ad9ee0d
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java/android/app/ActivityTransitionCoordinator.java
View File

@@ -217,11 +217,6 @@ abstract class ActivityTransitionCoordinator extends ResultReceiver {
}
protected void viewsReady(ArrayMap<String, View> sharedElements) {
final View decor = getDecor();
final ViewRootImpl viewRoot = decor == null ? null : decor.getViewRootImpl();
if (viewRoot != null) {
viewRoot.setPausedForTransition(true);
}
sharedElements.retainAll(mAllSharedElementNames);
if (mListener != null) {
mListener.onMapSharedElements(mAllSharedElementNames, sharedElements);
@@ -905,6 +900,14 @@ abstract class ActivityTransitionCoordinator extends ResultReceiver {
}
}
protected void pauseInput() {
final View decor = getDecor();
final ViewRootImpl viewRoot = decor == null ? null : decor.getViewRootImpl();
if (viewRoot != null) {
viewRoot.setPausedForTransition(true);
}
}
protected void onTransitionsComplete() {}
protected class ContinueTransitionListener extends Transition.TransitionListenerAdapter {

1
core/java/android/app/EnterTransitionCoordinator.java
View File

@@ -333,6 +333,7 @@ class EnterTransitionCoordinator extends ActivityTransitionCoordinator {
boolean startSharedElementTransition = true;
setGhostVisibility(View.INVISIBLE);
scheduleGhostVisibilityChange(View.INVISIBLE);
pauseInput();
Transition transition = beginTransition(decorView, startEnterTransition,
startSharedElementTransition);
scheduleGhostVisibilityChange(View.VISIBLE);

2
core/java/android/app/ExitTransitionCoordinator.java
View File

@@ -203,6 +203,7 @@ class ExitTransitionCoordinator extends ActivityTransitionCoordinator {
public void startExit() {
if (!mIsExitStarted) {
mIsExitStarted = true;
pauseInput();
ViewGroup decorView = getDecor();
if (decorView != null) {
decorView.suppressLayout(true);
@@ -220,6 +221,7 @@ class ExitTransitionCoordinator extends ActivityTransitionCoordinator {
public void startExit(int resultCode, Intent data) {
if (!mIsExitStarted) {
mIsExitStarted = true;
pauseInput();
ViewGroup decorView = getDecor();
if (decorView != null) {
decorView.suppressLayout(true);