diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-09-23 10:18:55 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-09-23 10:18:55 +0000 |
commit | 1698bb07deb14aed665fd41021cda8a1065bde63 (patch) | |
tree | 4b7aa94390d45773d70beacbd7e6c47bfc0c6cd1 /quickstep | |
parent | 68bac44c7e0e2af4e897c8b6e6d36dff28c4dde3 (diff) | |
parent | 450ac483066cefdf74e8c1b50d1946677cd40449 (diff) | |
download | Launcher3-1698bb07deb14aed665fd41021cda8a1065bde63.tar.gz |
Snap for 9098257 from 450ac483066cefdf74e8c1b50d1946677cd40449 to mainline-scheduling-releaseaml_sch_331113000aml_sch_331111000android13-mainline-scheduling-release
Change-Id: Ib452ab715b36eff89c16549160a86499dd0acc27
Diffstat (limited to 'quickstep')
4 files changed, 4 insertions, 20 deletions
diff --git a/quickstep/src/com/android/launcher3/appprediction/AppsDividerView.java b/quickstep/src/com/android/launcher3/appprediction/AppsDividerView.java index 0284ae4803..f42b39fb2d 100644 --- a/quickstep/src/com/android/launcher3/appprediction/AppsDividerView.java +++ b/quickstep/src/com/android/launcher3/appprediction/AppsDividerView.java @@ -21,7 +21,6 @@ import static com.android.launcher3.util.OnboardingPrefs.ALL_APPS_VISITED_COUNT; import android.annotation.TargetApi; import android.content.Context; import android.graphics.Canvas; -import android.graphics.Rect; import android.graphics.Typeface; import android.os.Build; import android.text.Layout; @@ -33,7 +32,6 @@ import android.view.View; import androidx.annotation.ColorInt; import androidx.core.content.ContextCompat; -import com.android.launcher3.DeviceProfile; import com.android.launcher3.R; import com.android.launcher3.allapps.FloatingHeaderRow; import com.android.launcher3.allapps.FloatingHeaderView; @@ -239,12 +237,6 @@ public class AppsDividerView extends View implements FloatingHeaderRow { } @Override - public void setInsets(Rect insets, DeviceProfile grid) { - int leftRightPadding = grid.allAppsLeftRightPadding; - setPadding(leftRightPadding, getPaddingTop(), leftRightPadding, getPaddingBottom()); - } - - @Override public void setVerticalScroll(int scroll, boolean isScrolledOut) { setTranslationY(scroll); mIsScrolledOut = isScrolledOut; diff --git a/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java b/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java index 1dec73721c..351a3bc164 100644 --- a/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java +++ b/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java @@ -19,7 +19,6 @@ package com.android.launcher3.appprediction; import android.annotation.TargetApi; import android.content.Context; import android.graphics.Canvas; -import android.graphics.Rect; import android.os.Build; import android.util.AttributeSet; import android.view.LayoutInflater; @@ -252,12 +251,6 @@ public class PredictionRowView<T extends Context & ActivityContext & DeviceProfi } @Override - public void setInsets(Rect insets, DeviceProfile grid) { - int leftRightPadding = grid.allAppsLeftRightPadding; - setPadding(leftRightPadding, getPaddingTop(), leftRightPadding, getPaddingBottom()); - } - - @Override public Class<PredictionRowView> getTypeClass() { return PredictionRowView.class; } diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java index 95da118948..dc2e3b624c 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java @@ -147,7 +147,7 @@ public class TaskbarActivityContext extends BaseTaskbarContext { mIsUserSetupComplete = SettingsCache.INSTANCE.get(this).getValue( Settings.Secure.getUriFor(Settings.Secure.USER_SETUP_COMPLETE), 0); mIsNavBarForceVisible = SettingsCache.INSTANCE.get(this).getValue( - Settings.Secure.getUriFor(Settings.Secure.NAV_BAR_FORCE_VISIBLE), 0); + Settings.Secure.getUriFor(Settings.Secure.NAV_BAR_KIDS_MODE), 0); mIsNavBarKidsMode = SettingsCache.INSTANCE.get(this).getValue( Settings.Secure.getUriFor(Settings.Secure.NAV_BAR_KIDS_MODE), 0); diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java index d676f7d195..76f7718765 100644 --- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java +++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java @@ -166,11 +166,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>, if (mActivity != activity) { return; } - if (mTaskAnimationManager != null) { - mTaskAnimationManager.finishRunningRecentsAnimation(true); - } mRecentsView = null; - mActivity.unregisterActivityLifecycleCallbacks(mLifecycleCallbacks); mActivity = null; } }; @@ -1599,6 +1595,9 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>, private void reset() { mStateCallback.setStateOnUiThread(STATE_HANDLER_INVALIDATED); + if (mActivity != null) { + mActivity.unregisterActivityLifecycleCallbacks(mLifecycleCallbacks); + } } /** |