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

Commit f4392dbf authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Some launcher3 fixes so that it compiles with different configurations"... 

Merge "Some launcher3 fixes so that it compiles with different configurations" into ub-launcher3-edmonton
parents c86805f4 d0f43ceb

proguard.flags

+5 −0
Original line number Diff line number Diff line
@@ -112,6 +112,11 @@ 
    public <init>(...);

}



# UserEventDispatcherExtension

-keep class com.android.quickstep.logging.UserEventDispatcherExtension {

    public <init>(...);

}



-keep interface com.android.launcher3.userevent.nano.LauncherLogProto.** {

  *;

}

quickstep/res/values/config.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,5 +18,5 @@ 


    <string name="overview_callbacks_class" translatable="false"></string>



    <string name="user_event_dispatcher_class" translatable="false">com.google.quickstep.logging.UserEventDispatcherExtension</string>

    <string name="user_event_dispatcher_class" translatable="false">com.android.quickstep.logging.UserEventDispatcherExtension</string>

</resources>

quickstep/src/com/android/quickstep/QuickstepProcessInitializer.java

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.content.Context; 
import com.android.launcher3.MainProcessInitializer;

import com.android.systemui.shared.system.ThreadedRendererCompat;



@SuppressWarnings("unused")

public class QuickstepProcessInitializer extends MainProcessInitializer {



    public QuickstepProcessInitializer(Context context) { }

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

+4 −5
Original line number Diff line number Diff line
@@ -15,10 +15,9 @@ 
 */

package com.android.quickstep.logging;



import android.content.Context;

import android.util.Log;



import static com.android.launcher3.logging.LoggerUtils.newAction;

import static com.android.launcher3.logging.LoggerUtils.newContainerTarget;

import static com.android.launcher3.logging.LoggerUtils.newLauncherEvent;

import static com.android.launcher3.userevent.nano.LauncherLogProto.ControlType.CANCEL_TARGET;

import static com.android.systemui.shared.system.LauncherEventUtil.VISIBLE;
@@ -27,20 +26,20 @@ import static com.android.systemui.shared.system.LauncherEventUtil.RECENTS_QUICK 
import static com.android.systemui.shared.system.LauncherEventUtil.RECENTS_SWIPE_UP_ONBOARDING_TIP;



import com.android.launcher3.logging.UserEventDispatcher;

import com.android.launcher3.model.nano.LauncherDumpProto;

import com.android.launcher3.userevent.nano.LauncherLogExtensions;

import com.android.launcher3.userevent.nano.LauncherLogProto;

import com.android.systemui.shared.system.LauncherEventUtil;

import com.android.systemui.shared.system.MetricsLoggerCompat;



/**

 * This class handles AOSP MetricsLogger function calls and logging around

 * quickstep interactions.

 */

@SuppressWarnings("unused")

public class UserEventDispatcherExtension extends UserEventDispatcher {



    private static final String TAG = "UserEventDispatcher";



    public UserEventDispatcherExtension(Context context) { }



    public void logStateChangeAction(int action, int dir, int srcChildTargetType,

                                     int srcParentContainerType, int dstContainerType,

                                     int pageIndex) {

src/com/android/launcher3/provider/ImportDataTask.java

+2 −0
Original line number Diff line number Diff line
@@ -142,6 +142,8 @@ public class ImportDataTask { 
                // First row of first screen is not empty

                createEmptyRowOnFirstScreen = c.moveToNext();

            }

        } else {

            createEmptyRowOnFirstScreen = false;

        }



        ArrayList<ContentProviderOperation> insertOperations = new ArrayList<>(BATCH_INSERT_SIZE);