diff --git a/lawnchair/res/values/config.xml b/lawnchair/res/values/config.xml
index 664e3048d3..ed89783d06 100644
--- a/lawnchair/res/values/config.xml
+++ b/lawnchair/res/values/config.xml
@@ -90,6 +90,7 @@
true
false
true
+ false
true
false
false
diff --git a/lawnchair/res/values/strings.xml b/lawnchair/res/values/strings.xml
index f7c57c56c1..1de0b316b6 100644
--- a/lawnchair/res/values/strings.xml
+++ b/lawnchair/res/values/strings.xml
@@ -341,6 +341,8 @@
Load Apps in Bulk
Load and display icons in bulk instead of individually loading and displaying icons
+ Remember Position
+ Remember the position when you left off instead of the top
Search
Show Search Bar
Automatically Show Keyboard
diff --git a/lawnchair/src/app/lawnchair/LawnchairLauncher.kt b/lawnchair/src/app/lawnchair/LawnchairLauncher.kt
index ac1c1d64f9..cb675f73f6 100644
--- a/lawnchair/src/app/lawnchair/LawnchairLauncher.kt
+++ b/lawnchair/src/app/lawnchair/LawnchairLauncher.kt
@@ -75,6 +75,7 @@ import com.android.launcher3.model.data.ItemInfo
import com.android.launcher3.popup.SystemShortcut
import com.android.launcher3.statemanager.StateManager
import com.android.launcher3.uioverrides.QuickstepLauncher
+import com.android.launcher3.uioverrides.states.AllAppsState
import com.android.launcher3.uioverrides.states.OverviewState
import com.android.launcher3.util.ActivityOptionsWrapper
import com.android.launcher3.util.Executors
@@ -123,6 +124,14 @@ class LawnchairLauncher :
}
}
}
+ private val rememberPositionStateListener = object : StateManager.StateListener {
+ override fun onStateTransitionStart(toState: LauncherState) {
+ if (toState is AllAppsState) {
+ mAppsView.activeRecyclerView.restoreScrollPosition()
+ }
+ }
+ override fun onStateTransitionComplete(finalState: LauncherState) {}
+ }
private lateinit var colorScheme: ColorScheme
private var hasBackGesture = false
@@ -247,6 +256,16 @@ class LawnchairLauncher :
}
}.launchIn(scope = lifecycleScope)
+ preferenceManager2.rememberPosition.get().onEach {
+ with(launcher.stateManager) {
+ if (it) {
+ addStateListener(rememberPositionStateListener)
+ } else {
+ removeStateListener(rememberPositionStateListener)
+ }
+ }
+ }.launchIn(scope = lifecycleScope)
+
prefs.overrideWindowCornerRadius.subscribeValues(this) {
QuickStepContract.sHasCustomCornerRadius = it
}
diff --git a/lawnchair/src/app/lawnchair/preferences2/PreferenceManager2.kt b/lawnchair/src/app/lawnchair/preferences2/PreferenceManager2.kt
index 7583a27300..88bd67edbb 100644
--- a/lawnchair/src/app/lawnchair/preferences2/PreferenceManager2.kt
+++ b/lawnchair/src/app/lawnchair/preferences2/PreferenceManager2.kt
@@ -196,6 +196,12 @@ class PreferenceManager2 private constructor(private val context: Context) : Pre
defaultValue = context.resources.getBoolean(R.bool.config_default_show_status_bar),
)
+ val rememberPosition = preference(
+ key = booleanPreferencesKey(name = "all_apps_remember_position"),
+ defaultValue = context.resources.getBoolean(R.bool.config_default_remember_position),
+ onSet = { reloadHelper.reloadGrid() },
+ )
+
val showTopShadow = preference(
key = booleanPreferencesKey(name = "show_top_shadow"),
defaultValue = context.resources.getBoolean(R.bool.config_default_show_top_shadow),
diff --git a/lawnchair/src/app/lawnchair/ui/preferences/destinations/AppDrawerPreferences.kt b/lawnchair/src/app/lawnchair/ui/preferences/destinations/AppDrawerPreferences.kt
index 8a6945d519..409695c01c 100644
--- a/lawnchair/src/app/lawnchair/ui/preferences/destinations/AppDrawerPreferences.kt
+++ b/lawnchair/src/app/lawnchair/ui/preferences/destinations/AppDrawerPreferences.kt
@@ -71,6 +71,11 @@ fun AppDrawerPreferences() {
description = stringResource(id = R.string.pref_all_apps_bulk_icon_loading_description),
adapter = prefs.allAppBulkIconLoading.getAdapter(),
)
+ SwitchPreference(
+ label = stringResource(id = R.string.pref_all_apps_remember_position_title),
+ description = stringResource(id = R.string.pref_all_apps_remember_position_description),
+ adapter = prefs2.rememberPosition.getAdapter(),
+ )
SuggestionsPreference()
}
diff --git a/src/com/android/launcher3/FastScrollRecyclerView.java b/src/com/android/launcher3/FastScrollRecyclerView.java
index c16b319934..3641ce163f 100644
--- a/src/com/android/launcher3/FastScrollRecyclerView.java
+++ b/src/com/android/launcher3/FastScrollRecyclerView.java
@@ -40,6 +40,8 @@ public abstract class FastScrollRecyclerView extends RecyclerView {
protected RecyclerViewFastScroller mScrollbar;
+ private int savedScrollPosition = RecyclerView.NO_POSITION;
+
public FastScrollRecyclerView(Context context) {
this(context, null);
}
@@ -78,6 +80,27 @@ public abstract class FastScrollRecyclerView extends RecyclerView {
return mScrollbar.getHeight() - getScrollBarTop() - getScrollBarMarginBottom();
}
+ public int getSavedScrollPosition() {
+ return savedScrollPosition;
+ }
+
+ /**
+ * Saved the scroll position
+ */
+ public void saveScrollPosition() {
+ savedScrollPosition = computeVerticalScrollOffset();
+ }
+
+ /**
+ * Restore the scroll position to the previously saved position.
+ */
+ public void restoreScrollPosition() {
+ if (savedScrollPosition != RecyclerView.NO_POSITION) {
+ scrollToPosition(savedScrollPosition);
+ savedScrollPosition = RecyclerView.NO_POSITION;
+ }
+ }
+
/**
* Returns the available scroll height:
* AvailableScrollHeight = Total height of the all items - last page height
@@ -171,6 +194,7 @@ public abstract class FastScrollRecyclerView extends RecyclerView {
if (state == SCROLL_STATE_IDLE) {
AccessibilityManagerCompat.sendScrollFinishedEventToTest(getContext());
+ saveScrollPosition();
}
}
@@ -187,6 +211,7 @@ public abstract class FastScrollRecyclerView extends RecyclerView {
if (mScrollbar != null) {
mScrollbar.reattachThumbToScroll();
}
- scrollToPosition(0);
+ saveScrollPosition();
+ scrollToPosition(savedScrollPosition);
}
}
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 38b1014a4e..b802c69175 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -363,7 +363,7 @@ public class Launcher extends StatefulActivity
// Main container view for the all apps screen.
@Thunk
- ActivityAllAppsContainerView mAppsView;
+ public ActivityAllAppsContainerView mAppsView;
AllAppsTransitionController mAllAppsController;
// Scrim view for the all apps and overview state.
diff --git a/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java b/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java
index 694073210e..6511a4fee7 100644
--- a/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java
@@ -478,9 +478,11 @@ public class ActivityAllAppsContainerView
* apps list.
*/
public void reset(boolean animate, boolean exitSearch) {
- for (int i = 0; i < mAH.size(); i++) {
- if (mAH.get(i).mRecyclerView != null) {
- mAH.get(i).mRecyclerView.scrollToTop();
+ if (!PreferenceExtensionsKt.firstBlocking (pref2.getRememberPosition ())) {
+ for (int i = 0; i < mAH.size(); i++) {
+ if (mAH.get(i).mRecyclerView != null) {
+ mAH.get(i).mRecyclerView.scrollToTop();
+ }
}
}
if (mTouchHandler != null) {
diff --git a/src/com/android/launcher3/allapps/FloatingHeaderView.java b/src/com/android/launcher3/allapps/FloatingHeaderView.java
index 330d13da06..846c8620e0 100644
--- a/src/com/android/launcher3/allapps/FloatingHeaderView.java
+++ b/src/com/android/launcher3/allapps/FloatingHeaderView.java
@@ -39,11 +39,14 @@ import com.android.launcher3.views.ActivityContext;
import com.android.systemui.plugins.AllAppsRow;
import com.android.systemui.plugins.AllAppsRow.OnHeightUpdatedListener;
import com.android.systemui.plugins.PluginListener;
+import com.patrykmichalik.opto.core.PreferenceExtensionsKt;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Map;
+import app.lawnchair.preferences2.PreferenceManager2;
+
public class FloatingHeaderView extends LinearLayout implements
ValueAnimator.AnimatorUpdateListener, PluginListener, Insettable,
OnHeightUpdatedListener {
@@ -113,6 +116,8 @@ public class FloatingHeaderView extends LinearLayout implements
// enabled or disabled, and represent the current set of all rows.
private FloatingHeaderRow[] mAllRows = FloatingHeaderRow.NO_ROWS;
+ private final PreferenceManager2 pref2;
+
public FloatingHeaderView(@NonNull Context context) {
this(context, null);
}
@@ -123,6 +128,7 @@ public class FloatingHeaderView extends LinearLayout implements
.getDimensionPixelSize(R.dimen.all_apps_header_top_adjustment);
mTabsAdditionalPaddingBottom = context.getResources()
.getDimensionPixelSize(R.dimen.all_apps_header_bottom_adjustment);
+ pref2 = PreferenceManager2.getInstance(context);
}
@Override
@@ -310,8 +316,9 @@ public class FloatingHeaderView extends LinearLayout implements
}
protected void applyVerticalMove() {
+ int maxTranslation = mMaxTranslation - mCurrentRV.getSavedScrollPosition();
int uncappedTranslationY = mTranslationY;
- mTranslationY = Math.max(mTranslationY, -mMaxTranslation);
+ mTranslationY = Math.max(mTranslationY, -maxTranslation);
if (mFloatingRowsCollapsed || uncappedTranslationY < mTranslationY - getPaddingTop()) {
// we hide it completely if already capped (for opening search anim)
@@ -377,7 +384,9 @@ public class FloatingHeaderView extends LinearLayout implements
}
mHeaderCollapsed = false;
mSnappedScrolledY = -mMaxTranslation;
- mCurrentRV.scrollToTop();
+ if (!PreferenceExtensionsKt.firstBlocking (pref2.getRememberPosition ())) {
+ mCurrentRV.scrollToTop();
+ }
}
public boolean isExpanded() {