From e2aeb6896a4b5539a0b9532c8ee284c75d9d9203 Mon Sep 17 00:00:00 2001
From: celtare21 <celtare21@gmail.com>
Date: Thu, 18 Jul 2019 20:07:34 +0000
Subject: Revert "mata: Add Lawnchair as default launcher"

This reverts commit dcd95928764a33f22fd648deb5f0d2dd5a8b2407.

Signed-off-by: celtare21 <celtare21@gmail.com>
---
 device.mk                                          |   9 -----
 launcher/Android.mk                                |   3 --
 launcher/Lawnchair/Android.mk                      |  25 --------------
 launcher/Lawnchair/Lawnchair.apk                   | Bin 8040714 -> 0 bytes
 .../etc/lawnchair-hiddenapi-package-whitelist.xml  |   7 ----
 .../etc/privapp-permissions-lawnchair.xml          |  28 ----------------
 launcher/LawnchairConfig/Android.mk                |  11 ------
 launcher/LawnchairConfig/AndroidManifest.xml       |   8 -----
 launcher/LawnchairConfig/res/values/colors.xml     |   6 ----
 launcher/LawnchairConfig/res/values/strings.xml    |  37 ---------------------
 .../frameworks/base/core/res/res/values/config.xml |   3 --
 vendor_prop.mk                                     |   4 ---
 12 files changed, 141 deletions(-)
 delete mode 100644 launcher/Android.mk
 delete mode 100644 launcher/Lawnchair/Android.mk
 delete mode 100644 launcher/Lawnchair/Lawnchair.apk
 delete mode 100644 launcher/Lawnchair/etc/lawnchair-hiddenapi-package-whitelist.xml
 delete mode 100644 launcher/Lawnchair/etc/privapp-permissions-lawnchair.xml
 delete mode 100644 launcher/LawnchairConfig/Android.mk
 delete mode 100644 launcher/LawnchairConfig/AndroidManifest.xml
 delete mode 100644 launcher/LawnchairConfig/res/values/colors.xml
 delete mode 100644 launcher/LawnchairConfig/res/values/strings.xml

diff --git a/device.mk b/device.mk
index 3d0785d3..ff1ba3ee 100644
--- a/device.mk
+++ b/device.mk
@@ -217,15 +217,6 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     android.hardware.light@2.0-service.mata
 
-# Launcher
-PRODUCT_PACKAGES += \
-    Lawnchair \
-    LawnConf
-
-PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/launcher/Lawnchair/etc/privapp-permissions-lawnchair.xml:system/etc/permissions/privapp-permissions-lawnchair.xml \
-    $(LOCAL_PATH)/launcher/Lawnchair/etc/lawnchair-hiddenapi-package-whitelist.xml:system/etc/sysconfig/lawnchair-hiddenapi-package-whitelist.xml
-
 # Media
 PRODUCT_COPY_FILES += \
     device/essential/mata/media/media_profiles_V1_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml \
diff --git a/launcher/Android.mk b/launcher/Android.mk
deleted file mode 100644
index 7a16792d..00000000
--- a/launcher/Android.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/launcher/Lawnchair/Android.mk b/launcher/Lawnchair/Android.mk
deleted file mode 100644
index 99953acf..00000000
--- a/launcher/Lawnchair/Android.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright (C) 2018 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.
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := Lawnchair
-LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
-LOCAL_MODULE_CLASS := APPS
-LOCAL_PRIVILEGED_MODULE := true
-LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3 Launcher3QuickStep
-LOCAL_CERTIFICATE := PRESIGNED
-LOCAL_DEX_PREOPT := false
-include $(BUILD_PREBUILT)
diff --git a/launcher/Lawnchair/Lawnchair.apk b/launcher/Lawnchair/Lawnchair.apk
deleted file mode 100644
index 26dcc172..00000000
Binary files a/launcher/Lawnchair/Lawnchair.apk and /dev/null differ
diff --git a/launcher/Lawnchair/etc/lawnchair-hiddenapi-package-whitelist.xml b/launcher/Lawnchair/etc/lawnchair-hiddenapi-package-whitelist.xml
deleted file mode 100644
index b7208794..00000000
--- a/launcher/Lawnchair/etc/lawnchair-hiddenapi-package-whitelist.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-This XML file declares which platform apps that need to access internal APIs.
--->
-<config>
-  <hidden-api-whitelisted-app package="ch.deletescape.lawnchair.ci" />
-</config>
diff --git a/launcher/Lawnchair/etc/privapp-permissions-lawnchair.xml b/launcher/Lawnchair/etc/privapp-permissions-lawnchair.xml
deleted file mode 100644
index 7db030a9..00000000
--- a/launcher/Lawnchair/etc/privapp-permissions-lawnchair.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-This XML file declares which signature|privileged permissions should be granted to privileged
-applications on GMS or Google-branded devices.
-It allows additional grants on top of privapp-permissions-platform.xml
--->
-<permissions>
-    <privapp-permissions package="ch.deletescape.lawnchair.ci">
-        <permission name="android.permission.BIND_APPWIDGET"/>
-        <permission name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-        <permission name="android.permission.PACKAGE_USAGE_STATS"/>
-        <permission name="android.permission.GET_TASKS"/>
-        <permission name="android.permission.REMOVE_TASKS"/>
-        <permission name="android.permission.REAL_GET_TASKS"/>
-        <permission name="android.permission.READ_FRAME_BUFFER"/>
-        <permission name="android.permission.GET DETAILED TASKS"/>
-        <permission name="android.permission.ACCESS_INSTANT_APPS"/>
-        <permission name="android.permission.MANAGE_ACTIVITY_STACKS"/>
-        <permission name="android.permission.START_TASKS_FROM_RECENTS"/>
-        <permission name="android.permission.CONTROL_REMOTE_APP_TRANSITION_ANIMATIONS"/>
-        <permission name="android.permission.FORCE_STOP_PACKAGES"/>
-        <permission name="android.permission.MANAGE_DEVICE_ADMINS"/>
-        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
-        <permission name="android.permission.MANAGE_USERS"/>
-        <permission name="android.permission.READ_WALLPAPER_INTERNAL"/>
-        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
-    </privapp-permissions>
-</permissions>
diff --git a/launcher/LawnchairConfig/Android.mk b/launcher/LawnchairConfig/Android.mk
deleted file mode 100644
index ffc5ff42..00000000
--- a/launcher/LawnchairConfig/Android.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_PACKAGE_NAME := LawnConf
-LOCAL_SDK_VERSION := current
-LOCAL_CERTIFICATE := platform
-LOCAL_PRIVILEGED_MODULE := false
-
-include $(BUILD_PACKAGE)
diff --git a/launcher/LawnchairConfig/AndroidManifest.xml b/launcher/LawnchairConfig/AndroidManifest.xml
deleted file mode 100644
index 915357e4..00000000
--- a/launcher/LawnchairConfig/AndroidManifest.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.overlay.lawnconf"
-    android:versionCode="1"
-    android:versionName="1.0">
-    <overlay android:targetPackage="ch.deletescape.lawnchair.ci" android:priority="1"/>
-
-     <application android:label="@string/lawnchair_overlay" android:hasCode="false"/>
-</manifest>
diff --git a/launcher/LawnchairConfig/res/values/colors.xml b/launcher/LawnchairConfig/res/values/colors.xml
deleted file mode 100644
index 1b0f6510..00000000
--- a/launcher/LawnchairConfig/res/values/colors.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-     <color name="language_picker_radio_button_tint">@*android:color/accent_device_default_light</color>
-
-</resources>
diff --git a/launcher/LawnchairConfig/res/values/strings.xml b/launcher/LawnchairConfig/res/values/strings.xml
deleted file mode 100644
index 1352798e..00000000
--- a/launcher/LawnchairConfig/res/values/strings.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/**
- * Copyright (c) 2017, 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">
-
-    <string name="lawnchair_overlay">LawnConf</string>
-
-     <!-- Whether or not blur is enabled per default -->
-    <bool name="config_default_enable_blur">true</bool>
-
-     <!--
-        Which color resolver to use per default; Possible values:
-            ch.deletescape.lawnchair.colors.SystemAccentResolver
-            ch.deletescape.lawnchair.colors.PixelAccentResolver
-            ch.deletescape.lawnchair.colors.RGBColorResolver|R|G|B
-            ch.deletescape.lawnchair.colors.WallpaperMainColorResolver
-            ch.deletescape.lawnchair.colors.WallpaperSecondaryColorResolver
-            ch.deletescape.lawnchair.colors.WallpaperTertiaryColorResolver
-    -->
-    <string name="config_default_color_resolver" translatable="false">ch.deletescape.lawnchair.colors.SystemAccentResolver</string>
-
-</resources>
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 63dadcc1..618472e6 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -452,9 +452,6 @@
     <!-- Enable 802.11ac for Wifi hotspot (SAP) -->
     <bool translatable="false" name="config_wifi_softap_ieee80211ac_supported">true</bool>
 
-    <!-- Lawnstep -->
-    <string name="config_recentsComponentName" translatable="false">ch.deletescape.lawnchair.ci/com.android.quickstep.RecentsActivity</string>
-
     <!-- Flag indicating whether round icons should be parsed from the application manifest. -->
     <bool name="config_useRoundIcon">true</bool>
 
diff --git a/vendor_prop.mk b/vendor_prop.mk
index fb42ab09..cb8c0146 100644
--- a/vendor_prop.mk
+++ b/vendor_prop.mk
@@ -173,10 +173,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
 PRODUCT_PROPERTY_OVERRIDES += \
     sys.vendor.shutdown.waittime=500
 
-# Lawnchair
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.boot.vendor.overlay.theme=com.overlay.lawnconf
-
 # SSR
 PRODUCT_PROPERTY_OVERRIDES += \
     persist.sys.ssr.restart_level=modem,slpi,adsp
-- 
cgit v1.2.3