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

Commit d5df5b3e authored by Jordan Silva's avatar Jordan Silva Committed by Android (Google) Code Review
Browse files

Merge "Refactoring TAPL functions for OverviewTask" into main

parents 3088ae55 ebd71c6c

Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ android_library { 
    ],

    srcs: [

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

        "tests/multivalentTests/tapl/**/*.kt",

    ],

    resource_dirs: [],

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

quickstep/res/layout/task.xml

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"

    xmlns:launcher="http://schemas.android.com/apk/res-auto"

    android:id="@+id/task"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:clipChildren="false"

quickstep/res/layout/task_desktop.xml

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"

    xmlns:launcher="http://schemas.android.com/apk/res-auto"

    android:id="@+id/task"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:clipChildren="true"

quickstep/res/layout/task_grouped.xml

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"

    xmlns:launcher="http://schemas.android.com/apk/res-auto"

    android:id="@+id/task"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:clipChildren="false"

quickstep/tests/src/com/android/quickstep/TaplOverviewIconTest.java

+3 −2
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
 */

package com.android.quickstep;



import static com.android.launcher3.ui.AbstractLauncherUiTest.initialize;

import static com.android.launcher3.util.rule.TestStabilityRule.LOCAL;

import static com.android.launcher3.util.rule.TestStabilityRule.PLATFORM_POSTSUBMIT;
@@ -25,6 +24,7 @@ import static org.junit.Assert.assertTrue; 
import android.content.Intent;

import android.platform.test.annotations.PlatinumTest;



import com.android.launcher3.tapl.OverviewTask.OverviewSplitTask;

import com.android.launcher3.tapl.OverviewTaskMenu;

import com.android.launcher3.ui.AbstractLauncherUiTest;

import com.android.launcher3.util.rule.TestStabilityRule;
@@ -86,7 +86,8 @@ public class TaplOverviewIconTest extends AbstractLauncherUiTest { 
        taskMenu.touchOutsideTaskMenuToDismiss();



        OverviewTaskMenu splitMenu =

                mLauncher.goHome().switchToOverview().getCurrentTask().tapSplitTaskMenu();

                mLauncher.goHome().switchToOverview().getCurrentTask().tapMenu(

                        OverviewSplitTask.SPLIT_BOTTOM_OR_RIGHT);

        assertTrue("App info item not appearing in expanded split task's menu.",

                splitMenu.hasMenuItem("App info"));

        splitMenu.touchOutsideTaskMenuToDismiss();