diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2018-04-12 11:23:33 -0700 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2018-04-16 13:01:57 -0700 |
commit | 3483c52e6bd81b7c37eb0089940e90a6f3e6d80c (patch) | |
tree | b3a51229bc7c539b90d4e56346c730f218ee1177 /src/com | |
parent | 9162f8187c3a1f9dfe6fecaf248121eb9cc6fd78 (diff) | |
download | packages_apps_Trebuchet-3483c52e6bd81b7c37eb0089940e90a6f3e6d80c.tar.gz packages_apps_Trebuchet-3483c52e6bd81b7c37eb0089940e90a6f3e6d80c.tar.bz2 packages_apps_Trebuchet-3483c52e6bd81b7c37eb0089940e90a6f3e6d80c.zip |
Waiting until onResume before creating the wallpaper-open animation.
Bug: 77853906
Change-Id: I5126855492da59c9dbfef0ce2a97f94662a6522b
Diffstat (limited to 'src/com')
-rw-r--r-- | src/com/android/launcher3/BaseActivity.java | 44 | ||||
-rw-r--r-- | src/com/android/launcher3/Utilities.java | 10 |
2 files changed, 46 insertions, 8 deletions
diff --git a/src/com/android/launcher3/BaseActivity.java b/src/com/android/launcher3/BaseActivity.java index 1f1ef9ad7..f197921ce 100644 --- a/src/com/android/launcher3/BaseActivity.java +++ b/src/com/android/launcher3/BaseActivity.java @@ -56,8 +56,23 @@ public abstract class BaseActivity extends Activity { protected UserEventDispatcher mUserEventDispatcher; protected SystemUiController mSystemUiController; - private boolean mStarted; - private boolean mUserActive; + private static final int ACTIVITY_STATE_STARTED = 1 << 0; + private static final int ACTIVITY_STATE_RESUMED = 1 << 1; + /** + * State flag indicating if the user is active or the actitvity when to background as a result + * of user action. + * @see #isUserActive() + */ + private static final int ACTIVITY_STATE_USER_ACTIVE = 1 << 2; + + @Retention(SOURCE) + @IntDef( + flag = true, + value = {ACTIVITY_STATE_STARTED, ACTIVITY_STATE_RESUMED, ACTIVITY_STATE_USER_ACTIVE}) + public @interface ActivityFlags{} + + @ActivityFlags + private int mActivityFlags; // When the recents animation is running, the visibility of the Launcher is managed by the // animation @@ -103,19 +118,19 @@ public abstract class BaseActivity extends Activity { @Override protected void onStart() { - mStarted = true; + mActivityFlags |= ACTIVITY_STATE_STARTED; super.onStart(); } @Override protected void onResume() { - mUserActive = true; + mActivityFlags |= ACTIVITY_STATE_RESUMED | ACTIVITY_STATE_USER_ACTIVE; super.onResume(); } @Override protected void onUserLeaveHint() { - mUserActive = false; + mActivityFlags &= ~ACTIVITY_STATE_USER_ACTIVE; super.onUserLeaveHint(); } @@ -129,17 +144,30 @@ public abstract class BaseActivity extends Activity { @Override protected void onStop() { - mStarted = false; + mActivityFlags &= ~ACTIVITY_STATE_STARTED; mForceInvisible = 0; super.onStop(); } + @Override + protected void onPause() { + mActivityFlags &= ~ACTIVITY_STATE_RESUMED; + super.onPause(); + } + public boolean isStarted() { - return mStarted; + return (mActivityFlags & ACTIVITY_STATE_STARTED) != 0; + } + + /** + * isResumed in already defined as a hidden final method in Activity.java + */ + public boolean hasBeenResumed() { + return (mActivityFlags & ACTIVITY_STATE_RESUMED) != 0; } public boolean isUserActive() { - return mUserActive; + return (mActivityFlags & ACTIVITY_STATE_USER_ACTIVE) != 0; } public void addOnDeviceProfileChangeListener(OnDeviceProfileChangeListener listener) { diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java index ba96d4ae6..98440fff5 100644 --- a/src/com/android/launcher3/Utilities.java +++ b/src/com/android/launcher3/Utilities.java @@ -35,6 +35,8 @@ import android.graphics.RectF; import android.os.Build; import android.os.Bundle; import android.os.DeadObjectException; +import android.os.Handler; +import android.os.Message; import android.os.PowerManager; import android.os.TransactionTooLargeException; import android.support.v4.os.BuildCompat; @@ -575,4 +577,12 @@ public final class Utilities { return hashSet; } + /** + * Utility method to post a runnable on the handler, skipping the synchronization barriers. + */ + public static void postAsyncCallback(Handler handler, Runnable callback) { + Message msg = Message.obtain(handler, callback); + msg.setAsynchronous(true); + handler.sendMessage(msg); + } } |