privapp-permissions: add MANAGE_USERS, ACCESS_HIDDEN_PROFILES_FULL, INTERACT_ACROSS_USERS, FORCE_STOP_PACKAGES

README.md

@@ -1,22 +1,11 @@
-# Lawnchair AOSP based build system
+# Lawnchair Prebuilt
 
 ## Disclaimer
-- All credits go to the Lawnchair team.
-- Quickstep enablement is done with the help of QuickSwitch Magisk module made by [Skittles9823](https://github.com/skittles9823).
+- This repository is based on [arter97's android_vendor_lawnchair](https://github.com/arter97/android_vendor_lawnchair).  
+  It has been adapted from the original Android.mk format to the Android.bp build system.
 
-## Getting started
-**1. Add this repository to your AOSP build root's `vendor/lawnchair`**
+## Usage
+- Simply add the Lawnchair package to your `PRODUCT_PACKAGES`.
 
-**2. Import vendor/lawnchair/lawnchair.mk**
-
-In case of Paranoid Android, this can be done by appending the following at `vendor/pa/config/common.mk`:
-
-`$(call inherit-product-if-exists, vendor/lawnchair/lawnchair.mk)`
-
-**3. Remove existing launcher from the build**
-
-`ParanoidQuickStep`, `Launcher3QuickStep`, `PixelLauncher` and `TrebuchetQuickStep` packages are overriden from `priv-app/Lawnchair/Android.mk`.
-
-If your existing launcher uses a different name, either remove it from the build manually or post a pull-request.
-
-**4. Build Android**
+## Note
+- There is a QuickstepSwitcherOverlay still, but the current version of lawnchair does not support being the Quickstep launcher, it is kept for future use.

etc/Android.bp

@@ -0,0 +1,15 @@
+prebuilt_etc {
+    name: "privapp-permissions-app.lawnchair.xml",
+    src: "permissions/privapp-permissions-app.lawnchair.xml",
+    sub_dir: "permissions",
+    filename_from_src: true,
+    installable: true,
+}
+
+prebuilt_etc {
+    name: "app.lawnchair-hiddenapi-package-whitelist.xml",
+    src: "sysconfig/app.lawnchair-hiddenapi-package-whitelist.xml",
+    sub_dir: "sysconfig",
+    filename_from_src: true,
+    installable: true,
+}

etc/permissions/privapp-permissions-app.lawnchair.xml

@@ -34,5 +34,9 @@
         <permission name="app.lawnchair.permission.READ_SETTINGS"/>
         <permission name="app.lawnchair.permission.WRITE_SETTINGS"/>
         <permission name="app.lawnchair.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION"/>
+        <permission name="android.permission.MANAGE_USERS"/>
+        <permission name="android.permission.ACCESS_HIDDEN_PROFILES_FULL"/>
+        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
+        <permission name="android.permission.FORCE_STOP_PACKAGES"/>
     </privapp-permissions>
 </permissions>

lawnchair.mk

@@ -1,9 +0,0 @@
-include $(call first-makefiles-under,$(LOCAL_PATH))
-
-PRODUCT_COPY_FILES += \
-    vendor/lawnchair/etc/permissions/privapp-permissions-app.lawnchair.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-app.lawnchair.xml \
-    vendor/lawnchair/etc/sysconfig/app.lawnchair-hiddenapi-package-whitelist.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/sysconfig/app.lawnchair-hiddenapi-package-whitelist.xml \
-
-PRODUCT_PACKAGES += \
-    QuickstepSwitcherOverlay \
-    Lawnchair

priv-app/Lawnchair/Android.bp

@@ -0,0 +1,19 @@
+android_app_import {
+    name: "Lawnchair",
+    apk: "Lawnchair.apk",
+    privileged: true,
+    certificate: "platform",
+    overrides: [
+        "Launcher3",
+        "PixelLauncher",
+        "Trebuchet",
+    ],
+    required: [
+        "privapp-permissions-app.lawnchair.xml",
+        "app.lawnchair-hiddenapi-package-whitelist.xml",
+    ],
+    optional_uses_libs: [
+        "androidx.window.extensions",
+        "androidx.window.sidecar",
+    ],
+}

priv-app/Lawnchair/Android.mk

@@ -1,12 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := Lawnchair
-LOCAL_MODULE_STEM := Lawnchair.apk
-LOCAL_SRC_FILES := Lawnchair.apk
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_PATH := $(TARGET_OUT)/priv-app/Lawnchair
-LOCAL_OVERRIDES_PACKAGES := ParanoidQuickStep Launcher3QuickStep PixelLauncher TrebuchetQuickStep
-
-include $(BUILD_PREBUILT)

product/overlay/QuickstepSwitcherOverlay/Android.bp

@@ -0,0 +1,6 @@
+runtime_resource_overlay {
+    name: "Lawnchair-QuickstepSwitcherOverlay",
+    resource_dirs: ["res"],
+    sdk_version: "current",
+    product_specific: true,
+}

product/overlay/QuickstepSwitcherOverlay/Android.mk

@@ -1,15 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_RRO_THEME := QuickstepSwitcher
-
-LOCAL_PRODUCT_MODULE := true
-
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-LOCAL_PACKAGE_NAME := QuickstepSwitcherOverlay
-LOCAL_SDK_VERSION := current
-
-include $(BUILD_RRO_PACKAGE)