PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Adding support for extending back behavior in Launcher" into tm-dev am: a292987030

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18187213

Change-Id: Ib9b94972fa6681f18dd756150da126bed462b34f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Sunny Goyal
2022-05-18 20:48:47 +00:00
committed by Automerger Merge Worker
parent b742969fb6 a292987030
commit d023ac2bee
2 changed files with 7 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/Launcher.java
+7 -4
View File
@@ -2045,13 +2045,16 @@ public class Launcher extends StatefulActivity<LauncherState>
// Note: There should be at most one log per method call. This is enforced implicitly
// by using if-else statements.
AbstractFloatingView topView = AbstractFloatingView.getTopOpenView(this);
if (topView != null && topView.onBackPressed()) {
// Handled by the floating view.
} else {
mStateManager.getState().onBackPressed(this);
if (topView == null || !topView.onBackPressed()) {
// Not handled by the floating view.
onStateBack();
}
}
protected void onStateBack() {
mStateManager.getState().onBackPressed(this);
}
protected void onScreenOff() {
// Reset AllApps to its initial state only if we are not in the middle of
// processing a multi-step drop
src/com/android/launcher3/allapps/AllAppsRecyclerView.java
-29
View File
@@ -15,9 +15,7 @@
*/
package com.android.launcher3.allapps;
import static android.view.View.MeasureSpec.EXACTLY;
import static android.view.View.MeasureSpec.UNSPECIFIED;
import static android.view.View.MeasureSpec.makeMeasureSpec;
import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ALLAPPS_SCROLLED;
import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ALLAPPS_VERTICAL_SWIPE_BEGIN;
@@ -47,7 +45,6 @@ import com.android.launcher3.logging.StatsLogManager;
import com.android.launcher3.views.ActivityContext;
import com.android.launcher3.views.RecyclerViewFastScroller;
import java.util.ArrayList;
import java.util.List;
/**
@@ -97,8 +94,6 @@ public class AllAppsRecyclerView extends BaseRecyclerView {
private AllAppsBackgroundDrawable mEmptySearchBackground;
private int mEmptySearchBackgroundTopOffset;
private ArrayList<View> mAutoSizedOverlays = new ArrayList<>();
public AllAppsRecyclerView(Context context) {
this(context, null);
}
@@ -172,30 +167,6 @@ public class AllAppsRecyclerView extends BaseRecyclerView {
protected void onSizeChanged(int w, int h, int oldw, int oldh) {
updateEmptySearchBackgroundBounds();
updatePoolSize();
for (int i = 0; i < mAutoSizedOverlays.size(); i++) {
View overlay = mAutoSizedOverlays.get(i);
overlay.measure(makeMeasureSpec(w, EXACTLY), makeMeasureSpec(w, EXACTLY));
overlay.layout(0, 0, w, h);
}
}
/**
* Adds an overlay that automatically rescales with the recyclerview.
*/
public void addAutoSizedOverlay(View overlay) {
mAutoSizedOverlays.add(overlay);
getOverlay().add(overlay);
onSizeChanged(getWidth(), getHeight(), getWidth(), getHeight());
}
/**
* Clears auto scaling overlay views added by #addAutoSizedOverlay
*/
public void clearAutoSizedOverlays() {
for (View v : mAutoSizedOverlays) {
getOverlay().remove(v);
}
mAutoSizedOverlays.clear();
}
public void onSearchResultsChanged() {