omni: remove obsolete overlays

Change-Id: I9f8b5baf0bc46dcb90f8171bb6617f9700b79cda
diff --git a/config/common.mk b/config/common.mk
index a4c4e7e..bf52995 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -118,4 +118,4 @@
 -include vendor/omni/config/version.mk
 
 # Add our overlays
-DEVICE_PACKAGE_OVERLAYS += vendor/omni/overlay/common
+PRODUCT_PACKAGE_OVERLAYS += vendor/omni/overlay/common
diff --git a/overlay/common/packages/apps/DocumentsUI/res/values-night-v31/themes.xml b/overlay/common/packages/apps/DocumentsUI/res/values-night-v31/themes.xml
deleted file mode 100644
index 55901b8..0000000
--- a/overlay/common/packages/apps/DocumentsUI/res/values-night-v31/themes.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 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:android="http://schemas.android.com/apk/res/android">
-    <style name="LauncherTheme" parent="DocumentsTheme">
-        <item name="android:windowBackground">@drawable/launcher_screen_night</item>
-    </style>
-    <style name="DocumentsTheme" parent="@android:style/Theme.DeviceDefault.DocumentsUI">
-
-        <!-- Toolbar -->
-        <item name="android:actionModeBackground">?android:attr/colorBackground</item>
-        <item name="android:actionBarSize">@dimen/action_bar_size</item>
-
-        <!-- Color section -->
-        <item name="android:colorAccent">@color/primary</item>
-        <item name="android:colorControlHighlight">@color/ripple_material_dark</item>
-        <item name="android:colorControlActivated">@color/primary</item>
-        <item name="android:colorPrimary">@color/primary</item>
-        <item name="android:colorSecondary">@color/secondary</item>
-        <item name="android:strokeColor">@color/hairline</item>
-
-        <!-- System | Widget section -->
-        <item name="android:statusBarColor">?android:attr/colorBackground</item>
-        <item name="android:windowBackground">?android:attr/colorBackground</item>
-        <item name="android:windowLightStatusBar">false</item>
-        <item name="android:windowLightNavigationBar">false</item>
-        <item name="android:windowNoTitle">true</item>
-        <item name="android:windowSoftInputMode">stateUnspecified|adjustUnspecified</item>
-
-    </style>
-</resources>
diff --git a/overlay/common/packages/apps/DocumentsUI/res/values-v31/themes.xml b/overlay/common/packages/apps/DocumentsUI/res/values-v31/themes.xml
deleted file mode 100644
index c6ba6bf..0000000
--- a/overlay/common/packages/apps/DocumentsUI/res/values-v31/themes.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 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>
-    <style name="LauncherTheme" parent="DocumentsTheme">
-        <item name="android:windowBackground">@drawable/launcher_screen</item>
-    </style>
-    <!-- DocumentsTheme is allow customize by run time overlay -->
-    <style name="DocumentsTheme" parent="@android:style/Theme.DeviceDefault.DocumentsUI">
-
-        <item name="android:actionBarSize">@dimen/action_bar_size</item>
-        <item name="android:actionModeBackground">?android:attr/colorBackground</item>
-
-        <!-- Color section -->
-        <item name="android:colorAccent">@color/primary</item>
-        <item name="android:colorControlHighlight">@color/ripple_material_light</item>
-        <item name="android:colorControlActivated">@color/primary</item>
-        <item name="android:colorPrimary">@color/primary</item>
-        <item name="android:colorSecondary">@color/secondary</item>
-        <item name="android:strokeColor">@color/hairline</item>
-
-        <!-- System | Widget section -->
-        <item name="android:statusBarColor">?android:colorBackground</item>
-        <item name="android:navigationBarColor">?android:colorBackground</item>
-        <item name="android:windowBackground">?android:colorBackground</item>
-        <item name="android:windowLightStatusBar">true</item>
-        <item name="android:windowLightNavigationBar">true</item>
-        <item name="android:windowSoftInputMode">stateUnspecified|adjustUnspecified</item>
-
-        <!-- OEM should not overlay this attr -->
-        <item name="android:windowNoTitle">true</item>
-
-    </style>
-
-    <style name="DocumentsDefaultTheme" parent="@style/Theme.MaterialComponents.DayNight.NoActionBar">
-
-        <!-- This only used by support lib, not allow to overlay -->
-        <item name="windowActionBar">false</item>
-        <item name="windowActionModeOverlay">true</item>
-
-        <!-- For material design widget, chips, buttons, not support attr-->
-        <item name="colorPrimary">@color/primary</item>
-        <item name="colorAccent">@color/primary</item>
-
-        <!-- TODO need to solve the error handle in GridItemThumbnail -->
-        <item name="gridItemTint">@color/item_doc_grid_tint</item>
-
-        <item name="actionBarTheme">@style/ActionBarTheme</item>
-        <item name="actionModeStyle">@style/ActionModeStyle</item>
-        <item name="actionOverflowButtonStyle">@style/OverflowButtonStyle</item>
-        <item name="actionOverflowMenuStyle">@style/OverflowMenuStyle</item>
-        <item name="alertDialogTheme">@style/AlertDialogTheme</item>
-        <item name="autoCompleteTextViewStyle">@style/AutoCompleteTextViewStyle</item>
-        <item name="bottomSheetDialogTheme">@style/BottomSheetDialogStyle</item>
-        <item name="materialButtonStyle">@style/MaterialButton</item>
-        <item name="materialButtonOutlinedStyle">@style/MaterialOutlinedButton</item>
-        <item name="materialCardViewStyle">@style/CardViewStyle</item>
-        <item name="materialAlertDialogTheme">@style/MaterialAlertDialogTheme</item>
-        <item name="queryBackground">@color/menu_search_background</item>
-        <item name="snackbarButtonStyle">@style/SnackbarButtonStyle</item>
-        <item name="android:itemTextAppearance">@style/MenuItemTextAppearance</item>
-    </style>
-
-    <style name="TabTheme" parent="@android:style/Theme.DeviceDefault.DayNight">
-        <item name="colorPrimary">@color/edge_effect</item>
-    </style>
-</resources>
diff --git a/overlay/common/packages/apps/ExactCalculator/res/mipmap-anydpi/ic_launcher_calculator.xml b/overlay/common/packages/apps/ExactCalculator/res/mipmap-anydpi/ic_launcher_calculator.xml
deleted file mode 100644
index c690539..0000000
--- a/overlay/common/packages/apps/ExactCalculator/res/mipmap-anydpi/ic_launcher_calculator.xml
+++ /dev/null
@@ -1,19 +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.
--->
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@mipmap/ic_background"/>
-    <foreground android:drawable="@mipmap/ic_foreground"/>
-</adaptive-icon>
diff --git a/overlay/common/packages/apps/ExactCalculator/res/mipmap-hdpi/ic_background.png b/overlay/common/packages/apps/ExactCalculator/res/mipmap-hdpi/ic_background.png
deleted file mode 100644
index 221938e..0000000
--- a/overlay/common/packages/apps/ExactCalculator/res/mipmap-hdpi/ic_background.png
+++ /dev/null
Binary files differ
diff --git a/overlay/common/packages/apps/ExactCalculator/res/mipmap-hdpi/ic_foreground.png b/overlay/common/packages/apps/ExactCalculator/res/mipmap-hdpi/ic_foreground.png
deleted file mode 100644
index 2cc92f4..0000000
--- a/overlay/common/packages/apps/ExactCalculator/res/mipmap-hdpi/ic_foreground.png
+++ /dev/null
Binary files differ
diff --git a/overlay/common/packages/apps/ExactCalculator/res/mipmap-mdpi/ic_background.png b/overlay/common/packages/apps/ExactCalculator/res/mipmap-mdpi/ic_background.png
deleted file mode 100644
index 38581a3..0000000
--- a/overlay/common/packages/apps/ExactCalculator/res/mipmap-mdpi/ic_background.png
+++ /dev/null
Binary files differ
diff --git a/overlay/common/packages/apps/ExactCalculator/res/mipmap-mdpi/ic_foreground.png b/overlay/common/packages/apps/ExactCalculator/res/mipmap-mdpi/ic_foreground.png
deleted file mode 100644
index efd125a..0000000
--- a/overlay/common/packages/apps/ExactCalculator/res/mipmap-mdpi/ic_foreground.png
+++ /dev/null
Binary files differ
diff --git a/overlay/common/packages/apps/ExactCalculator/res/mipmap-xhdpi/ic_background.png b/overlay/common/packages/apps/ExactCalculator/res/mipmap-xhdpi/ic_background.png
deleted file mode 100644
index 90cddc5..0000000
--- a/overlay/common/packages/apps/ExactCalculator/res/mipmap-xhdpi/ic_background.png
+++ /dev/null
Binary files differ
diff --git a/overlay/common/packages/apps/ExactCalculator/res/mipmap-xhdpi/ic_foreground.png b/overlay/common/packages/apps/ExactCalculator/res/mipmap-xhdpi/ic_foreground.png
deleted file mode 100644
index 88e9f04..0000000
--- a/overlay/common/packages/apps/ExactCalculator/res/mipmap-xhdpi/ic_foreground.png
+++ /dev/null
Binary files differ
diff --git a/overlay/common/packages/apps/ExactCalculator/res/mipmap-xxhdpi/ic_background.png b/overlay/common/packages/apps/ExactCalculator/res/mipmap-xxhdpi/ic_background.png
deleted file mode 100644
index 41e58e1..0000000
--- a/overlay/common/packages/apps/ExactCalculator/res/mipmap-xxhdpi/ic_background.png
+++ /dev/null
Binary files differ
diff --git a/overlay/common/packages/apps/ExactCalculator/res/mipmap-xxhdpi/ic_foreground.png b/overlay/common/packages/apps/ExactCalculator/res/mipmap-xxhdpi/ic_foreground.png
deleted file mode 100644
index efd52b2..0000000
--- a/overlay/common/packages/apps/ExactCalculator/res/mipmap-xxhdpi/ic_foreground.png
+++ /dev/null
Binary files differ
diff --git a/overlay/common/packages/apps/ExactCalculator/res/mipmap-xxxhdpi/ic_background.png b/overlay/common/packages/apps/ExactCalculator/res/mipmap-xxxhdpi/ic_background.png
deleted file mode 100644
index 7e19824..0000000
--- a/overlay/common/packages/apps/ExactCalculator/res/mipmap-xxxhdpi/ic_background.png
+++ /dev/null
Binary files differ
diff --git a/overlay/common/packages/apps/ExactCalculator/res/mipmap-xxxhdpi/ic_foreground.png b/overlay/common/packages/apps/ExactCalculator/res/mipmap-xxxhdpi/ic_foreground.png
deleted file mode 100644
index 055f69b..0000000
--- a/overlay/common/packages/apps/ExactCalculator/res/mipmap-xxxhdpi/ic_foreground.png
+++ /dev/null
Binary files differ
diff --git a/overlay/common/packages/apps/Launcher3/quickstep/res/xml/default_workspace_3x3.xml b/overlay/common/packages/apps/Launcher3/quickstep/res/xml/default_workspace_3x3.xml
deleted file mode 100644
index 5f05046..0000000
--- a/overlay/common/packages/apps/Launcher3/quickstep/res/xml/default_workspace_3x3.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 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.
--->
-
-<favorites xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3">
-
-    <!-- Hotseat (We use the screen as the position of the item in the hotseat) -->
-    <!-- Dialer, Messaging, Settings  -->
-    <resolve
-        launcher:container="-101"
-        launcher:screen="0"
-        launcher:x="0"
-        launcher:y="0" >
-        <favorite launcher:uri="#Intent;action=android.intent.action.DIAL;end" />
-        <favorite launcher:uri="tel:123" />
-        <favorite launcher:uri="#Intent;action=android.intent.action.CALL_BUTTON;end" />
-    </resolve>
-
-    <resolve
-        launcher:container="-101"
-        launcher:screen="1"
-        launcher:x="1"
-        launcher:y="0" >
-        <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_MESSAGING;end" />
-        <favorite launcher:uri="sms:" />
-        <favorite launcher:uri="smsto:" />
-        <favorite launcher:uri="mms:" />
-        <favorite launcher:uri="mmsto:" />
-    </resolve>
-    
-    <resolve
-        launcher:container="-101"
-        launcher:screen="2"
-        launcher:x="2"
-        launcher:y="0" >
-        <favorite launcher:uri="#Intent;action=android.settings.SETTINGS;end" />
-    </resolve>
-
-    <!-- Bottom row -->
-    <resolve
-        launcher:screen="0"
-        launcher:x="0"
-        launcher:y="-1" >
-        <favorite launcher:uri="#Intent;action=org.omnirom.control.intents.LAUNCH;category=android.intent.category.DEFAULT;end" />
-    </resolve>
-
-</favorites>
diff --git a/overlay/common/packages/apps/Launcher3/quickstep/res/xml/default_workspace_4x4.xml b/overlay/common/packages/apps/Launcher3/quickstep/res/xml/default_workspace_4x4.xml
deleted file mode 100644
index 59a8e35..0000000
--- a/overlay/common/packages/apps/Launcher3/quickstep/res/xml/default_workspace_4x4.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 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.
--->
-
-<favorites xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3">
-
-    <!-- Hotseat (We use the screen as the position of the item in the hotseat) -->
-    <!-- Dialer, Messaging, Settings, Camera -->
-    <resolve
-        launcher:container="-101"
-        launcher:screen="0"
-        launcher:x="0"
-        launcher:y="0" >
-        <favorite launcher:uri="#Intent;action=android.intent.action.DIAL;end" />
-        <favorite launcher:uri="tel:123" />
-        <favorite launcher:uri="#Intent;action=android.intent.action.CALL_BUTTON;end" />
-    </resolve>
-
-    <resolve
-        launcher:container="-101"
-        launcher:screen="1"
-        launcher:x="1"
-        launcher:y="0" >
-        <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_MESSAGING;end" />
-        <favorite launcher:uri="sms:" />
-        <favorite launcher:uri="smsto:" />
-        <favorite launcher:uri="mms:" />
-        <favorite launcher:uri="mmsto:" />
-    </resolve>
-
-    <resolve
-        launcher:container="-101"
-        launcher:screen="2"
-        launcher:x="2"
-        launcher:y="0" >
-        <favorite launcher:uri="#Intent;action=android.settings.SETTINGS;end" />
-    </resolve>
-
-    <resolve
-        launcher:container="-101"
-        launcher:screen="3"
-        launcher:x="3"
-        launcher:y="0" >
-        <favorite launcher:uri="#Intent;action=android.media.action.STILL_IMAGE_CAMERA;end" />
-        <favorite launcher:uri="#Intent;action=android.intent.action.CAMERA_BUTTON;end" />
-    </resolve>
-
-    <!-- Bottom row OmniControl -->
-    <resolve
-        launcher:screen="0"
-        launcher:x="0"
-        launcher:y="-1" >
-        <favorite launcher:uri="#Intent;action=org.omnirom.control.intents.LAUNCH;category=android.intent.category.DEFAULT;end" />
-    </resolve>
-
-</favorites>
diff --git a/overlay/common/packages/apps/Launcher3/quickstep/res/xml/default_workspace_5x5.xml b/overlay/common/packages/apps/Launcher3/quickstep/res/xml/default_workspace_5x5.xml
deleted file mode 100644
index e74d7f1..0000000
--- a/overlay/common/packages/apps/Launcher3/quickstep/res/xml/default_workspace_5x5.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 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.
--->
-
-<favorites xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3">
-
-    <!-- Hotseat (We use the screen as the position of the item in the hotseat) -->
-    <!-- Dialer, Messaging, Settings, OmniControl, Camera -->
-    <resolve
-        launcher:container="-101"
-        launcher:screen="0"
-        launcher:x="0"
-        launcher:y="0" >
-        <favorite launcher:uri="#Intent;action=android.intent.action.DIAL;end" />
-        <favorite launcher:uri="tel:123" />
-        <favorite launcher:uri="#Intent;action=android.intent.action.CALL_BUTTON;end" />
-    </resolve>
-
-    <resolve
-        launcher:container="-101"
-        launcher:screen="1"
-        launcher:x="1"
-        launcher:y="0" >
-        <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_MESSAGING;end" />
-        <favorite launcher:uri="sms:" />
-        <favorite launcher:uri="smsto:" />
-        <favorite launcher:uri="mms:" />
-        <favorite launcher:uri="mmsto:" />
-    </resolve>
-
-    <resolve
-        launcher:container="-101"
-        launcher:screen="2"
-        launcher:x="2"
-        launcher:y="0" >
-        <favorite launcher:uri="#Intent;action=android.settings.SETTINGS;end" />
-    </resolve>
-
-    <resolve
-        launcher:container="-101"
-        launcher:screen="3"
-        launcher:x="3"
-        launcher:y="0" >
-        <favorite launcher:uri="#Intent;action=org.omnirom.control.intents.LAUNCH;category=android.intent.category.DEFAULT;end" />
-    </resolve>
-
-    <resolve
-        launcher:container="-101"
-        launcher:screen="4"
-        launcher:x="4"
-        launcher:y="0" >
-        <favorite launcher:uri="#Intent;action=android.media.action.STILL_IMAGE_CAMERA;end" />
-        <favorite launcher:uri="#Intent;action=android.intent.action.CAMERA_BUTTON;end" />
-    </resolve>
-
-</favorites>
diff --git a/overlay/common/packages/apps/Launcher3/quickstep/res/xml/default_workspace_6x6.xml b/overlay/common/packages/apps/Launcher3/quickstep/res/xml/default_workspace_6x6.xml
deleted file mode 100644
index 63a64fc..0000000
--- a/overlay/common/packages/apps/Launcher3/quickstep/res/xml/default_workspace_6x6.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 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.
--->
-
-<favorites xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3">
-
-    <!-- Hotseat (We use the screen as the position of the item in the hotseat) -->
-    <!-- Dialer, Messaging, nothing, Settings, OmniControl, Camera -->
-    <resolve
-        launcher:container="-101"
-        launcher:screen="0"
-        launcher:x="0"
-        launcher:y="0" >
-        <favorite launcher:uri="#Intent;action=android.intent.action.DIAL;end" />
-        <favorite launcher:uri="tel:123" />
-        <favorite launcher:uri="#Intent;action=android.intent.action.CALL_BUTTON;end" />
-    </resolve>
-
-    <resolve
-        launcher:container="-101"
-        launcher:screen="1"
-        launcher:x="1"
-        launcher:y="0" >
-        <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_MESSAGING;end" />
-        <favorite launcher:uri="sms:" />
-        <favorite launcher:uri="smsto:" />
-        <favorite launcher:uri="mms:" />
-        <favorite launcher:uri="mmsto:" />
-    </resolve>
-
-    <resolve
-        launcher:container="-101"
-        launcher:screen="3"
-        launcher:x="3"
-        launcher:y="0" >
-        <favorite launcher:uri="#Intent;action=android.settings.SETTINGS;end" />
-    </resolve>
-
-    <resolve
-        launcher:container="-101"
-        launcher:screen="4"
-        launcher:x="4"
-        launcher:y="0" >
-        <favorite launcher:uri="#Intent;action=org.omnirom.control.intents.LAUNCH;category=android.intent.category.DEFAULT;end" />
-    </resolve>
-
-    <resolve
-        launcher:container="-101"
-        launcher:screen="5"
-        launcher:x="5"
-        launcher:y="0" >
-        <favorite launcher:uri="#Intent;action=android.media.action.STILL_IMAGE_CAMERA;end" />
-        <favorite launcher:uri="#Intent;action=android.intent.action.CAMERA_BUTTON;end" />
-    </resolve>
-
-</favorites>
diff --git a/overlay/common/packages/apps/Launcher3/quickstep/res/xml/device_profiles.xml b/overlay/common/packages/apps/Launcher3/quickstep/res/xml/device_profiles.xml
deleted file mode 100644
index dee0ef8..0000000
--- a/overlay/common/packages/apps/Launcher3/quickstep/res/xml/device_profiles.xml
+++ /dev/null
@@ -1,252 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2016 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.
--->
-
-<profiles xmlns:launcher="http://schemas.android.com/apk/res-auto" >
-
-    <grid-option
-        launcher:name="3_by_3"
-        launcher:numRows="3"
-        launcher:numColumns="3"
-        launcher:numFolderRows="2"
-        launcher:numFolderColumns="3"
-        launcher:numHotseatIcons="3"
-        launcher:dbFile="launcher_3_by_3.db"
-        launcher:defaultLayoutId="@xml/default_workspace_3x3"
-        launcher:deviceCategory="phone" >
-
-        <display-option
-            launcher:name="Super Short Stubby"
-            launcher:minWidthDps="255"
-            launcher:minHeightDps="300"
-            launcher:iconImageSize="48"
-            launcher:iconTextSize="13.0"
-            launcher:allAppsBorderSpace="16"
-            launcher:allAppsCellHeight="104"
-            launcher:canBeDefault="true" />
-
-        <display-option
-            launcher:name="Shorter Stubby"
-            launcher:minWidthDps="255"
-            launcher:minHeightDps="400"
-            launcher:iconImageSize="48"
-            launcher:iconTextSize="13.0"
-            launcher:allAppsBorderSpace="16"
-            launcher:allAppsCellHeight="104"
-            launcher:canBeDefault="true" />
-
-    </grid-option>
-
-    <grid-option
-        launcher:name="4_by_4"
-        launcher:numRows="4"
-        launcher:numColumns="4"
-        launcher:numFolderRows="3"
-        launcher:numFolderColumns="4"
-        launcher:numHotseatIcons="4"
-        launcher:dbFile="launcher_4_by_4.db"
-        launcher:inlineNavButtonsEndSpacing="@dimen/taskbar_button_margin_split"
-        launcher:defaultLayoutId="@xml/default_workspace_4x4"
-        launcher:deviceCategory="phone|multi_display" >
-
-        <display-option
-            launcher:name="Short Stubby"
-            launcher:minWidthDps="275"
-            launcher:minHeightDps="420"
-            launcher:iconImageSize="48"
-            launcher:iconTextSize="13.0"
-            launcher:allAppsBorderSpace="16"
-            launcher:allAppsCellHeight="104"
-            launcher:canBeDefault="true" />
-
-        <display-option
-            launcher:name="Stubby"
-            launcher:minWidthDps="255"
-            launcher:minHeightDps="450"
-            launcher:iconImageSize="48"
-            launcher:iconTextSize="13.0"
-            launcher:allAppsBorderSpace="16"
-            launcher:allAppsCellHeight="104"
-            launcher:canBeDefault="true" />
-
-        <display-option
-            launcher:name="Nexus S"
-            launcher:minWidthDps="296"
-            launcher:minHeightDps="491.33"
-            launcher:iconImageSize="48"
-            launcher:iconTextSize="13.0"
-            launcher:allAppsBorderSpace="16"
-            launcher:allAppsCellHeight="104"
-            launcher:canBeDefault="true" />
-
-        <display-option
-            launcher:name="Nexus 4"
-            launcher:minWidthDps="359"
-            launcher:minHeightDps="567"
-            launcher:iconImageSize="54"
-            launcher:iconTextSize="13.0"
-            launcher:allAppsBorderSpace="16"
-            launcher:allAppsCellHeight="104"
-            launcher:canBeDefault="true" />
-
-        <display-option
-            launcher:name="Nexus 5"
-            launcher:minWidthDps="335"
-            launcher:minHeightDps="567"
-            launcher:iconImageSize="54"
-            launcher:iconTextSize="13.0"
-            launcher:allAppsBorderSpace="16"
-            launcher:allAppsCellHeight="104"
-            launcher:canBeDefault="true" />
-
-    </grid-option>
-
-    <grid-option
-        launcher:name="5_by_5"
-        launcher:numRows="5"
-        launcher:numColumns="5"
-        launcher:numFolderRows="4"
-        launcher:numFolderColumns="4"
-        launcher:numHotseatIcons="5"
-        launcher:dbFile="launcher.db"
-        launcher:inlineNavButtonsEndSpacing="@dimen/taskbar_button_margin_split"
-        launcher:defaultLayoutId="@xml/default_workspace_5x5"
-        launcher:deviceCategory="phone|multi_display" >
-
-        <display-option
-            launcher:name="Large Phone"
-            launcher:minWidthDps="406"
-            launcher:minHeightDps="694"
-            launcher:iconImageSize="56"
-            launcher:iconTextSize="14.4"
-            launcher:allAppsBorderSpace="16"
-            launcher:allAppsCellHeight="104"
-            launcher:canBeDefault="true" />
-
-        <display-option
-            launcher:name="Large Phone Split Display"
-            launcher:minWidthDps="406"
-            launcher:minHeightDps="694"
-            launcher:iconImageSize="56"
-            launcher:iconTextSize="14.4"
-            launcher:allAppsBorderSpace="16"
-            launcher:allAppsCellHeight="104"
-            launcher:canBeDefault="true" />
-
-        <display-option
-            launcher:name="Shorter Stubby"
-            launcher:minWidthDps="255"
-            launcher:minHeightDps="400"
-            launcher:iconImageSize="48"
-            launcher:iconTextSize="13.0"
-            launcher:allAppsBorderSpace="16"
-            launcher:allAppsCellHeight="104"
-            launcher:canBeDefault="true" />
-
-    </grid-option>
-
-    <grid-option
-        launcher:name="6_by_6"
-        launcher:numRows="6"
-        launcher:numColumns="6"
-        launcher:numFolderRows="4"
-        launcher:numFolderColumns="4"
-        launcher:numHotseatIcons="6"
-        launcher:dbFile="launcher.db"
-        launcher:inlineNavButtonsEndSpacing="@dimen/taskbar_button_margin_split"
-        launcher:defaultLayoutId="@xml/default_workspace_6x6"
-        launcher:deviceCategory="phone|multi_display" >
-
-        <display-option
-            launcher:name="Large Phone"
-            launcher:minWidthDps="406"
-            launcher:minHeightDps="694"
-            launcher:iconImageSize="56"
-            launcher:iconTextSize="14.4"
-            launcher:allAppsBorderSpace="16"
-            launcher:allAppsCellHeight="104"
-            launcher:canBeDefault="true" />
-
-        <display-option
-            launcher:name="Large Phone Split Display"
-            launcher:minWidthDps="406"
-            launcher:minHeightDps="694"
-            launcher:iconImageSize="56"
-            launcher:iconTextSize="14.4"
-            launcher:allAppsBorderSpace="16"
-            launcher:allAppsCellHeight="104"
-            launcher:canBeDefault="true" />
-
-        <display-option
-            launcher:name="Shorter Stubby"
-            launcher:minWidthDps="255"
-            launcher:minHeightDps="400"
-            launcher:iconImageSize="48"
-            launcher:iconTextSize="13.0"
-            launcher:allAppsBorderSpace="16"
-            launcher:allAppsCellHeight="104"
-            launcher:canBeDefault="true" />
-
-    </grid-option>
-    
-    <grid-option
-        launcher:name="6_by_5"
-        launcher:numRows="5"
-        launcher:numColumns="6"
-        launcher:numSearchContainerColumns="3"
-        launcher:numFolderRows="3"
-        launcher:numFolderColumns="3"
-        launcher:numHotseatIcons="6"
-        launcher:numAllAppsColumns="6"
-        launcher:isScalable="true"
-        launcher:inlineNavButtonsEndSpacing="@dimen/taskbar_button_margin_6_5"
-        launcher:devicePaddingId="@xml/paddings_6x5"
-        launcher:dbFile="launcher_6_by_5.db"
-        launcher:defaultLayoutId="@xml/default_workspace_6x5"
-        launcher:deviceCategory="tablet" >
-
-        <display-option
-            launcher:name="Tablet"
-            launcher:minWidthDps="900"
-            launcher:minHeightDps="820"
-            launcher:minCellHeight="120"
-            launcher:minCellWidth="102"
-            launcher:minCellHeightLandscape="104"
-            launcher:minCellWidthLandscape="120"
-            launcher:iconImageSize="60"
-            launcher:iconTextSize="14"
-            launcher:borderSpaceHorizontal="16"
-            launcher:borderSpaceVertical="64"
-            launcher:borderSpaceLandscapeHorizontal="64"
-            launcher:borderSpaceLandscapeVertical="16"
-            launcher:horizontalMargin="54"
-            launcher:horizontalMarginLandscape="120"
-            launcher:allAppsCellWidth="96"
-            launcher:allAppsCellHeight="142"
-            launcher:allAppsCellWidthLandscape="126"
-            launcher:allAppsCellHeightLandscape="126"
-            launcher:allAppsIconSize="60"
-            launcher:allAppsIconTextSize="14"
-            launcher:allAppsBorderSpaceHorizontal="8"
-            launcher:allAppsBorderSpaceVertical="16"
-            launcher:allAppsBorderSpaceLandscape="16"
-            launcher:hotseatBarBottomSpace="76"
-            launcher:hotseatBarBottomSpaceLandscape="40"
-            launcher:canBeDefault="true" />
-
-    </grid-option>
-
-</profiles>
\ No newline at end of file
diff --git a/overlay/common/packages/apps/ThemePicker/res/values/override.xml b/overlay/common/packages/apps/ThemePicker/res/values/override.xml
deleted file mode 100644
index 098ad41..0000000
--- a/overlay/common/packages/apps/ThemePicker/res/values/override.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-
-     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.
--->
-<resources>
-    <string name="themes_stub_package" translatable="false">org.omnirom.overlaystub</string>
-
-    <!-- List of packages whose icons are used to preview the icon shape for a theme. -->
-    <array name="icon_shape_preview_packages">
-        <item>com.android.settings</item>
-        <item>com.android.messaging</item>
-        <item>com.android.dialer</item>
-        <item>com.android.contacts</item>
-        <item>com.android.documentsui</item>
-        <item>org.omnirom.logcat</item>
-    </array>
-</resources>
-
diff --git a/overlay/common/packages/apps/UnifiedEmail/res/mipmap-anydpi/ic_launcher_mail.xml b/overlay/common/packages/apps/UnifiedEmail/res/mipmap-anydpi/ic_launcher_mail.xml
deleted file mode 100644
index c690539..0000000
--- a/overlay/common/packages/apps/UnifiedEmail/res/mipmap-anydpi/ic_launcher_mail.xml
+++ /dev/null
@@ -1,19 +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.
--->
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@mipmap/ic_background"/>
-    <foreground android:drawable="@mipmap/ic_foreground"/>
-</adaptive-icon>
diff --git a/overlay/common/packages/apps/UnifiedEmail/res/mipmap-hdpi/ic_background.png b/overlay/common/packages/apps/UnifiedEmail/res/mipmap-hdpi/ic_background.png
deleted file mode 100644
index b0f574f..0000000
--- a/overlay/common/packages/apps/UnifiedEmail/res/mipmap-hdpi/ic_background.png
+++ /dev/null
Binary files differ
diff --git a/overlay/common/packages/apps/UnifiedEmail/res/mipmap-hdpi/ic_foreground.png b/overlay/common/packages/apps/UnifiedEmail/res/mipmap-hdpi/ic_foreground.png
deleted file mode 100644
index 06db99b..0000000
--- a/overlay/common/packages/apps/UnifiedEmail/res/mipmap-hdpi/ic_foreground.png
+++ /dev/null
Binary files differ
diff --git a/overlay/common/packages/apps/UnifiedEmail/res/mipmap-mdpi/ic_background.png b/overlay/common/packages/apps/UnifiedEmail/res/mipmap-mdpi/ic_background.png
deleted file mode 100644
index 13f94bd..0000000
--- a/overlay/common/packages/apps/UnifiedEmail/res/mipmap-mdpi/ic_background.png
+++ /dev/null
Binary files differ
diff --git a/overlay/common/packages/apps/UnifiedEmail/res/mipmap-mdpi/ic_foreground.png b/overlay/common/packages/apps/UnifiedEmail/res/mipmap-mdpi/ic_foreground.png
deleted file mode 100644
index d476170..0000000
--- a/overlay/common/packages/apps/UnifiedEmail/res/mipmap-mdpi/ic_foreground.png
+++ /dev/null
Binary files differ
diff --git a/overlay/common/packages/apps/UnifiedEmail/res/mipmap-xhdpi/ic_background.png b/overlay/common/packages/apps/UnifiedEmail/res/mipmap-xhdpi/ic_background.png
deleted file mode 100644
index e6c7bf9..0000000
--- a/overlay/common/packages/apps/UnifiedEmail/res/mipmap-xhdpi/ic_background.png
+++ /dev/null
Binary files differ
diff --git a/overlay/common/packages/apps/UnifiedEmail/res/mipmap-xhdpi/ic_foreground.png b/overlay/common/packages/apps/UnifiedEmail/res/mipmap-xhdpi/ic_foreground.png
deleted file mode 100644
index 5216e45..0000000
--- a/overlay/common/packages/apps/UnifiedEmail/res/mipmap-xhdpi/ic_foreground.png
+++ /dev/null
Binary files differ
diff --git a/overlay/common/packages/apps/UnifiedEmail/res/mipmap-xxhdpi/ic_background.png b/overlay/common/packages/apps/UnifiedEmail/res/mipmap-xxhdpi/ic_background.png
deleted file mode 100644
index 355d564..0000000
--- a/overlay/common/packages/apps/UnifiedEmail/res/mipmap-xxhdpi/ic_background.png
+++ /dev/null
Binary files differ
diff --git a/overlay/common/packages/apps/UnifiedEmail/res/mipmap-xxhdpi/ic_foreground.png b/overlay/common/packages/apps/UnifiedEmail/res/mipmap-xxhdpi/ic_foreground.png
deleted file mode 100644
index 9334641..0000000
--- a/overlay/common/packages/apps/UnifiedEmail/res/mipmap-xxhdpi/ic_foreground.png
+++ /dev/null
Binary files differ
diff --git a/overlay/common/packages/apps/UnifiedEmail/res/mipmap-xxxhdpi/ic_background.png b/overlay/common/packages/apps/UnifiedEmail/res/mipmap-xxxhdpi/ic_background.png
deleted file mode 100644
index 04ce89f..0000000
--- a/overlay/common/packages/apps/UnifiedEmail/res/mipmap-xxxhdpi/ic_background.png
+++ /dev/null
Binary files differ
diff --git a/overlay/common/packages/apps/UnifiedEmail/res/mipmap-xxxhdpi/ic_foreground.png b/overlay/common/packages/apps/UnifiedEmail/res/mipmap-xxxhdpi/ic_foreground.png
deleted file mode 100644
index 4657707..0000000
--- a/overlay/common/packages/apps/UnifiedEmail/res/mipmap-xxxhdpi/ic_foreground.png
+++ /dev/null
Binary files differ