commit 69230bbb29b44be90f2b3151d5b472c86ff75cc0
author Alex Chau <alexchau@google.com> Fri May 13 16:08:18 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 13 16:08:18 2022 +0000
tree cd9fc69266fa2ea49af157c16d120db5c2ccd7dc
parent 6c2c619d355f6cdd68d6ad04bfe86590bb1062f6
parent 9b5548c56db234963b6c07dc48495e8ef05ae0e7

Merge "Consider padding when measuring AllApps in SecondaryDragLayer" into tm-dev

src/com/android/launcher3/allapps/BaseAllAppsContainerView.java

diff --git a/src/com/android/launcher3/allapps/BaseAllAppsContainerView.java b/src/com/android/launcher3/allapps/BaseAllAppsContainerView.java
index 7c1e152..fc52797 100644
--- a/src/com/android/launcher3/allapps/BaseAllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/BaseAllAppsContainerView.java
@@ -326,7 +326,7 @@
     }
 
     protected boolean isPersonalTab() {
-        return mViewPager.getNextPage() == 0;
+        return mViewPager == null || mViewPager.getNextPage() == 0;
     }
 
     /**

src/com/android/launcher3/states/RotationHelper.java

diff --git a/src/com/android/launcher3/states/RotationHelper.java b/src/com/android/launcher3/states/RotationHelper.java
index 8b425da..38b62d4 100644
--- a/src/com/android/launcher3/states/RotationHelper.java
+++ b/src/com/android/launcher3/states/RotationHelper.java
@@ -109,7 +109,7 @@
 
     @Override
     public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String s) {
-        if (mDestroyed) return;
+        if (mDestroyed || mIgnoreAutoRotateSettings) return;
         boolean wasRotationEnabled = mHomeRotationEnabled;
         mHomeRotationEnabled = mSharedPrefs.getBoolean(ALLOW_ROTATION_PREFERENCE_KEY,
                 getAllowRotationDefaultValue(mActivity.getDeviceProfile()));