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

Commit fef67ba1 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 9444344 from c3f30502 to tm-qpr2-release 

Change-Id: Id55b5226f75c4fb6ed28fe803a8e70f6396a8bd6
parents 52502953 c3f30502

core/tests/coretests/src/com/android/internal/app/ChooserActivityWorkProfileTest.java

+16 −2
Original line number Diff line number Diff line
@@ -16,11 +16,14 @@ 


package com.android.internal.app;



import static android.util.PollingCheck.waitFor;



import static androidx.test.espresso.Espresso.onView;

import static androidx.test.espresso.action.ViewActions.click;

import static androidx.test.espresso.action.ViewActions.swipeUp;

import static androidx.test.espresso.assertion.ViewAssertions.matches;

import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;

import static androidx.test.espresso.matcher.ViewMatchers.isSelected;

import static androidx.test.espresso.matcher.ViewMatchers.withId;

import static androidx.test.espresso.matcher.ViewMatchers.withText;
@@ -49,6 +52,8 @@ import com.android.internal.R; 
import com.android.internal.app.ResolverActivity.ResolvedComponentInfo;

import com.android.internal.app.ChooserActivityWorkProfileTest.TestCase.Tab;



import junit.framework.AssertionFailedError;



import org.junit.Before;

import org.junit.Rule;

import org.junit.Test;
@@ -331,9 +336,18 @@ public class ChooserActivityWorkProfileTest { 
        final int stringId = tab == Tab.WORK ? R.string.resolver_work_tab

                : R.string.resolver_personal_tab;



        waitFor(() -> {

            onView(withText(stringId)).perform(click());

            waitForIdle();



            try {

                onView(withText(stringId)).check(matches(isSelected()));

                return true;

            } catch (AssertionFailedError e) {

                return false;

            }

        });



        onView(withId(R.id.contentPanel))

                .perform(swipeUp());

        waitForIdle();

core/tests/coretests/src/com/android/internal/app/ResolverActivityWorkProfileTest.java

+16 −2
Original line number Diff line number Diff line
@@ -16,11 +16,14 @@ 


package com.android.internal.app;



import static android.util.PollingCheck.waitFor;



import static androidx.test.espresso.Espresso.onView;

import static androidx.test.espresso.action.ViewActions.click;

import static androidx.test.espresso.action.ViewActions.swipeUp;

import static androidx.test.espresso.assertion.ViewAssertions.matches;

import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;

import static androidx.test.espresso.matcher.ViewMatchers.isSelected;

import static androidx.test.espresso.matcher.ViewMatchers.withId;

import static androidx.test.espresso.matcher.ViewMatchers.withText;
@@ -48,6 +51,8 @@ import com.android.internal.R; 
import com.android.internal.app.ResolverActivity.ResolvedComponentInfo;

import com.android.internal.app.ResolverActivityWorkProfileTest.TestCase.Tab;



import junit.framework.AssertionFailedError;



import org.junit.Before;

import org.junit.Rule;

import org.junit.Test;
@@ -309,9 +314,18 @@ public class ResolverActivityWorkProfileTest { 
        final int stringId = tab == Tab.WORK ? R.string.resolver_work_tab

                : R.string.resolver_personal_tab;



        waitFor(() -> {

            onView(withText(stringId)).perform(click());

            waitForIdle();



            try {

                onView(withText(stringId)).check(matches(isSelected()));

                return true;

            } catch (AssertionFailedError e) {

                return false;

            }

        });



        onView(withId(R.id.contentPanel))

                .perform(swipeUp());

        waitForIdle();

libs/WindowManager/Jetpack/Android.bp

+10 −1
Original line number Diff line number Diff line
@@ -63,6 +63,12 @@ android_library_import { 
    sdk_version: "current",

}



android_library_import {

    name: "window-extensions-core",

    aars: ["window-extensions-core-release.aar"],

    sdk_version: "current",

}



java_library {

    name: "androidx.window.extensions",

    srcs: [
@@ -70,7 +76,10 @@ java_library { 
        "src/androidx/window/util/**/*.java",

        "src/androidx/window/common/**/*.java",

    ],

    static_libs: ["window-extensions"],

    static_libs: [

        "window-extensions",

        "window-extensions-core",

    ],

    installable: true,

    sdk_version: "core_platform",

    system_ext_specific: true,

libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitController.java

+25 −7
Original line number Diff line number Diff line
@@ -75,7 +75,10 @@ import androidx.annotation.NonNull; 
import androidx.annotation.Nullable;

import androidx.window.common.CommonFoldingFeature;

import androidx.window.common.EmptyLifecycleCallbacksAdapter;

import androidx.window.extensions.WindowExtensionsImpl;

import androidx.window.extensions.WindowExtensionsProvider;

import androidx.window.extensions.core.util.function.Consumer;

import androidx.window.extensions.core.util.function.Function;

import androidx.window.extensions.embedding.TransactionManager.TransactionRecord;

import androidx.window.extensions.layout.WindowLayoutComponentImpl;
@@ -86,7 +89,6 @@ import java.util.List; 
import java.util.Objects;

import java.util.Set;

import java.util.concurrent.Executor;

import java.util.function.Consumer;



/**

 * Main controller class that manages split states and presentation.
@@ -112,7 +114,7 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen 
    /**

     * A developer-defined {@link SplitAttributes} calculator to compute the current

     * {@link SplitAttributes} with the current device and window states.

     * It is registered via {@link #setSplitAttributesCalculator(SplitAttributesCalculator)}

     * It is registered via {@link #setSplitAttributesCalculator(Function)}

     * and unregistered via {@link #clearSplitAttributesCalculator()}.

     * This is called when:

     * <ul>
@@ -125,7 +127,7 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen 
     */

    @GuardedBy("mLock")

    @Nullable

    private SplitAttributesCalculator mSplitAttributesCalculator;

    private Function<SplitAttributesCalculatorParams, SplitAttributes> mSplitAttributesCalculator;



    /**

     * Map from Task id to {@link TaskContainer} which contains all TaskFragment and split pair info
@@ -138,6 +140,7 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen 
    final SparseArray<TaskContainer> mTaskContainers = new SparseArray<>();



    /** Callback to Jetpack to notify about changes to split states. */

    @GuardedBy("mLock")

    @Nullable

    private Consumer<List<SplitInfo>> mEmbeddingCallback;

    private final List<SplitInfo> mLastReportedSplitStates = new ArrayList<>();
@@ -171,7 +174,8 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen 
        mWindowLayoutComponent.addFoldingStateChangedCallback(new FoldingFeatureListener());

    }



    private class FoldingFeatureListener implements Consumer<List<CommonFoldingFeature>> {

    private class FoldingFeatureListener

            implements java.util.function.Consumer<List<CommonFoldingFeature>> {

        @Override

        public void accept(List<CommonFoldingFeature> foldingFeatures) {

            synchronized (mLock) {
@@ -212,7 +216,8 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen 
    }



    @Override

    public void setSplitAttributesCalculator(@NonNull SplitAttributesCalculator calculator) {

    public void setSplitAttributesCalculator(

            @NonNull Function<SplitAttributesCalculatorParams, SplitAttributes> calculator) {

        synchronized (mLock) {

            mSplitAttributesCalculator = calculator;

        }
@@ -227,7 +232,7 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen 


    @GuardedBy("mLock")

    @Nullable

    SplitAttributesCalculator getSplitAttributesCalculator() {

    Function<SplitAttributesCalculatorParams, SplitAttributes> getSplitAttributesCalculator() {

        return mSplitAttributesCalculator;

    }
@@ -240,9 +245,22 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen 


    /**

     * Registers the split organizer callback to notify about changes to active splits.

     * @deprecated Use {@link #setSplitInfoCallback(Consumer)} starting with

     * {@link WindowExtensionsImpl#getVendorApiLevel()} 2.

     */

    @Deprecated

    @Override

    public void setSplitInfoCallback(@NonNull Consumer<List<SplitInfo>> callback) {

    public void setSplitInfoCallback(

            @NonNull java.util.function.Consumer<List<SplitInfo>> callback) {

        Consumer<List<SplitInfo>> oemConsumer = callback::accept;

        setSplitInfoCallback(oemConsumer);

    }



    /**

     * Registers the split organizer callback to notify about changes to active splits.

     * @since {@link WindowExtensionsImpl#getVendorApiLevel()} 2

     */

    public void setSplitInfoCallback(Consumer<List<SplitInfo>> callback) {

        synchronized (mLock) {

            mEmbeddingCallback = callback;

            updateCallbackIfNecessary();

libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitPresenter.java

+4 −3
Original line number Diff line number Diff line
@@ -42,11 +42,11 @@ import android.window.WindowContainerTransaction; 
import androidx.annotation.IntDef;

import androidx.annotation.NonNull;

import androidx.annotation.Nullable;

import androidx.window.extensions.core.util.function.Function;

import androidx.window.extensions.embedding.SplitAttributes.SplitType;

import androidx.window.extensions.embedding.SplitAttributes.SplitType.ExpandContainersSplitType;

import androidx.window.extensions.embedding.SplitAttributes.SplitType.HingeSplitType;

import androidx.window.extensions.embedding.SplitAttributes.SplitType.RatioSplitType;

import androidx.window.extensions.embedding.SplitAttributesCalculator.SplitAttributesCalculatorParams;

import androidx.window.extensions.embedding.TaskContainer.TaskProperties;

import androidx.window.extensions.layout.DisplayFeature;

import androidx.window.extensions.layout.FoldingFeature;
@@ -522,7 +522,8 @@ class SplitPresenter extends JetpackTaskFragmentOrganizer { 
            @NonNull SplitRule rule, @Nullable Pair<Size, Size> minDimensionsPair) {

        final Configuration taskConfiguration = taskProperties.getConfiguration();

        final WindowMetrics taskWindowMetrics = getTaskWindowMetrics(taskConfiguration);

        final SplitAttributesCalculator calculator = mController.getSplitAttributesCalculator();

        final Function<SplitAttributesCalculatorParams, SplitAttributes> calculator =

                mController.getSplitAttributesCalculator();

        final SplitAttributes defaultSplitAttributes = rule.getDefaultSplitAttributes();

        final boolean isDefaultMinSizeSatisfied = rule.checkParentMetrics(taskWindowMetrics);

        if (calculator == null) {
@@ -538,7 +539,7 @@ class SplitPresenter extends JetpackTaskFragmentOrganizer { 
        final SplitAttributesCalculatorParams params = new SplitAttributesCalculatorParams(

                taskWindowMetrics, taskConfiguration, defaultSplitAttributes,

                isDefaultMinSizeSatisfied, windowLayoutInfo, rule.getTag());

        final SplitAttributes splitAttributes = calculator.computeSplitAttributesForParams(params);

        final SplitAttributes splitAttributes = calculator.apply(params);

        return sanitizeSplitAttributes(taskProperties, splitAttributes, minDimensionsPair);

    }