summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libs/WindowManager/Shell/aconfig/multitasking.aconfig7
-rw-r--r--libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitScreenUtils.java3
2 files changed, 1 insertions, 9 deletions
diff --git a/libs/WindowManager/Shell/aconfig/multitasking.aconfig b/libs/WindowManager/Shell/aconfig/multitasking.aconfig
index 4a8ab327acc4..065644627393 100644
--- a/libs/WindowManager/Shell/aconfig/multitasking.aconfig
+++ b/libs/WindowManager/Shell/aconfig/multitasking.aconfig
@@ -21,13 +21,6 @@ flag {
}
flag {
- name: "enable_left_right_split_in_portrait"
- namespace: "multitasking"
- description: "Enables left/right split in portrait"
- bug: "291018646"
-}
-
-flag {
name: "enable_new_bubble_animations"
namespace: "multitasking"
description: "Enables new animations for expand and collapse for bubbles"
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitScreenUtils.java b/libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitScreenUtils.java
index 83e5e31bd125..84c30a52e8a6 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitScreenUtils.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitScreenUtils.java
@@ -76,8 +76,7 @@ public class SplitScreenUtils {
* Returns whether left/right split is allowed in portrait.
*/
public static boolean allowLeftRightSplitInPortrait(Resources res) {
- return Flags.enableLeftRightSplitInPortrait() && res.getBoolean(
- com.android.internal.R.bool.config_leftRightSplitInPortrait);
+ return res.getBoolean(com.android.internal.R.bool.config_leftRightSplitInPortrait);
}
/**