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

Commit 45633e5a authored by Vadim Tryshev's avatar Vadim Tryshev Committed by Android (Google) Code Review
Browse files

Merge "Moving all sources that are shared between Launcher and TAPL in one... 

Merge "Moving all sources that are shared between Launcher and TAPL in one directory" into tm-qpr-dev
parents d14f4c51 f6ef879c

Android.bp

+1 −3
Original line number Diff line number Diff line
@@ -35,9 +35,7 @@ android_library { 
    ],

    srcs: [

        "tests/tapl/**/*.java",

        "src/com/android/launcher3/ResourceUtils.java",

        "src/com/android/launcher3/testing/TestProtocol.java",

        "src/com/android/launcher3/testing/*Request.java",

        "src/com/android/launcher3/testing/shared/**/*.java",

    ],

    resource_dirs: [ ],

    manifest: "tests/tapl/AndroidManifest.xml",

ext_tests/src/com/android/launcher3/testing/DebugTestInformationHandler.java

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import com.android.launcher3.BubbleTextView; 
import com.android.launcher3.LauncherAppState;

import com.android.launcher3.LauncherSettings;

import com.android.launcher3.ShortcutAndWidgetContainer;

import com.android.launcher3.testing.shared.TestProtocol;



import java.util.ArrayList;

import java.util.Collection;

quickstep/ext_tests/src/com/android/quickstep/DebugQuickstepTestInformationHandler.java

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ import com.android.launcher3.Launcher; 
import com.android.launcher3.R;

import com.android.launcher3.taskbar.LauncherTaskbarUIController;

import com.android.launcher3.testing.DebugTestInformationHandler;

import com.android.launcher3.testing.TestProtocol;

import com.android.launcher3.testing.shared.TestProtocol;



import java.util.concurrent.ExecutionException;

quickstep/src/com/android/launcher3/QuickstepTransitionManager.java

+2 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ import static com.android.launcher3.config.FeatureFlags.KEYGUARD_ANIMATION; 
import static com.android.launcher3.config.FeatureFlags.SEPARATE_RECENTS_ACTIVITY;

import static com.android.launcher3.model.data.ItemInfo.NO_MATCHING_ID;

import static com.android.launcher3.statehandlers.DepthController.DEPTH;

import static com.android.launcher3.testing.TestProtocol.BAD_STATE;

import static com.android.launcher3.testing.shared.TestProtocol.BAD_STATE;

import static com.android.launcher3.util.window.RefreshRateTracker.getSingleFrameMs;

import static com.android.launcher3.views.FloatingIconView.SHAPE_PROGRESS_DURATION;

import static com.android.launcher3.views.FloatingIconView.getFloatingIconView;
@@ -100,6 +100,7 @@ import com.android.launcher3.icons.FastBitmapDrawable; 
import com.android.launcher3.shortcuts.DeepShortcutView;

import com.android.launcher3.statehandlers.DepthController;

import com.android.launcher3.taskbar.LauncherTaskbarUIController;

import com.android.launcher3.testing.shared.ResourceUtils;

import com.android.launcher3.touch.PagedOrientationHandler;

import com.android.launcher3.util.ActivityOptionsWrapper;

import com.android.launcher3.util.DynamicResource;

quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java

+2 −2
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ import static android.view.WindowManager.LayoutParams.TYPE_NAVIGATION_BAR_PANEL; 


import static com.android.launcher3.AbstractFloatingView.TYPE_ALL;

import static com.android.launcher3.AbstractFloatingView.TYPE_REBIND_SAFE;

import static com.android.launcher3.ResourceUtils.getBoolByName;

import static com.android.launcher3.testing.shared.ResourceUtils.getBoolByName;

import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_FOLDER_OPEN;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_QUICK_SETTINGS_EXPANDED;
@@ -76,7 +76,7 @@ import com.android.launcher3.model.data.WorkspaceItemInfo; 
import com.android.launcher3.popup.PopupDataProvider;

import com.android.launcher3.taskbar.allapps.TaskbarAllAppsController;

import com.android.launcher3.testing.TestLogging;

import com.android.launcher3.testing.TestProtocol;

import com.android.launcher3.testing.shared.TestProtocol;

import com.android.launcher3.touch.ItemClickHandler;

import com.android.launcher3.util.DisplayController;

import com.android.launcher3.util.DisplayController.NavigationMode;