aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-20 11:18:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Treat setup wizard default home as null." into tm-qpr-dev

Browse Source
This commit is contained in:
Brian Isganitis
2023-03-03 21:11:18 +00:00
committed by Android (Google) Code Review
parent f450476c7a 589cb3480a
commit 5248b02080
3 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
quickstep/res/values/config.xml
View File

@@ -49,4 +49,6 @@
<item name="config_wallpaperMaxScale" format="float" type="dimen">
@*android:dimen/config_wallpaperMaxScale
</item>
<string name="setup_wizard_pkg" translatable="false" />
</resources>

9
quickstep/src/com/android/quickstep/OverviewComponentObserver.java
View File

@@ -37,6 +37,7 @@ import android.util.SparseIntArray;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.android.launcher3.R;
import com.android.launcher3.tracing.OverviewComponentObserverProto;
import com.android.launcher3.tracing.TouchInteractionServiceProto;
import com.android.launcher3.util.SimpleBroadcastReceiver;
@@ -65,6 +66,7 @@ public final class OverviewComponentObserver {
private final Intent mMyHomeIntent;
private final Intent mFallbackIntent;
private final SparseIntArray mConfigChangesMap = new SparseIntArray();
private final String mSetupWizardPkg;
private Consumer<Boolean> mOverviewChangeListener = b -> { };
@@ -86,6 +88,7 @@ public final class OverviewComponentObserver {
new ComponentName(context.getPackageName(), info.activityInfo.name);
mMyHomeIntent.setComponent(myHomeComponent);
mConfigChangesMap.append(myHomeComponent.hashCode(), info.activityInfo.configChanges);
mSetupWizardPkg = context.getString(R.string.setup_wizard_pkg);
ComponentName fallbackComponent = new ComponentName(mContext, RecentsActivity.class);
mFallbackIntent = new Intent(Intent.ACTION_MAIN)
@@ -127,6 +130,12 @@ public final class OverviewComponentObserver {
private void updateOverviewTargets() {
ComponentName defaultHome = PackageManagerWrapper.getInstance()
.getHomeActivities(new ArrayList<>());
if (defaultHome != null && defaultHome.getPackageName().equals(mSetupWizardPkg)) {
// Treat setup wizard as null default home, because there is a period between setup and
// launcher being default home where it is briefly null. Otherwise, it would appear as
// if overview targets are changing twice, giving the listener an incorrect signal.
defaultHome = null;
}
mIsHomeDisabled = mDeviceState.isHomeDisabled();
mIsDefaultHome = Objects.equals(mMyHomeIntent.getComponent(), defaultHome);

4
quickstep/src/com/android/quickstep/TouchInteractionService.java
View File

@@ -1132,6 +1132,10 @@ public class TouchInteractionService extends Service
return;
}
// TODO(b/258022658): Remove temporary logging.
Log.i(TAG, "preloadOverview: forSUWAllSet=" + forSUWAllSet
+ ", isHomeAndOverviewSame=" + mOverviewComponentObserver.isHomeAndOverviewSame());
mTaskAnimationManager.preloadRecentsAnimation(overviewIntent);
}