| commit | fcb03702bd3be353ae1e292fc532fa8913d23d48 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | Wed Apr 18 16:58:52 2018 +0000 |
| committer | Android Build Merger (Role) <noreply-android-build-merger@google.com> | Wed Apr 18 16:58:52 2018 +0000 |
| tree | d37076c5626f9e29d8ff2f6e95a7e739a13f2bb3 | |
| parent | 67b7fabbb839878f9717234bceb4ce0f9b9fc825 [diff] | |
| parent | 4b03a1e5a2e07ca0ee2ba3bc9a0f1d7352375630 [diff] |
[automerger] Restricting the max duration used for the swipe-down animation am: 4b03a1e5a2 Change-Id: I311d03ae31ef689711e30c51f6668b14ae6581fb
diff --git a/src/com/android/launcher3/BaseActivity.java b/src/com/android/launcher3/BaseActivity.java index f197921..a41edc0 100644 --- a/src/com/android/launcher3/BaseActivity.java +++ b/src/com/android/launcher3/BaseActivity.java
@@ -144,7 +144,7 @@ @Override protected void onStop() { - mActivityFlags &= ~ACTIVITY_STATE_STARTED; + mActivityFlags &= ~ACTIVITY_STATE_STARTED & ~ACTIVITY_STATE_USER_ACTIVE; mForceInvisible = 0; super.onStop(); }