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

Commit f48aff42 authored by Andrii Kulian's avatar Andrii Kulian Committed by Diego Vela
Browse files

Update extensions embedding component package 

to match the package name in AndroidX.

Bug: 190433398
Test: Manual, using demo application
Change-Id: I985f8f95d6f0098bdadd53e204cb65d8f53c96bd
parent 7d93e0e5

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

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package androidx.window.extensions.embedding; 
import android.content.Context;



import androidx.annotation.NonNull;

import androidx.window.extensions.organizer.SplitController;



/**

 * Provider for the reference implementation of androidx.window.extensions.embedding OEM interface

libs/WindowManager/Jetpack/src/androidx/window/extensions/organizer/JetpackTaskFragmentOrganizer.java→libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/JetpackTaskFragmentOrganizer.java

+1 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package androidx.window.extensions.organizer;

package androidx.window.extensions.embedding;



import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW;

import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED;
@@ -36,7 +36,6 @@ import android.window.WindowContainerTransaction; 


import androidx.annotation.NonNull;

import androidx.annotation.Nullable;

import androidx.window.extensions.embedding.SplitRule;



import java.util.Map;

import java.util.concurrent.Executor;

libs/WindowManager/Jetpack/src/androidx/window/extensions/organizer/SplitContainer.java→libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitContainer.java

+1 −5
Original line number Diff line number Diff line
@@ -14,15 +14,11 @@ 
 * limitations under the License.

 */



package androidx.window.extensions.organizer;

package androidx.window.extensions.embedding;



import android.annotation.NonNull;

import android.app.Activity;



import androidx.window.extensions.embedding.SplitPairRule;

import androidx.window.extensions.embedding.SplitPlaceholderRule;

import androidx.window.extensions.embedding.SplitRule;



/**

 * Client-side descriptor of a split that holds two containers.

 */

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

+11 −22
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package androidx.window.extensions.organizer;

package androidx.window.extensions.embedding;



import android.annotation.NonNull;

import android.annotation.Nullable;
@@ -35,14 +35,6 @@ import android.window.TaskFragmentAppearedInfo; 
import android.window.TaskFragmentInfo;

import android.window.WindowContainerTransaction;



import androidx.window.extensions.embedding.ActivityRule;

import androidx.window.extensions.embedding.ActivityStack;

import androidx.window.extensions.embedding.EmbeddingRule;

import androidx.window.extensions.embedding.SplitInfo;

import androidx.window.extensions.embedding.SplitPairRule;

import androidx.window.extensions.embedding.SplitPlaceholderRule;

import androidx.window.extensions.embedding.SplitRule;



import java.util.ArrayList;

import java.util.List;

import java.util.Set;
@@ -53,7 +45,7 @@ import java.util.function.Consumer; 
 * Main controller class that manages split states and presentation.

 */

public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmentCallback,

        androidx.window.extensions.embedding.ActivityEmbeddingComponent {

        ActivityEmbeddingComponent {



    private final SplitPresenter mPresenter;
@@ -503,7 +495,7 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen 
                continue;

            }

            SplitPlaceholderRule placeholderRule = (SplitPlaceholderRule) rule;

            if (placeholderRule.getActivityPredicate().test(activity)) {

            if (placeholderRule.matchesActivity(activity)) {

                return placeholderRule;

            }

        }
@@ -569,8 +561,7 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen 
                continue;

            }

            SplitPairRule pairRule = (SplitPairRule) rule;

            if (pairRule.getActivityIntentPredicate().test(

                    new Pair(primaryActivity, secondaryActivityIntent))) {

            if (pairRule.matchesActivityIntentPair(primaryActivity, secondaryActivityIntent)) {

                return pairRule;

            }

        }
@@ -589,10 +580,9 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen 
            }

            SplitPairRule pairRule = (SplitPairRule) rule;

            final Intent intent = secondaryActivity.getIntent();

            if (pairRule.getActivityPairPredicate().test(

                    new Pair(primaryActivity, secondaryActivity))

                    && (intent == null || pairRule.getActivityIntentPredicate().test(

                            new Pair(primaryActivity, intent)))) {

            if (pairRule.matchesActivityPair(primaryActivity, secondaryActivity)

                    && (intent == null

                    || pairRule.matchesActivityIntentPair(primaryActivity, intent))) {

                return pairRule;

            }

        }
@@ -626,10 +616,9 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen 
            if (!activityRule.shouldAlwaysExpand()) {

                continue;

            }

            if (activity != null && activityRule.getActivityPredicate().test(activity)) {

            if (activity != null && activityRule.matchesActivity(activity)) {

                return true;

            }

            if (intent != null && activityRule.getIntentPredicate().test(intent)) {

            } else if (intent != null && activityRule.matchesIntent(intent)) {

                return true;

            }

        }
@@ -683,11 +672,11 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen 


    /** Executor that posts on the main application thread. */

    private static class MainThreadExecutor implements Executor {

        private final Handler handler = new Handler(Looper.getMainLooper());

        private final Handler mHandler = new Handler(Looper.getMainLooper());



        @Override

        public void execute(Runnable r) {

            handler.post(r);

            mHandler.post(r);

        }

    }

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

+2 −4
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package androidx.window.extensions.organizer;

package androidx.window.extensions.embedding;



import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW;
@@ -32,8 +32,6 @@ import android.window.WindowContainerTransaction; 
import androidx.annotation.IntDef;

import androidx.annotation.NonNull;

import androidx.annotation.Nullable;

import androidx.window.extensions.embedding.SplitPairRule;

import androidx.window.extensions.embedding.SplitRule;



import java.util.concurrent.Executor;
@@ -297,7 +295,7 @@ class SplitPresenter extends JetpackTaskFragmentOrganizer { 
        // TODO(b/190433398): Supply correct insets.

        final WindowMetrics parentMetrics = new WindowMetrics(parentBounds,

                new WindowInsets(new Rect()));

        return rule.getParentWindowMetricsPredicate().test(parentMetrics);

        return rule.checkParentMetrics(parentMetrics);

    }



    @NonNull