diff options
author | Tony Wickham <twickham@google.com> | 2018-05-22 19:06:02 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-05-22 19:06:02 +0000 |
commit | dcae7e2b24bd007df27b71a41cb6ffb342dd47df (patch) | |
tree | 44d72587275bb8c4e72ee6079ce4f4ea4f4ee18a /quickstep/src/com/android/quickstep/OverviewInteractionState.java | |
parent | 783cd3cf213ddb37920d1e88ddb9ce83352e8754 (diff) | |
parent | 4e21c1b5523fc80545260762a95c5d0f386cb734 (diff) | |
download | android_packages_apps_Trebuchet-dcae7e2b24bd007df27b71a41cb6ffb342dd47df.tar.gz android_packages_apps_Trebuchet-dcae7e2b24bd007df27b71a41cb6ffb342dd47df.tar.bz2 android_packages_apps_Trebuchet-dcae7e2b24bd007df27b71a41cb6ffb342dd47df.zip |
Merge "Cleanup how we set back button alpha" into ub-launcher3-edmonton
Diffstat (limited to 'quickstep/src/com/android/quickstep/OverviewInteractionState.java')
-rw-r--r-- | quickstep/src/com/android/quickstep/OverviewInteractionState.java | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/quickstep/src/com/android/quickstep/OverviewInteractionState.java b/quickstep/src/com/android/quickstep/OverviewInteractionState.java index d60574676..922a7ff29 100644 --- a/quickstep/src/com/android/quickstep/OverviewInteractionState.java +++ b/quickstep/src/com/android/quickstep/OverviewInteractionState.java @@ -91,6 +91,7 @@ public class OverviewInteractionState { // These are updated on the background thread private ISystemUiProxy mISystemUiProxy; private boolean mSwipeUpEnabled = true; + private float mBackButtonAlpha = 1; private Runnable mOnSwipeUpSettingChangedListener; @@ -117,7 +118,14 @@ public class OverviewInteractionState { return mSwipeUpEnabled; } + public float getBackButtonAlpha() { + return mBackButtonAlpha; + } + public void setBackButtonAlpha(float alpha, boolean animate) { + if (!mSwipeUpEnabled) { + alpha = 1; + } mUiHandler.removeMessages(MSG_SET_BACK_BUTTON_ALPHA); mUiHandler.obtainMessage(MSG_SET_BACK_BUTTON_ALPHA, animate ? 1 : 0, 0, alpha) .sendToTarget(); @@ -128,6 +136,9 @@ public class OverviewInteractionState { } private boolean handleUiMessage(Message msg) { + if (msg.what == MSG_SET_BACK_BUTTON_ALPHA) { + mBackButtonAlpha = (float) msg.obj; + } mBgHandler.obtainMessage(msg.what, msg.arg1, msg.arg2, msg.obj).sendToTarget(); return true; } |