From 10938bc833803dd58e01ace096d2306bbf03a15c Mon Sep 17 00:00:00 2001
From: Nolen Johnson <johnsonnolen@gmail.com>
Date: Wed, 1 Sep 2021 23:29:42 -0400
Subject: [PATCH] google_pixel: Don't exclude our overlays from RRO

Change-Id: I6d51688a84797a06b2814e0e7f2cfc828807feff
---
 apps/GoogleApps.mk                    |  1 -
 pixel-quickstep/Android.mk            | 10 ----------
 pixel-quickstep/AndroidManifest.xml   | 21 ---------------------
 pixel-quickstep/res/values/styles.xml | 19 -------------------
 product.mk                            |  6 +-----
 5 files changed, 1 insertion(+), 56 deletions(-)
 delete mode 100644 pixel-quickstep/Android.mk
 delete mode 100644 pixel-quickstep/AndroidManifest.xml
 delete mode 100644 pixel-quickstep/res/values/styles.xml

diff --git a/apps/GoogleApps.mk b/apps/GoogleApps.mk
index 6e56ff6..e6ce392 100644
--- a/apps/GoogleApps.mk
+++ b/apps/GoogleApps.mk
@@ -52,4 +52,3 @@ PRODUCT_COPY_FILES += \
     vendor/google_pixel/apps/permissions/privapp-permissions-pixel.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/privapp-permissions-pixel.xml
 
 PRODUCT_PACKAGE_OVERLAYS += vendor/google_pixel/overlays/overlay-gms
-PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS += vendor/google_pixel/overlays/overlay-gms
diff --git a/pixel-quickstep/Android.mk b/pixel-quickstep/Android.mk
deleted file mode 100644
index 63cd47f..0000000
--- a/pixel-quickstep/Android.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_RRO_THEME := PixelQuickstep
-LOCAL_PRODUCT_MODULE := true
-LOCAL_CERTIFICATE := platform
-LOCAL_SDK_VERSION := current
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-LOCAL_PACKAGE_NAME := PixelQuickstep
-include $(BUILD_RRO_PACKAGE)
diff --git a/pixel-quickstep/AndroidManifest.xml b/pixel-quickstep/AndroidManifest.xml
deleted file mode 100644
index e1df585..0000000
--- a/pixel-quickstep/AndroidManifest.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<!--
-    Copyright (c) 2018, The LineageOS 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.
--->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.pixelquickstep"
-    android:versionCode="1"
-    android:versionName="1.0">
-    <overlay android:targetPackage="android" android:priority="0" android:isStatic="true" />
-</manifest>
diff --git a/pixel-quickstep/res/values/styles.xml b/pixel-quickstep/res/values/styles.xml
deleted file mode 100644
index 3eed77d..0000000
--- a/pixel-quickstep/res/values/styles.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2018, The LineageOS 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>
-  <string name="config_recentsComponentName">com.google.android.apps.nexuslauncher/com.android.quickstep.RecentsActivity</string>
-</resources>
diff --git a/product.mk b/product.mk
index 62ad743..38ddc03 100644
--- a/product.mk
+++ b/product.mk
@@ -1,8 +1,5 @@
 include vendor/google_pixel/codenames.mk
 
-## Exclude us from RRO enforcement, as it is broken at the moment
-PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS += vendor/google_pixel
-
 ## Google Fonts
 # LineageOS already defines font_customization.xml, and there's no way to override it.
 # Therefore, on LineageOS run `repopick -f 289513` prior to every build.
@@ -25,8 +22,7 @@ endif
 
 ## Pixel Theme
 PRODUCT_PACKAGES += \
-    PixelTheme \
-    PixelQuickstep
+    PixelTheme
 
 PRODUCT_PACKAGE_OVERLAYS += vendor/google_pixel/overlays/overlay-theme
 PRODUCT_PRODUCT_PROPERTIES += ro.atrace.core.services=com.google.android.gms,com.google.android.gms.ui,com.google.android.gms.persistent