From fac22bf2792973a7bb85b37744ae4cb851174e24 Mon Sep 17 00:00:00 2001
From: Yumi Yukimura <me.cafebabe@gmail.com>
Date: Tue, 25 Feb 2025 13:51:15 +0800
Subject: [PATCH] tablet: Enable desktop windowing mode

* This replaces the old freeform window management

Change-Id: I8711af4d90662252a37bc717590d35651460ad25
---
 config/tablet.mk                              |  4 ----
 .../base/core/res/res/values/config.xml       | 23 +++++++++++++++++++
 release/aconfig/ap4a/Android.bp               |  1 +
 .../ap4a/com.android.window.flags/Android.bp  | 21 +++++++++++++++++
 ...sktop_windowing_mode_flag_values.textproto |  6 +++++
 5 files changed, 51 insertions(+), 4 deletions(-)
 create mode 100644 overlay/tablet/frameworks/base/core/res/res/values/config.xml
 create mode 100644 release/aconfig/ap4a/com.android.window.flags/Android.bp
 create mode 100644 release/aconfig/ap4a/com.android.window.flags/enable_desktop_windowing_mode_flag_values.textproto

diff --git a/config/tablet.mk b/config/tablet.mk
index 1ca1b303..cb5a6ce6 100644
--- a/config/tablet.mk
+++ b/config/tablet.mk
@@ -6,7 +6,3 @@ PRODUCT_PRODUCT_PROPERTIES += \
 
 # Tablet-specific overlay
 PRODUCT_PACKAGE_OVERLAYS += vendor/lineage/overlay/tablet
-
-# Freeform window management
-PRODUCT_COPY_FILES += \
-    frameworks/native/data/etc/android.software.freeform_window_management.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/android.software.freeform_window_management.xml
diff --git a/overlay/tablet/frameworks/base/core/res/res/values/config.xml b/overlay/tablet/frameworks/base/core/res/res/values/config.xml
new file mode 100644
index 00000000..7ee87bca
--- /dev/null
+++ b/overlay/tablet/frameworks/base/core/res/res/values/config.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Whether desktop mode is supported on the current device  -->
+    <bool name="config_isDesktopModeSupported">true</bool>
+</resources>
diff --git a/release/aconfig/ap4a/Android.bp b/release/aconfig/ap4a/Android.bp
index c477523f..fb62009d 100644
--- a/release/aconfig/ap4a/Android.bp
+++ b/release/aconfig/ap4a/Android.bp
@@ -17,5 +17,6 @@ aconfig_value_set {
     name: "aconfig_value_set-lineage-ap4a",
     values: [
         "aconfig-values-ap4a-com.android.server.notification-all",
+        "aconfig-values-ap4a-com.android.window.flags-all",
     ],
 }
diff --git a/release/aconfig/ap4a/com.android.window.flags/Android.bp b/release/aconfig/ap4a/com.android.window.flags/Android.bp
new file mode 100644
index 00000000..b0810d6f
--- /dev/null
+++ b/release/aconfig/ap4a/com.android.window.flags/Android.bp
@@ -0,0 +1,21 @@
+// Copyright 2024 Google Inc. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+aconfig_values {
+  name: "aconfig-values-ap4a-com.android.window.flags-all",
+  package: "com.android.window.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/release/aconfig/ap4a/com.android.window.flags/enable_desktop_windowing_mode_flag_values.textproto b/release/aconfig/ap4a/com.android.window.flags/enable_desktop_windowing_mode_flag_values.textproto
new file mode 100644
index 00000000..606961f8
--- /dev/null
+++ b/release/aconfig/ap4a/com.android.window.flags/enable_desktop_windowing_mode_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "enable_desktop_windowing_mode"
+  state: ENABLED
+  permission: READ_WRITE
+}