google_pixel: Don't exclude our overlays from RRO

Change-Id: I6d51688a84797a06b2814e0e7f2cfc828807feff
lineage-18.1
Nolen Johnson 3 years ago
parent ff90d97533
commit 10938bc833
  1. 1
      apps/GoogleApps.mk
  2. 10
      pixel-quickstep/Android.mk
  3. 21
      pixel-quickstep/AndroidManifest.xml
  4. 19
      pixel-quickstep/res/values/styles.xml
  5. 6
      product.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 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_PACKAGE_OVERLAYS += vendor/google_pixel/overlays/overlay-gms
PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS += vendor/google_pixel/overlays/overlay-gms

@ -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)

@ -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>

@ -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>

@ -1,8 +1,5 @@
include vendor/google_pixel/codenames.mk 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 ## Google Fonts
# LineageOS already defines font_customization.xml, and there's no way to override it. # 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. # Therefore, on LineageOS run `repopick -f 289513` prior to every build.
@ -25,8 +22,7 @@ endif
## Pixel Theme ## Pixel Theme
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
PixelTheme \ PixelTheme
PixelQuickstep
PRODUCT_PACKAGE_OVERLAYS += vendor/google_pixel/overlays/overlay-theme 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 PRODUCT_PRODUCT_PROPERTIES += ro.atrace.core.services=com.google.android.gms,com.google.android.gms.ui,com.google.android.gms.persistent

Loading…
Cancel
Save