diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-07-20 18:20:34 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-07-20 18:20:34 +0000 |
commit | bdf6e7d8f8a83808276b245ea8c9d851f80625a3 (patch) | |
tree | 284e4da3e3ce13f8fdf521a0a5f799f1eae542de /src | |
parent | a2d1327b5abd1dc3dafe10c4639bc5428ed2fba7 (diff) | |
parent | 7fda285cf0edcae469c82dee977c9e2d485ea184 (diff) | |
download | android_packages_apps_Trebuchet-bdf6e7d8f8a83808276b245ea8c9d851f80625a3.tar.gz android_packages_apps_Trebuchet-bdf6e7d8f8a83808276b245ea8c9d851f80625a3.tar.bz2 android_packages_apps_Trebuchet-bdf6e7d8f8a83808276b245ea8c9d851f80625a3.zip |
Merge "Update when Launcher's scrim should fade." into ub-launcher3-dorval-polish
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/launcher3/Launcher.java | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index c2bddd533..7b7177e54 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -274,6 +274,7 @@ public class Launcher extends BaseActivity private boolean mHasFocus = false; private ObjectAnimator mScrimAnimator; + private boolean mShouldFadeInScrim; private PopupDataProvider mPopupDataProvider; @@ -467,8 +468,12 @@ public class Launcher extends BaseActivity mLauncherCallbacks.onCreate(savedInstanceState); } - // Listen for broadcasts screen off - registerReceiver(mReceiver, new IntentFilter(Intent.ACTION_SCREEN_OFF)); + // Listen for broadcasts + IntentFilter filter = new IntentFilter(); + filter.addAction(Intent.ACTION_SCREEN_OFF); + filter.addAction(Intent.ACTION_USER_PRESENT); // When the device wakes up + keyguard is gone + registerReceiver(mReceiver, filter); + mShouldFadeInScrim = true; getSystemUiController().updateUiState(SystemUiController.UI_STATE_BASE_WINDOW, Themes.getAttrBoolean(this, R.attr.isWorkspaceDarkText)); @@ -906,7 +911,7 @@ public class Launcher extends BaseActivity NotificationListener.setNotificationsChangedListener(mPopupDataProvider); } - if (mIsResumeFromActionScreenOff && mDragLayer.getBackground() != null) { + if (mShouldFadeInScrim && mDragLayer.getBackground() != null) { if (mScrimAnimator != null) { mScrimAnimator.cancel(); } @@ -923,6 +928,7 @@ public class Launcher extends BaseActivity mScrimAnimator.setStartDelay(getWindow().getTransitionBackgroundFadeDuration()); mScrimAnimator.start(); } + mShouldFadeInScrim = false; } @Override @@ -1534,6 +1540,11 @@ public class Launcher extends BaseActivity } } mIsResumeFromActionScreenOff = true; + mShouldFadeInScrim = true; + } else if (Intent.ACTION_USER_PRESENT.equals(action)) { + // ACTION_USER_PRESENT is sent after onStart/onResume. This covers the case where + // the user unlocked and the Launcher is not in the foreground. + mShouldFadeInScrim = false; } } }; |