summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-08-13 01:26:04 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-08-13 01:26:04 +0000
commit7dbd893d536918c060e15210d52f26f610231baf (patch)
tree74076848eafbb1de59eb144083d719f24c093650
parente047964aa064da6537a977cde41cdb8d7c10a234 (diff)
parentfbdd08e71cd488c4a97a55ac11973cb536c9c220 (diff)
downloadservices-7dbd893d536918c060e15210d52f26f610231baf.tar.gz
Snap for 8941678 from fbdd08e71cd488c4a97a55ac11973cb536c9c220 to tm-qpr1-release
Change-Id: Ifdf59aa29c6a6603bcd88f79d9b7ffb5d244b49d
-rw-r--r--builtInServices/src/com/android/server/wm/CarDisplayAreaPolicyProvider.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/builtInServices/src/com/android/server/wm/CarDisplayAreaPolicyProvider.java b/builtInServices/src/com/android/server/wm/CarDisplayAreaPolicyProvider.java
index ea4a4bf..96a90bc 100644
--- a/builtInServices/src/com/android/server/wm/CarDisplayAreaPolicyProvider.java
+++ b/builtInServices/src/com/android/server/wm/CarDisplayAreaPolicyProvider.java
@@ -16,6 +16,7 @@
package com.android.server.wm;
+import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW;
import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION;
import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY;
import static android.view.WindowManager.LayoutParams.TYPE_INPUT_METHOD;
@@ -83,14 +84,17 @@ public class CarDisplayAreaPolicyProvider implements DisplayAreaPolicy.Provider
TaskDisplayArea backgroundTaskDisplayArea = new TaskDisplayArea(content, wmService,
"BackgroundTaskDisplayArea", BACKGROUND_TASK_CONTAINER,
/* createdByOrganizer= */ false, /* canHostHomeTask= */ false);
+ backgroundTaskDisplayArea.setWindowingMode(WINDOWING_MODE_MULTI_WINDOW);
TaskDisplayArea controlBarDisplayArea = new TaskDisplayArea(content, wmService,
"ControlBarTaskDisplayArea", CONTROL_BAR_DISPLAY_AREA,
/* createdByOrganizer= */ false, /* canHostHomeTask= */ false);
+ controlBarDisplayArea.setWindowingMode(WINDOWING_MODE_MULTI_WINDOW);
TaskDisplayArea voicePlateTaskDisplayArea = new TaskDisplayArea(content, wmService,
"VoicePlateTaskDisplayArea", FEATURE_VOICE_PLATE,
/* createdByOrganizer= */ false, /* canHostHomeTask= */ false);
+ // voicePlatTaskDisplayArea needs to be in full screen windowing mode.
List<TaskDisplayArea> backgroundTdaList = new ArrayList<>();
backgroundTdaList.add(voicePlateTaskDisplayArea);
@@ -115,6 +119,8 @@ public class CarDisplayAreaPolicyProvider implements DisplayAreaPolicy.Provider
// Default application launches here
RootDisplayArea defaultAppsRoot = new DisplayAreaGroup(wmService,
"FeatureForegroundApplication", FOREGROUND_DISPLAY_AREA_ROOT);
+ defaultAppsRoot.setWindowingMode(WINDOWING_MODE_MULTI_WINDOW);
+
TaskDisplayArea defaultAppTaskDisplayArea = new TaskDisplayArea(content, wmService,
"DefaultApplicationTaskDisplayArea", DEFAULT_APP_TASK_CONTAINER);
List<TaskDisplayArea> firstTdaList = new ArrayList<>();