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

Commit ab98166c authored by Raman Tenneti's avatar Raman Tenneti
Browse files

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

See https://source.android.com/setup/contribute/respectful-code for reference

BUG=161896447

Test: make and Presubmit verify.

Change-Id: I44e903046dd4cd9c7c07872fc56a8d552eb09522
parent 12e59e9a

quickstep/recents_ui_overrides/src/com/android/quickstep/fallback/FallbackRecentsView.java

+5 −5
Original line number Diff line number Diff line
@@ -101,20 +101,20 @@ public class FallbackRecentsView extends RecentsView<RecentsActivity> 
    }



    @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<Task> 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()) {

quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/DeviceLockedInputConsumer.java

+1 −1
Original line number Diff line number Diff line
@@ -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 {

quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java

+3 −3
Original line number Diff line number Diff line
@@ -1183,9 +1183,9 @@ public abstract class RecentsView<T extends StatefulActivity> 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<T extends StatefulActivity> 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();

quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskThumbnailView.java

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ public class TaskThumbnailView extends View implements PluginListener<OverviewSc 
        mDimmingPaintAfterClearing.setColor(Color.BLACK);

        mActivity = BaseActivity.fromContext(context);

        mIsDarkTextTheme = Themes.getAttrBoolean(mActivity, R.attr.isWorkspaceDarkText);

        // Initialize with dummy value. It is overridden later by TaskView

        // Initialize with placeholder value. It is overridden later by TaskView

        mFullscreenParams = TEMP_PARAMS.get(context);

    }

quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskView.java

+8 −8
Original line number Diff line number Diff line
@@ -245,14 +245,14 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable { 
     */

    public WorkspaceItemInfo getItemInfo() {

        ComponentKey componentKey = TaskUtils.getLaunchComponentKeyForTask(getTask().key);

        WorkspaceItemInfo dummyInfo = new WorkspaceItemInfo();

        dummyInfo.itemType = LauncherSettings.Favorites.ITEM_TYPE_TASK;

        dummyInfo.container = LauncherSettings.Favorites.CONTAINER_TASKSWITCHER;

        dummyInfo.user = componentKey.user;

        dummyInfo.intent = new Intent().setComponent(componentKey.componentName);

        dummyInfo.title = TaskUtils.getTitle(getContext(), getTask());

        dummyInfo.screenId = getRecentsView().indexOfChild(this);

        return dummyInfo;

        WorkspaceItemInfo stubInfo = new WorkspaceItemInfo();

        stubInfo.itemType = LauncherSettings.Favorites.ITEM_TYPE_TASK;

        stubInfo.container = LauncherSettings.Favorites.CONTAINER_TASKSWITCHER;

        stubInfo.user = componentKey.user;

        stubInfo.intent = new Intent().setComponent(componentKey.componentName);

        stubInfo.title = TaskUtils.getTitle(getContext(), getTask());

        stubInfo.screenId = getRecentsView().indexOfChild(this);

        return stubInfo;

    }



    @Override