Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update extensions embedding component package

Browse Source 
to match the package name in AndroidX.

Bug: 190433398
Test: Manual, using demo application
Change-Id: I985f8f95d6f0098bdadd53e204cb65d8f53c96bd
This commit is contained in:
Andrii Kulian
2021-09-02 19:08:34 -07:00
committed by Diego Vela
parent 7d93e0e544
commit f48aff4251
10 changed files with 23 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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

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

@@ -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;

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

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

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

@@ -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);
}
}

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

@@ -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

2
libs/WindowManager/Jetpack/src/androidx/window/extensions/organizer/TaskFragmentAnimationAdapter.java → libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/TaskFragmentAnimationAdapter.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package androidx.window.extensions.organizer;
package androidx.window.extensions.embedding;
import android.graphics.Rect;
import android.view.Choreographer;

2
libs/WindowManager/Jetpack/src/androidx/window/extensions/organizer/TaskFragmentAnimationController.java → libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/TaskFragmentAnimationController.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package androidx.window.extensions.organizer;
package androidx.window.extensions.embedding;
import static android.view.WindowManager.TRANSIT_OLD_TASK_FRAGMENT_CHANGE;
import static android.view.WindowManager.TRANSIT_OLD_TASK_FRAGMENT_CLOSE;

2
libs/WindowManager/Jetpack/src/androidx/window/extensions/organizer/TaskFragmentAnimationRunner.java → libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/TaskFragmentAnimationRunner.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package androidx.window.extensions.organizer;
package androidx.window.extensions.embedding;
import static android.view.RemoteAnimationTarget.MODE_CLOSING;
import static android.view.WindowManager.TRANSIT_OLD_TASK_FRAGMENT_CHANGE;

2
libs/WindowManager/Jetpack/src/androidx/window/extensions/organizer/TaskFragmentAnimationSpec.java → libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/TaskFragmentAnimationSpec.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package androidx.window.extensions.organizer;
package androidx.window.extensions.embedding;
import static android.view.RemoteAnimationTarget.MODE_CLOSING;

6
libs/WindowManager/Jetpack/src/androidx/window/extensions/organizer/TaskFragmentContainer.java → libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/TaskFragmentContainer.java
View File

@@ -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;
@@ -212,7 +212,9 @@ class TaskFragmentContainer {
@NonNull WindowContainerTransaction wct, @NonNull SplitController controller) {
// Finish own activities
for (Activity activity : collectActivities()) {
activity.finish();
if (!activity.isFinishing()) {
activity.finish();
}
}
if (!shouldFinishDependent) {