diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/fallback/FallbackRecentsView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/fallback/FallbackRecentsView.java index a946304779..f5f525965f 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/fallback/FallbackRecentsView.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/fallback/FallbackRecentsView.java @@ -101,20 +101,20 @@ public class FallbackRecentsView extends RecentsView } @Override - protected boolean shouldAddDummyTaskView(RunningTaskInfo runningTaskInfo) { + protected boolean shouldAddStubTaskView(RunningTaskInfo runningTaskInfo) { if (mHomeTaskInfo != null && runningTaskInfo != null && mHomeTaskInfo.taskId == runningTaskInfo.taskId && getTaskViewCount() == 0) { - // Do not add a dummy task if we are running over home with empty recents, so that we - // show the empty recents message instead of showing a dummy task and later removing it. + // Do not add a stub task if we are running over home with empty recents, so that we + // show the empty recents message instead of showing a stub task and later removing it. return false; } - return super.shouldAddDummyTaskView(runningTaskInfo); + return super.shouldAddStubTaskView(runningTaskInfo); } @Override protected void applyLoadPlan(ArrayList tasks) { - // When quick-switching on 3p-launcher, we add a "dummy" tile corresponding to Launcher + // When quick-switching on 3p-launcher, we add a "stub" tile corresponding to Launcher // as well. This tile is never shown as we have setCurrentTaskHidden, but allows use to // track the index of the next task appropriately, as if we are switching on any other app. if (mHomeTaskInfo != null && mHomeTaskInfo.taskId == mRunningTaskId && !tasks.isEmpty()) { diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/DeviceLockedInputConsumer.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/DeviceLockedInputConsumer.java index db1948b9f3..7032fae8f0 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/DeviceLockedInputConsumer.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/DeviceLockedInputConsumer.java @@ -60,7 +60,7 @@ import com.android.systemui.shared.system.RemoteAnimationTargetCompat; import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat.SurfaceParams.Builder; /** - * A dummy input consumer used when the device is still locked, e.g. from secure camera. + * A placeholder input consumer used when the device is still locked, e.g. from secure camera. */ public class DeviceLockedInputConsumer implements InputConsumer, RecentsAnimationCallbacks.RecentsAnimationListener, BuilderProxy { diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java index 0335ee7748..9393e08327 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java @@ -1183,9 +1183,9 @@ public abstract class RecentsView extends PagedView } /** - * Returns true if we should add a dummy taskView for the running task id + * Returns true if we should add a stub taskView for the running task id */ - protected boolean shouldAddDummyTaskView(RunningTaskInfo runningTaskInfo) { + protected boolean shouldAddStubTaskView(RunningTaskInfo runningTaskInfo) { return runningTaskInfo != null && getTaskView(runningTaskInfo.taskId) == null; } @@ -1196,7 +1196,7 @@ public abstract class RecentsView extends PagedView * is called. Also scrolls the view to this task. */ public void showCurrentTask(RunningTaskInfo runningTaskInfo) { - if (shouldAddDummyTaskView(runningTaskInfo)) { + if (shouldAddStubTaskView(runningTaskInfo)) { boolean wasEmpty = getChildCount() == 0; // Add an empty view for now until the task plan is loaded and applied final TaskView taskView = mTaskViewPool.getView(); diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskThumbnailView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskThumbnailView.java index a8d6442135..7651dd89e2 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskThumbnailView.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskThumbnailView.java @@ -125,7 +125,7 @@ public class TaskThumbnailView extends View implements PluginListener { }, widgetId -> AppWidgetManager.getInstance(getContext()) - .updateAppWidget(widgetId, createMainWidgetViews(dummyText)), - dummyText); + .updateAppWidget(widgetId, createMainWidgetViews(stubText)), + stubText); } @Test diff --git a/robolectric_tests/src/com/android/launcher3/model/CacheDataUpdatedTaskTest.java b/robolectric_tests/src/com/android/launcher3/model/CacheDataUpdatedTaskTest.java index 5610b0ee0a..9ac3fe761e 100644 --- a/robolectric_tests/src/com/android/launcher3/model/CacheDataUpdatedTaskTest.java +++ b/robolectric_tests/src/com/android/launcher3/model/CacheDataUpdatedTaskTest.java @@ -53,10 +53,10 @@ public class CacheDataUpdatedTaskTest { mModelHelper = new LauncherModelHelper(); mModelHelper.initializeData("/cache_data_updated_task_data.txt"); - // Add dummy entries in the cache to simulate update + // Add placeholder entries in the cache to simulate update Context context = RuntimeEnvironment.application; IconCache iconCache = LauncherAppState.getInstance(context).getIconCache(); - CachingLogic dummyLogic = new CachingLogic() { + CachingLogic placeholderLogic = new CachingLogic() { @Override public ComponentName getComponent(ItemInfo info) { return info.getTargetComponent(); @@ -81,7 +81,7 @@ public class CacheDataUpdatedTaskTest { UserManager um = context.getSystemService(UserManager.class); for (ItemInfo info : mModelHelper.getBgDataModel().itemsIdMap) { - iconCache.addIconToDBAndMemCache(info, dummyLogic, new PackageInfo(), + iconCache.addIconToDBAndMemCache(info, placeholderLogic, new PackageInfo(), um.getSerialNumberForUser(info.user), true); } } diff --git a/robolectric_tests/src/com/android/launcher3/model/DbDowngradeHelperTest.java b/robolectric_tests/src/com/android/launcher3/model/DbDowngradeHelperTest.java index bbbe21e3f2..be03c7dd4b 100644 --- a/robolectric_tests/src/com/android/launcher3/model/DbDowngradeHelperTest.java +++ b/robolectric_tests/src/com/android/launcher3/model/DbDowngradeHelperTest.java @@ -165,7 +165,7 @@ public class DbDowngradeHelperTest { @Override public void onOpen(SQLiteDatabase db) { } }; - // Insert dummy data + // Insert mock data for (int i = 0; i < 10; i++) { ContentValues values = new ContentValues(); values.put(Favorites._ID, i); diff --git a/robolectric_tests/src/com/android/launcher3/model/DefaultLayoutProviderTest.java b/robolectric_tests/src/com/android/launcher3/model/DefaultLayoutProviderTest.java index 8f3a83ed07..655237d08c 100644 --- a/robolectric_tests/src/com/android/launcher3/model/DefaultLayoutProviderTest.java +++ b/robolectric_tests/src/com/android/launcher3/model/DefaultLayoutProviderTest.java @@ -109,7 +109,7 @@ public class DefaultLayoutProviderTest { public void testCustomProfileLoaded_with_widget() throws Exception { String pendingAppPkg = "com.test.pending"; - // Add a dummy session info so that the widget exists + // Add a placeholder session info so that the widget exists SessionParams params = new SessionParams(SessionParams.MODE_FULL_INSTALL); params.setAppPackageName(pendingAppPkg); @@ -120,7 +120,7 @@ public class DefaultLayoutProviderTest { setField(sessionInfo, "appIcon", BitmapInfo.LOW_RES_ICON); writeLayoutAndLoad(new LauncherLayoutBuilder().atWorkspace(0, 1, 0) - .putWidget(pendingAppPkg, "DummyWidget", 2, 2)); + .putWidget(pendingAppPkg, "PlaceholderWidget", 2, 2)); // Verify widget assertEquals(1, mModelHelper.getBgDataModel().appWidgets.size()); diff --git a/robolectric_tests/src/com/android/launcher3/model/LoaderCursorTest.java b/robolectric_tests/src/com/android/launcher3/model/LoaderCursorTest.java index 3a252dcce9..0e760f97db 100644 --- a/robolectric_tests/src/com/android/launcher3/model/LoaderCursorTest.java +++ b/robolectric_tests/src/com/android/launcher3/model/LoaderCursorTest.java @@ -110,7 +110,7 @@ public class LoaderCursorTest { public void getAppShortcutInfo_dontAllowMissing_invalidComponent() { initCursor(ITEM_TYPE_APPLICATION, ""); assertTrue(mLoaderCursor.moveToNext()); - ComponentName cn = new ComponentName(mContext.getPackageName(), "dummy-do"); + ComponentName cn = new ComponentName(mContext.getPackageName(), "placeholder-do"); assertNull(mLoaderCursor.getAppShortcutInfo( new Intent().setComponent(cn), false /* allowMissingTarget */, true)); } @@ -136,7 +136,7 @@ public class LoaderCursorTest { initCursor(ITEM_TYPE_APPLICATION, ""); assertTrue(mLoaderCursor.moveToNext()); - ComponentName cn = new ComponentName(mContext.getPackageName(), "dummy-do"); + ComponentName cn = new ComponentName(mContext.getPackageName(), "placeholder-do"); WorkspaceItemInfo info = Executors.MODEL_EXECUTOR.submit(() -> mLoaderCursor.getAppShortcutInfo( new Intent().setComponent(cn), true /* allowMissingTarget */, true)) diff --git a/robolectric_tests/src/com/android/launcher3/provider/RestoreDbTaskTest.java b/robolectric_tests/src/com/android/launcher3/provider/RestoreDbTaskTest.java index ee73b82bb8..4184d33a68 100644 --- a/robolectric_tests/src/com/android/launcher3/provider/RestoreDbTaskTest.java +++ b/robolectric_tests/src/com/android/launcher3/provider/RestoreDbTaskTest.java @@ -44,7 +44,7 @@ public class RestoreDbTaskTest { @Test public void testMigrateProfileId() throws Exception { SQLiteDatabase db = new MyDatabaseHelper(42).getWritableDatabase(); - // Add some dummy data + // Add some mock data for (int i = 0; i < 5; i++) { ContentValues values = new ContentValues(); values.put(Favorites._ID, i); @@ -64,7 +64,7 @@ public class RestoreDbTaskTest { @Test public void testChangeDefaultColumn() throws Exception { SQLiteDatabase db = new MyDatabaseHelper(42).getWritableDatabase(); - // Add some dummy data + // Add some mock data for (int i = 0; i < 5; i++) { ContentValues values = new ContentValues(); values.put(Favorites._ID, i); diff --git a/robolectric_tests/src/com/android/launcher3/util/LauncherModelHelper.java b/robolectric_tests/src/com/android/launcher3/util/LauncherModelHelper.java index 03880879d7..f2b3071c95 100644 --- a/robolectric_tests/src/com/android/launcher3/util/LauncherModelHelper.java +++ b/robolectric_tests/src/com/android/launcher3/util/LauncherModelHelper.java @@ -81,7 +81,7 @@ public class LauncherModelHelper { public static final int NO__ICON = -1; public static final String TEST_PACKAGE = "com.android.launcher3.validpackage"; - // Authority for providing a dummy default-workspace-layout data. + // Authority for providing a test default-workspace-layout data. private static final String TEST_PROVIDER_AUTHORITY = LauncherModelHelper.class.getName().toLowerCase(); private static final int DEFAULT_BITMAP_SIZE = 10; @@ -252,7 +252,7 @@ public class LauncherModelHelper { } /** - * Adds a dummy item in the DB. + * Adds a mock item in the DB. * @param type {@link #APP_ICON} or {@link #SHORTCUT} or >= 2 for * folder (where the type represents the number of items in the folder). */ @@ -310,7 +310,7 @@ public class LauncherModelHelper { } /** - * Initializes the DB with dummy elements to represent the provided grid structure. + * Initializes the DB with mock elements to represent the provided grid structure. * @param typeArray A 3d array of item types. {@see #addItem(int, long, long, int, int)} for * type definitions. The first dimension represents the screens and the next * two represent the workspace grid. @@ -347,7 +347,7 @@ public class LauncherModelHelper { } /** - * Sets up a dummy provider to load the provided layout by default, next time the layout loads + * Sets up a mock provider to load the provided layout by default, next time the layout loads */ public LauncherModelHelper setupDefaultLayoutProvider(LauncherLayoutBuilder builder) throws Exception { @@ -360,7 +360,7 @@ public class LauncherModelHelper { "launcher3.layout.provider", TEST_PROVIDER_AUTHORITY); shadowOf(context.getPackageManager()) - .addProviderIfNotPresent(new ComponentName("com.test", "Dummy")).authority = + .addProviderIfNotPresent(new ComponentName("com.test", "Mock")).authority = TEST_PROVIDER_AUTHORITY; ByteArrayOutputStream bos = new ByteArrayOutputStream(); diff --git a/robolectric_tests/src/com/android/launcher3/widget/WidgetsListAdapterTest.java b/robolectric_tests/src/com/android/launcher3/widget/WidgetsListAdapterTest.java index 84c65b1108..5ab3106bd9 100644 --- a/robolectric_tests/src/com/android/launcher3/widget/WidgetsListAdapterTest.java +++ b/robolectric_tests/src/com/android/launcher3/widget/WidgetsListAdapterTest.java @@ -129,7 +129,7 @@ public class WidgetsListAdapterTest { ShadowPackageManager spm = shadowOf(mContext.getPackageManager()); for (int i = 0; i < num; i++) { - ComponentName cn = new ComponentName("com.dummy.apk" + i, "DummyWidet"); + ComponentName cn = new ComponentName("com.placeholder.apk" + i, "PlaceholderWidet"); AppWidgetProviderInfo widgetInfo = new AppWidgetProviderInfo(); widgetInfo.provider = cn; diff --git a/src/com/android/launcher3/anim/PendingAnimation.java b/src/com/android/launcher3/anim/PendingAnimation.java index 4195933f5c..53625756b8 100644 --- a/src/com/android/launcher3/anim/PendingAnimation.java +++ b/src/com/android/launcher3/anim/PendingAnimation.java @@ -149,7 +149,7 @@ public class PendingAnimation implements PropertySetter { mProgressAnimator = null; } if (mAnimHolders.isEmpty()) { - // Add a dummy animation to that the duration is respected + // Add a placeholder animation to that the duration is respected add(ValueAnimator.ofFloat(0, 1).setDuration(mDuration)); } return mAnim; diff --git a/src/com/android/launcher3/dragndrop/DragController.java b/src/com/android/launcher3/dragndrop/DragController.java index 03028d3a86..ef666f0acd 100644 --- a/src/com/android/launcher3/dragndrop/DragController.java +++ b/src/com/android/launcher3/dragndrop/DragController.java @@ -463,10 +463,10 @@ public class DragController implements DragDriver.EventListener, TouchController } public void forceTouchMove() { - int[] dummyCoordinates = mCoordinatesTemp; - DropTarget dropTarget = findDropTarget(mLastTouch.x, mLastTouch.y, dummyCoordinates); - mDragObject.x = dummyCoordinates[0]; - mDragObject.y = dummyCoordinates[1]; + int[] placeholderCoordinates = mCoordinatesTemp; + DropTarget dropTarget = findDropTarget(mLastTouch.x, mLastTouch.y, placeholderCoordinates); + mDragObject.x = placeholderCoordinates[0]; + mDragObject.y = placeholderCoordinates[1]; checkTouchMove(dropTarget); } diff --git a/src/com/android/launcher3/dragndrop/PinShortcutRequestActivityInfo.java b/src/com/android/launcher3/dragndrop/PinShortcutRequestActivityInfo.java index 9982b39339..f543e47c0a 100644 --- a/src/com/android/launcher3/dragndrop/PinShortcutRequestActivityInfo.java +++ b/src/com/android/launcher3/dragndrop/PinShortcutRequestActivityInfo.java @@ -49,14 +49,14 @@ class PinShortcutRequestActivityInfo extends ShortcutConfigActivityInfo { // Class name used in the target component, such that it will never represent an // actual existing class. - private static final String DUMMY_COMPONENT_CLASS = "pinned-shortcut"; + private static final String STUB_COMPONENT_CLASS = "pinned-shortcut"; private final PinItemRequest mRequest; private final ShortcutInfo mInfo; private final Context mContext; public PinShortcutRequestActivityInfo(PinItemRequest request, Context context) { - super(new ComponentName(request.getShortcutInfo().getPackage(), DUMMY_COMPONENT_CLASS), + super(new ComponentName(request.getShortcutInfo().getPackage(), STUB_COMPONENT_CLASS), request.getShortcutInfo().getUserHandle()); mRequest = request; mInfo = request.getShortcutInfo(); diff --git a/src/com/android/launcher3/logging/StatsLogManager.java b/src/com/android/launcher3/logging/StatsLogManager.java index de72534ccc..03740096c3 100644 --- a/src/com/android/launcher3/logging/StatsLogManager.java +++ b/src/com/android/launcher3/logging/StatsLogManager.java @@ -37,7 +37,7 @@ import java.util.List; * * 
  * All of the event ids are defined here.
- * Most of the methods are dummy methods for Launcher3
+ * Most of the methods are placeholder methods for Launcher3
  * Actual call happens only for Launcher variant that implements QuickStep.
  *
*/ diff --git a/src/com/android/launcher3/logging/UserEventDispatcher.java b/src/com/android/launcher3/logging/UserEventDispatcher.java index e094cab82f..31a81b8164 100644 --- a/src/com/android/launcher3/logging/UserEventDispatcher.java +++ b/src/com/android/launcher3/logging/UserEventDispatcher.java @@ -147,7 +147,7 @@ public class UserEventDispatcher implements ResourceBasedOverride { } /** - * Dummy method. + * Placeholder method. */ public void logActionTip(int actionType, int viewType) { } diff --git a/src/com/android/launcher3/model/data/WorkspaceItemInfo.java b/src/com/android/launcher3/model/data/WorkspaceItemInfo.java index a7bf1f38af..1e1d093b13 100644 --- a/src/com/android/launcher3/model/data/WorkspaceItemInfo.java +++ b/src/com/android/launcher3/model/data/WorkspaceItemInfo.java @@ -216,7 +216,7 @@ public class WorkspaceItemInfo extends ItemInfoWithIcon { if (cn == null && (itemType == Favorites.ITEM_TYPE_SHORTCUT || hasStatusFlag( FLAG_SUPPORTS_WEB_UI | FLAG_AUTOINSTALL_ICON | FLAG_RESTORED_ICON))) { // Legacy shortcuts and promise icons with web UI may not have a componentName but just - // a packageName. In that case create a dummy componentName instead of adding additional + // a packageName. In that case create a empty componentName instead of adding additional // check everywhere. String pkg = intent.getPackage(); return pkg == null ? null : new ComponentName(pkg, IconCache.EMPTY_CLASS_NAME); diff --git a/src/com/android/launcher3/notification/NotificationKeyData.java b/src/com/android/launcher3/notification/NotificationKeyData.java index a1917ecb00..1dda3dfd27 100644 --- a/src/com/android/launcher3/notification/NotificationKeyData.java +++ b/src/com/android/launcher3/notification/NotificationKeyData.java @@ -30,9 +30,9 @@ import java.util.List; /** * The key data associated with the notification, used to determine what to include - * in dots and dummy popup views before they are populated. + * in dots and stub popup views before they are populated. * - * @see NotificationInfo for the full data used when populating the dummy views. + * @see NotificationInfo for the full data used when populating the stub views. */ public class NotificationKeyData { public final String notificationKey; diff --git a/src/com/android/launcher3/notification/NotificationMainView.java b/src/com/android/launcher3/notification/NotificationMainView.java index b03aa9c3fe..32f060ba85 100644 --- a/src/com/android/launcher3/notification/NotificationMainView.java +++ b/src/com/android/launcher3/notification/NotificationMainView.java @@ -137,7 +137,7 @@ public class NotificationMainView extends FrameLayout implements SingleAxisSwipe setOnClickListener(mNotificationInfo); } setContentTranslation(0); - // Add a dummy ItemInfo so that logging populates the correct container and item types + // Add a stub ItemInfo so that logging populates the correct container and item types // instead of DEFAULT_CONTAINERTYPE and DEFAULT_ITEMTYPE, respectively. setTag(NOTIFICATION_ITEM_INFO); if (animate) { diff --git a/src/com/android/launcher3/views/OptionsPopupView.java b/src/com/android/launcher3/views/OptionsPopupView.java index e95dc5b83f..9ad2331112 100644 --- a/src/com/android/launcher3/views/OptionsPopupView.java +++ b/src/com/android/launcher3/views/OptionsPopupView.java @@ -226,15 +226,15 @@ public class OptionsPopupView extends ArrowPopup if (!TextUtils.isEmpty(pickerPackage)) { intent.setPackage(pickerPackage); } - return launcher.startActivitySafely(v, intent, dummyInfo(intent)); + return launcher.startActivitySafely(v, intent, placeholderInfo(intent)); } - static WorkspaceItemInfo dummyInfo(Intent intent) { - WorkspaceItemInfo dummyInfo = new WorkspaceItemInfo(); - dummyInfo.intent = intent; - dummyInfo.itemType = LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT; - dummyInfo.container = LauncherSettings.Favorites.CONTAINER_SETTINGS; - return dummyInfo; + static WorkspaceItemInfo placeholderInfo(Intent intent) { + WorkspaceItemInfo placeholderInfo = new WorkspaceItemInfo(); + placeholderInfo.intent = intent; + placeholderInfo.itemType = LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT; + placeholderInfo.container = LauncherSettings.Favorites.CONTAINER_SETTINGS; + return placeholderInfo; } public static class OptionItem { diff --git a/src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/ColorExtractionAlgorithm.java b/src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/ColorExtractionAlgorithm.java index 5a1f9caa5d..780a0f0372 100644 --- a/src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/ColorExtractionAlgorithm.java +++ b/src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/ColorExtractionAlgorithm.java @@ -21,16 +21,16 @@ import android.util.Log; import android.util.Pair; import android.util.Range; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.graphics.ColorUtils; + import com.android.launcher3.Utilities; import java.util.Arrays; import java.util.LinkedList; import java.util.List; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.graphics.ColorUtils; - /** * Implementation of tonal color extraction **/ @@ -69,7 +69,7 @@ public class ColorExtractionAlgorithm { // palettes. The best fit is tweaked to be closer to the source color // and replaces the original palette - // Get the most preeminent, non-blacklisted color. + // Get the most preeminent, non-disallowed color. Integer bestColor = 0; final float[] hsl = new float[3]; for (int i = 0; i < mainColorsSize; i++) { @@ -78,7 +78,7 @@ public class ColorExtractionAlgorithm { Color.blue(colorValue), hsl); // Stop when we find a color that meets our criteria - if (!isBlacklisted(hsl)) { + if (!isDisallowed(hsl)) { bestColor = colorValue; break; } @@ -167,12 +167,12 @@ public class ColorExtractionAlgorithm { } /** - * Checks if a given color exists in the blacklist + * Checks if a given color exists in the disallowed_colors list. * @param hsl float array with 3 components (H 0..360, S 0..1 and L 0..1) * @return true if color should be avoided */ - private boolean isBlacklisted(float[] hsl) { - for (ColorRange badRange: BLACKLISTED_COLORS) { + private boolean isDisallowed(float[] hsl) { + for (ColorRange badRange: DISALLOWED_COLORS) { if (badRange.containsColor(hsl[0], hsl[1], hsl[2])) { return true; } @@ -592,7 +592,7 @@ public class ColorExtractionAlgorithm { ); @SuppressWarnings("WeakerAccess") - static final ColorRange[] BLACKLISTED_COLORS = new ColorRange[] { + static final ColorRange[] DISALLOWED_COLORS = new ColorRange[] { // Red new ColorRange( diff --git a/tests/src/com/android/launcher3/testcomponent/ListViewService.java b/tests/src/com/android/launcher3/testcomponent/ListViewService.java index 3da20e0991..9e3a492551 100644 --- a/tests/src/com/android/launcher3/testcomponent/ListViewService.java +++ b/tests/src/com/android/launcher3/testcomponent/ListViewService.java @@ -89,7 +89,7 @@ public class ListViewService extends RemoteViewsService { public RemoteViewsFactory onGetViewFactory(Intent intent) { return SimpleViewsFactory.this; } - }.onBind(new Intent("dummy_intent")); + }.onBind(new Intent("stub_intent")); } } } diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java index c621616ef5..a77c1c6b70 100644 --- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java +++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java @@ -175,8 +175,7 @@ public final class LauncherInstrumentation { private Runnable mOnLauncherCrashed; private static Pattern getTouchEventPattern(String prefix, String action) { - // The pattern includes sanity checks that we don't get a multi-touch events or other - // surprises. + // The pattern includes checks that we don't get a multi-touch events or other surprises. return Pattern.compile( prefix + ": MotionEvent.*?action=" + action + ".*?id\\[0\\]=0" + ".*?toolType\\[0\\]=TOOL_TYPE_FINGER.*?buttonState=0.*?pointerCount=1");