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

Commit b9bb107c authored by Raman Tenneti's avatar Raman Tenneti Committed by Automerger Merge Worker
Browse files

AOSP/Launcher3 - Update language to comply with Android's inclusive language... 

AOSP/Launcher3 - Update language to comply with Android's inclusive language guidance.  DO NOT MERGE am: d0a660cf

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/1389245

Change-Id: I8d212a52072c180304707a51d1031c23a31d2a9a
parents 3856824f d0a660cf

iconloaderlib/src/com/android/launcher3/icons/cache/BaseIconCache.java

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ public abstract class BaseIconCache { 
        if (inMemoryCache) {

            mCache = new HashMap<>(INITIAL_ICON_CACHE_CAPACITY);

        } else {

            // Use a dummy cache

            // Use a placeholder cache

            mCache = new AbstractMap<ComponentKey, CacheEntry>() {

                @Override

                public Set<Entry<ComponentKey, CacheEntry>> entrySet() {

quickstep/recents_ui_overrides/src/com/android/quickstep/RecentsAnimationWrapper.java

+3 −3
Original line number Diff line number Diff line
@@ -161,9 +161,9 @@ public class RecentsAnimationWrapper { 
    private void disableInputProxy() {

        if (mInputConsumer != null && mTouchInProgress) {

            long now = SystemClock.uptimeMillis();

            MotionEvent dummyCancel = MotionEvent.obtain(now,  now, ACTION_CANCEL, 0, 0, 0);

            mInputConsumer.onMotionEvent(dummyCancel);

            dummyCancel.recycle();

            MotionEvent tempCancel = MotionEvent.obtain(now,  now, ACTION_CANCEL, 0, 0, 0);

            mInputConsumer.onMotionEvent(tempCancel);

            tempCancel.recycle();

        }

        mInputConsumerController.setInputListener(null);

    }

quickstep/recents_ui_overrides/src/com/android/quickstep/TaskSystemShortcut.java

+9 −8
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.quickstep;



import static android.view.Display.DEFAULT_DISPLAY;



import static com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch.TAP;



import android.app.Activity;
@@ -85,19 +86,19 @@ public class TaskSystemShortcut<T extends SystemShortcut> extends SystemShortcut 
    public View.OnClickListener getOnClickListener(BaseDraggingActivity activity, TaskView view) {

        Task task = view.getTask();



        WorkspaceItemInfo dummyInfo = new WorkspaceItemInfo();

        dummyInfo.intent = new Intent();

        WorkspaceItemInfo stubItemInfo = new WorkspaceItemInfo();

        stubItemInfo.intent = new Intent();

        ComponentName component = task.getTopComponent();

        dummyInfo.intent.setComponent(component);

        dummyInfo.user = UserHandle.of(task.key.userId);

        dummyInfo.title = TaskUtils.getTitle(activity, task);

        stubItemInfo.intent.setComponent(component);

        stubItemInfo.user = UserHandle.of(task.key.userId);

        stubItemInfo.title = TaskUtils.getTitle(activity, task);



        return getOnClickListenerForTask(activity, task, dummyInfo);

        return getOnClickListenerForTask(activity, task, stubItemInfo);

    }



    protected View.OnClickListener getOnClickListenerForTask(

            BaseDraggingActivity activity, Task task, ItemInfo dummyInfo) {

        return mSystemShortcut.getOnClickListener(activity, dummyInfo);

            BaseDraggingActivity activity, Task task, ItemInfo stubItemInfo) {

        return mSystemShortcut.getOnClickListener(activity, stubItemInfo);

    }



    public static class AppInfo extends TaskSystemShortcut<SystemShortcut.AppInfo> {

robolectric_tests/src/com/android/launcher3/model/BaseGridChangesTestCase.java

+2 −2
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ public abstract class BaseGridChangesTestCase { 
    }



    /**

     * 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).

     */
@@ -82,7 +82,7 @@ public abstract class BaseGridChangesTestCase { 
    }



    /**

     * 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.

src/com/android/launcher3/WorkspaceItemInfo.java

+1 −1
Original line number Diff line number Diff line
@@ -214,7 +214,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);