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

Commit a49a2a32 authored by Fengjiang Li's avatar Fengjiang Li Committed by Android (Google) Code Review
Browse files

Merge "[Dagger] Make SettingsCache provided by DaggerSingletonObject" into main

parents 67ed9200 4d819d9d

quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java

+2 −2
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ public class QuickstepModelDelegate extends ModelDelegate { 
            InstanceId instanceId = new InstanceIdSequence().newInstanceId();

            for (ItemInfo info : itemsIdMap) {

                CollectionInfo parent = getContainer(info, itemsIdMap);

                StatsLogCompatManager.writeSnapshot(info.buildProto(parent), instanceId);

                StatsLogCompatManager.writeSnapshot(info.buildProto(parent, mContext), instanceId);

            }

            additionalSnapshotEvents(instanceId);

            prefs.put(LAST_SNAPSHOT_TIME_MILLIS, now);
@@ -274,7 +274,7 @@ public class QuickstepModelDelegate extends ModelDelegate { 


                        for (ItemInfo info : itemsIdMap) {

                            CollectionInfo parent = getContainer(info, itemsIdMap);

                            LauncherAtom.ItemInfo itemInfo = info.buildProto(parent);

                            LauncherAtom.ItemInfo itemInfo = info.buildProto(parent, mContext);

                            Log.d(TAG, itemInfo.toString());

                            StatsEvent statsEvent = StatsLogCompatManager.buildStatsEvent(itemInfo,

                                    instanceId);

quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java

+2 −2
Original line number Diff line number Diff line
@@ -386,12 +386,12 @@ public class StatsLogCompatManager extends StatsLogManager { 
                // and then write to StatsLog.

                app.getModel().enqueueModelUpdateTask((taskController, dataModel, apps) ->

                        write(event, applyOverwrites(mItemInfo.buildProto(

                                dataModel.collections.get(mItemInfo.container)))));

                                dataModel.collections.get(mItemInfo.container), mContext))));

            })) {

                // Write log on the model thread so that logs do not go out of order

                // (for eg: drop comes after drag)

                Executors.MODEL_EXECUTOR.execute(

                        () -> write(event, applyOverwrites(mItemInfo.buildProto())));

                        () -> write(event, applyOverwrites(mItemInfo.buildProto(mContext))));

            }

        }

src/com/android/launcher3/dagger/LauncherBaseAppComponent.java

+2 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.content.Context; 
import com.android.launcher3.pm.InstallSessionHelper;

import com.android.launcher3.util.DaggerSingletonTracker;

import com.android.launcher3.util.ScreenOnTracker;

import com.android.launcher3.util.SettingsCache;



import dagger.BindsInstance;
@@ -36,6 +37,7 @@ public interface LauncherBaseAppComponent { 
    DaggerSingletonTracker getDaggerSingletonTracker();

    InstallSessionHelper getInstallSessionHelper();

    ScreenOnTracker getScreenOnTracker();

    SettingsCache getSettingsCache();



    /** Builder for LauncherBaseAppComponent. */

    interface Builder {

src/com/android/launcher3/model/data/AppPairInfo.kt

+3 −3
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ class AppPairInfo() : CollectionInfo() { 
            (ActivityContext.lookupContext(context) as ActivityContext).getDeviceProfile().isTablet

        return Pair(

            isTablet || !getFirstApp().isNonResizeable(),

            isTablet || !getSecondApp().isNonResizeable()

            isTablet || !getSecondApp().isNonResizeable(),

        )

    }
@@ -105,10 +105,10 @@ class AppPairInfo() : CollectionInfo() { 
    }



    /** Generates an ItemInfo for logging. */

    override fun buildProto(cInfo: CollectionInfo?): LauncherAtom.ItemInfo {

    override fun buildProto(cInfo: CollectionInfo?, context: Context): LauncherAtom.ItemInfo {

        val appPairIcon = LauncherAtom.FolderIcon.newBuilder().setCardinality(contents.size)

        appPairIcon.setLabelInfo(title.toString())

        return getDefaultItemInfoBuilder()

        return getDefaultItemInfoBuilder(context)

            .setFolderIcon(appPairIcon)

            .setRank(rank)

            .setContainerInfo(getContainerInfo())

src/com/android/launcher3/model/data/CollectionInfo.kt

+0 −6
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.launcher3.model.data



import com.android.launcher3.LauncherSettings

import com.android.launcher3.logger.LauncherAtom

import com.android.launcher3.util.ContentWriter

import java.util.function.Predicate
@@ -42,9 +41,4 @@ abstract class CollectionInfo : ItemInfo() { 
        super.onAddToDatabase(writer)

        writer.put(LauncherSettings.Favorites.TITLE, title)

    }



    /** Returns the collection wrapped as {@link LauncherAtom.ItemInfo} for logging. */

    override fun buildProto(): LauncherAtom.ItemInfo {

        return buildProto(null)

    }

}