Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5248b020 authored by Brian Isganitis's avatar Brian Isganitis Committed by Android (Google) Code Review
Browse files

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

parents f450476c 589cb348

quickstep/res/values/config.xml

+2 −0
Original line number Diff line number Diff line
@@ -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>

quickstep/src/com/android/quickstep/OverviewComponentObserver.java

+9 −0
Original line number Diff line number Diff line
@@ -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);

quickstep/src/com/android/quickstep/TouchInteractionService.java

+4 −0
Original line number Diff line number Diff line
@@ -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);

    }