aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-04 09:56:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Fix crash on long press of prediction row icons" into tm-qpr-dev

Browse Source
This commit is contained in:
Brian Isganitis
2022-10-20 22:54:06 +00:00
committed by Android (Google) Code Review
parent e690ef7f80 aee55077cc
commit 2bcc3f8599
4 changed files with 33 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
quickstep/src/com/android/launcher3/secondarydisplay/SecondaryDisplayPredictionsImpl.java
View File

@@ -18,7 +18,9 @@ package com.android.launcher3.secondarydisplay;
import static com.android.launcher3.util.OnboardingPrefs.ALL_APPS_VISITED_COUNT;
import android.content.Context;
import android.view.View;
import com.android.launcher3.allapps.ActivityAllAppsContainerView;
import com.android.launcher3.appprediction.AppsDividerView;
import com.android.launcher3.appprediction.PredictionRowView;
import com.android.launcher3.model.BgDataModel;
@@ -39,10 +41,13 @@ public final class SecondaryDisplayPredictionsImpl extends SecondaryDisplayPredi
@Override
void updateAppDivider() {
OnboardingPrefs<?> onboardingPrefs = mActivityContext.getOnboardingPrefs();
mActivityContext.getAppsView().getFloatingHeaderView()
.findFixedRowByType(AppsDividerView.class)
.setShowAllAppsLabel(!onboardingPrefs.hasReachedMaxCount(ALL_APPS_VISITED_COUNT));
onboardingPrefs.incrementEventCount(ALL_APPS_VISITED_COUNT);
if (onboardingPrefs != null) {
mActivityContext.getAppsView().getFloatingHeaderView()
.findFixedRowByType(AppsDividerView.class)
.setShowAllAppsLabel(
!onboardingPrefs.hasReachedMaxCount(ALL_APPS_VISITED_COUNT));
onboardingPrefs.incrementEventCount(ALL_APPS_VISITED_COUNT);
}
}
@Override
@@ -51,4 +56,12 @@ public final class SecondaryDisplayPredictionsImpl extends SecondaryDisplayPredi
.findFixedRowByType(PredictionRowView.class)
.setPredictedApps(item.items);
}
@Override
public void setLongClickListener(ActivityAllAppsContainerView<?> appsView,
View.OnLongClickListener onIconLongClickListener) {
appsView.getFloatingHeaderView()
.findFixedRowByType(PredictionRowView.class)
.setOnIconLongClickListener(onIconLongClickListener);
}
}

4
src/com/android/launcher3/secondarydisplay/SecondaryDisplayLauncher.java
View File

@@ -303,6 +303,10 @@ public class SecondaryDisplayLauncher extends BaseDraggingActivity
}
}
public SecondaryDisplayPredictions getSecondaryDisplayPredictions() {
return mSecondaryDisplayPredictions;
}
@Override
public StringCache getStringCache() {
return mStringCache;

10
src/com/android/launcher3/secondarydisplay/SecondaryDisplayPredictions.java
View File

@@ -16,8 +16,10 @@
package com.android.launcher3.secondarydisplay;
import android.content.Context;
import android.view.View;
import com.android.launcher3.R;
import com.android.launcher3.allapps.ActivityAllAppsContainerView;
import com.android.launcher3.model.BgDataModel;
import com.android.launcher3.util.ResourceBasedOverride;
@@ -45,4 +47,12 @@ public class SecondaryDisplayPredictions implements ResourceBasedOverride {
*/
public void setPredictedApps(BgDataModel.FixedContainerItems item) {
}
/**
* Set long click listener for predicted apps in top of app drawer.
*/
public void setLongClickListener(
ActivityAllAppsContainerView<?> appsView,
View.OnLongClickListener onIconLongClickListener) {
}
}

3
src/com/android/launcher3/secondarydisplay/SecondaryDragLayer.java
View File

@@ -77,7 +77,8 @@ public class SecondaryDragLayer extends BaseDragLayer<SecondaryDisplayLauncher>
mAppsView = findViewById(R.id.apps_view);
mAppsView.setOnIconLongClickListener(this::onIconLongClicked);
mActivity.getSecondaryDisplayPredictions()
.setLongClickListener(mAppsView, this::onIconLongClicked);
// Setup workspace
mWorkspace = findViewById(R.id.workspace_grid);
mPinnedAppsAdapter = new PinnedAppsAdapter(mActivity, mAppsView.getAppsStore(),