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

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

Merge "Tapl library" into ub-launcher3-master

parents b70e1add 2ce6a13f

quickstep/src/com/android/quickstep/ActivityControlHelper.java

+3 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ import com.android.launcher3.allapps.AllAppsTransitionController; 
import com.android.launcher3.allapps.DiscoveryBounce;

import com.android.launcher3.anim.AnimationSuccessListener;

import com.android.launcher3.anim.AnimatorPlaybackController;

import com.android.launcher3.compat.AccessibilityManagerCompat;

import com.android.launcher3.dragndrop.DragLayer;

import com.android.launcher3.uioverrides.FastOverviewState;

import com.android.launcher3.userevent.nano.LauncherLogProto;
@@ -230,6 +231,8 @@ public interface ActivityControlHelper<T extends BaseDraggingActivity> { 


                // Optimization, hide the all apps view to prevent layout while initializing

                activity.getAppsView().getContentView().setVisibility(View.GONE);



                AccessibilityManagerCompat.sendEventToTest(activity, "TAPL_WENT_TO_STATE");

            }



            return new AnimationFactory() {

src/com/android/launcher3/Utilities.java

+4 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.launcher3;



import android.app.ActivityManager;

import android.app.WallpaperManager;

import android.content.ComponentName;

import android.content.Context;
@@ -130,6 +131,9 @@ public final class Utilities { 
            CORE_POOL_SIZE, MAXIMUM_POOL_SIZE, KEEP_ALIVE,

            TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>());



    public static final boolean IS_RUNNING_IN_TEST_HARNESS =

                    ActivityManager.isRunningInTestHarness();



    public static boolean isPropertyEnabled(String propertyName) {

        return Log.isLoggable(propertyName, Log.VERBOSE);

    }

src/com/android/launcher3/Workspace.java

+1 −1
Original line number Diff line number Diff line
@@ -1034,7 +1034,7 @@ public class Workspace extends PagedView<WorkspacePageIndicator> 
    }



    protected void onScrollInteractionBegin() {

        super.onScrollInteractionEnd();

        super.onScrollInteractionBegin();

        mScrollInteractionBegan = true;

    }

src/com/android/launcher3/compat/AccessibilityManagerCompat.java

+18 −0
Original line number Diff line number Diff line
@@ -16,11 +16,14 @@ 


package com.android.launcher3.compat;



import android.accessibilityservice.AccessibilityServiceInfo;

import android.content.Context;

import android.view.View;

import android.view.accessibility.AccessibilityEvent;

import android.view.accessibility.AccessibilityManager;



import com.android.launcher3.Utilities;



public class AccessibilityManagerCompat {



    public static boolean isAccessibilityEnabled(Context context) {
@@ -44,4 +47,19 @@ public class AccessibilityManagerCompat { 
    private static AccessibilityManager getManager(Context context) {

        return (AccessibilityManager) context.getSystemService(Context.ACCESSIBILITY_SERVICE);

    }



    public static void sendEventToTest(Context context, String eventTag) {

        if (!Utilities.IS_RUNNING_IN_TEST_HARNESS) return;



        final AccessibilityManager accessibilityManager = getManager(context);

        if (accessibilityManager.isEnabled() &&

                accessibilityManager.getEnabledAccessibilityServiceList(

                        AccessibilityServiceInfo.FEEDBACK_ALL_MASK).size() == 0) {



            final AccessibilityEvent e = AccessibilityEvent.obtain(

                    AccessibilityEvent.TYPE_ANNOUNCEMENT);

            e.setClassName(eventTag);

            accessibilityManager.sendAccessibilityEvent(e);

        }

    }

}

src/com/android/launcher3/touch/AbstractStateChangeTouchController.java

+3 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ import com.android.launcher3.Utilities; 
import com.android.launcher3.anim.AnimationSuccessListener;

import com.android.launcher3.anim.AnimatorPlaybackController;

import com.android.launcher3.anim.AnimatorSetBuilder;

import com.android.launcher3.compat.AccessibilityManagerCompat;

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

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

import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch;
@@ -515,6 +516,8 @@ public abstract class AbstractStateChangeTouchController 
                logReachedState(logAction, targetState);

            }

            mLauncher.getStateManager().goToState(targetState, false /* animated */);



            AccessibilityManagerCompat.sendEventToTest(mLauncher, "TAPL_WENT_TO_STATE");

        }

    }