diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2017-06-12 13:54:01 -0700 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2017-06-12 13:54:01 -0700 |
commit | a616d2b0e2fbcd1379385abeae6b8be7effca6f5 (patch) | |
tree | 83c346fcf9951ac2ac32c3725d421888be83bc0d /src | |
parent | 606d3836a522ebf11a27f72717bf96958a3c99a7 (diff) | |
parent | 5cc7bbdbb3cdce3040d2a4f091a4543c2d469579 (diff) | |
download | android_packages_apps_Trebuchet-a616d2b0e2fbcd1379385abeae6b8be7effca6f5.tar.gz android_packages_apps_Trebuchet-a616d2b0e2fbcd1379385abeae6b8be7effca6f5.tar.bz2 android_packages_apps_Trebuchet-a616d2b0e2fbcd1379385abeae6b8be7effca6f5.zip |
resolve merge conflicts of 5cc7bbdbb to ub-launcher3-dorval-polish
Test: I solemnly swear I tested this conflict resolution.
Change-Id: If3359341d5269f2c908b3a8856b6f38ba69a05eb
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/launcher3/Launcher.java | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 62cf2b3c4..dd0d2b804 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -272,7 +272,6 @@ public class Launcher extends BaseActivity private Handler mHandler = new Handler(); private boolean mIsResumeFromActionScreenOff; private boolean mHasFocus = false; - private boolean mAttached = false; private ObjectAnimator mScrimAnimator; @@ -468,6 +467,9 @@ public class Launcher extends BaseActivity mLauncherCallbacks.onCreate(savedInstanceState); } + // Listen for broadcasts screen off + registerReceiver(mReceiver, new IntentFilter(Intent.ACTION_SCREEN_OFF)); + if (Themes.getAttrBoolean(this, R.attr.isWorkspaceDarkText)) { activateLightSystemBars(true, true, true); } @@ -1591,13 +1593,7 @@ public class Launcher extends BaseActivity public void onAttachedToWindow() { super.onAttachedToWindow(); - // Listen for broadcasts related to user-presence - final IntentFilter filter = new IntentFilter(); - filter.addAction(Intent.ACTION_SCREEN_OFF); - registerReceiver(mReceiver, filter); FirstFrameAnimatorHelper.initializeDrawListener(getWindow().getDecorView()); - mAttached = true; - if (mLauncherCallbacks != null) { mLauncherCallbacks.onAttachedToWindow(); } @@ -1606,10 +1602,6 @@ public class Launcher extends BaseActivity @Override public void onDetachedFromWindow() { super.onDetachedFromWindow(); - if (mAttached) { - unregisterReceiver(mReceiver); - mAttached = false; - } if (mLauncherCallbacks != null) { mLauncherCallbacks.onDetachedFromWindow(); @@ -1846,6 +1838,7 @@ public class Launcher extends BaseActivity public void onDestroy() { super.onDestroy(); + unregisterReceiver(mReceiver); mWorkspace.removeCallbacks(mBuildLayersRunnable); mWorkspace.removeFolderListeners(); |