diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index b2b189d6a1..ca4bfbb3fc 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,5 +1,6 @@
 # These are supported funding model platforms
 
+custom: ["https://www.paypal.me/saulhenriquez"]
 github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
 patreon: # Replace with a single Patreon username
 open_collective: # Replace with a single Open Collective username
@@ -7,6 +8,5 @@ ko_fi: # Replace with a single Ko-fi username
 tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
 community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
 liberapay: otakuhqz # Replace with a single Liberapay username
-issuehunt: otakuhqz # Replace with a single IssueHunt username
+issuehunt: # Replace with a single IssueHunt username
 otechie: # Replace with a single Otechie username
-custom: ["https://www.paypal.me/saulhenriquez"]
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 0000000000..451882e8f0
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,44 @@
+<!--- Provide a general summary of the issue in the Title above -->
+<!--- Check if your issue or something similar has been reported before (if yes upvote/comment there) -->
+
+## Description
+<!--- Provide a more detailed introduction to the issue itself, and why you consider it to be a bug -->
+
+
+## Expected Behavior
+<!--- Tell us what should happen -->
+
+
+## Actual Behavior
+<!--- Tell us what happens instead -->
+
+
+## Steps to Reproduce
+<!--- Provide a link to a live example (screenshot/recording etc..), or a set of steps to reproduce the issue -->
+
+1.
+2.
+3.
+4.
+
+
+## Device and OS
+<!--- Include as many relevant details about the environment you experienced the bug in -->
+<!--- For example: -->
+<!--- * Device: Samsung Galaxy S10 "beyondlte" -->
+<!--- * Android version: 9.0.0 -->
+<!--- * Launcher version: 2.1.0 -->
+<!--- * Rom: OneUI 1.2 -->
+
+
+* Device:
+* Android version:
+* Launcher version:
+* Rom:
+
+
+## Logcat
+<!--- If possible, include a logcat of the issue, otherwise remove this section-->
+```
+your log here
+```
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
new file mode 100644
index 0000000000..aae29dd8dc
--- /dev/null
+++ b/.github/workflows/android.yml
@@ -0,0 +1,23 @@
+name: Main CI Workflow
+
+on:
+  push:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: set up JDK 1.8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+      - name: Compile with Gradle
+        run: ./gradlew compileReleaseSources
+      - name: Clean up
+        run: ./gradlew clean
diff --git a/.gitignore b/.gitignore
index 29b82fa68d..7dcd3792f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 # Project exclude paths
+/aospWithQuickstepOmega
 /buildSrc/.gradle/
 /buildSrc/build/
 /buildSrc/build/classes/java/main/
@@ -8,6 +9,7 @@ db_files
 .classpath
 .project.properties
 gen/
+google-services.json
 tests/stress/gen/
 WallpaperPicker/gen/
 WallpaperPicker/.project.properties
@@ -15,8 +17,5 @@ bin/
 .idea/
 .gradle/
 local.properties
-gradle/
 build/
-gradlew*
 .DS_Store
-*.jks
\ No newline at end of file
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000000..b70e183911
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,63 @@
+image: openjdk:8-jdk
+
+variables:
+  ANDROID_COMPILE_SDK: "30"
+  ANDROID_BUILD_TOOLS: "30.0.2"
+  ANDROID_SDK_TOOLS:   "4333796"
+  VARIANT:             "aospWithQuickstepOmega"
+  FLAVOUR:             "debug"
+  CHAT_ID:             "omega"
+  APK_NAME:            "Omega-Nightly"
+  SECRET_BOT_TOKEN_PLACEHOLDER: "PLA CE HO LDE R"
+
+before_script:
+  - git submodule update --recursive --init
+  - apt-get --quiet update --yes
+  - apt-get --quiet install --yes wget tar unzip lib32stdc++6 lib32z1 screenfetch curl
+  - screenfetch
+  - export ANDROID_HOME=$PWD/android-sdk-linux
+  - export PATH=$PATH:$PWD/android-sdk-linux/platform-tools/
+  - echo "sdk.dir=$ANDROID_HOME" > local.properties
+  - echo "sdk-location=$ANDROID_HOME" >> local.properties
+  - chmod +x ./gradlew
+
+stages:
+  - build
+  - sign
+  #- deploy
+
+assemble:
+  stage: build
+  script:
+    #- curl -F text="$(git log --oneline | head -n 5)" "https://api.telegram.org/bot${SECRET_BOT_TOKEN}/sendMessage?chat_id=@${CHAT_ID}"
+    - wget --quiet --output-document=android-sdk.zip https://dl.google.com/android/repository/sdk-tools-linux-${ANDROID_SDK_TOOLS}.zip
+    - unzip -d android-sdk-linux android-sdk.zip
+    - echo y | android-sdk-linux/tools/bin/sdkmanager "platforms;android-${ANDROID_COMPILE_SDK}" > /dev/null
+    - echo y | android-sdk-linux/tools/bin/sdkmanager "platform-tools" > /dev/null
+    - echo y | android-sdk-linux/tools/bin/sdkmanager "build-tools;${ANDROID_BUILD_TOOLS}" > /dev/null
+    - set +o pipefail
+    - yes | android-sdk-linux/tools/bin/sdkmanager --licenses
+    - set -o pipefail
+    - ./gradlew assembleAospWithQuickstepOmegaDebug
+
+signRelease:
+  stage: sign
+  dependencies:
+    - assemble
+  script:
+    - mkdir outputs
+    - echo "${KEYSTORE}" | base64 -d - > omega.jks
+    - jarsigner -keystore omega.jks build/outputs/apk/${VARIANT}/${FLAVOUR}/${APK_NAME}.apk -storepass "${KEYSTORE_PASSWORD}" -keypass "${KEY_PASSWORD}" "${KEYSTORE_ALIAS}" --signedjar omega-ci-signed.apk
+    - ${ANDROID_HOME}/build-tools/${ANDROID_BUILD_TOOLS}/zipalign -v 4 omega-ci-signed.apk outputs/omega-ci-signed-aligned.apk
+  artifacts:
+    paths:
+      - outputs/omega-ci-signed-aligned.apk
+    expire_in: 1 week
+
+#sendReleaseTelegram:
+#  stage: deploy
+#  script:
+#    - apt-get install curl
+#    - curl -F document=@"outputs/librechair-ci-signed-aligned.apk" "https://api.telegram.org/bot${SECRET_BOT_TOKEN}/sendDocument?chat_id=@${CHAT_ID}"
+#  dependencies:
+#    - signRelease
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000000..214a96e74f
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,58 @@
+language: android
+sudo: false
+jdk: oraclejdk8
+
+before_cache:
+  - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
+  - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
+cache:
+  directories:
+    - $HOME/.gradle/caches/
+    - $HOME/.gradle/wrapper/
+    - $HOME/.android/build-cache
+
+env:
+  global:
+    - ANDROID_API=30
+    - EMULATOR_API=30
+    - ANDROID_BUILD_TOOLS=30.0.2
+    - ADB_INSTALL_TIMEOUT=5 # minutes
+    - ANDROID_ABI=google-apis/armeabi-v7a
+
+android:
+  components:
+    - build-tools-30.0.2
+    - android-30
+    - extra-android-support # because I'm use support library
+    - extra-android-m2repository # because I'm use support library
+    - extra-google-m2repository
+    - addon-google_apis-google-30
+    - sys-img-armeabi-v7a-google-apis-30
+
+licenses:
+  - android-sdk-preview-license-.+
+  - android-sdk-license-.+
+  - google-gdk-license-.+
+
+before_install:
+  - wget https://services.gradle.org/distributions/gradle-6.5.1-all.zip
+  - unzip -qq gradle-6.5.1-all.zip
+  - export GRADLE_HOME=$PWD/gradle-6.5
+  - export PATH=$GRADLE_HOME/bin:$PATH
+  - gradle -v
+
+  - gradle wrapper
+    - chmod +x gradlew
+    - ./gradlew dependencies || true
+    - yes | sdkmanager "platforms;android-30"
+
+#before_script:
+#- echo no | android create avd --force -n test -t android-25 --abi google_apis/armeabi-v7a
+#- emulator -avd test -no-audio -no-window &
+#- android-wait-for-emulator
+#- adb shell input keyevent 82 &
+install: true
+script:
+  - echo "skipping tests"
+
+
diff --git a/AndroidManifest-common.xml b/AndroidManifest-common.xml
index 1493315e0c..54bd89d47b 100644
--- a/AndroidManifest-common.xml
+++ b/AndroidManifest-common.xml
@@ -44,7 +44,6 @@
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" />
     <uses-permission android:name="android.permission.READ_DEVICE_CONFIG" />
-    <uses-permission android:name="android.permission.PACKAGE_USAGE_STATS" />
 
     <!--
     Permissions required for read/write access to the workspace data. These permission name
@@ -72,7 +71,8 @@
         android:fullBackupOnly="true"
         android:fullBackupContent="@xml/backupscheme"
         android:hardwareAccelerated="true"
-        android:icon="@drawable/ic_launcher_home"
+        android:icon="@mipmap/ic_launcher"
+        android:roundIcon="@mipmap/ic_launcher_round"
         android:label="@string/derived_app_name"
         android:largeHeap="@bool/config_largeHeap"
         android:restoreAnyVersion="true"
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b031ffbee4..24feffd750 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -20,7 +20,9 @@
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.launcher3">
-    <uses-sdk android:targetSdkVersion="29" android:minSdkVersion="25"/>
+    <uses-sdk
+        android:minSdkVersion="25"
+        android:targetSdkVersion="30" />
     <!--
     Manifest entries specific to Launcher3. This is merged with AndroidManifest-common.xml.
     Refer comments around specific entries on how to extend individual components.
@@ -31,7 +33,8 @@
         android:fullBackupOnly="true"
         android:fullBackupContent="@xml/backupscheme"
         android:hardwareAccelerated="true"
-        android:icon="@drawable/ic_launcher_home"
+        android:icon="@mipmap/ic_launcher"
+        android:roundIcon="@mipmap/ic_launcher_round"
         android:label="@string/derived_app_name"
         android:theme="@style/AppTheme"
         android:largeHeap="@bool/config_largeHeap"
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000000..261eeb9e9f
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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.
diff --git a/Omega/AndroidManifest.xml b/Omega/AndroidManifest.xml
index 17888b170e..35e47a2339 100644
--- a/Omega/AndroidManifest.xml
+++ b/Omega/AndroidManifest.xml
@@ -17,14 +17,62 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
+    <!-- Pixel -->
+    <permission
+        android:name="${applicationId}.permission.QSB"
+        android:permissionGroup="android.permission-group.SYSTEM_TOOLS"
+        android:protectionLevel="signatureOrSystem" />
+
+    <uses-permission android:name="com.android.launcher.permission.READ_SETTINGS" />
+    <uses-permission android:name="com.android.launcher.permission.WRITE_SETTINGS" />
+    <uses-permission android:name="com.google.android.apps.nexuslauncher.permission.READ_SETTINGS" />
+    <uses-permission android:name="com.google.android.apps.nexuslauncher.permission.WRITE_SETTINGS" />
+    <uses-permission android:name="${applicationId}.permission.READ_SETTINGS" />
+    <uses-permission android:name="${applicationId}.permission.WRITE_SETTINGS" />
+
+    <uses-permission android:name="${applicationId}.permission.QSB" />
+
+    <uses-permission android:name="android.permission.START_TASKS_FROM_RECENTS" />
+    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" />
+    <uses-permission android:name="android.permission.CREATE_USERS" />
+    <uses-permission android:name="android.permission.MANAGE_USERS" />
+    <uses-permission android:name="android.permission.FORCE_STOP_PACKAGES" />
+    <uses-permission android:name="android.permission.MANAGE_DEVICE_ADMINS" />
+    <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />
+
+    <uses-permission android:name="android.permission.EXPAND_STATUS_BAR" />
+    <uses-permission android:name="android.permission.STATUS_BAR" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_CALENDAR" />
+    <uses-permission android:name="android.permission.SET_WALLPAPER" />
+    <uses-permission android:name="android.permission.INSTALL_SHORTCUT" />
+    <uses-permission android:name="android.permission.WRITE_SETTINGS" />
+    <uses-permission android:name="android.permission.READ_WALLPAPER_INTERNAL" />
+    <uses-permission android:name="android.permission.DEVICE_POWER" />
+    <uses-permission android:name="android.permission.INTERNET" />
+
+    <uses-permission android:name="com.huawei.wallpaperservcie.permission.SET_WALLPAPER_OFFSET" />
+    <uses-permission android:name="com.huawei.android.thememanager.permission.ACCESS_CHANGE_WALLPAPER" />
+
+    <!-- For weather / sunset/-rise -->
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+
+    <uses-permission android:name="org.pixelexperience.weather.client.READ_WEATHER" />
+
+    <!-- App prediction -->
+    <uses-permission
+        android:name="android.permission.PACKAGE_USAGE_STATS"
+        tools:ignore="ProtectedPermissions" />
 
     <application
         android:name="com.saggitt.omega.OmegaApp"
+        android:networkSecurityConfig="@xml/network_security_config"
         android:backupAgent="com.android.launcher3.LauncherBackupAgent"
         android:fullBackupContent="@xml/backupscheme"
         android:fullBackupOnly="true"
         android:hardwareAccelerated="true"
-        android:icon="@drawable/ic_launcher_home"
+        android:icon="@mipmap/ic_launcher"
+        android:roundIcon="@mipmap/ic_launcher_round"
         android:label="@string/derived_app_name"
         android:largeHeap="@bool/config_largeHeap"
         android:restoreAnyVersion="true"
@@ -55,7 +103,6 @@
             android:windowSoftInputMode="adjustPan">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.HOME" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.MONKEY" />
@@ -90,6 +137,51 @@
             android:parentActivityName="com.saggitt.omega.settings.SettingsActivity"
             android:theme="@style/SettingsTheme_Light" />
 
+        <activity
+            android:name="com.saggitt.omega.preferences.SelectableAppsActivity"
+            android:autoRemoveFromRecents="true"
+            android:theme="@style/SettingsTheme_Light" />
+
+        <!-- Icon picker -->
+        <activity
+            android:name="com.saggitt.omega.iconpack.EditIconActivity"
+            android:taskAffinity="${applicationId}.tasks.EDIT_ICON"
+            android:theme="@style/SettingsTheme_Light" />
+        <activity
+            android:name="com.saggitt.omega.iconpack.IconPickerActivity"
+            android:theme="@style/SettingsTheme_Light" />
+
+        <!-- Actions -->
+        <activity
+            android:name="com.saggitt.omega.gestures.OmegaShortcutActivity"
+            android:icon="@mipmap/ic_launcher"
+            android:label="@string/omega_actions"
+            android:theme="@style/SettingsTheme_Light.Transparent">
+            <intent-filter>
+                <action android:name="android.intent.action.CREATE_SHORTCUT" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="com.saggitt.omega.gestures.ui.RunHandlerActivity"
+            android:taskAffinity="${applicationId}.tasks.RUN_HANDLER"
+            android:theme="@style/SettingsTheme_Light.Transparent">
+            <intent-filter>
+                <action android:name="com.saggitt.omega.START_ACTION" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name="com.saggitt.omega.gestures.ui.SelectAppActivity"
+            android:label="@string/action_open_app_select_app"
+            android:theme="@style/SettingsTheme_Light" />
+        <activity
+            android:name="com.saggitt.omega.BlankActivity"
+            android:theme="@style/Theme.Transparent" />
+
         <activity
             android:name="com.saggitt.omega.FakeLauncher"
             android:enabled="false">
@@ -102,17 +194,121 @@
             </intent-filter>
         </activity>
 
+        <!-- DT2S using screen timeout -->
         <activity
-            android:name="com.saggitt.omega.dash.DashActivity"
-            android:theme="@style/DashTheme" />
+            android:name="com.saggitt.omega.gestures.handlers.SleepTimeoutActivity"
+            android:screenOrientation="locked"
+            android:theme="@style/SleepTimeoutTheme" />
+
+        <!-- DT2S using device admin -->
+        <receiver
+            android:description="@string/dt2s_admin_hint"
+            android:name="com.saggitt.omega.gestures.handlers.SleepMethodDeviceAdmin$SleepDeviceAdmin"
+            android:permission="android.permission.BIND_DEVICE_ADMIN">
+            <meta-data
+                android:name="android.app.device_admin"
+                android:resource="@xml/sleep_admin_policy" />
+
+            <intent-filter>
+                <action android:name="android.app.action.DEVICE_ADMIN_ENABLED" />
+            </intent-filter>
+        </receiver>
+
+        <service
+            android:name="com.saggitt.omega.OmegaAccessibilityService"
+            android:label="@string/derived_app_name"
+            android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE">
+            <intent-filter>
+                <action android:name="android.accessibilityservice.AccessibilityService" />
+            </intent-filter>
+        </service>
+
+        <!-- Pixel -->
+        <activity
+            android:name="com.saggitt.omega.search.AppLaunchActivity"
+            android:theme="@android:style/Theme.NoDisplay">
+            <intent-filter android:priority="1">
+                <action android:name="com.saggitt.omega.search.APP_LAUNCH" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+
+                <data
+                    android:mimeType="vnd.android.cursor.dir/vnd.android.search.suggest"
+                    android:scheme="content" />
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name="com.saggitt.omega.backup.BackupListActivity"
+            android:label="@string/backups"
+            android:parentActivityName="com.saggitt.omega.settings.SettingsActivity"
+            android:theme="@style/SettingsTheme_Light" />
+        <activity
+            android:name="com.saggitt.omega.backup.NewBackupActivity"
+            android:label="@string/new_backup"
+            android:parentActivityName="com.saggitt.omega.backup.BackupListActivity"
+            android:theme="@style/SettingsTheme_Light" />
+        <activity
+            android:name="com.saggitt.omega.backup.RestoreBackupActivity"
+            android:label="@string/restore_backup"
+            android:parentActivityName="com.saggitt.omega.backup.BackupListActivity"
+            android:theme="@style/SettingsTheme_Light">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:mimeType="application/vnd.zim.backup" />
+                <data android:mimeType="application/octet-stream" />
+                <data android:mimeType="application/x-zip-compressed" />
+                <data android:mimeType="application/zip" />
+
+                <data android:scheme="file" />
+                <data android:scheme="content" />
+                <data android:mimeType="*/*" />
+                <!--
+                    Work around Android's ugly primitive PatternMatcher
+                    implementation that can't cope with finding a . early in
+                    the path unless it's explicitly matched.
+                -->
+                <data android:host="*" />
+                <data android:pathPattern=".*\\.zbk" />
+                <data android:pathPattern=".*\\..*\\.zbk" />
+                <data android:pathPattern=".*\\..*\\..*\\.zbk" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\.zbk" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.zbk" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.zbk" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\.zbk" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.zbk" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.zbk" />
+            </intent-filter>
+        </activity>
 
         <meta-data
             android:name="android.max_aspect"
             android:value="2.1" />
+
         <meta-data
             android:name="com.samsung.android.non_immersive"
             android:value="true" />
 
+        <receiver android:name="com.saggitt.omega.smartspace.SmartspaceBroadcastReceiver">
+            <intent-filter>
+                <action android:name="com.google.android.apps.nexuslauncher.UPDATE_SMARTSPACE" />
+            </intent-filter>
+        </receiver>
+
+        <receiver android:name="com.saggitt.omega.qsb.LongClickReceiver" />
+
+        <receiver
+            android:name="com.saggitt.omega.qsb.OPAStatusReceiver"
+            android:permission="android.permission.CAPTURE_AUDIO_HOTWORD">
+            <intent-filter>
+                <action android:name="com.google.android.systemui.OPA_ENABLED" />
+            </intent-filter>
+        </receiver>
+
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.provider"
@@ -122,5 +318,11 @@
                 android:name="android.support.FILE_PROVIDER_PATHS"
                 android:resource="@xml/provider_paths" />
         </provider>
+
+        <provider
+            android:name="com.saggitt.omega.search.AppSearchProvider"
+            android:authorities="${applicationId}.appssearch"
+            android:exported="true" />
+
     </application>
 </manifest>
\ No newline at end of file
diff --git a/Omega/res/color/app_categorization_type_item_bg_color.xml b/Omega/res/color/app_categorization_type_item_bg_color.xml
new file mode 100644
index 0000000000..984f8cdf0e
--- /dev/null
+++ b/Omega/res/color/app_categorization_type_item_bg_color.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~     This file is part of Lawnchair Launcher.
+  ~
+  ~     Lawnchair Launcher is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     Lawnchair Launcher is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="#19000000" android:state_selected="true" />
+    <item android:color="@android:color/transparent" />
+</selector>
diff --git a/go/quickstep/res/values/colors.xml b/Omega/res/color/qsb_icon_tint.xml
similarity index 70%
rename from go/quickstep/res/values/colors.xml
rename to Omega/res/color/qsb_icon_tint.xml
index ff9dc9c61a..f71dad3fd2 100644
--- a/go/quickstep/res/values/colors.xml
+++ b/Omega/res/color/qsb_icon_tint.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2019 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2018 CypherOS
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -14,7 +12,6 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<resources>
-    <color name="clear_all_button_bg">#FFDADCE0</color>
-    <color name="clear_all_button_text">#FF5F6368</color>
-</resources>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="#64ffffff" android:state_pressed="true" />
+</selector>
\ No newline at end of file
diff --git a/Omega/res/drawable-hdpi/ic_widget_resize_handle.png b/Omega/res/drawable-hdpi/ic_widget_resize_handle.png
new file mode 100644
index 0000000000..b243aec99b
Binary files /dev/null and b/Omega/res/drawable-hdpi/ic_widget_resize_handle.png differ
diff --git a/Omega/res/drawable-hdpi/weather_01.png b/Omega/res/drawable-hdpi/weather_01.png
new file mode 100644
index 0000000000..e037088411
Binary files /dev/null and b/Omega/res/drawable-hdpi/weather_01.png differ
diff --git a/Omega/res/drawable-hdpi/weather_01n.png b/Omega/res/drawable-hdpi/weather_01n.png
new file mode 100644
index 0000000000..c625856b11
Binary files /dev/null and b/Omega/res/drawable-hdpi/weather_01n.png differ
diff --git a/Omega/res/drawable-hdpi/weather_02.png b/Omega/res/drawable-hdpi/weather_02.png
new file mode 100644
index 0000000000..5722757e2c
Binary files /dev/null and b/Omega/res/drawable-hdpi/weather_02.png differ
diff --git a/Omega/res/drawable-hdpi/weather_02n.png b/Omega/res/drawable-hdpi/weather_02n.png
new file mode 100644
index 0000000000..7cfef0f94f
Binary files /dev/null and b/Omega/res/drawable-hdpi/weather_02n.png differ
diff --git a/Omega/res/drawable-hdpi/weather_03.png b/Omega/res/drawable-hdpi/weather_03.png
new file mode 100644
index 0000000000..93a9456338
Binary files /dev/null and b/Omega/res/drawable-hdpi/weather_03.png differ
diff --git a/Omega/res/drawable-hdpi/weather_03n.png b/Omega/res/drawable-hdpi/weather_03n.png
new file mode 100644
index 0000000000..109207153e
Binary files /dev/null and b/Omega/res/drawable-hdpi/weather_03n.png differ
diff --git a/Omega/res/drawable-hdpi/weather_04.png b/Omega/res/drawable-hdpi/weather_04.png
new file mode 100644
index 0000000000..530fe82562
Binary files /dev/null and b/Omega/res/drawable-hdpi/weather_04.png differ
diff --git a/Omega/res/drawable-hdpi/weather_04n.png b/Omega/res/drawable-hdpi/weather_04n.png
new file mode 100644
index 0000000000..98c04b585f
Binary files /dev/null and b/Omega/res/drawable-hdpi/weather_04n.png differ
diff --git a/Omega/res/drawable-hdpi/weather_09.png b/Omega/res/drawable-hdpi/weather_09.png
new file mode 100644
index 0000000000..55e943cf73
Binary files /dev/null and b/Omega/res/drawable-hdpi/weather_09.png differ
diff --git a/Omega/res/drawable-hdpi/weather_10.png b/Omega/res/drawable-hdpi/weather_10.png
new file mode 100644
index 0000000000..5c3a51a9ba
Binary files /dev/null and b/Omega/res/drawable-hdpi/weather_10.png differ
diff --git a/Omega/res/drawable-hdpi/weather_10n.png b/Omega/res/drawable-hdpi/weather_10n.png
new file mode 100644
index 0000000000..8521a74669
Binary files /dev/null and b/Omega/res/drawable-hdpi/weather_10n.png differ
diff --git a/Omega/res/drawable-hdpi/weather_11.png b/Omega/res/drawable-hdpi/weather_11.png
new file mode 100644
index 0000000000..f140e3431b
Binary files /dev/null and b/Omega/res/drawable-hdpi/weather_11.png differ
diff --git a/Omega/res/drawable-hdpi/weather_13.png b/Omega/res/drawable-hdpi/weather_13.png
new file mode 100644
index 0000000000..ba6240393c
Binary files /dev/null and b/Omega/res/drawable-hdpi/weather_13.png differ
diff --git a/Omega/res/drawable-hdpi/weather_50.png b/Omega/res/drawable-hdpi/weather_50.png
new file mode 100644
index 0000000000..23d3ee3b72
Binary files /dev/null and b/Omega/res/drawable-hdpi/weather_50.png differ
diff --git a/Omega/res/drawable-hdpi/weather_none_available.png b/Omega/res/drawable-hdpi/weather_none_available.png
new file mode 100644
index 0000000000..0db93f2973
Binary files /dev/null and b/Omega/res/drawable-hdpi/weather_none_available.png differ
diff --git a/Omega/res/drawable-hdpi/widget_resize_frame.9.png b/Omega/res/drawable-hdpi/widget_resize_frame.9.png
new file mode 100644
index 0000000000..a710932696
Binary files /dev/null and b/Omega/res/drawable-hdpi/widget_resize_frame.9.png differ
diff --git a/Omega/res/drawable-hdpi/widget_resize_shadow.9.png b/Omega/res/drawable-hdpi/widget_resize_shadow.9.png
new file mode 100644
index 0000000000..7cb521405e
Binary files /dev/null and b/Omega/res/drawable-hdpi/widget_resize_shadow.9.png differ
diff --git a/Omega/res/drawable-hdpi/work_tab_user_education.png b/Omega/res/drawable-hdpi/work_tab_user_education.png
new file mode 100644
index 0000000000..1879dfb2b7
Binary files /dev/null and b/Omega/res/drawable-hdpi/work_tab_user_education.png differ
diff --git a/Omega/res/drawable-hdpi/workspace_bg.9.png b/Omega/res/drawable-hdpi/workspace_bg.9.png
new file mode 100644
index 0000000000..1d82fd41f6
Binary files /dev/null and b/Omega/res/drawable-hdpi/workspace_bg.9.png differ
diff --git a/Omega/res/drawable-hdpi/workspace_bg_dark.9.png b/Omega/res/drawable-hdpi/workspace_bg_dark.9.png
new file mode 100644
index 0000000000..5b03c02b21
Binary files /dev/null and b/Omega/res/drawable-hdpi/workspace_bg_dark.9.png differ
diff --git a/Omega/res/drawable-mdpi/ic_widget_resize_handle.png b/Omega/res/drawable-mdpi/ic_widget_resize_handle.png
new file mode 100644
index 0000000000..656e96c356
Binary files /dev/null and b/Omega/res/drawable-mdpi/ic_widget_resize_handle.png differ
diff --git a/Omega/res/drawable-mdpi/weather_01.png b/Omega/res/drawable-mdpi/weather_01.png
new file mode 100644
index 0000000000..4b98d98cb7
Binary files /dev/null and b/Omega/res/drawable-mdpi/weather_01.png differ
diff --git a/Omega/res/drawable-mdpi/weather_01n.png b/Omega/res/drawable-mdpi/weather_01n.png
new file mode 100644
index 0000000000..0cebf47687
Binary files /dev/null and b/Omega/res/drawable-mdpi/weather_01n.png differ
diff --git a/Omega/res/drawable-mdpi/weather_02.png b/Omega/res/drawable-mdpi/weather_02.png
new file mode 100644
index 0000000000..4b32a9f602
Binary files /dev/null and b/Omega/res/drawable-mdpi/weather_02.png differ
diff --git a/Omega/res/drawable-mdpi/weather_02n.png b/Omega/res/drawable-mdpi/weather_02n.png
new file mode 100644
index 0000000000..304ab02deb
Binary files /dev/null and b/Omega/res/drawable-mdpi/weather_02n.png differ
diff --git a/Omega/res/drawable-mdpi/weather_03.png b/Omega/res/drawable-mdpi/weather_03.png
new file mode 100644
index 0000000000..049a06a92f
Binary files /dev/null and b/Omega/res/drawable-mdpi/weather_03.png differ
diff --git a/Omega/res/drawable-mdpi/weather_03n.png b/Omega/res/drawable-mdpi/weather_03n.png
new file mode 100644
index 0000000000..028b86f989
Binary files /dev/null and b/Omega/res/drawable-mdpi/weather_03n.png differ
diff --git a/Omega/res/drawable-mdpi/weather_04.png b/Omega/res/drawable-mdpi/weather_04.png
new file mode 100644
index 0000000000..751db791dd
Binary files /dev/null and b/Omega/res/drawable-mdpi/weather_04.png differ
diff --git a/Omega/res/drawable-mdpi/weather_04n.png b/Omega/res/drawable-mdpi/weather_04n.png
new file mode 100644
index 0000000000..ec692a291d
Binary files /dev/null and b/Omega/res/drawable-mdpi/weather_04n.png differ
diff --git a/Omega/res/drawable-mdpi/weather_09.png b/Omega/res/drawable-mdpi/weather_09.png
new file mode 100644
index 0000000000..b244592acb
Binary files /dev/null and b/Omega/res/drawable-mdpi/weather_09.png differ
diff --git a/Omega/res/drawable-mdpi/weather_10.png b/Omega/res/drawable-mdpi/weather_10.png
new file mode 100644
index 0000000000..d852a5af02
Binary files /dev/null and b/Omega/res/drawable-mdpi/weather_10.png differ
diff --git a/Omega/res/drawable-mdpi/weather_10n.png b/Omega/res/drawable-mdpi/weather_10n.png
new file mode 100644
index 0000000000..b7699f3aa3
Binary files /dev/null and b/Omega/res/drawable-mdpi/weather_10n.png differ
diff --git a/Omega/res/drawable-mdpi/weather_11.png b/Omega/res/drawable-mdpi/weather_11.png
new file mode 100644
index 0000000000..3c91106630
Binary files /dev/null and b/Omega/res/drawable-mdpi/weather_11.png differ
diff --git a/Omega/res/drawable-mdpi/weather_13.png b/Omega/res/drawable-mdpi/weather_13.png
new file mode 100644
index 0000000000..2ffbaefec2
Binary files /dev/null and b/Omega/res/drawable-mdpi/weather_13.png differ
diff --git a/Omega/res/drawable-mdpi/weather_50.png b/Omega/res/drawable-mdpi/weather_50.png
new file mode 100644
index 0000000000..b0b5c11374
Binary files /dev/null and b/Omega/res/drawable-mdpi/weather_50.png differ
diff --git a/Omega/res/drawable-mdpi/weather_none_available.png b/Omega/res/drawable-mdpi/weather_none_available.png
new file mode 100644
index 0000000000..bae5399009
Binary files /dev/null and b/Omega/res/drawable-mdpi/weather_none_available.png differ
diff --git a/Omega/res/drawable-mdpi/widget_resize_frame.9.png b/Omega/res/drawable-mdpi/widget_resize_frame.9.png
new file mode 100644
index 0000000000..252482f021
Binary files /dev/null and b/Omega/res/drawable-mdpi/widget_resize_frame.9.png differ
diff --git a/Omega/res/drawable-mdpi/widget_resize_shadow.9.png b/Omega/res/drawable-mdpi/widget_resize_shadow.9.png
new file mode 100644
index 0000000000..a2010e2a86
Binary files /dev/null and b/Omega/res/drawable-mdpi/widget_resize_shadow.9.png differ
diff --git a/Omega/res/drawable-mdpi/work_tab_user_education.png b/Omega/res/drawable-mdpi/work_tab_user_education.png
new file mode 100644
index 0000000000..65c7e638dd
Binary files /dev/null and b/Omega/res/drawable-mdpi/work_tab_user_education.png differ
diff --git a/Omega/res/drawable-mdpi/workspace_bg.9.png b/Omega/res/drawable-mdpi/workspace_bg.9.png
new file mode 100644
index 0000000000..116ce443f2
Binary files /dev/null and b/Omega/res/drawable-mdpi/workspace_bg.9.png differ
diff --git a/Omega/res/drawable-mdpi/workspace_bg_dark.9.png b/Omega/res/drawable-mdpi/workspace_bg_dark.9.png
new file mode 100644
index 0000000000..d8b9f85206
Binary files /dev/null and b/Omega/res/drawable-mdpi/workspace_bg_dark.9.png differ
diff --git a/Omega/res/drawable-ru/ic_yandex.xml b/Omega/res/drawable-ru/ic_yandex.xml
new file mode 100644
index 0000000000..653c4a6c94
--- /dev/null
+++ b/Omega/res/drawable-ru/ic_yandex.xml
@@ -0,0 +1,9 @@
+<vector android:height="24dp"
+    android:viewportHeight="498"
+    android:viewportWidth="237.64"
+    android:width="12dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="#d7143a"
+        android:pathData="M230.36,0L154.9,0c-74.14,0 -137,56.44 -137,166 0,65.73 30.45,114.2 84.72,138.1L1.33,487.38c-3.31,6 0,10.62 5.29,10.62h47c4,0 6.63,-1.32 8,-4.64l92,-180h33.09v180a5,5 0,0 0,4.63 4.64h41c4,0 5.29,-2 5.29,-5.3L237.63,6.64C237.64,2 234.99,0 230.36,0ZM186.67,270.92h-27.8c-43.68,0 -86,-31.87 -86,-111.55 0,-83 39.71,-116.88 80.09,-116.88h33.76L186.72,270.92Z" />
+</vector>
diff --git a/Omega/res/drawable-ru/ic_yandex_shadow.xml b/Omega/res/drawable-ru/ic_yandex_shadow.xml
new file mode 100644
index 0000000000..37c8cbdeaa
--- /dev/null
+++ b/Omega/res/drawable-ru/ic_yandex_shadow.xml
@@ -0,0 +1,9 @@
+<vector android:height="24dp"
+    android:viewportHeight="498"
+    android:viewportWidth="237.64"
+    android:width="12dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="#fff"
+        android:pathData="M230.36,0L154.9,0c-74.14,0 -137,56.44 -137,166 0,65.73 30.45,114.2 84.72,138.1L1.33,487.38c-3.31,6 0,10.62 5.29,10.62h47c4,0 6.63,-1.32 8,-4.64l92,-180h33.09v180a5,5 0,0 0,4.63 4.64h41c4,0 5.29,-2 5.29,-5.3L237.63,6.64C237.64,2 234.99,0 230.36,0ZM186.67,270.92h-27.8c-43.68,0 -86,-31.87 -86,-111.55 0,-83 39.71,-116.88 80.09,-116.88h33.76L186.72,270.92Z" />
+</vector>
diff --git a/Omega/res/drawable-xhdpi/ic_widget_resize_handle.png b/Omega/res/drawable-xhdpi/ic_widget_resize_handle.png
new file mode 100644
index 0000000000..0e8dd68787
Binary files /dev/null and b/Omega/res/drawable-xhdpi/ic_widget_resize_handle.png differ
diff --git a/Omega/res/drawable-xhdpi/weather_01.png b/Omega/res/drawable-xhdpi/weather_01.png
new file mode 100644
index 0000000000..2f4fa984fd
Binary files /dev/null and b/Omega/res/drawable-xhdpi/weather_01.png differ
diff --git a/Omega/res/drawable-xhdpi/weather_01n.png b/Omega/res/drawable-xhdpi/weather_01n.png
new file mode 100644
index 0000000000..8c29ccc258
Binary files /dev/null and b/Omega/res/drawable-xhdpi/weather_01n.png differ
diff --git a/Omega/res/drawable-xhdpi/weather_02.png b/Omega/res/drawable-xhdpi/weather_02.png
new file mode 100644
index 0000000000..7d18362140
Binary files /dev/null and b/Omega/res/drawable-xhdpi/weather_02.png differ
diff --git a/Omega/res/drawable-xhdpi/weather_02n.png b/Omega/res/drawable-xhdpi/weather_02n.png
new file mode 100644
index 0000000000..c820c5397e
Binary files /dev/null and b/Omega/res/drawable-xhdpi/weather_02n.png differ
diff --git a/Omega/res/drawable-xhdpi/weather_03.png b/Omega/res/drawable-xhdpi/weather_03.png
new file mode 100644
index 0000000000..89d0e470cb
Binary files /dev/null and b/Omega/res/drawable-xhdpi/weather_03.png differ
diff --git a/Omega/res/drawable-xhdpi/weather_03n.png b/Omega/res/drawable-xhdpi/weather_03n.png
new file mode 100644
index 0000000000..cc814acb26
Binary files /dev/null and b/Omega/res/drawable-xhdpi/weather_03n.png differ
diff --git a/Omega/res/drawable-xhdpi/weather_04.png b/Omega/res/drawable-xhdpi/weather_04.png
new file mode 100644
index 0000000000..3c7764590d
Binary files /dev/null and b/Omega/res/drawable-xhdpi/weather_04.png differ
diff --git a/Omega/res/drawable-xhdpi/weather_04n.png b/Omega/res/drawable-xhdpi/weather_04n.png
new file mode 100644
index 0000000000..eeda00792c
Binary files /dev/null and b/Omega/res/drawable-xhdpi/weather_04n.png differ
diff --git a/Omega/res/drawable-xhdpi/weather_09.png b/Omega/res/drawable-xhdpi/weather_09.png
new file mode 100644
index 0000000000..c50f12027e
Binary files /dev/null and b/Omega/res/drawable-xhdpi/weather_09.png differ
diff --git a/Omega/res/drawable-xhdpi/weather_10.png b/Omega/res/drawable-xhdpi/weather_10.png
new file mode 100644
index 0000000000..ca8d544d05
Binary files /dev/null and b/Omega/res/drawable-xhdpi/weather_10.png differ
diff --git a/Omega/res/drawable-xhdpi/weather_10n.png b/Omega/res/drawable-xhdpi/weather_10n.png
new file mode 100644
index 0000000000..654a751943
Binary files /dev/null and b/Omega/res/drawable-xhdpi/weather_10n.png differ
diff --git a/Omega/res/drawable-xhdpi/weather_11.png b/Omega/res/drawable-xhdpi/weather_11.png
new file mode 100644
index 0000000000..b834468109
Binary files /dev/null and b/Omega/res/drawable-xhdpi/weather_11.png differ
diff --git a/Omega/res/drawable-xhdpi/weather_13.png b/Omega/res/drawable-xhdpi/weather_13.png
new file mode 100644
index 0000000000..52ce6c28f3
Binary files /dev/null and b/Omega/res/drawable-xhdpi/weather_13.png differ
diff --git a/Omega/res/drawable-xhdpi/weather_50.png b/Omega/res/drawable-xhdpi/weather_50.png
new file mode 100644
index 0000000000..dbdc1a3da2
Binary files /dev/null and b/Omega/res/drawable-xhdpi/weather_50.png differ
diff --git a/Omega/res/drawable-xhdpi/weather_none_available.png b/Omega/res/drawable-xhdpi/weather_none_available.png
new file mode 100644
index 0000000000..038bcbf1b8
Binary files /dev/null and b/Omega/res/drawable-xhdpi/weather_none_available.png differ
diff --git a/Omega/res/drawable-xhdpi/widget_resize_frame.9.png b/Omega/res/drawable-xhdpi/widget_resize_frame.9.png
new file mode 100644
index 0000000000..563c75d15c
Binary files /dev/null and b/Omega/res/drawable-xhdpi/widget_resize_frame.9.png differ
diff --git a/Omega/res/drawable-xhdpi/widget_resize_shadow.9.png b/Omega/res/drawable-xhdpi/widget_resize_shadow.9.png
new file mode 100644
index 0000000000..2b1ac05f0c
Binary files /dev/null and b/Omega/res/drawable-xhdpi/widget_resize_shadow.9.png differ
diff --git a/Omega/res/drawable-xhdpi/work_tab_user_education.png b/Omega/res/drawable-xhdpi/work_tab_user_education.png
new file mode 100644
index 0000000000..59df7a8647
Binary files /dev/null and b/Omega/res/drawable-xhdpi/work_tab_user_education.png differ
diff --git a/Omega/res/drawable-xhdpi/workspace_bg.9.png b/Omega/res/drawable-xhdpi/workspace_bg.9.png
new file mode 100644
index 0000000000..b1b3b850cc
Binary files /dev/null and b/Omega/res/drawable-xhdpi/workspace_bg.9.png differ
diff --git a/Omega/res/drawable-xhdpi/workspace_bg_dark.9.png b/Omega/res/drawable-xhdpi/workspace_bg_dark.9.png
new file mode 100644
index 0000000000..f3459a39c9
Binary files /dev/null and b/Omega/res/drawable-xhdpi/workspace_bg_dark.9.png differ
diff --git a/Omega/res/drawable-xxhdpi/ic_widget_resize_handle.png b/Omega/res/drawable-xxhdpi/ic_widget_resize_handle.png
new file mode 100644
index 0000000000..736a157de9
Binary files /dev/null and b/Omega/res/drawable-xxhdpi/ic_widget_resize_handle.png differ
diff --git a/Omega/res/drawable-xxhdpi/weather_01.png b/Omega/res/drawable-xxhdpi/weather_01.png
new file mode 100644
index 0000000000..795acbdda7
Binary files /dev/null and b/Omega/res/drawable-xxhdpi/weather_01.png differ
diff --git a/Omega/res/drawable-xxhdpi/weather_01n.png b/Omega/res/drawable-xxhdpi/weather_01n.png
new file mode 100644
index 0000000000..163bd68f9f
Binary files /dev/null and b/Omega/res/drawable-xxhdpi/weather_01n.png differ
diff --git a/Omega/res/drawable-xxhdpi/weather_02.png b/Omega/res/drawable-xxhdpi/weather_02.png
new file mode 100644
index 0000000000..c2db55b777
Binary files /dev/null and b/Omega/res/drawable-xxhdpi/weather_02.png differ
diff --git a/Omega/res/drawable-xxhdpi/weather_02n.png b/Omega/res/drawable-xxhdpi/weather_02n.png
new file mode 100644
index 0000000000..32ec2fa7c7
Binary files /dev/null and b/Omega/res/drawable-xxhdpi/weather_02n.png differ
diff --git a/Omega/res/drawable-xxhdpi/weather_03.png b/Omega/res/drawable-xxhdpi/weather_03.png
new file mode 100644
index 0000000000..018d167aef
Binary files /dev/null and b/Omega/res/drawable-xxhdpi/weather_03.png differ
diff --git a/Omega/res/drawable-xxhdpi/weather_03n.png b/Omega/res/drawable-xxhdpi/weather_03n.png
new file mode 100644
index 0000000000..eb4612726d
Binary files /dev/null and b/Omega/res/drawable-xxhdpi/weather_03n.png differ
diff --git a/Omega/res/drawable-xxhdpi/weather_04.png b/Omega/res/drawable-xxhdpi/weather_04.png
new file mode 100644
index 0000000000..237beb703a
Binary files /dev/null and b/Omega/res/drawable-xxhdpi/weather_04.png differ
diff --git a/Omega/res/drawable-xxhdpi/weather_04n.png b/Omega/res/drawable-xxhdpi/weather_04n.png
new file mode 100644
index 0000000000..40227d319a
Binary files /dev/null and b/Omega/res/drawable-xxhdpi/weather_04n.png differ
diff --git a/Omega/res/drawable-xxhdpi/weather_09.png b/Omega/res/drawable-xxhdpi/weather_09.png
new file mode 100644
index 0000000000..99e5a07344
Binary files /dev/null and b/Omega/res/drawable-xxhdpi/weather_09.png differ
diff --git a/Omega/res/drawable-xxhdpi/weather_10.png b/Omega/res/drawable-xxhdpi/weather_10.png
new file mode 100644
index 0000000000..8b2266ddfc
Binary files /dev/null and b/Omega/res/drawable-xxhdpi/weather_10.png differ
diff --git a/Omega/res/drawable-xxhdpi/weather_10n.png b/Omega/res/drawable-xxhdpi/weather_10n.png
new file mode 100644
index 0000000000..3b98e4b2fd
Binary files /dev/null and b/Omega/res/drawable-xxhdpi/weather_10n.png differ
diff --git a/Omega/res/drawable-xxhdpi/weather_11.png b/Omega/res/drawable-xxhdpi/weather_11.png
new file mode 100644
index 0000000000..8f11ef6b7c
Binary files /dev/null and b/Omega/res/drawable-xxhdpi/weather_11.png differ
diff --git a/Omega/res/drawable-xxhdpi/weather_13.png b/Omega/res/drawable-xxhdpi/weather_13.png
new file mode 100644
index 0000000000..8fd63f8e21
Binary files /dev/null and b/Omega/res/drawable-xxhdpi/weather_13.png differ
diff --git a/Omega/res/drawable-xxhdpi/weather_50.png b/Omega/res/drawable-xxhdpi/weather_50.png
new file mode 100644
index 0000000000..4dda86727b
Binary files /dev/null and b/Omega/res/drawable-xxhdpi/weather_50.png differ
diff --git a/Omega/res/drawable-xxhdpi/weather_none_available.png b/Omega/res/drawable-xxhdpi/weather_none_available.png
new file mode 100644
index 0000000000..576c69c63d
Binary files /dev/null and b/Omega/res/drawable-xxhdpi/weather_none_available.png differ
diff --git a/Omega/res/drawable-xxhdpi/widget_resize_frame.9.png b/Omega/res/drawable-xxhdpi/widget_resize_frame.9.png
new file mode 100644
index 0000000000..ea527f46af
Binary files /dev/null and b/Omega/res/drawable-xxhdpi/widget_resize_frame.9.png differ
diff --git a/Omega/res/drawable-xxhdpi/widget_resize_shadow.9.png b/Omega/res/drawable-xxhdpi/widget_resize_shadow.9.png
new file mode 100644
index 0000000000..54121682fb
Binary files /dev/null and b/Omega/res/drawable-xxhdpi/widget_resize_shadow.9.png differ
diff --git a/Omega/res/drawable-xxhdpi/work_tab_user_education.png b/Omega/res/drawable-xxhdpi/work_tab_user_education.png
new file mode 100644
index 0000000000..3c6aa208ea
Binary files /dev/null and b/Omega/res/drawable-xxhdpi/work_tab_user_education.png differ
diff --git a/Omega/res/drawable-xxhdpi/workspace_bg.9.png b/Omega/res/drawable-xxhdpi/workspace_bg.9.png
new file mode 100644
index 0000000000..d47f6b2810
Binary files /dev/null and b/Omega/res/drawable-xxhdpi/workspace_bg.9.png differ
diff --git a/Omega/res/drawable-xxhdpi/workspace_bg_dark.9.png b/Omega/res/drawable-xxhdpi/workspace_bg_dark.9.png
new file mode 100644
index 0000000000..d5d370e88e
Binary files /dev/null and b/Omega/res/drawable-xxhdpi/workspace_bg_dark.9.png differ
diff --git a/Omega/res/drawable-xxxhdpi/ic_widget_resize_handle.png b/Omega/res/drawable-xxxhdpi/ic_widget_resize_handle.png
new file mode 100644
index 0000000000..e3c45ad0a6
Binary files /dev/null and b/Omega/res/drawable-xxxhdpi/ic_widget_resize_handle.png differ
diff --git a/Omega/res/drawable-xxxhdpi/weather_01.png b/Omega/res/drawable-xxxhdpi/weather_01.png
new file mode 100644
index 0000000000..188946f49a
Binary files /dev/null and b/Omega/res/drawable-xxxhdpi/weather_01.png differ
diff --git a/Omega/res/drawable-xxxhdpi/weather_01n.png b/Omega/res/drawable-xxxhdpi/weather_01n.png
new file mode 100644
index 0000000000..5a1f88c807
Binary files /dev/null and b/Omega/res/drawable-xxxhdpi/weather_01n.png differ
diff --git a/Omega/res/drawable-xxxhdpi/weather_02.png b/Omega/res/drawable-xxxhdpi/weather_02.png
new file mode 100644
index 0000000000..af50b07867
Binary files /dev/null and b/Omega/res/drawable-xxxhdpi/weather_02.png differ
diff --git a/Omega/res/drawable-xxxhdpi/weather_02n.png b/Omega/res/drawable-xxxhdpi/weather_02n.png
new file mode 100644
index 0000000000..92405a952a
Binary files /dev/null and b/Omega/res/drawable-xxxhdpi/weather_02n.png differ
diff --git a/Omega/res/drawable-xxxhdpi/weather_03.png b/Omega/res/drawable-xxxhdpi/weather_03.png
new file mode 100644
index 0000000000..1c31e1ce06
Binary files /dev/null and b/Omega/res/drawable-xxxhdpi/weather_03.png differ
diff --git a/Omega/res/drawable-xxxhdpi/weather_03n.png b/Omega/res/drawable-xxxhdpi/weather_03n.png
new file mode 100644
index 0000000000..2fc379cc55
Binary files /dev/null and b/Omega/res/drawable-xxxhdpi/weather_03n.png differ
diff --git a/Omega/res/drawable-xxxhdpi/weather_04.png b/Omega/res/drawable-xxxhdpi/weather_04.png
new file mode 100644
index 0000000000..f85683755e
Binary files /dev/null and b/Omega/res/drawable-xxxhdpi/weather_04.png differ
diff --git a/Omega/res/drawable-xxxhdpi/weather_04n.png b/Omega/res/drawable-xxxhdpi/weather_04n.png
new file mode 100644
index 0000000000..3929e40073
Binary files /dev/null and b/Omega/res/drawable-xxxhdpi/weather_04n.png differ
diff --git a/Omega/res/drawable-xxxhdpi/weather_09.png b/Omega/res/drawable-xxxhdpi/weather_09.png
new file mode 100644
index 0000000000..19ae47e2d3
Binary files /dev/null and b/Omega/res/drawable-xxxhdpi/weather_09.png differ
diff --git a/Omega/res/drawable-xxxhdpi/weather_10.png b/Omega/res/drawable-xxxhdpi/weather_10.png
new file mode 100644
index 0000000000..0562a438c9
Binary files /dev/null and b/Omega/res/drawable-xxxhdpi/weather_10.png differ
diff --git a/Omega/res/drawable-xxxhdpi/weather_10n.png b/Omega/res/drawable-xxxhdpi/weather_10n.png
new file mode 100644
index 0000000000..61ee37e03c
Binary files /dev/null and b/Omega/res/drawable-xxxhdpi/weather_10n.png differ
diff --git a/Omega/res/drawable-xxxhdpi/weather_11.png b/Omega/res/drawable-xxxhdpi/weather_11.png
new file mode 100644
index 0000000000..21ae421ecb
Binary files /dev/null and b/Omega/res/drawable-xxxhdpi/weather_11.png differ
diff --git a/Omega/res/drawable-xxxhdpi/weather_13.png b/Omega/res/drawable-xxxhdpi/weather_13.png
new file mode 100644
index 0000000000..c24e3418ef
Binary files /dev/null and b/Omega/res/drawable-xxxhdpi/weather_13.png differ
diff --git a/Omega/res/drawable-xxxhdpi/weather_50.png b/Omega/res/drawable-xxxhdpi/weather_50.png
new file mode 100644
index 0000000000..e22a9fb4b7
Binary files /dev/null and b/Omega/res/drawable-xxxhdpi/weather_50.png differ
diff --git a/Omega/res/drawable-xxxhdpi/weather_none_available.png b/Omega/res/drawable-xxxhdpi/weather_none_available.png
new file mode 100644
index 0000000000..ad426fb9a5
Binary files /dev/null and b/Omega/res/drawable-xxxhdpi/weather_none_available.png differ
diff --git a/Omega/res/drawable-xxxhdpi/widget_resize_frame.9.png b/Omega/res/drawable-xxxhdpi/widget_resize_frame.9.png
new file mode 100644
index 0000000000..4644e9ae3c
Binary files /dev/null and b/Omega/res/drawable-xxxhdpi/widget_resize_frame.9.png differ
diff --git a/Omega/res/drawable-xxxhdpi/widget_resize_shadow.9.png b/Omega/res/drawable-xxxhdpi/widget_resize_shadow.9.png
new file mode 100644
index 0000000000..63cea847c6
Binary files /dev/null and b/Omega/res/drawable-xxxhdpi/widget_resize_shadow.9.png differ
diff --git a/Omega/res/drawable-xxxhdpi/workspace_bg.9.png b/Omega/res/drawable-xxxhdpi/workspace_bg.9.png
new file mode 100644
index 0000000000..328154847e
Binary files /dev/null and b/Omega/res/drawable-xxxhdpi/workspace_bg.9.png differ
diff --git a/Omega/res/drawable-xxxhdpi/workspace_bg_dark.9.png b/Omega/res/drawable-xxxhdpi/workspace_bg_dark.9.png
new file mode 100644
index 0000000000..5c23c988f2
Binary files /dev/null and b/Omega/res/drawable-xxxhdpi/workspace_bg_dark.9.png differ
diff --git a/Omega/res/drawable/app_categorization_type_item_background.xml b/Omega/res/drawable/app_categorization_type_item_background.xml
new file mode 100644
index 0000000000..5ec5e1f568
--- /dev/null
+++ b/Omega/res/drawable/app_categorization_type_item_background.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~     This file is part of Lawnchair Launcher.
+  ~
+  ~     Lawnchair Launcher is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     Lawnchair Launcher is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?android:attr/colorControlHighlight">
+    <item
+        android:id="@android:id/mask"
+        android:drawable="@drawable/app_categorization_type_item_ripple_mask" />
+    <item android:drawable="@drawable/app_categorization_type_item_bg_content" />
+</ripple>
diff --git a/Omega/res/drawable/app_categorization_type_item_bg_content.xml b/Omega/res/drawable/app_categorization_type_item_bg_content.xml
new file mode 100644
index 0000000000..94fae92699
--- /dev/null
+++ b/Omega/res/drawable/app_categorization_type_item_bg_content.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~     This file is part of Lawnchair Launcher.
+  ~
+  ~     Lawnchair Launcher is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     Lawnchair Launcher is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/app_categorization_type_item_shape" android:state_selected="true" />
+    <item android:drawable="@drawable/app_categorization_type_item_shape_outlined" />
+</selector>
diff --git a/Omega/res/drawable/app_categorization_type_item_ripple_mask.xml b/Omega/res/drawable/app_categorization_type_item_ripple_mask.xml
new file mode 100644
index 0000000000..2dce3b6ce7
--- /dev/null
+++ b/Omega/res/drawable/app_categorization_type_item_ripple_mask.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~     This file is part of Lawnchair Launcher.
+  ~
+  ~     Lawnchair Launcher is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     Lawnchair Launcher is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="@dimen/button_corner_radius" />
+    <solid android:color="@android:color/black" />
+</shape>
\ No newline at end of file
diff --git a/Omega/res/drawable/app_categorization_type_item_shape.xml b/Omega/res/drawable/app_categorization_type_item_shape.xml
new file mode 100644
index 0000000000..21efb2f221
--- /dev/null
+++ b/Omega/res/drawable/app_categorization_type_item_shape.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~     This file is part of Lawnchair Launcher.
+  ~
+  ~     Lawnchair Launcher is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     Lawnchair Launcher is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle"
+    android:tint="@android:color/black">
+    <corners android:radius="@dimen/button_corner_radius" />
+    <solid android:color="@color/app_categorization_type_item_bg_color" />
+</shape>
diff --git a/Omega/res/drawable/app_categorization_type_item_shape_outlined.xml b/Omega/res/drawable/app_categorization_type_item_shape_outlined.xml
new file mode 100644
index 0000000000..da3e5fbe1f
--- /dev/null
+++ b/Omega/res/drawable/app_categorization_type_item_shape_outlined.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~     This file is part of Lawnchair Launcher.
+  ~
+  ~     Lawnchair Launcher is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     Lawnchair Launcher is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle"
+    android:tint="@android:color/black">
+    <corners android:radius="@dimen/button_corner_radius" />
+    <solid android:color="@color/app_categorization_type_item_bg_color" />
+    <stroke
+        android:width="1dp"
+        android:color="#15000000" />
+</shape>
diff --git a/Omega/res/drawable/bg_all_apps_searchbox.xml b/Omega/res/drawable/bg_all_apps_searchbox.xml
new file mode 100644
index 0000000000..eb9c52eec6
--- /dev/null
+++ b/Omega/res/drawable/bg_all_apps_searchbox.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/search_ripple">
+    <item
+        android:id="@+id/search_basic"
+        android:drawable="@drawable/bg_all_apps_searchbox_basic" />
+</ripple>
diff --git a/go/quickstep/res/drawable/clear_all_button.xml b/Omega/res/drawable/bg_all_apps_searchbox_basic.xml
similarity index 68%
rename from go/quickstep/res/drawable/clear_all_button.xml
rename to Omega/res/drawable/bg_all_apps_searchbox_basic.xml
index acac32de5e..31ce78c941 100644
--- a/go/quickstep/res/drawable/clear_all_button.xml
+++ b/Omega/res/drawable/bg_all_apps_searchbox_basic.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2019 The Android Open Source Project
+<?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.
@@ -14,9 +12,8 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="@color/clear_all_button_bg"/>
-    <corners android:radius="4dp"/>
-</shape>
+    <solid android:color="?attr/omegaColorSearchBar" />
+    <corners android:radius="@dimen/bg_round_rect_radius" />
+</shape>
\ No newline at end of file
diff --git a/Omega/res/drawable/bg_pixel_qsb_connector.xml b/Omega/res/drawable/bg_pixel_qsb_connector.xml
new file mode 100644
index 0000000000..976f73adee
--- /dev/null
+++ b/Omega/res/drawable/bg_pixel_qsb_connector.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient
+        android:startColor="@android:color/transparent"
+        android:endColor="@color/qsb_connector_gradient_end_color"
+        android:angle="0"
+        android:right="@dimen/qsb_connector_gradient_end_padding" />
+</shape>
\ No newline at end of file
diff --git a/Omega/res/drawable/bg_qsb_click_feedback.xml b/Omega/res/drawable/bg_qsb_click_feedback.xml
new file mode 100644
index 0000000000..4c9e4ba869
--- /dev/null
+++ b/Omega/res/drawable/bg_qsb_click_feedback.xml
@@ -0,0 +1,30 @@
+<?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.
+-->
+
+<inset xmlns:android="http://schemas.android.com/apk/res/android"
+    android:insetLeft="@dimen/qsb_shadow_margin"
+    android:insetTop="@dimen/qsb_shadow_margin"
+    android:insetRight="@dimen/qsb_shadow_margin"
+    android:insetBottom="@dimen/qsb_shadow_margin">
+    <ripple android:color="@color/focused_background">
+        <item android:id="@android:id/mask">
+            <shape android:shape="rectangle">
+                <solid android:color="@android:color/white" />
+                <stroke android:width="0dp" />
+                <corners android:radius="100dp" />
+            </shape>
+        </item>
+    </ripple>
+</inset>
\ No newline at end of file
diff --git a/Omega/res/drawable/bg_qsb_pill.xml b/Omega/res/drawable/bg_qsb_pill.xml
new file mode 100644
index 0000000000..17d4709930
--- /dev/null
+++ b/Omega/res/drawable/bg_qsb_pill.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple android:color="@color/focused_background"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@android:id/mask">
+        <shape android:shape="rectangle">
+            <solid android:color="@android:color/white" />
+            <stroke android:width="0.0dip" />
+            <corners android:radius="100.0dip" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@android:color/white" />
+            <stroke android:width="0.0dip" />
+            <corners android:radius="100.0dip" />
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/go/res/values/dimens.xml b/Omega/res/drawable/bg_smartspace.xml
similarity index 74%
rename from go/res/values/dimens.xml
rename to Omega/res/drawable/bg_smartspace.xml
index f1b1053160..f62b4a7121 100644
--- a/go/res/values/dimens.xml
+++ b/Omega/res/drawable/bg_smartspace.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 The Android Open Source Project
+<?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.
@@ -14,7 +13,5 @@
      limitations under the License.
 -->
 
-<resources>
-    <!-- Dynamic Grid -->
-    <dimen name="dynamic_grid_hotseat_size">60dp</dimen>
-</resources>
\ No newline at end of file
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle" />
\ No newline at end of file
diff --git a/Omega/res/drawable/btn_outlined_colored_material.xml b/Omega/res/drawable/btn_outlined_colored_material.xml
new file mode 100644
index 0000000000..716c280886
--- /dev/null
+++ b/Omega/res/drawable/btn_outlined_colored_material.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~     This file is part of Lawnchair Launcher.
+  ~
+  ~     Lawnchair Launcher is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     Lawnchair Launcher is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?android:attr/colorControlHighlight">
+    <item
+        android:id="@android:id/mask"
+        android:drawable="@drawable/btn_outlined_mtrl_mask" />
+    <item android:drawable="@drawable/btn_outlined_colored_mtrl_shape" />
+</ripple>
diff --git a/Omega/res/drawable/btn_outlined_colored_mtrl_shape.xml b/Omega/res/drawable/btn_outlined_colored_mtrl_shape.xml
new file mode 100644
index 0000000000..76390bd9e3
--- /dev/null
+++ b/Omega/res/drawable/btn_outlined_colored_mtrl_shape.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~     This file is part of Lawnchair Launcher.
+  ~
+  ~     Lawnchair Launcher is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     Lawnchair Launcher is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<inset xmlns:android="http://schemas.android.com/apk/res/android"
+    android:insetLeft="@dimen/abc_button_inset_horizontal_material"
+    android:insetTop="@dimen/abc_button_inset_vertical_material"
+    android:insetRight="@dimen/abc_button_inset_horizontal_material"
+    android:insetBottom="@dimen/abc_button_inset_vertical_material">
+    <shape
+        android:shape="rectangle"
+        android:tint="?android:colorAccent">
+        <corners android:radius="@dimen/button_corner_radius" />
+        <solid android:color="#19FFFFFF" />
+        <padding
+            android:bottom="@dimen/abc_button_padding_vertical_material"
+            android:left="@dimen/abc_button_padding_horizontal_material"
+            android:right="@dimen/abc_button_padding_horizontal_material"
+            android:top="@dimen/abc_button_padding_vertical_material" />
+    </shape>
+</inset>
diff --git a/Omega/res/drawable/btn_outlined_material.xml b/Omega/res/drawable/btn_outlined_material.xml
new file mode 100644
index 0000000000..8afee557b7
--- /dev/null
+++ b/Omega/res/drawable/btn_outlined_material.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~     This file is part of Lawnchair Launcher.
+  ~
+  ~     Lawnchair Launcher is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     Lawnchair Launcher is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?android:attr/colorControlHighlight">
+    <item
+        android:id="@android:id/mask"
+        android:drawable="@drawable/btn_outlined_mtrl_mask" />
+    <item android:drawable="@drawable/btn_outlined_mtrl_shape" />
+</ripple>
diff --git a/Omega/res/drawable/btn_outlined_mtrl_mask.xml b/Omega/res/drawable/btn_outlined_mtrl_mask.xml
new file mode 100644
index 0000000000..33aa713cf3
--- /dev/null
+++ b/Omega/res/drawable/btn_outlined_mtrl_mask.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~     This file is part of Lawnchair Launcher.
+  ~
+  ~     Lawnchair Launcher is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     Lawnchair Launcher is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<inset xmlns:android="http://schemas.android.com/apk/res/android"
+    android:insetLeft="@dimen/abc_button_inset_horizontal_material"
+    android:insetTop="@dimen/abc_button_inset_vertical_material"
+    android:insetRight="@dimen/abc_button_inset_horizontal_material"
+    android:insetBottom="@dimen/abc_button_inset_vertical_material">
+    <shape android:shape="rectangle">
+        <corners android:radius="@dimen/button_corner_radius" />
+        <solid android:color="@android:color/white" />
+        <padding
+            android:bottom="@dimen/abc_button_padding_vertical_material"
+            android:left="@dimen/abc_button_padding_horizontal_material"
+            android:right="@dimen/abc_button_padding_horizontal_material"
+            android:top="@dimen/abc_button_padding_vertical_material" />
+    </shape>
+</inset>
diff --git a/Omega/res/drawable/btn_outlined_mtrl_shape.xml b/Omega/res/drawable/btn_outlined_mtrl_shape.xml
new file mode 100644
index 0000000000..f658c565b4
--- /dev/null
+++ b/Omega/res/drawable/btn_outlined_mtrl_shape.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~     This file is part of Lawnchair Launcher.
+  ~
+  ~     Lawnchair Launcher is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     Lawnchair Launcher is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<inset xmlns:android="http://schemas.android.com/apk/res/android"
+    android:insetLeft="@dimen/abc_button_inset_horizontal_material"
+    android:insetTop="@dimen/abc_button_inset_vertical_material"
+    android:insetRight="@dimen/abc_button_inset_horizontal_material"
+    android:insetBottom="@dimen/abc_button_inset_vertical_material">
+    <shape
+        android:shape="rectangle"
+        android:tint="@android:color/black">
+        <corners android:radius="@dimen/button_corner_radius" />
+        <solid android:color="@android:color/transparent" />
+        <padding
+            android:bottom="@dimen/abc_button_padding_vertical_material"
+            android:left="@dimen/abc_button_padding_horizontal_material"
+            android:right="@dimen/abc_button_padding_horizontal_material"
+            android:top="@dimen/abc_button_padding_vertical_material" />
+        <stroke
+            android:width="1dp"
+            android:color="#15FFFFFF" />
+    </shape>
+</inset>
diff --git a/Omega/res/drawable/chevron_right.xml b/Omega/res/drawable/chevron_right.xml
new file mode 100644
index 0000000000..417afd7a4e
--- /dev/null
+++ b/Omega/res/drawable/chevron_right.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~     This file is part of Lawnchair Launcher.
+  ~
+  ~     Lawnchair Launcher is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     Lawnchair Launcher is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="?android:colorControlNormal"
+        android:pathData="M8.59,16.58L13.17,12L8.59,7.41L10,6L16,12L10,18L8.59,16.58Z" />
+</vector>
diff --git a/Omega/res/drawable/ic_add.xml b/Omega/res/drawable/ic_add.xml
new file mode 100644
index 0000000000..2ba0da8887
--- /dev/null
+++ b/Omega/res/drawable/ic_add.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#fff"
+        android:pathData="M19,13H13V19H11V13H5V11H11V5H13V11H19V13Z" />
+</vector>
\ No newline at end of file
diff --git a/Omega/res/drawable/ic_alarm_on_black_24dp.xml b/Omega/res/drawable/ic_alarm_on_black_24dp.xml
new file mode 100644
index 0000000000..d9dfbf5109
--- /dev/null
+++ b/Omega/res/drawable/ic_alarm_on_black_24dp.xml
@@ -0,0 +1,29 @@
+<!--
+  ~     Copyright (c) 2017-2019 the Lawnchair team
+  ~     Copyright (c)  2019 oldosfan (would)
+  ~     This file is part of Lawnchair Launcher.
+  ~
+  ~     Lawnchair Launcher is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     Lawnchair Launcher is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<vector android:height="24dp"
+    android:tint="#FFFFFF"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M22,5.72l-4.6,-3.86 -1.29,1.53 4.6,3.86L22,5.72zM7.88,3.39L6.6,1.86 2,5.71l1.29,1.53 4.59,-3.85zM12,4c-4.97,0 -9,4.03 -9,9s4.02,9 9,9c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,20c-3.87,0 -7,-3.13 -7,-7s3.13,-7 7,-7 7,3.13 7,7 -3.13,7 -7,7zM10.54,14.53L8.41,12.4l-1.06,1.06 3.18,3.18 6,-6 -1.06,-1.06 -4.93,4.95z" />
+</vector>
diff --git a/Omega/res/drawable/ic_alexa.xml b/Omega/res/drawable/ic_alexa.xml
new file mode 100644
index 0000000000..c9e62dc221
--- /dev/null
+++ b/Omega/res/drawable/ic_alexa.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="496"
+    android:viewportHeight="496">
+    <path
+        android:fillColor="#00caff"
+        android:pathData="M248,0C110.79,0 0,111.88 0,248S110.79,496 248,496 496,384.12 496,248 385.21,0 248,0ZM209.11,492.88L209.11,443.71a43.57,43.57 0,0 0,-26.94 -40C121.41,378 78.88,317.64 78.88,248c0,-92.82 75.55,-169.11 169.11,-169.11S417.11,155.18 417.11,248C417.11,357.52 332.39,461.08 209.11,492.88Z" />
+</vector>
diff --git a/Omega/res/drawable/ic_alisa_yandex.xml b/Omega/res/drawable/ic_alisa_yandex.xml
new file mode 100644
index 0000000000..19a4742d27
--- /dev/null
+++ b/Omega/res/drawable/ic_alisa_yandex.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="370"
+    android:viewportHeight="370">
+    <path
+        android:fillColor="#FF4A26FF"
+        android:fillType="nonZero"
+        android:pathData="M185,370C82.827,370 0,287.173 0,185C0,82.827 82.827,0 185,0C287.173,0 370,82.827 370,185C370,287.173 287.173,370 185,370ZM100.288,244.708C113.569,257.924 148.946,265.86 185,265.999C221.053,265.86 256.431,257.924 269.712,244.708C302.709,211.874 222.5,86.08 185.041,85.897C147.5,86.08 67.291,211.874 100.288,244.708Z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000"></path>
+</vector>
diff --git a/Omega/res/drawable/ic_allapps_foreground.xml b/Omega/res/drawable/ic_allapps_foreground.xml
new file mode 100644
index 0000000000..19a9ed7f56
--- /dev/null
+++ b/Omega/res/drawable/ic_allapps_foreground.xml
@@ -0,0 +1,57 @@
+<!--
+  ~     This file is part of Lawnchair Launcher.
+  ~
+  ~     Lawnchair Launcher is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     Lawnchair Launcher is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="54.597546"
+    android:viewportHeight="54.597546">
+    <group
+        android:translateX="7.6436567"
+        android:translateY="11.218387">
+        <path
+            android:fillAlpha="1"
+            android:fillColor="#666666"
+            android:pathData="M12.0713,12.1382m-2.0713,0a2.0713,2.0713 0,1 1,4.1427 0a2.0713,2.0713 0,1 1,-4.1427 0"
+            android:strokeWidth="0.26458332" />
+        <path
+            android:fillAlpha="1"
+            android:fillColor="#666666"
+            android:pathData="M19.6885,12.1382m-2.0713,0a2.0713,2.0713 0,1 1,4.1427 0a2.0713,2.0713 0,1 1,-4.1427 0"
+            android:strokeWidth="0.26458332" />
+        <path
+            android:fillAlpha="1"
+            android:fillColor="#666666"
+            android:pathData="M27.2389,12.0713m-2.0713,0a2.0713,2.0713 0,1 1,4.1427 0a2.0713,2.0713 0,1 1,-4.1427 0"
+            android:strokeWidth="0.26458332" />
+        <path
+            android:fillAlpha="1"
+            android:fillColor="#666666"
+            android:pathData="M12.0713,20.0226m-2.0713,0a2.0713,2.0713 0,1 1,4.1427 0a2.0713,2.0713 0,1 1,-4.1427 0"
+            android:strokeWidth="0.26458332" />
+        <path
+            android:fillAlpha="1"
+            android:fillColor="#666666"
+            android:pathData="M19.6885,20.0894m-2.0713,0a2.0713,2.0713 0,1 1,4.1427 0a2.0713,2.0713 0,1 1,-4.1427 0"
+            android:strokeWidth="0.26458332" />
+        <path
+            android:fillAlpha="1"
+            android:fillColor="#666666"
+            android:pathData="M27.1053,20.0226m-2.0713,0a2.0713,2.0713 0,1 1,4.1427 0a2.0713,2.0713 0,1 1,-4.1427 0"
+            android:strokeWidth="0.26458332" />
+    </group>
+</vector>
diff --git a/Omega/res/drawable/ic_apps.xml b/Omega/res/drawable/ic_apps.xml
index 96d16b8c18..7b8c8ecfee 100644
--- a/Omega/res/drawable/ic_apps.xml
+++ b/Omega/res/drawable/ic_apps.xml
@@ -20,6 +20,7 @@
     android:height="32dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
+
     <path
         android:fillColor="#008AF8"
         android:pathData="M4,8h4L8,4L4,4v4zM10,20h4v-4h-4v4zM4,20h4v-4L4,16v4zM4,14h4v-4L4,10v4zM10,14h4v-4h-4v4zM16,4v4h4L20,4h-4zM10,8h4L14,4h-4v4zM16,14h4v-4h-4v4zM16,20h4v-4h-4v4z" />
diff --git a/Omega/res/drawable/ic_apps_colored.xml b/Omega/res/drawable/ic_apps_colored.xml
new file mode 100644
index 0000000000..339c904487
--- /dev/null
+++ b/Omega/res/drawable/ic_apps_colored.xml
@@ -0,0 +1,38 @@
+<!--
+  ~  Copyright (c) 2020 Omega Launcher
+  ~
+  ~  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.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="38dp"
+    android:height="38dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+
+    <path
+        android:pathData="M16,16m-16,0a16,16 0,1 1,32 0a16,16 0,1 1,-32 0"
+        android:strokeAlpha="0.20"
+        android:fillColor="#830091"
+        android:fillAlpha="0.20" />
+    <group
+        android:translateX="5"
+        android:translateY="5"
+        android:scaleY="0.95"
+        android:scaleX="0.95">
+        <path
+            android:fillColor="#830091"
+            android:pathData="M4,8h4L8,4L4,4v4zM10,20h4v-4h-4v4zM4,20h4v-4L4,16v4zM4,14h4v-4L4,10v4zM10,14h4v-4h-4v4zM16,4v4h4L20,4h-4zM10,8h4L14,4h-4v4zM16,14h4v-4h-4v4zM16,20h4v-4h-4v4z" />
+    </group>
+</vector>
diff --git a/Omega/res/drawable/ic_backup.xml b/Omega/res/drawable/ic_backup.xml
new file mode 100644
index 0000000000..20b192e67c
--- /dev/null
+++ b/Omega/res/drawable/ic_backup.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="?android:textColorSecondary"
+        android:pathData="M14,13V17H10V13H7L12,8L17,13M19.35,10.03C18.67,6.59 15.64,4 12,4C9.11,4 6.6,5.64 5.35,8.03C2.34,8.36 0,10.9 0,14A6,6 0 0,0 6,20H19A5,5 0 0,0 24,15C24,12.36 21.95,10.22 19.35,10.03Z" />
+</vector>
\ No newline at end of file
diff --git a/Omega/res/drawable/ic_baidu.xml b/Omega/res/drawable/ic_baidu.xml
new file mode 100644
index 0000000000..0e336fb386
--- /dev/null
+++ b/Omega/res/drawable/ic_baidu.xml
@@ -0,0 +1,24 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="59.15"
+    android:viewportHeight="64">
+    <path
+        android:fillColor="#2d03e4"
+        android:pathData="M50.12,43.9A57.51,57.51 0,0 1,40.07 34a50.81,50.81 0,0 0,-3.64 -4.67,9.6 9.6,0 0,0 -8.17,-3.14 10.54,10.54 0,0 0,-7.81 4.94,32.71 32.71,0 0,1 -5,6.08c-2.1,2 -4.42,3.72 -6.58,5.63C4.97,46.26 2.97,50.43 4.57,55.67a10.11,10.11 0,0 0,6.22 7.17,15.45 15.45,0 0,0 5.06,0.57 38.62,38.62 0,0 0,8.16 -0.82A23.71,23.71 0,0 1,35.57 62.81,27 27,0 0,0 44.48,64c4.29,-0.24 7.65,-1.88 9.27,-6.15C55.64,52.92 54.9,47.49 50.12,43.9ZM27.31,47.36v10.3c0,0.53 -0.13,0.7 -0.68,0.68L19.24,58.34a7.36,7.36 0,0 1,-7.3 -5.45,8.11 8.11,0 0,1 2,-8.42 7,7 0,0 1,5.15 -2.19L22.57,42.28c0.5,0 0.67,-0.1 0.66,-0.63L23.23,37c0,-0.57 0.18,-0.7 0.71,-0.67a26.56,26.56 0,0 0,2.66 0c0.61,0 0.81,0.13 0.8,0.77 -0.05,3.41 0,6.82 0,10.22ZM44.31,43.6L44.31,57.55c0,0.51 -0.09,0.71 -0.67,0.71L34.2,58.26A4.84,4.84 0,0 1,29.57 53.66L29.57,43.45c0,-0.5 0.14,-0.68 0.66,-0.67h3c0.51,0 0.62,0.14 0.62,0.61L33.85,52.5a1.7,1.7 0,0 0,1.47 1.9h4c0.55,0 0.46,-0.37 0.46,-0.71L39.78,43.58c0,-0.61 0.15,-0.79 0.77,-0.75a26.6,26.6 0,0 0,3 0C44.2,42.75 44.33,43 44.32,43.6Z" />
+    <path
+        android:fillColor="#2d03e4"
+        android:pathData="M59.13,29v-1.7a7.43,7.43 0,0 0,-0.27 -1.74,7.72 7.72,0 0,0 -6.69,-6.1A6.18,6.18 0,0 0,45.02 24a18,18 0,0 0,-0.31 9.2,5.56 5.56,0 0,0 3.94,4.4 10.47,10.47 0,0 0,5.15 0.3A5.83,5.83 0,0 0,58.37 34a13.09,13.09 0,0 0,0.76 -5Z" />
+    <path
+        android:fillColor="#2d03e4"
+        android:pathData="M13.68,30.36a12.77,12.77 0,0 0,1.29 -5.78,9.45 9.45,0 0,0 -4.51,-8.78 5.73,5.73 0,0 0,-8 1.39l0,0a11.59,11.59 0,0 0,-1.79 3.64A11.46,11.46 0,0 0,1.57 30.5C4.73,36 11.75,34.19 13.68,30.36Z" />
+    <path
+        android:fillColor="#2d03e4"
+        android:pathData="M43.39,19.17a11.42,11.42 0,0 0,4.36 -7.72A9,9 0,0 0,43.57 2.56a4.36,4.36 0,0 0,-5.79 0,11.59 11.59,0 0,0 -5.15,9.59 14.78,14.78 0,0 0,0.24 2.78,6.55 6.55,0 0,0 10.5,4.24Z" />
+    <path
+        android:fillColor="#2d03e4"
+        android:pathData="M17.67,17.74a5.43,5.43 0,0 0,8.45 0.08,11.69 11.69,0 0,0 2.85,-7.88 11,11 0,0 0,-0.22 -2.37,10.3 10.3,0 0,0 -2.7,-5.69A5.29,5.29 0,0 0,20.24 0.3a6.44,6.44 0,0 0,-3.21 2.57,12.38 12.38,0 0,0 -1.94,9.05A10.62,10.62 0,0 0,17.67 17.74Z" />
+    <path
+        android:fillColor="#2d03e4"
+        android:pathData="M23.11,50.27L23.11,46.41c0,-0.45 -0.09,-0.66 -0.61,-0.62s-1.42,0 -2.12,0a4.18,4.18 0,0 0,-4.3 5.78,3.86 3.86,0 0,0 4.18,3.14 18.59,18.59 0,0 1,2.25 0c0.45,0 0.59,-0.1 0.59,-0.57C23.09,52.86 23.11,51.56 23.11,50.27Z" />
+</vector>
diff --git a/Omega/res/drawable/ic_bing.xml b/Omega/res/drawable/ic_bing.xml
new file mode 100644
index 0000000000..7a8181af62
--- /dev/null
+++ b/Omega/res/drawable/ic_bing.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="512"
+    android:viewportHeight="512">
+    <path
+        android:fillColor="#00897B"
+        android:pathData="M208,128l48,112l79.008,32.992l-159.008,79.008l0,-304l-128,-48l0,432l128,80l288,-176l0,-128z" />
+</vector>
diff --git a/Omega/res/drawable/ic_calendar.xml b/Omega/res/drawable/ic_calendar.xml
new file mode 100644
index 0000000000..b2e21c9506
--- /dev/null
+++ b/Omega/res/drawable/ic_calendar.xml
@@ -0,0 +1,24 @@
+<!--
+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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="@dimen/options_menu_icon_size"
+    android:height="@dimen/options_menu_icon_size"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M19,19H5V8H19M16,1V3H8V1H6V3H5C3.89,3 3,3.89 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V5C21,3.89 20.1,3 19,3H18V1M17,12H12V17H17V12Z" />
+</vector>
diff --git a/Omega/res/drawable/ic_category.xml b/Omega/res/drawable/ic_category.xml
new file mode 100644
index 0000000000..5168aea43b
--- /dev/null
+++ b/Omega/res/drawable/ic_category.xml
@@ -0,0 +1,26 @@
+<!--
+  ~     This file is part of Lawnchair Launcher.
+  ~
+  ~     Lawnchair Launcher is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     Lawnchair Launcher is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="?android:colorAccent"
+        android:pathData="M12,2l-5.5,9h11L12,2zM12,5.84L13.93,9h-3.87L12,5.84zM17.5,13c-2.49,0 -4.5,2.01 -4.5,4.5s2.01,4.5 4.5,4.5 4.5,-2.01 4.5,-4.5 -2.01,-4.5 -4.5,-4.5zM17.5,20c-1.38,0 -2.5,-1.12 -2.5,-2.5s1.12,-2.5 2.5,-2.5 2.5,1.12 2.5,2.5 -1.12,2.5 -2.5,2.5zM3,21.5h8v-8L3,13.5v8zM5,15.5h4v4L5,19.5v-4z" />
+</vector>
diff --git a/Omega/res/drawable/ic_check.xml b/Omega/res/drawable/ic_check.xml
new file mode 100644
index 0000000000..b677a06374
--- /dev/null
+++ b/Omega/res/drawable/ic_check.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="?android:attr/colorAccent"
+        android:pathData="M 9 16.17 L 5.537 12.707 C 5.147 12.317 4.512 12.316 4.12 12.705 L 4.12 12.705 C 3.728 13.094 3.727 13.727 4.117 14.117 L 9 19 L 20.293 7.707 C 20.683 7.317 20.684 6.684 20.295 6.295 L 20.295 6.295 C 19.906 5.906 19.273 5.907 18.883 6.297 L 9 16.17 Z" />
+</vector>
\ No newline at end of file
diff --git a/Omega/res/drawable/ic_check_white.xml b/Omega/res/drawable/ic_check_white.xml
new file mode 100644
index 0000000000..0e6fa6f2eb
--- /dev/null
+++ b/Omega/res/drawable/ic_check_white.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#fff"
+        android:pathData="M21,7L9,19L3.5,13.5L4.91,12.09L9,16.17L19.59,5.59L21,7Z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_baseline_apps.xml b/Omega/res/drawable/ic_circle.xml
similarity index 67%
rename from res/drawable/ic_baseline_apps.xml
rename to Omega/res/drawable/ic_circle.xml
index 1425e0c4fe..e1584255ca 100644
--- a/res/drawable/ic_baseline_apps.xml
+++ b/Omega/res/drawable/ic_circle.xml
@@ -16,12 +16,15 @@
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
+    android:width="24dp"
+    android:height="24dp"
     android:tint="?attr/colorControlNormal"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M4,8h4L8,4L4,4v4zM10,20h4v-4h-4v4zM4,20h4v-4L4,16v4zM4,14h4v-4L4,10v4zM10,14h4v-4h-4v4zM16,4v4h4L20,4h-4zM10,8h4L14,4h-4v4zM16,14h4v-4h-4v4zM16,20h4v-4h-4v4z" />
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+
+  <path
+      android:fillColor="#E1261D"
+      android:pathData="M10,20
+        A10,10 0 1,1 10,21Z" />
+
 </vector>
diff --git a/Omega/res/drawable/ic_close.xml b/Omega/res/drawable/ic_close.xml
new file mode 100644
index 0000000000..b89b78cacf
--- /dev/null
+++ b/Omega/res/drawable/ic_close.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="?android:colorAccent"
+        android:pathData="M19,6.41L17.59,5L12,10.59L6.41,5L5,6.41L10.59,12L5,17.59L6.41,19L12,13.41L17.59,19L19,17.59L13.41,12L19,6.41Z" />
+</vector>
\ No newline at end of file
diff --git a/Omega/res/drawable/ic_code.xml b/Omega/res/drawable/ic_code.xml
index 61ac37a5e7..1611da3bbd 100644
--- a/Omega/res/drawable/ic_code.xml
+++ b/Omega/res/drawable/ic_code.xml
@@ -16,11 +16,22 @@
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:width="38dp"
+    android:height="38dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
     <path
-        android:fillColor="#008AF8"
-        android:pathData="M9.4,16.6L4.8,12l4.6,-4.6L8,6l-6,6 6,6 1.4,-1.4zM14.6,16.6l4.6,-4.6 -4.6,-4.6L16,6l6,6 -6,6 -1.4,-1.4z" />
+        android:pathData="M16,16m-16,0a16,16 0,1 1,32 0a16,16 0,1 1,-32 0"
+        android:strokeAlpha="0.20"
+        android:fillColor="#FF6600"
+        android:fillAlpha="0.20" />
+    <group
+        android:translateX="5"
+        android:translateY="5"
+        android:scaleY="0.95"
+        android:scaleX="0.95">
+        <path
+            android:fillColor="#FF6600"
+            android:pathData="M9.4,16.6L4.8,12l4.6,-4.6L8,6l-6,6 6,6 1.4,-1.4zM14.6,16.6l4.6,-4.6 -4.6,-4.6L16,6l6,6 -6,6 -1.4,-1.4z" />
+    </group>
 </vector>
diff --git a/Omega/res/drawable/ic_cortana.xml b/Omega/res/drawable/ic_cortana.xml
new file mode 100644
index 0000000000..04bb8406a1
--- /dev/null
+++ b/Omega/res/drawable/ic_cortana.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="300"
+    android:viewportHeight="300">
+    <path
+        android:fillColor="#9adaf6"
+        android:pathData="M150,300c-82.7,0 -150,-67.3 -150,-150S67.3,0 150,0s150,67.3 150,150 -67.3,150 -150,150m0,-260c-60.7,0 -110,49.3 -110,110s49.3,110 110,110 110,-49.3 110,-110S210.7,40 150,40" />
+    <path
+        android:fillColor="#1c9fe7"
+        android:pathData="M150,270c-66.2,0 -120,-53.8 -120,-120S83.8,30 150,30s120,53.8 120,120 -53.8,120 -120,120m0,-215c-52.4,0 -95,42.6 -95,95s42.6,95 95,95 95,-42.6 95,-95 -42.6,-95 -95,-95" />
+</vector>
diff --git a/Omega/res/drawable/ic_ddg.xml b/Omega/res/drawable/ic_ddg.xml
new file mode 100644
index 0000000000..6918a1e4b0
--- /dev/null
+++ b/Omega/res/drawable/ic_ddg.xml
@@ -0,0 +1,57 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="254.88"
+    android:viewportHeight="254.88">
+    <path
+        android:fillColor="#de5833"
+        android:pathData="M127.45,18.8A108.64,108.64 0,1 1,18.8 127.44,108.64 108.64,0 0,1 127.45,18.8" />
+    <path
+        android:fillColor="#de5833"
+        android:pathData="M127.44,254.88A127.44,127.44 0,1 0,0 127.44,127.44 127.44,0 0,0 127.44,254.88ZM127.44,244.26A116.82,116.82 0,1 1,244.3 127.44,116.82 116.82,0 0,1 127.44,244.26Z" />
+    <path
+        android:fillColor="#d5d7d8"
+        android:pathData="M74.52,54.09c0,-1.83 1.31,-2.85 3.07,-3.57a9.21,9.21 0,0 0,-2.28 0.65c-1.84,0.83 -3.21,4 -3.2,5.48 8.92,-0.9 22.12,-0.28 31.77,2.6 0.71,-0.1 1.42,-0.2 2.15,-0.28a64,64 0,0 0,-31.51 -4.88" />
+    <path
+        android:fillColor="#d5d7d8"
+        android:pathData="M76.3,43.11l0.61,-0.1c-1.93,0.24 -2.94,0.93 -4.38,1.16 1.57,0.14 7.51,2.91 11.25,4.44A6.76,6.76 0,0 0,85.2 47.96C83.3,47.65 78.45,43.3 76.3,43.11" />
+    <path
+        android:fillColor="#d5d7d8"
+        android:pathData="M85.63,64.72a14.31,14.31 0,0 0,-1.48 0.65c-14.55,7.66 -21,25.56 -17.14,47C70.5,131.9 84.82,198.58 91.38,229.96q2.87,1 5.82,1.87c-5.84,-28.24 -21.78,-102.24 -25.5,-123 -3.77,-21.14 -0.1,-36.31 13.93,-44.08" />
+    <path
+        android:fillColor="#fff"
+        android:pathData="M144.48,218.58a6.88,6.88 0,0 1,-0.83 0.46,3.11 3.11,0 0,1 -1.07,1.87c-3,2 -11.49,3 -16,2a4.07,4.07 0,0 1,-1.81 -0.84c-7.65,4.25 -18.65,9.9 -20.88,8.63 -3.49,-2 -4,-28.45 -3.49,-34.94 0.37,-4.9 17.58,3 26,7.2 1.85,-1.73 6.39,-2.89 10.4,-3.28 -6.07,-14.76 -10.54,-31.64 -7.8,-43.62 -3.79,-2.64 -8.81,-8.77 -7.77,-15.16 0.81,-4.87 13.38,-14.07 22.28,-14.63s11.7,-0.44 19.14,-2.22l1.21,-0.29c4.58,-16.09 -6.4,-44.07 -18.64,-56.32 -4,-4 -10.13,-6.5 -17,-7.83 -2.66,-3.65 -6.95,-7.14 -13,-10.37a61.28,61.28 0,0 0,-38.19 -6.22l-0.61,0.1c2.1,0.19 6.92,4.54 8.85,4.83a6.76,6.76 0,0 1,-1.38 0.68c-1.82,0.69 -4.29,1.11 -6.23,1.9 -1.76,0.72 -3.09,1.74 -3.07,3.57A64,64 0,0 1,106.03 58.96c-0.72,0.08 -1.44,0.18 -2.15,0.28 -6.83,1 -13.1,2.73 -17.63,5.12l-0.62,0.35c-14,7.76 -17.71,22.93 -13.93,44.08C75.41,129.57 91.46,204.72 97.3,232.96c9.6,2.78 18.58,5 29.08,5 8.91,0 19.63,-2 27.92,-4 -2.91,-5.61 -6.66,-11.82 -9,-16.27A4.6,4.6 0,0 1,144.48 218.58ZM150.35,112.02a6.91,6.91 0,1 1,6.92 -6.92,6.92 6.92,0 0,1 -6.92,6.92ZM154.51,86.02s-4.36,-2.49 -7.74,-2.45c-6.95,0.09 -8.84,3.16 -8.84,3.16s1.17,-7.32 10.05,-5.85A8.91,8.91 0,0 1,154.52 85.96ZM81.3,94.96s-3.13,-7 5.21,-10.39S98.89,86.56 98.89,86.56a13.48,13.48 0,0 0,-12 1C81.05,91.22 81.3,94.96 81.3,94.96ZM88.59,109.82a8,8 0,1 1,8 8,8 8,0 0,1 -8,-8Z" />
+    <path
+        android:fillColor="#2d4f8e"
+        android:pathData="M104.64,109.87a8,8 0,1 0,-8 8,8 8,0 0,0 8,-8ZM100.16,109.28a2.09,2.09 0,1 1,2.09 -2.09,2.09 2.09,0 0,1 -2.09,2.09Z" />
+    <path
+        android:fillColor="#fff"
+        android:pathData="M100.16,105.1a2.09,2.09 0,1 0,2.09 2.09,2.08 2.08,0 0,0 -2.09,-2.09" />
+    <path
+        android:fillColor="#2d4f8e"
+        android:pathData="M150.36,98.19a6.91,6.91 0,1 0,6.92 6.9,6.91 6.91,0 0,0 -6.92,-6.9ZM153.43,104.58a1.79,1.79 0,1 1,1.8 -1.79,1.78 1.78,0 0,1 -1.8,1.79Z" />
+    <path
+        android:fillColor="#fff"
+        android:pathData="M153.42,100.96a1.79,1.79 0,0 0,0 3.58,1.79 1.79,0 1,0 0,-3.58" />
+    <path
+        android:fillColor="#394a9f"
+        android:pathData="M98.89,86.56s-4.06,-5.36 -12.41,-1.95S81.3,94.96 81.3,94.96s-0.22,-3.78 5.67,-7.48a13.48,13.48 0,0 1,12 -1" />
+    <path
+        android:fillColor="#339"
+        android:pathData="M147.99,80.87c-8.89,-1.47 -10.05,5.85 -10.05,5.85s1.89,-3.07 8.84,-3.16c3.38,0 7.74,2.45 7.74,2.45a8.91,8.91 0,0 0,-6.53 -5.14" />
+    <path
+        android:fillColor="#fdd209"
+        android:pathData="M143.5,126.26c-8.9,0.56 -21.48,9.76 -22.28,14.63 -1,6.39 4,12.52 7.77,15.16l0,0c3.79,2.64 29,11.15 41.53,10.91S203.66,159.06 201.4,152.96s-22.69,5.43 -44,3.45c-15.79,-1.47 -18.58,-8.54 -15.08,-13.71 4.4,-6.49 12.41,1.23 25.62,-2.72s31.73,-11 38.6,-14.84c15.87,-8.85 -6.64,-12.52 -12,-10.06 -5,2.33 -22.59,6.76 -30.72,8.72l-1.21,0.29c-7.43,1.78 -10.21,1.65 -19.14,2.22" />
+    <path
+        android:fillColor="#65bc46"
+        android:pathData="M123.62,206.96c0,-0.92 0.74,-1.74 1.92,-2.43a2.36,2.36 0,0 1,0.85 -1.56c-8.37,-4.16 -25.58,-12.1 -26,-7.2 -0.51,6.49 0,32.94 3.49,34.94 2.23,1.27 13.23,-4.38 20.88,-8.63 -2.21,-1.88 -1.18,-6.45 -1.18,-15.13" />
+    <path
+        android:fillColor="#65bc46"
+        android:pathData="M145.22,217.65l0.11,0c6.85,2.65 20.5,7.62 23.46,6.54 4,-1.53 3,-33.45 -1.49,-34.47 -3.59,-0.8 -17.34,8.89 -22.75,12.84 1,4 2.11,12 0.67,15.05" />
+    <path
+        android:fillColor="#43a244"
+        android:pathData="M128.51,220.57c-4.5,-1 -3,-5.49 -3,-16 0,0 0,-0.07 0,-0.1 -1.18,0.69 -1.92,1.51 -1.92,2.43 0,8.68 -1,13.25 1.18,15.13a4.07,4.07 0,0 0,1.81 0.84c4.48,1 13,0 16,-2a3.11,3.11 0,0 0,1.07 -1.87c-3.52,1.68 -11,2.47 -15.14,1.54" />
+    <path
+        android:fillColor="#65bc46"
+        android:pathData="M126.38,202.96a2.36,2.36 0,0 0,-0.85 1.56s0,0.07 0,0.1c0,10.48 -1.5,15 3,16 4.11,0.94 11.62,0.15 15.14,-1.54a6.88,6.88 0,0 0,0.83 -0.46,2.27 2.27,0 0,0 0.74,-0.93c1.44,-3 0.29,-11 -0.67,-15.05a16.73,16.73 0,0 0,-0.57 -2c-0.41,-1 -3.59,-1.28 -7.2,-0.93 -4,0.39 -8.55,1.55 -10.4,3.28" />
+</vector>
diff --git a/Omega/res/drawable/ic_default_shortcut.xml b/Omega/res/drawable/ic_default_shortcut.xml
new file mode 100644
index 0000000000..c5585f3fbf
--- /dev/null
+++ b/Omega/res/drawable/ic_default_shortcut.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+    <path
+        android:fillColor="@color/colorPrimary"
+        android:pathData="M24,24 m-22,0 a22,22 0,1 1,44 0 a22,22 0,1 1,-44 0"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000" />
+
+    <group
+        android:scaleX="1.25"
+        android:scaleY="1.25"
+        android:translateX="9.1"
+        android:translateY="8.5">
+        <path
+            android:fillColor="@color/colorAccent"
+            android:pathData="M3.9,18.35c2.5-2.49,5.78-3.64,10.14-3.64v3.05c0,0.47,0.57,0.71,0.9,0.37l5.74-5.74c0.41-0.41,0.41-1.08,0-1.49l-5.74-5.74
+            c-0.33-0.33-0.9-0.1-0.9,0.37v2.95c-6.32,0.9-9.56,4.9-11.02,9.34C2.86,18.34,3.51,18.74,3.9,18.35z"
+            android:strokeWidth="1"
+            android:strokeColor="#00000000" />
+    </group>
+</vector>
\ No newline at end of file
diff --git a/Omega/res/drawable/ic_desktop.xml b/Omega/res/drawable/ic_desktop.xml
index b3c517602f..e6319af592 100644
--- a/Omega/res/drawable/ic_desktop.xml
+++ b/Omega/res/drawable/ic_desktop.xml
@@ -16,11 +16,25 @@
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:width="38dp"
+    android:height="38dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
     <path
-        android:fillColor="#008AF8"
-        android:pathData="M21,2L3,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h7v2L8,20v2h8v-2h-2v-2h7c1.1,0 2,-0.9 2,-2L23,4c0,-1.1 -0.9,-2 -2,-2zM21,16L3,16L3,4h18v12z" />
+        android:pathData="M16,16m-16,0a16,16 0,1 1,32 0a16,16 0,1 1,-32 0"
+        android:strokeAlpha="0.30"
+        android:fillColor="#27B3FF"
+        android:fillAlpha="0.20" />
+    <group
+        android:translateX="5"
+        android:translateY="5"
+        android:scaleY="0.9"
+        android:scaleX="0.9">
+        <path
+            android:fillColor="#008AF8"
+            android:pathData="M21,2L3,2c-1.1,0 -2,0.9 -2,
+                    2v12c0,1.1 0.9,2 2,2h7v2L8,20v2h8v-2h-2v-2h7c1.1,
+                    0 2,-0.9 2,-2L23,4c0,-1.1 -0.9,-2 -2,
+                    -2zM21,16L3,16L3,4h18v12z" />
+    </group>
 </vector>
diff --git a/Omega/res/drawable/ic_dock.xml b/Omega/res/drawable/ic_dock.xml
new file mode 100644
index 0000000000..d50a01d9fa
--- /dev/null
+++ b/Omega/res/drawable/ic_dock.xml
@@ -0,0 +1,48 @@
+<!--
+  ~  Copyright (c) 2020 Omega Launcher
+  ~
+  ~  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.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="38dp"
+    android:height="38dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+
+    <path
+        android:fillAlpha="0.20"
+        android:fillColor="#FF8C00"
+        android:pathData="M16,16m-16,0a16,16 0,1 1,32 0a16,16 0,1 1,-32 0"
+        android:strokeAlpha="0.20" />
+
+    <group
+        android:scaleX="0.95"
+        android:scaleY="0.95"
+        android:translateX="5"
+        android:translateY="5">
+        <path
+            android:fillColor="#FF8C00"
+            android:pathData="M17,1.01L7,1c-1.1,0 -2,0.9 -2,2v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V3c0,-1.1 -0.9,-1.99 -2,-1.99zM17,19H7V5h10v14z" />
+        <group
+            android:scaleX="0.55"
+            android:scaleY="0.55"
+            android:translateX="5.5"
+            android:translateY="14.3">
+            <path
+                android:fillColor="#FF0505"
+                android:pathData="M6,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM18,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z" />
+        </group>
+    </group>
+</vector>
diff --git a/Omega/res/drawable/ic_ecosia.xml b/Omega/res/drawable/ic_ecosia.xml
new file mode 100644
index 0000000000..769414628f
--- /dev/null
+++ b/Omega/res/drawable/ic_ecosia.xml
@@ -0,0 +1,46 @@
+<!--
+  ~     Copyright (C) 2019 Lawnchair Team.
+  ~
+  ~     This file is part of Lawnchair Launcher.
+  ~
+  ~     Lawnchair Launcher is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     Lawnchair Launcher is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="35"
+    android:viewportHeight="35">
+    <path
+        android:fillColor="#dc7e58"
+        android:fillType="nonZero"
+        android:pathData="M17.1597,0.4395C7.9293,0.4395 0.4395,7.9117 0.4395,17.1597S7.9117,33.88 17.1597,33.88 33.88,26.4077 33.88,17.1597 26.4077,0.4395 17.1597,0.4395zM17.1597,31.9441c-8.158,0 -14.738,-6.6256 -14.738,-14.7826s6.581,-14.7827 14.738,-14.7827 14.738,6.6256 14.738,14.7827 -6.581,14.7826 -14.738,14.7826z"
+        android:strokeColor="#00000000"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#36acb8"
+        android:fillType="nonZero"
+        android:pathData="M17.34,5.0372c-6.8058,0 -12.2588,5.5435 -12.2588,12.2588 0,6.806 5.4538,12.259 12.2588,12.259 6.77,0 12.214,-5.4987 12.214,-12.259S24.1,5.0372 17.34,5.0372z"
+        android:strokeColor="#00000000"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#d4db34"
+        android:fillType="nonZero"
+        android:pathData="M29.285,19.7302c0,0.0897 0,0.1802 0.044,0.2707 0.044,-0.1353 0.044,-0.2707 0.0896,-0.451 -0.0896,0.044 -0.0896,0.1345 -0.1345,0.1802zM20.8564,21.9832c-0.4044,0.2707 -0.677,0.5415 -0.7666,1.2166 0.0905,0.1354 0.1354,0.226 0.3165,0.3165 0.4958,-0.1802 1.0373,-0.9916 0.6768,-1.4944 -0.0905,-0.0458 -0.1353,-0.0458 -0.225,-0.0458zM14.9972,6.434c-0.225,-0.0896 -0.4958,-0.1354 -0.721,-0.225 -0.5855,0.1354 -1.3072,0 -1.9832,-0.1354 -0.4958,0.225 -0.9916,0.4958 -1.4417,0.7666a1.029,1.029 0,0 1,0.225 0.3516c-0.0896,0.3165 -0.4043,0.6312 -0.2698,0.9916 0.0457,0.225 0.1353,0.3165 0.3164,0.45 0.5864,0.044 0.902,-0.3165 1.352,-0.45l1.4065,-0.225c0.5406,-0.1354 1.4874,-0.901 1.127,-1.5323zM7.831,17.7013l-0.677,-0.9917c-0.5854,-0.5854 -1.1718,-1.0812 -1.9383,-1.2614 -0.0906,0.5854 -0.1354,1.2166 -0.1354,1.8478 0,2.073 0.4958,4.056 1.4417,5.7694 0.1354,-0.1353 0.2708,-0.225 0.406,-0.3516l0.5855,-0.9468c0.3165,-0.3164 0.8114,-0.406 1.0813,-0.7665l0.3165,-0.8563c0.1802,-0.3516 0.631,-0.6312 0.5406,-1.127 -0.225,-0.721 -1.127,-0.8115 -1.6228,-1.3073zM8.1017,10.1297c0.406,-0.1802 0.6312,0.3165 0.9468,-0.044 0.406,-0.406 -0.1354,-1.0812 -0.1354,-1.5322 0,-0.0905 0.044,-0.225 0.0905,-0.3165 -0.8113,0.721 -1.4873,1.577 -2.0746,2.48 0.181,-0.044 0.3517,-0.044 0.4967,-0.0905 0.27,-0.1354 0.45,-0.3165 0.677,-0.4958zM26.1757,8.7777c-0.2708,0 -0.5407,0 -0.8114,0.0457l-3.831,0.406c-1.2166,0 -1.8478,-0.9916 -3.0196,-0.7208 -0.45,0.0905 -1.3072,0.5854 -1.5322,0.9467 -0.3166,0.4967 0.0896,0.8114 -0.496,1.0813 -0.406,-0.0905 -0.5406,-0.406 -0.9,-0.5855 -0.2548,0.0163 -0.4878,0.1493 -0.6312,0.3605 -0.044,0.5406 0.3516,0.6312 0.3516,1.1718 -0.225,0.3165 -0.7666,0.3516 -0.9,0.7208 -0.1802,0.4044 0,0.8563 -0.2708,1.172l-1.1718,1.127c-0.7666,0.9468 -0.406,2.479 0.1802,3.0645 0.5406,0.5407 1.352,0.0906 2.0746,0.4062 0.5407,0.225 0.6312,1.2615 0.7648,1.7582 0.2708,0.8113 -0.225,1.1718 -0.225,1.9374s0.27,2.975 1.352,2.9292c1.2167,-0.044 1.4945,-1.2615 2.1626,-2.073 0.225,-0.2708 0.5855,-0.4062 0.7665,-0.8114l0.044,-1.2615c0.2708,-0.7208 1.127,-0.9468 1.578,-1.4874 0.45,-0.4958 0.044,-0.902 0.2708,-1.3072 0,0 0.044,0 0.044,-0.044l1.127,-0.6312 0.5406,-0.631 0.406,-0.1354c1.4065,0.7208 0.901,2.1625 1.8927,2.929 0.0897,-0.044 0.1354,-0.0897 0.225,-0.1354 0.1354,-0.1802 0.044,-0.3516 0.1354,-0.6312 0.1802,-0.5415 0.8114,-1.0812 1.4874,-0.9467 0.3165,0.4043 0.8562,0.9467 0.9468,1.5322 0.0905,0.5407 -0.27,0.8562 -0.27,1.3072 0,0.3165 0.1802,0.721 0.45,1.127 0.1826,-0.466 0.3187,-0.949 0.4062,-1.4417 0,-0.0906 0,-0.1802 -0.044,-0.2708 0.044,-0.044 0.044,-0.0896 0.0897,-0.1802a12.331,12.331 0,0 0,0.225 -2.2539c0,-3.2527 -1.3072,-6.2653 -3.4258,-8.4744zM19.4595,14.4037c-0.2708,0.044 -0.5407,-0.1354 -0.721,-0.225l-0.9916,-0.0897c-0.044,0 -1.6228,-1.2615 -1.6676,-1.352 0.0905,-0.225 0.1802,-0.225 0.3165,-0.3165 0.5855,0.1354 0.7208,0.4958 1.127,0.677l0.6312,0.1354 0.677,0.4958c0.2708,0.1354 0.6312,0.1354 0.8563,0.1802 0,0.044 0.044,0.0905 0.044,0.1354v0.225c-0.1353,0.044 -0.1802,0.0897 -0.27,0.1354zM17.7013,14.0872l-1.6676,-1.352c0.0905,0.0906 1.6228,1.352 1.6676,1.352z"
+        android:strokeColor="#00000000"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+</vector>
diff --git a/Omega/res/drawable/ic_edge.xml b/Omega/res/drawable/ic_edge.xml
new file mode 100644
index 0000000000..4eb6fb5a0f
--- /dev/null
+++ b/Omega/res/drawable/ic_edge.xml
@@ -0,0 +1,26 @@
+<!--
+  ~     This file is part of Lawnchair Launcher.
+  ~
+  ~     Lawnchair Launcher is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     Lawnchair Launcher is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="23dp"
+    android:height="24dp"
+    android:viewportWidth="60"
+    android:viewportHeight="64">
+    <path
+        android:fillColor="#0078D7"
+        android:pathData="m18.87,38c0,1.54 0.23,2.94 0.7,4.2 0.5,1.24 1.15,2.35 1.98,3.32s1.8,1.8 2.94,2.5c1.1,0.7 2.3,1.28 3.58,1.73 1.27,0.46 2.6,0.8 3.95,1.02 1.37,0.22 2.7,0.33 4.05,0.33 1.7,0 3.28,-0.13 4.78,-0.4 1.5,-0.28 2.96,-0.65 4.4,-1.12s2.83,-1.03 4.22,-1.67c1.4,-0.64 2.82,-1.34 4.28,-2.12v13.56c-1.63,0.8 -3.23,1.47 -4.83,2.05 -1.6,0.56 -3.2,1.05 -4.83,1.44 -1.63,0.4 -3.28,0.7 -4.97,0.88s-3.42,0.28 -5.22,0.28c-2.4,0 -4.72,-0.28 -6.95,-0.83s-4.32,-1.34 -6.28,-2.38 -3.75,-2.3 -5.38,-3.78c-1.64,-1.48 -3.03,-3.15 -4.2,-5s-2.07,-3.88 -2.72,-6.06c-0.63,-2.18 -0.95,-4.5 -0.95,-6.96 0,-2.63 0.36,-5.13 1.08,-7.52 0.73,-2.4 1.76,-4.58 3.12,-6.58 1.35,-2 3,-3.78 4.95,-5.33s4.14,-2.82 6.58,-3.8c-1.33,1.33 -2.37,2.9 -3.1,4.73 -0.75,1.82 -1.22,3.65 -1.43,5.48h22.78c0,-2.3 -0.23,-4.3 -0.7,-6.02s-1.22,-3.15 -2.27,-4.28c-1.04,-1.14 -2.38,-2 -4.03,-2.56 -1.65,-0.57 -3.64,-0.86 -5.97,-0.86 -2.75,0 -5.5,0.4 -8.25,1.23 -2.75,0.8 -5.36,1.95 -7.84,3.4 -2.48,1.47 -4.76,3.2 -6.84,5.18 -2.08,2 -3.83,4.15 -5.25,6.48 0.3,-2.7 0.9,-5.3 1.73,-7.77s1.93,-4.77 3.25,-6.9c1.32,-2.1 2.87,-4.02 4.64,-5.74s3.73,-3.2 5.9,-4.4 4.47,-2.17 6.97,-2.82c2.5,-0.57 5.16,-0.91 7.96,-0.91 1.64,0 3.27,0.15 4.9,0.44 1.63,0.3 3.22,0.7 4.77,1.22 3.08,1.06 5.83,2.54 8.25,4.42 2.42,1.9 4.45,4.06 6.1,6.53s2.9,5.2 3.76,8.17 1.3,6.06 1.3,9.27v7.95h-40.91z" />
+</vector>
diff --git a/Omega/res/drawable/ic_edit_no_shadow.xml b/Omega/res/drawable/ic_edit_no_shadow.xml
new file mode 100644
index 0000000000..2c5cac6dd1
--- /dev/null
+++ b/Omega/res/drawable/ic_edit_no_shadow.xml
@@ -0,0 +1,25 @@
+<?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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?android:attr/textColorPrimary"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,
+        -0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z" />
+</vector>
\ No newline at end of file
diff --git a/Omega/res/drawable/ic_file_restore.xml b/Omega/res/drawable/ic_file_restore.xml
new file mode 100644
index 0000000000..2ed501af65
--- /dev/null
+++ b/Omega/res/drawable/ic_file_restore.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="?android:textColorSecondary"
+        android:pathData="M14,2H6A2,2 0 0,0 4,4V20A2,2 0 0,0 6,22H18A2,2 0 0,0 20,20V8L14,2M12,18C9.95,18 8.19,16.76 7.42,15H9.13C9.76,15.9 10.81,16.5 12,16.5A3.5,3.5 0 0,0 15.5,13A3.5,3.5 0 0,0 12,9.5C10.65,9.5 9.5,10.28 8.9,11.4L10.5,13H6.5V9L7.8,10.3C8.69,8.92 10.23,8 12,8A5,5 0 0,1 17,13A5,5 0 0,1 12,18Z" />
+</vector>
\ No newline at end of file
diff --git a/Omega/res/drawable/ic_firefox.xml b/Omega/res/drawable/ic_firefox.xml
new file mode 100644
index 0000000000..603c1b8f95
--- /dev/null
+++ b/Omega/res/drawable/ic_firefox.xml
@@ -0,0 +1,45 @@
+<!--
+  ~     This file is part of Lawnchair Launcher.
+  ~
+  ~     Lawnchair Launcher is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     Lawnchair Launcher is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="36dp"
+    android:height="36dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+
+    <path
+        android:fillColor="#FFF176"
+        android:pathData="M30,8C30,8 30.3008,7.8984 30.8984,7.8984C31.1992,7.8984 31.5,7.8984 31.8984,7.8984C32.3008,7.8984 32.6992,8 33.1992,8.1016C33.6992,8.1992 34.1992,8.3984 34.6992,8.6016C35.1992,8.8008 35.8008,9.1016 36.3008,9.5C36.8008,9.8008 37.3008,10.3008 37.8008,10.6992C38.3008,11.1016 38.6992,11.6992 39.1016,12.1992C39.3984,12.8008 39.8008,13.3008 40.1016,13.8984C40.3984,14.5 40.6016,15.1016 40.8008,15.6992C41,16.3008 41.1016,16.8984 41.1992,17.3984C41.3008,18 41.3008,18.5 41.3008,18.8984C41.3008,19.1016 41.3008,19.3984 41.3008,19.6016C41.3008,19.8008 41.3008,20 41.1992,20.1992C41.1992,20.6016 41.1016,20.8984 41.1016,21.1992C41.1016,21.6992 41,22 41,22C41,22 40.8008,21.6992 40.6016,21.1992C40.5,21 40.3008,20.6992 40.1992,20.3008C40.1016,20 39.8984,19.6016 39.6992,19.1992C39.5,18.8008 39.3008,18.3984 39.1016,17.8984C38.8984,17.5 38.6016,17 38.3984,16.5C38.1992,16 37.8984,15.6016 37.6016,15.1016C37.3008,14.6016 37,14.1992 36.6992,13.8008C36.3984,13.3984 36.1016,12.8984 35.6992,12.6016C35.3008,12.1992 35,11.8008 34.6016,11.5C34.3008,11.1016 33.8984,10.8008 33.5,10.5C33.1016,10.1992 32.8008,9.8984 32.3984,9.6992C32.1016,9.3984 31.6992,9.1992 31.3984,9C31.1016,8.8008 30.8008,8.6016 30.6016,8.5C30.3008,8.1992 30,8 30,8Z" />
+    <path
+        android:fillColor="#FDD835"
+        android:pathData="M43.1016,17.6016C42.8008,15.3984 41.8984,13.3984 40.8984,12C40.3984,11.3008 39.8984,10.8008 39.6016,10.5C39.1992,10.1992 39,10 39,10C39,10 39,10.3008 39.1016,10.8008C39.1992,11.3008 39.1992,11.8984 39.3008,12.6992C39.3984,13.1016 39.3984,13.5 39.5,13.8984C39.1016,13.3008 38.6016,12.6992 38.1016,12.3008C37.6016,11.8008 37,11.5 36.6992,11.3008C36.1992,11.1016 36,11 36,11C36,11 36.1016,11.1992 36.1992,11.6016C36.3008,12 36.5,12.5 36.6992,13.1992C36.8984,13.8984 37.1992,14.8008 37.5,15.6992C36.8984,15 36.3008,14.3984 35.6992,14C35,13.6016 34.3984,13.3008 33.8984,13.1992C33.3008,13 33,13 33,13C33,13 33.1992,13.1992 33.3984,13.6016C33.5,13.8008 33.6992,14 33.8008,14.3008C34,14.6016 34.1016,14.8984 34.3008,15.1992C34.6016,15.8008 35,16.5 35.3008,17.3008C35.5,17.6992 35.6016,18.1016 35.8008,18.5C35.8984,18.8984 36.1992,19.3008 36.3008,19.8008C36.5,20.1992 36.6016,20.6016 36.8008,21.1016C36.8984,21.5 37.1016,21.8984 37.1992,22.3984C37.3008,22.8008 37.5,23.1992 37.6016,23.6016C37.6992,24 37.8008,24.3984 38,24.6992C38.3008,25.3984 38.5,26 38.6992,26.3984C38.8984,26.8008 39,27 39,27C39,27 39.1016,26.8008 39.3008,26.3008C39.3984,26.1016 39.5,25.8008 39.5,25.5C39.6016,25.1992 39.6992,24.8008 39.6992,24.3984C39.6992,24.1016 39.8008,23.8008 39.8008,23.5C39.8984,23.8008 40,24 40,24C40,24 40.1016,23.8008 40.3008,23.3984C40.3984,23.1992 40.5,23 40.6016,22.6992C40.6016,22.6992 40.6016,22.6016 40.6016,22.6016C40.6016,22.8008 40.6016,23.1016 40.6992,23.3008C40.6992,23.6992 40.8008,24 40.8008,24.3008C40.8008,24.6016 40.8008,24.8984 40.8008,25.1992C40.8008,25.6992 40.8984,26 40.8984,26C40.8984,26 41.1016,25.8008 41.3984,25.3984C41.5,25.1992 41.6992,25 41.8984,24.6992C42.1016,24.3984 42.1992,24.1016 42.3984,23.6992C42.6016,23.3008 42.6992,22.8984 42.8008,22.3984C42.8984,21.8984 43,21.3984 43.1016,20.8984C43.1992,20.3984 43.1992,19.8008 43.1992,19.3008C43.3008,18.6992 43.1992,18.1016 43.1016,17.6016Z" />
+    <path
+        android:fillColor="#FFB300"
+        android:pathData="M44.1016,19.8008C44.1016,19.3008 44,19 44,19C44,19 43.8008,19.3008 43.5,19.6992C43.1992,20.1992 42.8984,20.8008 42.5,21.6016C42.1992,22.3008 41.8008,23.1016 41.3984,23.8984C41.3984,23.1016 41.3984,22.3984 41.3008,21.6992C41.1992,21.1016 41.1016,20.6016 41,20.1016C40.8008,19.6016 40.6992,19.1016 40.5,18.6992C40.1992,17.8008 39.8008,17.1992 39.5,16.6992C39.1992,16.1992 39,16 39,16C39,16 38.8984,17.1992 38.8984,19C38.8984,19.8984 38.8008,20.8008 38.6992,21.8984C38.6992,22.3984 38.6016,22.8984 38.6016,23.5C38.6016,24 38.5,24.6016 38.3984,25.1016C38.3984,25.1992 38.3984,25.3984 38.3984,25.5C38.3008,24.6016 38,23.6992 37.6016,23.1016C37.3008,22.3984 36.8984,21.8984 36.6016,21.6016C36.1992,21.1016 36,21 36,21C36,21 36,21.3008 36,21.6992C36,22.1016 36,22.6992 35.8984,23.3984C35.8008,24.6992 35.6016,26.3984 35.3984,28C35.3008,28.3984 35.1992,28.8008 35.1992,29.1992C35.1016,29.6016 35,30 35,30.3984C34.8984,30.8008 34.8008,31.1992 34.6992,31.5C34.6016,31.8984 34.5,32.1992 34.5,32.5C34.3984,32.8008 34.3984,33.1992 34.3008,33.3984C34.1992,33.6992 34.1992,33.8984 34.1016,34.1992C34,34.6992 34,35 34,35C34,35 34.1992,34.8984 34.6016,34.6016C35,34.3008 35.5,34 36,33.3984C36.1992,33.1016 36.5,32.8008 36.8008,32.3984C37,32 37.3008,31.6992 37.5,31.3008C37.5,31.6016 37.3984,31.8984 37.3984,32.1992C37.3008,32.5 37.3008,32.8984 37.1992,33.1016C37,33.6992 37,34 37,34C37.1016,33.8984 37.3984,34 37.6992,34.1016C37.6992,34.1992 37.6016,34.3008 37.6016,34.3008C37.5,34.6016 37.3984,34.8984 37.3008,35.1992C37.1016,35.6992 37,36 37,36C37,36 37.3008,35.8984 37.6992,35.6016C37.8984,35.3984 38.1992,35.3008 38.5,35C38.8008,34.8008 39.1016,34.5 39.3984,34.1016C39.6992,33.8008 40,33.3984 40.3984,33C40.6992,32.6016 41,32.1016 41.3008,31.6016C41.8984,30.6016 42.3984,29.5 42.8008,28.3984C43.1992,27.3008 43.6016,26.1016 43.8008,25C44,23.8984 44.1016,22.8984 44.1992,22C44.1992,21.1016 44.1992,20.3984 44.1016,19.8008Z" />
+    <path
+        android:fillColor="#FF9800"
+        android:pathData="M41.3984,30.3984C41,30.6016 40.6016,31 40,31.3984C39.1992,32 38.3008,32.8008 37.3984,33.6992C37.5,33.3984 37.6992,33.1016 37.8008,32.8008C38.1016,31.8984 38.1992,31.1016 38.3008,30.3984C38.3008,29.6992 38.3008,29.1016 38.1992,28.6992C38.1016,28.1992 38,28 38,28C38,28 37.8008,28.1992 37.6016,28.5C37.3984,28.8008 37,29.3008 36.6016,29.8008C36.1992,30.3008 35.8008,31 35.3984,31.6016C35.3008,31.6992 35.3008,31.8008 35.1992,31.8984C35.3984,31.3008 35.3984,30.6016 35.3984,30C35.3984,29.1992 35.1992,28.3984 35,27.8008C34.8008,27.1992 34.5,26.6992 34.3008,26.3984C34.1992,26.1992 34,26 34,26C34,26 33.8984,26.1992 33.8008,26.6016C33.6992,26.8984 33.5,27.3984 33.3008,28C33.1016,28.5 33,29.1016 32.8008,29.8008C32.6992,30.1016 32.6016,30.3984 32.5,30.8008C32.3984,31.1016 32.3008,31.3984 32.1992,31.6016C30.3008,33.5 28,34 25.8008,34.1016C24.6016,34.1016 23.5,33.8984 22.5,33.6016C21,33.1016 19.6016,32.1992 18.3008,31C20.1992,31.1992 22,30.8008 23.5,30.1016L26,28.5C26.3008,28.3984 26.6016,28.3984 26.8984,28.5C27.5,28.3984 27.6992,28.1016 27.5,27.5C27.1992,27.1016 26.6992,26.6992 26.1992,26.3984C24.8984,25.6992 23.6016,25.8008 22.1992,26.6992C20.8984,27.3984 19.6992,27.3008 18.3984,26.6016C15.3008,25 16.5,20.8984 19.8008,23C20,22 19.6992,20.8984 19.1016,19.8008C16.1992,14.5 19.5,10.1992 20.6016,9.5C18.6016,9.6992 16.8008,10.6016 15.1992,12.1016C4.8984,10.8984 4,20.8984 4,21L5.1992,19.8984C4.8008,21 4.5,22.1016 4.3984,23.3008C4,27.1992 5.1016,31 7.6992,34.8008C11.6992,39.8984 18,43 24,43C30.8008,43 35.1992,40.5 38.1016,37.3008C38.3008,37.1016 38.5,36.8984 38.6992,36.6992C39.3008,36 39.8984,35.3008 40.3984,34.5C40.8984,33.8008 41.1992,33 41.5,32.3008C41.6992,31.6016 41.8984,31 42,30.6016C42,30.3008 42,30 42,30C42,30 41.8008,30.1016 41.3984,30.3984Z" />
+    <path
+        android:fillColor="#EF6C00"
+        android:pathData="M12,28C11.8008,21 16.3008,21.6016 18.6016,22.3984C17,22.1016 16.3008,23.6016 17,25C16.6992,25 13.6016,24.6992 12,28ZM18.3008,30.8984C20.1992,31.1016 22,30.6992 23.5,30L26,28.3984C26.1992,28.3008 26.5,28.3008 26.6992,28.3984C23.8008,26.6992 20.6992,30.3008 13.8984,29.1992C15.6016,30.5 18.3008,30.8984 18.3008,30.8984ZM18.1016,14.5C17.8984,16 18.1992,17.8008 19.1992,19.6992C20.6016,18.8984 22,18 22,18C22,18 24,16 22,16C20.1016,16 18.8008,15.1992 18.1016,14.5ZM10.3008,12.3984C9.3984,11.6016 8,10 8,8C8,8 5.6016,11.8984 6.5,15C7.3984,13.8984 8.6992,13 10.3008,12.3984Z" />
+    <path
+        android:fillColor="#FFCC80"
+        android:pathData="M19.1992,19.6992C20.6016,18.8984 22,18 22,18C22,18 22.1992,17.8008 22.3984,17.6016L22,17L18.1992,17C18.3984,17.8984 18.6992,18.8008 19.1992,19.6992Z" />
+    <path
+        android:fillColor="#5D4037"
+        android:pathData="M22,16C21.6992,16 21.3984,16 21.1016,15.8984L21,16C21,16 21.8008,17.3008 22,18C22,18 24,16 22,16Z" />
+</vector>
diff --git a/Omega/res/drawable/ic_folder_outline.xml b/Omega/res/drawable/ic_folder_outline.xml
new file mode 100644
index 0000000000..d401d2aabc
--- /dev/null
+++ b/Omega/res/drawable/ic_folder_outline.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~     This file is part of Lawnchair Launcher.
+  ~
+  ~     Lawnchair Launcher is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     Lawnchair Launcher is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000"
+        android:pathData="M20,18H4V8H20M20,6H12L10,4H4C2.89,4 2,4.89 2,6V18A2,2 0 0,0 4,20H20A2,2 0 0,0 22,18V8C22,6.89 21.1,6 20,6Z" />
+</vector>
diff --git a/Omega/res/drawable/ic_gesture.xml b/Omega/res/drawable/ic_gesture.xml
index be98682d0f..fcc65d114d 100644
--- a/Omega/res/drawable/ic_gesture.xml
+++ b/Omega/res/drawable/ic_gesture.xml
@@ -16,12 +16,22 @@
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
+    android:width="38dp"
+    android:height="38dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
     <path
-        android:fillColor="#008AF8"
-        android:pathData="M4.59,6.89c0.7,-0.71 1.4,-1.35 1.71,-1.22 0.5,0.2 0,1.03 -0.3,1.52 -0.25,0.42 -2.86,3.89 -2.86,6.31 0,1.28 0.48,2.34 1.34,2.98 0.75,0.56 1.74,0.73 2.64,0.46 1.07,-0.31 1.95,-1.4 3.06,-2.77 1.21,-1.49 2.83,-3.44 4.08,-3.44 1.63,0 1.65,1.01 1.76,1.79 -3.78,0.64 -5.38,3.67 -5.38,5.37 0,1.7 1.44,3.09 3.21,3.09 1.63,0 4.29,-1.33 4.69,-6.1L21,14.88v-2.5h-2.47c-0.15,-1.65 -1.09,-4.2 -4.03,-4.2 -2.25,0 -4.18,1.91 -4.94,2.84 -0.58,0.73 -2.06,2.48 -2.29,2.72 -0.25,0.3 -0.68,0.84 -1.11,0.84 -0.45,0 -0.72,-0.83 -0.36,-1.92 0.35,-1.09 1.4,-2.86 1.85,-3.52 0.78,-1.14 1.3,-1.92 1.3,-3.28C8.95,3.69 7.31,3 6.44,3 5.12,3 3.97,4 3.72,4.25c-0.36,0.36 -0.66,0.66 -0.88,0.93l1.75,1.71zM13.88,18.55c-0.31,0 -0.74,-0.26 -0.74,-0.72 0,-0.6 0.73,-2.2 2.87,-2.76 -0.3,2.69 -1.43,3.48 -2.13,3.48z" />
+        android:fillAlpha="0.25"
+        android:fillColor="#152DFF"
+        android:pathData="M16,16m-16,0a16,16 0,1 1,32 0a16,16 0,1 1,-32 0"
+        android:strokeAlpha="0.20" />
+    <group
+        android:scaleX="1"
+        android:scaleY="1"
+        android:translateX="5"
+        android:translateY="5">
+        <path
+            android:fillColor="#152DFF"
+            android:pathData="M4.59,6.89c0.7,-0.71 1.4,-1.35 1.71,-1.22 0.5,0.2 0,1.03 -0.3,1.52 -0.25,0.42 -2.86,3.89 -2.86,6.31 0,1.28 0.48,2.34 1.34,2.98 0.75,0.56 1.74,0.73 2.64,0.46 1.07,-0.31 1.95,-1.4 3.06,-2.77 1.21,-1.49 2.83,-3.44 4.08,-3.44 1.63,0 1.65,1.01 1.76,1.79 -3.78,0.64 -5.38,3.67 -5.38,5.37 0,1.7 1.44,3.09 3.21,3.09 1.63,0 4.29,-1.33 4.69,-6.1L21,14.88v-2.5h-2.47c-0.15,-1.65 -1.09,-4.2 -4.03,-4.2 -2.25,0 -4.18,1.91 -4.94,2.84 -0.58,0.73 -2.06,2.48 -2.29,2.72 -0.25,0.3 -0.68,0.84 -1.11,0.84 -0.45,0 -0.72,-0.83 -0.36,-1.92 0.35,-1.09 1.4,-2.86 1.85,-3.52 0.78,-1.14 1.3,-1.92 1.3,-3.28C8.95,3.69 7.31,3 6.44,3 5.12,3 3.97,4 3.72,4.25c-0.36,0.36 -0.66,0.66 -0.88,0.93l1.75,1.71zM13.88,18.55c-0.31,0 -0.74,-0.26 -0.74,-0.72 0,-0.6 0.73,-2.2 2.87,-2.76 -0.3,2.69 -1.43,3.48 -2.13,3.48z" />
+    </group>
 </vector>
diff --git a/Omega/res/drawable/ic_import_export.xml b/Omega/res/drawable/ic_import_export.xml
new file mode 100644
index 0000000000..e069e9f727
--- /dev/null
+++ b/Omega/res/drawable/ic_import_export.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/accent_material_light"
+        android:pathData="M 12 3 C 7.029 3 3 7.029 3 12 L 0 12 L 4 16 L 8 12 L 5 12 C 5 8.134 8.134 5 12 5 C 15.866 5 19 8.134 19 12 C 19 15.866 15.866 19 12 19 C 10.5 19 9.09 18.5 8.761 18.271 C 8.308 17.956 7.623 18.017 7.233 18.407 L 7.207 18.433 C 6.817 18.823 6.858 19.41 7.299 19.742 C 8.04 20.3 9.94 21 12 21 C 16.971 21 21 16.971 21 12 C 21 7.029 16.971 3 12 3 Z  M 14 12 C 14 10.895 13.105 10 12 10 C 10.895 10 10 10.895 10 12 C 10 13.105 10.895 14 12 14 C 13.105 14 14 13.105 14 12 Z" />
+</vector>
diff --git a/Omega/res/drawable/ic_info.xml b/Omega/res/drawable/ic_info.xml
index 36e5248c3b..4b5926a446 100644
--- a/Omega/res/drawable/ic_info.xml
+++ b/Omega/res/drawable/ic_info.xml
@@ -16,11 +16,22 @@
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:width="38dp"
+    android:height="38dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
     <path
-        android:fillColor="#008AF8"
-        android:pathData="M11,7h2v2h-2zM11,11h2v6h-2zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z" />
+        android:pathData="M16,16m-16,0a16,16 0,1 1,32 0a16,16 0,1 1,-32 0"
+        android:strokeAlpha="0.30"
+        android:fillColor="#CA0000"
+        android:fillAlpha="0.20" />
+    <group
+        android:translateX="4"
+        android:translateY="4"
+        android:scaleY="1"
+        android:scaleX="1">
+        <path
+            android:fillColor="#CA0000"
+            android:pathData="M11,7h2v2h-2zM11,11h2v6h-2zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z" />
+    </group>
 </vector>
diff --git a/Omega/res/drawable/ic_language.xml b/Omega/res/drawable/ic_language.xml
new file mode 100644
index 0000000000..b5b3587055
--- /dev/null
+++ b/Omega/res/drawable/ic_language.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="@color/accent_material_light"
+        android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM18.92,8h-2.95c-0.32,-1.25 -0.78,-2.45 -1.38,-3.56 1.84,0.63 3.37,1.91 4.33,3.56zM12,4.04c0.83,1.2 1.48,2.53 1.91,3.96h-3.82c0.43,-1.43 1.08,-2.76 1.91,-3.96zM4.26,14C4.1,13.36 4,12.69 4,12s0.1,-1.36 0.26,-2h3.38c-0.08,0.66 -0.14,1.32 -0.14,2 0,0.68 0.06,1.34 0.14,2L4.26,14zM5.08,16h2.95c0.32,1.25 0.78,2.45 1.38,3.56 -1.84,-0.63 -3.37,-1.9 -4.33,-3.56zM8.03,8L5.08,8c0.96,-1.66 2.49,-2.93 4.33,-3.56C8.81,5.55 8.35,6.75 8.03,8zM12,19.96c-0.83,-1.2 -1.48,-2.53 -1.91,-3.96h3.82c-0.43,1.43 -1.08,2.76 -1.91,3.96zM14.34,14L9.66,14c-0.09,-0.66 -0.16,-1.32 -0.16,-2 0,-0.68 0.07,-1.35 0.16,-2h4.68c0.09,0.65 0.16,1.32 0.16,2 0,0.68 -0.07,1.34 -0.16,2zM14.59,19.56c0.6,-1.11 1.06,-2.31 1.38,-3.56h2.95c-0.96,1.65 -2.49,2.93 -4.33,3.56zM16.36,14c0.08,-0.66 0.14,-1.32 0.14,-2 0,-0.68 -0.06,-1.34 -0.14,-2h3.38c0.16,0.64 0.26,1.31 0.26,2s-0.1,1.36 -0.26,2h-3.38z" />
+</vector>
diff --git a/Omega/res/drawable/ic_list_remove.xml b/Omega/res/drawable/ic_list_remove.xml
new file mode 100644
index 0000000000..be699807f4
--- /dev/null
+++ b/Omega/res/drawable/ic_list_remove.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="?android:textColorSecondary"
+        android:pathData="M2,6V8H14V6H2M2,10V12H10V10H2M14.17,10.76L12.76,12.17L15.59,15L12.76,17.83L14.17,19.24L17,16.41L19.83,19.24L21.24,17.83L18.41,15L21.24,12.17L19.83,10.76L17,13.59L14.17,10.76M2,14V16H10V14H2Z" />
+</vector>
\ No newline at end of file
diff --git a/Omega/res/drawable/ic_location.xml b/Omega/res/drawable/ic_location.xml
new file mode 100644
index 0000000000..95f0528241
--- /dev/null
+++ b/Omega/res/drawable/ic_location.xml
@@ -0,0 +1,29 @@
+<!--
+  ~     This file is part of Lawnchair Launcher.
+  ~
+  ~     Lawnchair Launcher is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     Lawnchair Launcher is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,2C8.13,2 5,5.13 5,9c0,5.25 7,13 7,13s7,-7.75 7,-13c0,-3.87 -3.13,-7 -7,-7zM7,9c0,-2.76 2.24,-5 5,-5s5,2.24 5,5c0,2.88 -2.88,7.19 -5,9.88C9.92,16.21 7,11.85 7,9z" />
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,9m-2.5,0a2.5,2.5 0,1 1,5 0a2.5,2.5 0,1 1,-5 0" />
+</vector>
diff --git a/Omega/res/drawable/ic_mic_shadow.xml b/Omega/res/drawable/ic_mic_shadow.xml
new file mode 100644
index 0000000000..f0766838a7
--- /dev/null
+++ b/Omega/res/drawable/ic_mic_shadow.xml
@@ -0,0 +1,28 @@
+<?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.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="#ffffffff"
+        android:pathData="M12,15c1.66,0 2.99,-1.34 2.99,-3L15,5c0,-1.66 -1.34,-3 -3,-3S9,3.34 9,5v7c0,1.66 1.34,3 3,3z,
+            M11,18.92h2V22h-2z,
+            M7,12H5c0,1.93 0.78,3.68 2.05,4.95l1.41,-1.41C7.56,14.63 7,13.38 7,12z,
+            M12,17c-1.38,0 -2.63,-0.56 -3.54,-1.47l-1.41,1.41C8.32,18.21 10.07,19 12.01,19c3.87,0 6.98,-3.14 6.98,-7h-2c0,2.76 -2.23,5 -4.99,5z" />
+</vector>
\ No newline at end of file
diff --git a/Omega/res/drawable/ic_more_horiz.xml b/Omega/res/drawable/ic_more_horiz.xml
index d65e1beedc..23a0173735 100644
--- a/Omega/res/drawable/ic_more_horiz.xml
+++ b/Omega/res/drawable/ic_more_horiz.xml
@@ -16,11 +16,22 @@
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:width="38dp"
+    android:height="38dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
     <path
-        android:fillColor="#008AF8"
-        android:pathData="M6,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM18,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z" />
+        android:pathData="M16,16m-16,0a16,16 0,1 1,32 0a16,16 0,1 1,-32 0"
+        android:strokeAlpha="0.30"
+        android:fillColor="#00D34D"
+        android:fillAlpha="0.20" />
+    <group
+        android:translateX="2"
+        android:translateY="2"
+        android:scaleY="1.2"
+        android:scaleX="1.2">
+        <path
+            android:fillColor="#00D34D"
+            android:pathData="M6,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM18,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z" />
+    </group>
 </vector>
diff --git a/Omega/res/drawable/ic_music_note.xml b/Omega/res/drawable/ic_music_note.xml
new file mode 100644
index 0000000000..b881f60898
--- /dev/null
+++ b/Omega/res/drawable/ic_music_note.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~     This file is part of Lawnchair Launcher.
+  ~
+  ~     Lawnchair Launcher is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     Lawnchair Launcher is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#fff"
+        android:pathData="M12,3V12.26C11.5,12.09 11,12 10.5,12C8,12 6,14 6,16.5C6,19 8,21 10.5,21C13,21 15,19 15,16.5V6H19V3H12Z" />
+</vector>
diff --git a/Omega/res/drawable/ic_qsb_assist.xml b/Omega/res/drawable/ic_qsb_assist.xml
new file mode 100644
index 0000000000..0b682b5b5f
--- /dev/null
+++ b/Omega/res/drawable/ic_qsb_assist.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2018 CypherOS
+
+     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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24.0dip"
+    android:height="24.0dip"
+    android:viewportWidth="192.0"
+    android:viewportHeight="192.0">
+    <path
+        android:fillColor="#ff34a853"
+        android:pathData="M160,60a12,12 0 1,0 24,0a12,12 0 1,0 -24,0z" />
+    <path
+        android:fillColor="#ffea4335"
+        android:pathData="M112,88a24,24 0 1,0 48,0a24,24 0 1,0 -48,0z" />
+    <path
+        android:fillColor="#fffbbc05"
+        android:pathData="M108,148a28,28 0 1,0 56,0a28,28 0 1,0 -56,0" />
+    <path
+        android:fillColor="#ff4285f4"
+        android:pathData="M8,64a48,48 0 1,0 96,0a48,48 0 1,0 -96,0z" />
+</vector>
\ No newline at end of file
diff --git a/Omega/res/drawable/ic_qsb_logo.xml b/Omega/res/drawable/ic_qsb_logo.xml
new file mode 100644
index 0000000000..2fa27e4660
--- /dev/null
+++ b/Omega/res/drawable/ic_qsb_logo.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2018 CypherOS
+
+     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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24.0dip"
+    android:height="24.0dip"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#ff4285f4"
+        android:pathData="M23.49,12.27c0,-0.79 -0.07,-1.54 -0.19,-2.27H12v4.51h6.47c-0.29,1.48 -1.14,2.73 -2.4,3.58v3h3.86c2.26,-2.09 3.56,-5.17 3.56,-8.82z" />
+    <path
+        android:fillColor="#ff34a853"
+        android:pathData="M12,24c3.24,0 5.95,-1.08 7.93,-2.91l-3.86,-3c-1.08,0.72 -2.45,1.16 -4.07,1.16 -3.13,0 -5.78,-2.11 -6.73,-4.96H1.29v3.09C3.26,21.3 7.31,24 12,24z" />
+    <path
+        android:fillColor="#fffbbc05"
+        android:pathData="M5.27,14.29c-0.25,-0.72 -0.38,-1.49 -0.38,-2.29s0.14,-1.57 0.38,-2.29V6.62H1.29C0.47,8.24 0,10.06 0,12s0.47,3.76 1.29,5.38l3.98,-3.09z" />
+    <path
+        android:fillColor="#ffea4335"
+        android:pathData="M12,4.75c1.77,0 3.35,0.61 4.6,1.8l3.42,-3.42C17.95,1.19 15.24,0 12,0 7.31,0 3.26,2.7 1.29,6.62l3.98,3.09c0.95,-2.85 3.6,-4.96 6.73,-4.96z" />
+</vector>
\ No newline at end of file
diff --git a/Omega/res/drawable/ic_qsb_mic.xml b/Omega/res/drawable/ic_qsb_mic.xml
new file mode 100644
index 0000000000..4a63b7e2ab
--- /dev/null
+++ b/Omega/res/drawable/ic_qsb_mic.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2018 CypherOS
+
+     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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24.0dip"
+    android:height="24.0dip"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#ff4285f4"
+        android:pathData="M12,15c1.66,0 2.99,-1.34 2.99,-3L15,5c0,-1.66 -1.34,-3 -3,-3S9,3.34 9,5v7c0,1.66 1.34,3 3,3z" />
+    <path
+        android:fillColor="#ff34a853"
+        android:pathData="M11,18.92h2V22h-2z" />
+    <path
+        android:fillColor="#fffbbc05"
+        android:pathData="M7,12H5c0,1.93 0.78,3.68 2.05,4.95l1.41,-1.41C7.56,14.63 7,13.38 7,12z" />
+    <path
+        android:fillColor="#ffea4335"
+        android:pathData="M12,17c-1.38,0 -2.63,-0.56 -3.54,-1.47l-1.41,1.41C8.32,18.21 10.07,19 12.01,19c3.87,0 6.98,-3.14 6.98,-7h-2c0,2.76 -2.23,5 -4.99,5z" />
+</vector>
\ No newline at end of file
diff --git a/Omega/res/drawable/ic_qwant.xml b/Omega/res/drawable/ic_qwant.xml
new file mode 100644
index 0000000000..5ad6c0bfe3
--- /dev/null
+++ b/Omega/res/drawable/ic_qwant.xml
@@ -0,0 +1,56 @@
+<!--
+  ~     This file is part of Lawnchair Launcher.
+  ~
+  ~     Lawnchair Launcher is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     Lawnchair Launcher is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="110.27581"
+    android:viewportHeight="108.2946">
+    <path
+        android:fillColor="#4ba2ea"
+        android:pathData="m87.456,104.63c0.505,1.045 1.009,2.596 2.091,3.208a5.005,5.005 0,0 0,2.523 0.324h15.645a2.566,2.566 0,0 0,2.271 -3.749c-0.973,-1.875 -1.983,-3.713 -2.956,-5.588l-6.02,-11.355a5.749,5.749 0,0 1,-0.757 -1.658c0,0 -0.216,-0.36 0.072,-1.334 0.288,-0.721 3.929,-7.895 4.146,-8.616 1.478,-4.578 19.467,-47.945 -31.579,-52.379a11.56,11.56 0,0 1,1.118 0.685,36.336 36.336,0 0,1 10.887,10.851 35.713,35.713 0,0 1,2.74 33.237,34.716 34.716,0 0,1 -2.704,5.119 35.355,35.355 0,0 1,-6.417 7.498,3.75 3.75,0 0,0 -1.334,1.658 2.494,2.494 0,0 0,0.108 1.839z" />
+    <path
+        android:fillColor="#ff3b4a"
+        android:pathData="M0.362,47.96C8.581,42.373 16.872,42.012 19.468,49.727a1.617,1.617 0,0 0,-0.036 0.397,35.63 35.63,0 0,0 30.678,39.474 35.204,35.204 0,0 0,9.733 -0.036c0.793,-0.108 1.55,-0.252 2.343,-0.397a4.703,4.703 0,0 1,1.73 -0.144c0.901,11.031 -33.706,13.915 -55.119,-12.473 -5.299,-6.525 -7.859,-19.683 -8.436,-28.587" />
+    <path
+        android:fillColor="#65cee7"
+        android:pathData="m107.247,70.275a52.197,52.197 0,0 1,-3.28 8.039c-0.288,0.541 -0.541,1.045 -0.829,1.586 -0.397,0.721 -0.829,1.478 -1.262,2.199a13.083,13.083 0,0 0,-1.55 2.559l0.036,-0.144a22.579,22.579 0,0 0,0.757 -2.199,47.414 47.414,0 0,0 -28.226,-58.796c-0.18,-0.108 -0.324,-0.18 -0.505,-0.288v0c1.37,0.721 -6.489,-19.07 9.841,-16.51 0.685,0.36 1.37,0.757 2.055,1.154a51.878,51.878 0,0 1,12.473 10.454,52.399 52.399,0 0,1 9.229,15.177 55.053,55.053 0,0 1,3.677 18.962,55.08 55.08,0 0,1 -2.415,17.808z" />
+    <path
+        android:fillColor="#87c966"
+        android:pathData="m86.591,14.759a9.822,9.822 0,0 1,-0.685 3.569,9.656 9.656,0 0,1 -8.94,6.056 9.797,9.797 0,0 1,-4.578 -1.154v0a36.226,36.226 0,0 0,-14.42 -4.47,35.036 35.036,0 0,0 -18.349,3.28 34.677,34.677 0,0 0,-7.715 4.939,35.883 35.883,0 0,0 -5.876,6.273 36.26,36.26 0,0 0,-6.381 15.105C2.092,26.872 38.141,-7.736 78.588,5.278v0c0.685,0.18 1.406,0.397 2.091,0.613 0.505,0.252 1.045,0.505 1.55,0.793h0.036a9.682,9.682 0,0 1,4.326 8.075z" />
+    <path android:pathData="m80.463,5.783a11.06,11.06 0,0 0,-1.875 -0.505v0a47.129,47.129 0,0 0,-9.373 -1.55c-0.937,-0.072 -1.875,-0.072 -2.848,-0.072a46.99,46.99 0,0 0,-46.72 44.701,2.828 2.828,0 0,0 -0.072,0.505v0c-0.036,0.288 -0.072,0.577 -0.108,0.829v0a9.641,9.641 0,0 1,-9.481 7.859h-0.288a9.612,9.612 0,0 1,-9.337 -9.625c0,-0.433 0.036,-0.829 0.072,-1.226v0a53.396,53.396 0,0 1,4.831 -16.402,51.577 51.577,0 0,1 10.923,-15.141 55.415,55.415 0,0 1,15.429 -10.418,54.744 54.744,0 0,1 18.205,-4.542 64.16,64.16 0,0 1,10.851 0.072,53.685 53.685,0 0,1 7.534,1.19 55.088,55.088 0,0 1,12.257 4.326z">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:endX="116.30566"
+                android:endY="28.77486"
+                android:startX="36.20448"
+                android:startY="28.77486"
+                android:type="linear">
+                <item
+                    android:color="#FFFFDA12"
+                    android:offset="0" />
+                <item
+                    android:color="#FFEFE333"
+                    android:offset="1" />
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:fillColor="#af27cc"
+        android:pathData="m71.847,104.557c-0.505,1.442 -1.983,1.694 -3.317,2.019 -1.586,0.397 -3.172,0.685 -4.795,0.937 -2.92,0.433 -5.876,0.613 -8.796,0.757a49.04,49.04 0,0 1,-9.193 -0.577,61.173 61.173,0 0,1 -9.481,-2.163 52.006,52.006 0,0 1,-20.007 -11.824,51.122 51.122,0 0,1 -7.859,-9.517 52.862,52.862 0,0 1,-7.066 -16.979,61.765 61.765,0 0,1 -1.009,-19.106v-0.144a46.624,46.624 0,0 0,43.151 43.872c1.262,0.108 2.523,0.144 3.821,0.144a46.827,46.827 0,0 0,16.583 -2.992,0.917 0.917,0 0,1 0.252,0.072 2.494,2.494 0,0 1,1.55 1.406c1.19,2.343 2.379,4.686 3.533,7.066 0.036,0.072 0.072,0.18 0.108,0.252 0.613,1.19 1.19,2.415 1.802,3.605 0.541,1.009 1.154,1.983 0.721,3.172z" />
+</vector>
diff --git a/Omega/res/drawable/ic_remove_no_shadow.xml b/Omega/res/drawable/ic_remove_no_shadow.xml
new file mode 100644
index 0000000000..9a30f2c28b
--- /dev/null
+++ b/Omega/res/drawable/ic_remove_no_shadow.xml
@@ -0,0 +1,26 @@
+<?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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0"
+    android:tint="?android:attr/textColorPrimary">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M13.41,12l5.29-5.29c0.39-0.39,0.39-1.02,0-1.41c-0.39-0.39-1.02-0.39-1.41,0L12,10.59L6.71,
+        5.29c-0.39-0.39-1.02-0.39-1.41,0c-0.39,0.39-0.39,1.02,0,1.41L10.59,12l-5.29,5.29c-0.39,0.39-0.39,1.02,
+        0,1.41c0.39,0.39,1.02,0.39,1.41,0L12,13.41l5.29,5.29c0.39,0.39,1.02,0.39,1.41,0c0.39-0.39,0.39-1.02,0-1.41L13.41,12z" />
+</vector>
diff --git a/Omega/res/drawable/ic_restore.xml b/Omega/res/drawable/ic_restore.xml
new file mode 100644
index 0000000000..09f8243426
--- /dev/null
+++ b/Omega/res/drawable/ic_restore.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="?android:textColorSecondary"
+        android:pathData="M13,3A9,9 0 0,0 4,12H1L4.89,15.89L4.96,16.03L9,12H6A7,7 0 0,1 13,5A7,7 0 0,1 20,12A7,7 0 0,1 13,19C11.07,19 9.32,18.21 8.06,16.94L6.64,18.36C8.27,20 10.5,21 13,21A9,9 0 0,0 22,12A9,9 0 0,0 13,3M12,8V13L16.28,15.54L17,14.33L13.5,12.25V8H12Z" />
+</vector>
\ No newline at end of file
diff --git a/Omega/res/drawable/ic_restore_white.xml b/Omega/res/drawable/ic_restore_white.xml
new file mode 100644
index 0000000000..95ec3be9bc
--- /dev/null
+++ b/Omega/res/drawable/ic_restore_white.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#fff"
+        android:pathData="M13,3A9,9 0 0,0 4,12H1L4.89,15.89L4.96,16.03L9,12H6A7,7 0 0,1 13,5A7,7 0 0,1 20,12A7,7 0 0,1 13,19C11.07,19 9.32,18.21 8.06,16.94L6.64,18.36C8.27,20 10.5,21 13,21A9,9 0 0,0 22,12A9,9 0 0,0 13,3M12,8V13L16.28,15.54L17,14.33L13.5,12.25V8H12Z" />
+</vector>
\ No newline at end of file
diff --git a/Omega/res/drawable/ic_search.xml b/Omega/res/drawable/ic_search.xml
new file mode 100644
index 0000000000..2ae8a53823
--- /dev/null
+++ b/Omega/res/drawable/ic_search.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="32dp"
+    android:height="32dp"
+    android:viewportWidth="128"
+    android:viewportHeight="128">
+    <path
+        android:fillColor="#008AF8"
+        android:pathData="M120.589,106.375 L96.561,80.394l-3.842,3.846 -4.352,-4.352c0.334,-0.432 0.667,-0.864 0.983,-1.305A46.777,46.777 0,1 0,77.88 89.857q0.995,-0.686 1.955,-1.43l4.345,4.345 -4.314,4.314 26.51,23.525a10.059,10.059 0,1 0,14.214 -14.236ZM74.22,74.229a32.479,32.479 0,1 1,9.489 -22.942A32.482,32.482 0,0 1,74.22 74.229Z" />
+</vector>
diff --git a/Omega/res/drawable/ic_search_colored.xml b/Omega/res/drawable/ic_search_colored.xml
new file mode 100644
index 0000000000..70cb6be23d
--- /dev/null
+++ b/Omega/res/drawable/ic_search_colored.xml
@@ -0,0 +1,22 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="38dp"
+    android:height="38dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32
+">
+    <path
+        android:pathData="M16,16m-16,0a16,16 0,1 1,32 0a16,16 0,1 1,-32 0"
+        android:strokeAlpha="0.20"
+        android:fillColor="#01C32B"
+        android:fillAlpha="0.20" />
+    <group
+        android:translateX="5"
+        android:translateY="5">
+
+        <path
+            android:fillColor="#01C32B"
+            android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z" />
+
+    </group>
+
+</vector>
diff --git a/Omega/res/drawable/ic_settings_search.xml b/Omega/res/drawable/ic_search_shadow.xml
similarity index 93%
rename from Omega/res/drawable/ic_settings_search.xml
rename to Omega/res/drawable/ic_search_shadow.xml
index 0a7938f329..c4f185747d 100644
--- a/Omega/res/drawable/ic_settings_search.xml
+++ b/Omega/res/drawable/ic_search_shadow.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="#FFFFFFFF"
+        android:fillColor="#fff"
         android:pathData="M15.5,14h-0.79l-0.28,-0.27c1.2,-1.4 1.82,-3.31 1.48,-5.34 -0.47,-2.78 -2.79,-5 -5.59,-5.34 -4.23,-0.52 -7.79,3.04 -7.27,7.27 0.34,2.8 2.56,5.12 5.34,5.59 2.03,0.34 3.94,-0.28 5.34,-1.48l0.27,0.28v0.79l4.25,4.25c0.41,0.41 1.08,0.41 1.49,0 0.41,-0.41 0.41,-1.08 0,-1.49L15.5,14zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z" />
 </vector>
diff --git a/Omega/res/drawable/ic_share.xml b/Omega/res/drawable/ic_share.xml
new file mode 100644
index 0000000000..25de5ae757
--- /dev/null
+++ b/Omega/res/drawable/ic_share.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="?android:textColorSecondary"
+        android:pathData="M18,16.08C17.24,16.08 16.56,16.38 16.04,16.85L8.91,12.7C8.96,12.47 9,12.24 9,12C9,11.76 8.96,11.53 8.91,11.3L15.96,7.19C16.5,7.69 17.21,8 18,8A3,3 0 0,0 21,5A3,3 0 0,0 18,2A3,3 0 0,0 15,5C15,5.24 15.04,5.47 15.09,5.7L8.04,9.81C7.5,9.31 6.79,9 6,9A3,3 0 0,0 3,12A3,3 0 0,0 6,15C6.79,15 7.5,14.69 8.04,14.19L15.16,18.34C15.11,18.55 15.08,18.77 15.08,19C15.08,20.61 16.39,21.91 18,21.91C19.61,21.91 20.92,20.61 20.92,19A2.92,2.92 0 0,0 18,16.08Z" />
+</vector>
\ No newline at end of file
diff --git a/Omega/res/drawable/ic_smartspace_preferences.xml b/Omega/res/drawable/ic_smartspace_preferences.xml
new file mode 100644
index 0000000000..19cc0e8f27
--- /dev/null
+++ b/Omega/res/drawable/ic_smartspace_preferences.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:pathData="M0 0h24v24H0z" />
+    <path
+        android:fillColor="?android:attr/textColorPrimary"
+        android:pathData="M7.5 5.6L10 7 8.6 4.5 10 2 7.5 3.4 5 2l1.4 2.5L5 7zm12 9.8L17 14l1.4 2.5L17
+        19l2.5-1.4L22 19l-1.4-2.5L22 14zM22 2l-2.5 1.4L17 2l1.4 2.5L17 7l2.5-1.4L22
+        7l-1.4-2.5zm-7.63 5.29c-0.39-0.39-1.02-0.39-1.41 0L1.29 18.96c-0.39 0.39 -0.39 1.02 0
+        1.41l2.34 2.34c0.39 0.39 1.02 0.39 1.41 0L16.7 11.05c0.39-0.39 0.39 -1.02
+        0-1.41l-2.33-2.35zm-1.03 5.49l-2.12-2.12 2.44-2.44 2.12 2.12-2.44 2.44z" />
+</vector>
diff --git a/Omega/res/drawable/ic_startpage_search.xml b/Omega/res/drawable/ic_startpage_search.xml
new file mode 100644
index 0000000000..b285029afb
--- /dev/null
+++ b/Omega/res/drawable/ic_startpage_search.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M22,22L16.4,16.4"
+      android:strokeWidth="2"
+      android:strokeColor="#6573ff" />
+  <path
+      android:pathData="M10,10m-9,0a9,9 0,1 1,18 0a9,9 0,1 1,-18 0"
+      android:strokeWidth="2"
+      android:strokeColor="#6573ff" />
+</vector>
diff --git a/Omega/res/drawable/ic_style.xml b/Omega/res/drawable/ic_style.xml
index c31e83d5cd..80e902a6b4 100644
--- a/Omega/res/drawable/ic_style.xml
+++ b/Omega/res/drawable/ic_style.xml
@@ -16,11 +16,24 @@
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:width="38dp"
+    android:height="38dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+
     <path
-        android:fillColor="#008AF8"
-        android:pathData="M2.53,19.65l1.34,0.56v-9.03l-2.43,5.86c-0.41,1.02 0.08,2.19 1.09,2.61zM22.03,15.95L17.07,3.98c-0.31,-0.75 -1.04,-1.21 -1.81,-1.23 -0.26,0 -0.53,0.04 -0.79,0.15L7.1,5.95c-0.75,0.31 -1.21,1.03 -1.23,1.8 -0.01,0.27 0.04,0.54 0.15,0.8l4.96,11.97c0.31,0.76 1.05,1.22 1.83,1.23 0.26,0 0.52,-0.05 0.77,-0.15l7.36,-3.05c1.02,-0.42 1.51,-1.59 1.09,-2.6zM7.88,8.75c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1 1,0.45 1,1 -0.45,1 -1,1zM5.88,19.75c0,1.1 0.9,2 2,2h1.45l-3.45,-8.34v6.34z" />
+        android:pathData="M16,16m-16,0a16,16 0,1 1,32 0a16,16 0,1 1,-32 0"
+        android:strokeAlpha="0.20"
+        android:fillColor="#FF074D"
+        android:fillAlpha="0.20" />
+    <group
+        android:translateX="5"
+        android:translateY="5"
+        android:scaleY="0.95"
+        android:scaleX="0.95">
+        <path
+            android:fillColor="#FF074D"
+            android:pathData="M2.53,19.65l1.34,0.56v-9.03l-2.43,5.86c-0.41,1.02 0.08,2.19 1.09,2.61zM22.03,15.95L17.07,3.98c-0.31,-0.75 -1.04,-1.21 -1.81,-1.23 -0.26,0 -0.53,0.04 -0.79,0.15L7.1,5.95c-0.75,0.31 -1.21,1.03 -1.23,1.8 -0.01,0.27 0.04,0.54 0.15,0.8l4.96,11.97c0.31,0.76 1.05,1.22 1.83,1.23 0.26,0 0.52,-0.05 0.77,-0.15l7.36,-3.05c1.02,-0.42 1.51,-1.59 1.09,-2.6zM7.88,8.75c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1 1,0.45 1,1 -0.45,1 -1,1zM5.88,19.75c0,1.1 0.9,2 2,2h1.45l-3.45,-8.34v6.34z" />
+    </group>
+
 </vector>
diff --git a/Omega/res/drawable/ic_super_g_color.xml b/Omega/res/drawable/ic_super_g_color.xml
new file mode 100644
index 0000000000..cd24b67dfb
--- /dev/null
+++ b/Omega/res/drawable/ic_super_g_color.xml
@@ -0,0 +1,33 @@
+<?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.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24">
+    <path
+        android:fillColor="#ff4285f4"
+        android:pathData="M23.49,12.27c0,-0.79 -0.07,-1.54 -0.19,-2.27H12v4.51h6.47c-0.29,1.48 -1.14,2.73 -2.4,3.58v3h3.86c2.26,-2.09 3.56,-5.17 3.56,-8.82z" />
+    <path
+        android:fillColor="#ff34a853"
+        android:pathData="M12,24c3.24,0 5.95,-1.08 7.93,-2.91l-3.86,-3c-1.08,0.72 -2.45,1.16 -4.07,1.16 -3.13,0 -5.78,-2.11 -6.73,-4.96H1.29v3.09C3.26,21.3 7.31,24 12,24z" />
+    <path
+        android:fillColor="#fffbbc05"
+        android:pathData="M5.27,14.29c-0.25,-0.72 -0.38,-1.49 -0.38,-2.29s0.14,-1.57 0.38,-2.29V6.62H1.29C0.47,8.24 0,10.06 0,12s0.47,3.76 1.29,5.38l3.98,-3.09z" />
+    <path
+        android:fillColor="#ffea4335"
+        android:pathData="M12,4.75c1.77,0 3.35,0.61 4.6,1.8l3.42,-3.42C17.95,1.19 15.24,0 12,0 7.31,0 3.26,2.7 1.29,6.62l3.98,3.09c0.95,-2.85 3.6,-4.96 6.73,-4.96z" />
+</vector>
\ No newline at end of file
diff --git a/Omega/res/drawable/ic_super_g_shadow.xml b/Omega/res/drawable/ic_super_g_shadow.xml
new file mode 100644
index 0000000000..4206c01ffc
--- /dev/null
+++ b/Omega/res/drawable/ic_super_g_shadow.xml
@@ -0,0 +1,28 @@
+<?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.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="#ffffffff"
+        android:pathData="M23.49,12.27c0,-0.79 -0.07,-1.54 -0.19,-2.27H12v4.51h6.47c-0.29,1.48 -1.14,2.73 -2.4,3.58v3h3.86c2.26,-2.09 3.56,-5.17 3.56,-8.82z,
+            M12,24c3.24,0 5.95,-1.08 7.93,-2.91l-3.86,-3c-1.08,0.72 -2.45,1.16 -4.07,1.16 -3.13,0 -5.78,-2.11 -6.73,-4.96H1.29v3.09C3.26,21.3 7.31,24 12,24z,
+            M5.27,14.29c-0.25,-0.72 -0.38,-1.49 -0.38,-2.29s0.14,-1.57 0.38,-2.29V6.62H1.29C0.47,8.24 0,10.06 0,12s0.47,3.76 1.29,5.38l3.98,-3.09z,
+            M12,4.75c1.77,0 3.35,0.61 4.6,1.8l3.42,-3.42C17.95,1.19 15.24,0 12,0 7.31,0 3.26,2.7 1.29,6.62l3.98,3.09c0.95,-2.85 3.6,-4.96 6.73,-4.96z" />
+</vector>
\ No newline at end of file
diff --git a/Omega/res/drawable/ic_widgets.xml b/Omega/res/drawable/ic_widgets.xml
index e77c5dde14..8d9d035844 100644
--- a/Omega/res/drawable/ic_widgets.xml
+++ b/Omega/res/drawable/ic_widgets.xml
@@ -16,11 +16,24 @@
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:width="38dp"
+    android:height="38dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+
     <path
-        android:fillColor="#008AF8"
-        android:pathData="M13,13v8h8v-8h-8zM3,21h8v-8L3,13v8zM3,3v8h8L11,3L3,3zM16.66,1.69L11,7.34 16.66,13l5.66,-5.66 -5.66,-5.65z" />
+        android:fillAlpha="0.25"
+        android:fillColor="#5B05E4"
+        android:pathData="M16,16m-16,0a16,16 0,1 1,32 0a16,16 0,1 1,-32 0"
+        android:strokeAlpha="0.20" />
+    <group
+        android:scaleX="0.95"
+        android:scaleY="0.95"
+        android:translateX="5"
+        android:translateY="5">
+
+        <path
+            android:fillColor="#5B05E4"
+            android:pathData="M13,13v8h8v-8h-8zM3,21h8v-8L3,13v8zM3,3v8h8L11,3L3,3zM16.66,1.69L11,7.34 16.66,13l5.66,-5.66 -5.66,-5.65z" />
+    </group>
 </vector>
diff --git a/Omega/res/drawable/ic_yahoo.xml b/Omega/res/drawable/ic_yahoo.xml
new file mode 100644
index 0000000000..7a6044795b
--- /dev/null
+++ b/Omega/res/drawable/ic_yahoo.xml
@@ -0,0 +1,31 @@
+<!--
+  ~     Copyright (C) 2019 Lawnchair Team.
+  ~
+  ~     This file is part of Lawnchair Launcher.
+  ~
+  ~     Lawnchair Launcher is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     Lawnchair Launcher is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="291.319"
+    android:viewportHeight="291.319">
+    <path
+        android:fillColor="#720E9E"
+        android:pathData="M145.659,0c80.45,0 145.66,65.219 145.66,145.66c0,80.45 -65.21,145.659 -145.66,145.659S0,226.109 0,145.66C0,65.219 65.21,0 145.659,0z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M212.353,114.98l0.155,-0.027l4.825,-5.371l-0.237,-0.018l0.51,-0.801h-67.595l2.604,9.249h18.444l-31.044,28.722c-6.336,-9.24 -21.184,-30.479 -31.544,-46.411h19.254v-6.555l0.264,-1.884l-0.264,-0.036v-0.765H54.631v9.24H77.49c8.876,7.328 47.358,54.049 48.76,58.51c0.564,4.179 1.366,28.841 -0.291,30.698c-1.994,2.868 -22.814,1.32 -26.483,1.593l-0.137,9.058c6.7,0.2 26.801,-0.009 33.584,-0.009c13.364,0 36.77,-0.346 40.065,-0.082l0.41,-8.576l-26.901,-0.401c-0.564,-3.887 -1.183,-28.422 -0.619,-31.098c2.54,-7.765 43.816,-39.902 48.059,-41.112l3.997,-0.901h12.472C210.405,118.002 212.353,114.98 212.353,114.98zM202.266,179.079l11.689,0.892l13.628,-49.979c-2.276,-0.082 -22.95,-1.93 -25.636,-2.431L202.266,179.079zM200.245,187.091l0.064,12.208l5.917,0.492l6.391,0.446l1.875,-11.944l-6.737,-0.31C207.756,187.983 200.245,187.091 200.245,187.091z" />
+</vector>
diff --git a/Omega/res/drawable/ic_yandex.xml b/Omega/res/drawable/ic_yandex.xml
new file mode 100644
index 0000000000..7f18830757
--- /dev/null
+++ b/Omega/res/drawable/ic_yandex.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="12dp"
+    android:height="24dp"
+    android:viewportWidth="271.23"
+    android:viewportHeight="498">
+    <path
+        android:fillColor="#d7143a"
+        android:pathData="M266.38,0L224.23,0c-3.74,0 -6.06,1.83 -6.61,4.49S154.42,198.25 149.86,214.17C146.62,225.46 136.1,265.24 133.62,274.79l-21.8,-59.51c-5.3,-16.38 -56.06,-158.2 -57.55,-163.86 -0.82,-3.11 -2.25,-7 -7.71,-7L5.37,44.42c-4,0 -6.3,4.41 -5,7.15 1,2.19 75.37,199.93 105.39,275.47L105.76,493.15c0,3 1.21,4.85 4.24,4.85h39c2.42,0 4.23,-1.82 4.23,-4.85L153.23,328.37C178.22,258.46 269.62,9.77 270.62,7 271.87,3.58 271.51,0 266.38,0Z" />
+</vector>
diff --git a/Omega/res/drawable/ic_zen_mode.xml b/Omega/res/drawable/ic_zen_mode.xml
new file mode 100644
index 0000000000..419f9ef15c
--- /dev/null
+++ b/Omega/res/drawable/ic_zen_mode.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~     This file is part of Lawnchair Launcher.
+  ~
+  ~     Lawnchair Launcher is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     Lawnchair Launcher is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="17dp"
+    android:height="17dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12c0,5.52 4.48,10 10,10c5.52,0 10,-4.48 10,-10C22,6.48 17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8c0,-4.41 3.59,-8 8,-8c4.41,0 8,3.59 8,8C20,16.41 16.41,20 12,20z" />
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M7,11h10v2h-10z" />
+</vector>
diff --git a/go/res/values-v26/bools.xml b/Omega/res/drawable/qsb_icon_feedback.xml
similarity index 60%
rename from go/res/values-v26/bools.xml
rename to Omega/res/drawable/qsb_icon_feedback.xml
index cc4a7ba449..249884c7d7 100644
--- a/go/res/values-v26/bools.xml
+++ b/Omega/res/drawable/qsb_icon_feedback.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* Copyright 2017, The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?><!--
+/* Copyright 2019, Paranoid Android
 **
 ** Licensed under the Apache License, Version 2.0 (the "License");
 ** you may not use this file except in compliance with the License.
@@ -15,7 +14,11 @@
 ** limitations under the License.
 */
 -->
-
-<resources>
-    <bool name="notification_badging_enabled">false</bool>
-</resources>
\ No newline at end of file
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?android:colorControlHighlight">
+    <item android:id="@android:id/mask">
+        <shape android:shape="oval">
+            <solid android:color="@android:color/white" />
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/Omega/res/drawable/qsb_icon_feedback_bg.xml b/Omega/res/drawable/qsb_icon_feedback_bg.xml
new file mode 100644
index 0000000000..1d3c9123e4
--- /dev/null
+++ b/Omega/res/drawable/qsb_icon_feedback_bg.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2018 CypherOS
+
+     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.
+-->
+<inset xmlns:android="http://schemas.android.com/apk/res/android"
+    android:insetLeft="@dimen/qsb_shadow_margin"
+    android:insetTop="@dimen/qsb_shadow_margin"
+    android:insetRight="@dimen/qsb_shadow_margin"
+    android:insetBottom="@dimen/qsb_shadow_margin">
+    <ripple android:color="@color/focused_background">
+        <item android:id="@android:id/mask">
+            <shape android:shape="rectangle">
+                <solid android:color="@android:color/white" />
+                <stroke android:width="0.0dip" />
+                <corners android:radius="100.0dip" />
+            </shape>
+        </item>
+    </ripple>
+</inset>
\ No newline at end of file
diff --git a/Omega/res/drawable/ripple_circle_bg.xml b/Omega/res/drawable/ripple_circle_bg.xml
index 32d505cfb7..79686685c0 100644
--- a/Omega/res/drawable/ripple_circle_bg.xml
+++ b/Omega/res/drawable/ripple_circle_bg.xml
@@ -16,11 +16,11 @@
   -->
 
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="#DF0935">
+    android:color="#8E05E4">
 
     <item android:id="@android:id/mask">
         <shape android:shape="oval">
-            <solid android:color="#EA0202" />
+            <solid android:color="#6C009A" />
             <stroke
                 android:width="1dp"
                 android:color="#078CF3" />
diff --git a/Omega/res/drawable/shape_circle.xml b/Omega/res/drawable/shape_circle.xml
new file mode 100644
index 0000000000..140b9fdedd
--- /dev/null
+++ b/Omega/res/drawable/shape_circle.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2020 Omega Launcher
+  ~
+  ~  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.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="128dp"
+    android:height="128dp"
+    android:viewportWidth="100.0"
+    android:viewportHeight="100.0"
+    android:tint="@color/transparentish">
+
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M50 0A50 50,0,1,1,50 100A50 50,0,1,1,50 0" />
+
+</vector>
\ No newline at end of file
diff --git a/Omega/res/drawable/shape_cylinder.xml b/Omega/res/drawable/shape_cylinder.xml
new file mode 100644
index 0000000000..de69a4cdc3
--- /dev/null
+++ b/Omega/res/drawable/shape_cylinder.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2020 Omega Launcher
+  ~
+  ~  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.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="128dp"
+    android:height="128dp"
+    android:viewportWidth="100.0"
+    android:viewportHeight="100.0"
+    android:tint="@color/transparentish">
+
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M50,0A50,30 0,0,1 100,30V70A50,30 0,0,1 0,70V30A50,30 0,0,1 50,0z" />
+
+</vector>
\ No newline at end of file
diff --git a/Omega/res/drawable/shape_rounded.xml b/Omega/res/drawable/shape_rounded.xml
new file mode 100644
index 0000000000..45db1bb767
--- /dev/null
+++ b/Omega/res/drawable/shape_rounded.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2020 Omega Launcher
+  ~
+  ~  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.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="128dp"
+    android:height="128dp"
+    android:viewportWidth="100.0"
+    android:viewportHeight="100.0"
+    android:tint="@color/transparentish">
+
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M50,0L80,0 A20,20,0,0 1 100,20 L100,80 A20,20,0,0 1 80,100 L20,100 A20,20,0,0 1 0,80 L 0,20 A20,20,0,0 1 20,0z" />
+
+</vector>
\ No newline at end of file
diff --git a/Omega/res/drawable/shape_square.xml b/Omega/res/drawable/shape_square.xml
new file mode 100644
index 0000000000..4172ca0741
--- /dev/null
+++ b/Omega/res/drawable/shape_square.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2020 Omega Launcher
+  ~
+  ~  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.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="128dp"
+    android:height="128dp"
+    android:viewportWidth="100.0"
+    android:viewportHeight="100.0"
+    android:tint="@color/transparentish">
+
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M50,0L100,0 100,100 0,100 0,0z" />
+
+</vector>
\ No newline at end of file
diff --git a/Omega/res/drawable/shape_squircle.xml b/Omega/res/drawable/shape_squircle.xml
new file mode 100644
index 0000000000..dd8bfc6cdf
--- /dev/null
+++ b/Omega/res/drawable/shape_squircle.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2020 Omega Launcher
+  ~
+  ~  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.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="128dp"
+    android:height="128dp"
+    android:viewportWidth="100.0"
+    android:viewportHeight="100.0"
+    android:tint="@color/transparentish">
+
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M50,0 C10,0 0,10 0,50 0,90 10,100 50,100 90,100 100,90 100,50 100,10 90,0 50,0 Z" />
+
+</vector>
\ No newline at end of file
diff --git a/Omega/res/drawable/shape_teardrop.xml b/Omega/res/drawable/shape_teardrop.xml
new file mode 100644
index 0000000000..473db4670a
--- /dev/null
+++ b/Omega/res/drawable/shape_teardrop.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2020 Omega Launcher
+  ~
+  ~  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.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="128dp"
+    android:height="128dp"
+    android:viewportWidth="100.0"
+    android:viewportHeight="100.0"
+    android:tint="@color/transparentish">
+
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M50,0A50,50,0,0 1 100,50 L100,85 A15,15,0,0 1 85,100 L50,100 A50,50,0,0 1 50,0z" />
+
+</vector>
\ No newline at end of file
diff --git a/Omega/res/drawable/tab_hide_from_main.xml b/Omega/res/drawable/tab_hide_from_main.xml
new file mode 100644
index 0000000000..0731722882
--- /dev/null
+++ b/Omega/res/drawable/tab_hide_from_main.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~     This file is part of Lawnchair Launcher.
+  ~
+  ~     Lawnchair Launcher is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     Lawnchair Launcher is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="?android:colorAccent"
+        android:pathData="M2,5.27L3.28,4L20,20.72L18.73,22L15.65,18.92C14.5,19.3 13.28,19.5 12,19.5C7,19.5 2.73,16.39 1,12C1.69,10.24 2.79,8.69 4.19,7.46L2,5.27M12,9A3,3 0 0,1 15,12C15,12.35 14.94,12.69 14.83,13L11,9.17C11.31,9.06 11.65,9 12,9M12,4.5C17,4.5 21.27,7.61 23,12C22.18,14.08 20.79,15.88 19,17.19L17.58,15.76C18.94,14.82 20.06,13.54 20.82,12C19.17,8.64 15.76,6.5 12,6.5C10.91,6.5 9.84,6.68 8.84,7L7.3,5.47C8.74,4.85 10.33,4.5 12,4.5M3.18,12C4.83,15.36 8.24,17.5 12,17.5C12.69,17.5 13.37,17.43 14,17.29L11.72,15C10.29,14.85 9.15,13.71 9,12.28L5.6,8.87C4.61,9.72 3.78,10.78 3.18,12Z" />
+</vector>
diff --git a/Omega/res/drawable/tab_manage_apps.xml b/Omega/res/drawable/tab_manage_apps.xml
new file mode 100644
index 0000000000..07b759b1ce
--- /dev/null
+++ b/Omega/res/drawable/tab_manage_apps.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~     This file is part of Lawnchair Launcher.
+  ~
+  ~     Lawnchair Launcher is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     Lawnchair Launcher is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="?android:colorAccent"
+        android:pathData="M16,20H20V16H16M16,14H20V10H16M10,8H14V4H10M16,8H20V4H16M10,14H14V10H10M4,14H8V10H4M4,20H8V16H4M10,20H14V16H10M4,8H8V4H4V8Z" />
+</vector>
diff --git a/go/quickstep/res/drawable/empty_content_box.xml b/Omega/res/layout-v23/search_container_all_apps_include.xml
similarity index 55%
rename from go/quickstep/res/drawable/empty_content_box.xml
rename to Omega/res/layout-v23/search_container_all_apps_include.xml
index a4883889fe..fc382a0d86 100644
--- a/go/quickstep/res/drawable/empty_content_box.xml
+++ b/Omega/res/layout-v23/search_container_all_apps_include.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2019 The Android Open Source Project
+<?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.
@@ -13,11 +11,11 @@
      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.
--->
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@android:color/transparent"/>
-    <stroke android:color="@android:color/white" android:width="4px"/>
-    <corners android:radius="2dp"/>
-</shape>
\ No newline at end of file
+--><!-- Note: we are reusing/repurposing a system attribute for search layout, because of a
+ platform bug, which prevents using custom attributes in <include> tag -->
+<merge>
+
+    <include xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@id/search_container_all_apps"
+        layout="?android:attr/keyboardLayout" />
+</merge>
\ No newline at end of file
diff --git a/Omega/res/layout/activity_about.xml b/Omega/res/layout/activity_about.xml
index b933bcd26e..286c9ee7f2 100644
--- a/Omega/res/layout/activity_about.xml
+++ b/Omega/res/layout/activity_about.xml
@@ -32,7 +32,7 @@
             android:layout_height="72dp"
             android:layout_gravity="center|center_vertical"
             android:contentDescription="@string/app_name"
-            android:src="@mipmap/ic_launcher_home" />
+            android:src="@mipmap/ic_launcher" />
 
         <LinearLayout
             android:layout_width="wrap_content"
diff --git a/Omega/res/layout/activity_backup_list.xml b/Omega/res/layout/activity_backup_list.xml
new file mode 100644
index 0000000000..1c63e316a5
--- /dev/null
+++ b/Omega/res/layout/activity_backup_list.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.saggitt.omega.views.SpringRecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/recyclerView"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:clipToPadding="false"
+    android:paddingLeft="8dp"
+    android:paddingTop="8dp"
+    android:paddingRight="8dp"
+    android:paddingBottom="8dp"
+    tools:context="com.saggitt.omega.backup.BackupListActivity" />
\ No newline at end of file
diff --git a/Omega/res/layout/activity_edit_icon.xml b/Omega/res/layout/activity_edit_icon.xml
new file mode 100644
index 0000000000..73c63f6686
--- /dev/null
+++ b/Omega/res/layout/activity_edit_icon.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@android:color/transparent"
+    tools:context="com.saggitt.omega.iconpack.EditIconActivity">
+
+    <ImageView
+        android:id="@+id/originalIcon"
+        android:layout_width="@dimen/icon_preview_size"
+        android:layout_height="@dimen/icon_preview_size"
+        android:layout_marginStart="32dp"
+        android:layout_marginTop="16dp"
+        android:background="?android:attr/selectableItemBackgroundBorderless"
+        android:scaleType="fitCenter"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:src="@mipmap/ic_launcher" />
+
+    <View
+        android:id="@+id/divider"
+        android:layout_width="1dp"
+        android:layout_height="@dimen/icon_preview_size"
+        android:layout_marginStart="32dp"
+        android:background="?android:attr/listDivider"
+        app:layout_constraintBottom_toBottomOf="@+id/originalIcon"
+        app:layout_constraintStart_toEndOf="@+id/originalIcon"
+        app:layout_constraintTop_toTopOf="@+id/originalIcon"
+        app:layout_constraintVertical_bias="1.0" />
+
+    <com.saggitt.omega.views.SpringRecyclerView
+        android:id="@+id/iconRecyclerView"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:clipChildren="false"
+        android:clipToPadding="false"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp"
+        app:layout_constraintBottom_toBottomOf="@+id/originalIcon"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/divider"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:listitem="@layout/icon_item" />
+
+    <View
+        android:id="@+id/horizontalDivider"
+        android:layout_width="0dp"
+        android:layout_height="1dp"
+        android:layout_marginStart="32dp"
+        android:layout_marginTop="32dp"
+        android:layout_marginEnd="32dp"
+        android:background="?android:attr/listDivider"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/originalIcon" />
+
+    <com.saggitt.omega.views.SpringRecyclerView
+        android:id="@+id/iconPackRecyclerView"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:clipChildren="false"
+        android:clipToPadding="false"
+        android:paddingTop="16dp"
+        android:paddingBottom="16dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/horizontalDivider"
+        tools:listitem="@layout/icon_pack_item" />
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/Omega/res/layout/activity_new_backup.xml b/Omega/res/layout/activity_new_backup.xml
new file mode 100644
index 0000000000..2260f04a90
--- /dev/null
+++ b/Omega/res/layout/activity_new_backup.xml
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/content"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="com.saggitt.omega.backup.NewBackupActivity">
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/config"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingBottom="16dp">
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/textInputLayout"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_marginTop="16dp"
+                android:layout_marginEnd="16dp"
+                android:hint="@string/backup_name"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/name"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:imeOptions="flagNoExtractUi"
+                    android:singleLine="true" />
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <TextView
+                android:id="@+id/textView3"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="20dp"
+                android:layout_marginTop="16dp"
+                android:text="@string/backup_contents"
+                android:textColor="?android:textColorHint"
+                android:textSize="12sp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/textInputLayout" />
+
+            <CheckBox
+                android:id="@+id/content_homescreen"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_marginTop="16dp"
+                android:checked="true"
+                android:text="@string/backup_homescreen"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/textView3" />
+
+            <CheckBox
+                android:id="@+id/content_settings"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_marginTop="16dp"
+                android:checked="true"
+                android:text="@string/backup_settings"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/content_homescreen" />
+
+            <CheckBox
+                android:id="@+id/content_wallpaper"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_marginTop="16dp"
+                android:checked="true"
+                android:text="@string/backup_wallpaper"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/content_settings" />
+
+            <TextView
+                android:id="@+id/textView7"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="20dp"
+                android:layout_marginTop="16dp"
+                android:text="@string/backup_location"
+                android:textColor="?android:textColorHint"
+                android:textSize="12sp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/content_wallpaper" />
+
+            <RadioGroup
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_marginTop="16dp"
+                android:layout_marginEnd="16dp"
+                android:orientation="vertical"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/textView7">
+
+                <RadioButton
+                    android:id="@+id/location_device"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:checked="true"
+                    android:text="@string/backup_location_device_storage" />
+
+                <RadioButton
+                    android:id="@+id/location_documents"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="16dp"
+                    android:text="@string/custom" />
+            </RadioGroup>
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </ScrollView>
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/fab"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|end"
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="16dp"
+        android:src="@drawable/ic_check_white" />
+
+    <LinearLayout
+        android:id="@+id/progress"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:orientation="vertical"
+        android:visibility="gone">
+
+        <ProgressBar
+            android:id="@+id/progressBar"
+            style="?android:attr/progressBarStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginTop="8dp"
+            android:text="@string/backup_creating" />
+    </LinearLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/Omega/res/layout/activity_restore_backup.xml b/Omega/res/layout/activity_restore_backup.xml
new file mode 100644
index 0000000000..7aefb1baa2
--- /dev/null
+++ b/Omega/res/layout/activity_restore_backup.xml
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/content"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="com.saggitt.omega.backup.NewBackupActivity">
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/config"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingBottom="16dp">
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/textInputLayout"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_marginTop="16dp"
+                android:layout_marginEnd="16dp"
+                android:hint="@string/backup_name"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/name"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:enabled="false"
+                    android:imeOptions="flagNoExtractUi"
+                    android:singleLine="true"
+                    android:text=" "
+                    tools:ignore="HardcodedText" />
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/textInputLayout2"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_marginTop="16dp"
+                android:layout_marginEnd="16dp"
+                android:hint="@string/backup_timestamp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/textInputLayout">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/timestamp"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:enabled="false"
+                    android:singleLine="true"
+                    android:text=" "
+                    tools:ignore="HardcodedText" />
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <TextView
+                android:id="@+id/backup_contents_label"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="20dp"
+                android:layout_marginTop="16dp"
+                android:text="@string/restore_contents"
+                android:textColor="?android:textColorHint"
+                android:textSize="12sp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/textInputLayout2" />
+
+            <CheckBox
+                android:id="@+id/content_homescreen"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_marginTop="16dp"
+                android:text="@string/backup_homescreen"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/backup_contents_label" />
+
+            <CheckBox
+                android:id="@+id/content_settings"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_marginTop="16dp"
+                android:text="@string/backup_settings"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/content_homescreen" />
+
+            <CheckBox
+                android:id="@+id/content_wallpaper"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_marginTop="16dp"
+                android:enabled="false"
+                android:text="@string/backup_wallpaper"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/content_settings" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </ScrollView>
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/fab"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|end"
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="16dp"
+        android:src="@drawable/ic_restore_white" />
+
+    <LinearLayout
+        android:id="@+id/progress"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:orientation="vertical"
+        android:visibility="gone">
+
+        <ProgressBar
+            android:id="@+id/progressBar"
+            style="?android:attr/progressBarStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center" />
+
+        <ImageView
+            android:id="@+id/success_icon"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:layout_gravity="center"
+            android:src="@drawable/ic_check"
+            android:visibility="gone" />
+
+        <TextView
+            android:id="@+id/progress_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginTop="8dp"
+            android:text="@string/backup_restoring" />
+    </LinearLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/Omega/res/layout/activity_settings_home.xml b/Omega/res/layout/activity_settings_home.xml
index 255b1013cf..b950e22464 100644
--- a/Omega/res/layout/activity_settings_home.xml
+++ b/Omega/res/layout/activity_settings_home.xml
@@ -48,7 +48,7 @@
                 android:theme="@style/Toolbar"
                 app:contentInsetEnd="64dp"
                 app:contentInsetStartWithNavigation="64dp"
-                app:navigationIcon="@drawable/ic_settings_search">
+                app:navigationIcon="@drawable/ic_allapps_search">
                 <!-- TODO: Figure out proper way to align text to preference titles -->
                 <TextView
                     android:id="@+id/search_action_bar_title"
diff --git a/Omega/res/layout/adapter_loading.xml b/Omega/res/layout/adapter_loading.xml
new file mode 100644
index 0000000000..5f0adbf86c
--- /dev/null
+++ b/Omega/res/layout/adapter_loading.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:gravity="center_horizontal"
+        android:orientation="vertical">
+
+        <TextView
+            style="@android:style/TextAppearance.Material.Title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/loading" />
+
+        <ProgressBar
+            android:id="@+id/progress"
+            style="?android:attr/progressBarStyleHorizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:indeterminate="true" />
+    </LinearLayout>
+</FrameLayout>
\ No newline at end of file
diff --git a/Omega/res/layout/all_apps_floating_header.xml b/Omega/res/layout/all_apps_floating_header.xml
new file mode 100644
index 0000000000..91c29abae4
--- /dev/null
+++ b/Omega/res/layout/all_apps_floating_header.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~  Copyright (c) 2020 Omega Launcher
+  ~
+  ~  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.
+  ~
+  -->
+
+<com.android.launcher3.allapps.FloatingHeaderView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/all_apps_header"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_below="@id/search_container_all_apps"
+    android:clipToPadding="false"
+    android:orientation="vertical"
+    android:paddingTop="24dp">
+
+    <include layout="@layout/floating_header_content" />
+
+    <HorizontalScrollView
+        android:id="@+id/tabs_scroller"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@android:color/transparent"
+        android:clipChildren="false"
+        android:clipToPadding="false"
+        android:fillViewport="true"
+        android:paddingLeft="@dimen/all_apps_tabs_side_padding"
+        android:paddingRight="@dimen/all_apps_tabs_side_padding"
+        android:scrollbars="none">
+
+        <com.android.launcher3.allapps.PersonalWorkSlidingTabStrip
+            android:id="@+id/tabs"
+            style="@style/TextHeadline"
+            android:layout_width="wrap_content"
+            android:layout_height="@dimen/all_apps_header_tab_height"
+            android:clipChildren="false"
+            android:clipToPadding="false"
+            android:orientation="horizontal" />
+
+    </HorizontalScrollView>
+</com.android.launcher3.allapps.FloatingHeaderView>
diff --git a/Omega/res/layout/all_apps_folder_application.xml b/Omega/res/layout/all_apps_folder_application.xml
new file mode 100644
index 0000000000..49a438ea26
--- /dev/null
+++ b/Omega/res/layout/all_apps_folder_application.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~     This file is part of Lawnchair Launcher.
+  ~
+  ~     Lawnchair Launcher is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     Lawnchair Launcher is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<com.android.launcher3.BubbleTextView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:launcher="http://schemas.android.com/apk/res-auto"
+    style="@style/BaseIcon"
+    android:includeFontPadding="false"
+    launcher:iconDisplay="drawer_folder" />
diff --git a/Omega/res/layout/all_apps_folder_icon.xml b/Omega/res/layout/all_apps_folder_icon.xml
new file mode 100644
index 0000000000..33b5f9dae7
--- /dev/null
+++ b/Omega/res/layout/all_apps_folder_icon.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~     This file is part of Lawnchair Launcher.
+  ~
+  ~     Lawnchair Launcher is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     Lawnchair Launcher is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<com.android.launcher3.folder.FolderIcon xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/folder_icon"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_gravity="center"
+    android:focusable="true"
+    android:orientation="vertical"
+    android:paddingLeft="@dimen/dynamic_grid_cell_padding_x"
+    android:paddingRight="@dimen/dynamic_grid_cell_padding_x">
+
+    <com.android.launcher3.BubbleTextView
+        android:id="@+id/folder_icon_name"
+        style="@style/BaseIcon"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="top"
+        android:focusable="false"
+        app:iconDisplay="all_apps" />
+</com.android.launcher3.folder.FolderIcon>
\ No newline at end of file
diff --git a/Omega/res/layout/all_apps_google_search_fallback.xml b/Omega/res/layout/all_apps_google_search_fallback.xml
new file mode 100644
index 0000000000..1adfb911fe
--- /dev/null
+++ b/Omega/res/layout/all_apps_google_search_fallback.xml
@@ -0,0 +1,33 @@
+<?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.
+-->
+
+<com.saggitt.omega.qsb.FallbackAppsSearchView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:layout_gravity="bottom"
+    android:layout_marginLeft="48dp"
+    android:layout_marginRight="48dp"
+    android:background="@android:color/transparent"
+    android:focusableInTouchMode="true"
+    android:gravity="start|center"
+    android:imeOptions="actionSearch|flagNoExtractUi"
+    android:inputType="textCapWords|textNoSuggestions"
+    android:maxLines="1"
+    android:paddingStart="20dp"
+    android:scrollHorizontally="true"
+    android:singleLine="true"
+    android:textColor="@color/qsb_drawer_text_color_normal"
+    android:textColorHint="@drawable/all_apps_search_hint"
+    android:textSize="16sp" />
\ No newline at end of file
diff --git a/Omega/res/layout/all_apps_paged_layout.xml b/Omega/res/layout/all_apps_paged_layout.xml
new file mode 100644
index 0000000000..d658b65ce0
--- /dev/null
+++ b/Omega/res/layout/all_apps_paged_layout.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~  Copyright (c) 2020 Omega Launcher
+  ~
+  ~  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.
+  ~
+  -->
+
+<com.android.launcher3.allapps.AllAppsPagedView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:launcher="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/all_apps_tabs_view_pager"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_below="@id/search_container_all_apps"
+    android:layout_gravity="center_horizontal|top"
+    android:clipChildren="true"
+    android:clipToPadding="false"
+    android:descendantFocusability="afterDescendants"
+    launcher:pageIndicator="@+id/tabs">
+
+    <include layout="@layout/all_apps_rv_layout" />
+
+</com.android.launcher3.allapps.AllAppsPagedView>
\ No newline at end of file
diff --git a/Omega/res/layout/all_apps_search_suggestion.xml b/Omega/res/layout/all_apps_search_suggestion.xml
new file mode 100644
index 0000000000..e37827eb38
--- /dev/null
+++ b/Omega/res/layout/all_apps_search_suggestion.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~     Copyright (C) 2019 Lawnchair Team.
+  ~
+  ~     This file is part of Lawnchair Launcher.
+  ~
+  ~     Lawnchair Launcher is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     Lawnchair Launcher is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="40dp"
+    android:orientation="horizontal"
+    android:paddingLeft="@dimen/dynamic_grid_drawer_additional_padding"
+    android:paddingRight="@dimen/dynamic_grid_drawer_additional_padding">
+
+    <ImageView
+        android:id="@android:id/icon"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_gravity="center"
+        android:src="@drawable/ic_search"
+        app:tint="?android:attr/textColorSecondary" />
+
+    <TextView
+        android:id="@+id/suggestion"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginStart="10dp"
+        android:layout_marginEnd="10dp"
+        android:background="?android:selectableItemBackground"
+        android:focusable="true"
+        android:fontFamily="sans-serif-medium"
+        android:gravity="center_vertical"
+        android:textColor="?android:attr/textColorSecondary"
+        android:textSize="18sp"
+        tools:text="Launcher Apk" />
+</LinearLayout>
diff --git a/Omega/res/layout/all_apps_tab.xml b/Omega/res/layout/all_apps_tab.xml
new file mode 100644
index 0000000000..4a2756d5dc
--- /dev/null
+++ b/Omega/res/layout/all_apps_tab.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~     This file is part of Lawnchair Launcher.
+  ~
+  ~     Lawnchair Launcher is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     Lawnchair Launcher is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<com.saggitt.omega.views.ColoredButton xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:background="?android:attr/selectableItemBackgroundBorderless"
+    android:padding="8dp"
+    android:textAllCaps="false"
+    android:textColor="@color/all_apps_tab_text"
+    android:textSize="14sp"
+    app:customFontType="drawerTab"
+    tools:text="@string/all_apps_personal_tab" />
diff --git a/Omega/res/layout/app_categorization_enable_toggle.xml b/Omega/res/layout/app_categorization_enable_toggle.xml
new file mode 100644
index 0000000000..99e307282f
--- /dev/null
+++ b/Omega/res/layout/app_categorization_enable_toggle.xml
@@ -0,0 +1,91 @@
+<?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
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?android:attr/selectableItemBackground"
+    android:clipToPadding="false"
+    android:focusable="true"
+    android:gravity="center_vertical"
+    android:minHeight="?android:attr/listPreferredItemHeightSmall"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
+
+    <LinearLayout
+        android:id="@+id/icon_frame"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="start|center_vertical"
+        android:minWidth="56dp"
+        android:orientation="horizontal"
+        android:paddingTop="4dp"
+        android:paddingEnd="8dp"
+        android:paddingBottom="4dp">
+
+        <androidx.preference.internal.PreferenceImageView
+            android:id="@android:id/icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/ic_folder_outline"
+            app:maxHeight="48dp"
+            app:maxWidth="48dp" />
+    </LinearLayout>
+
+    <RelativeLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:paddingTop="16dp"
+        android:paddingBottom="16dp">
+
+        <TextView
+            android:id="@android:id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="marquee"
+            android:singleLine="true"
+            android:text="@string/pref_appcategorization_enable_title"
+            android:textAppearance="?android:attr/textAppearanceListItem" />
+
+        <TextView
+            android:id="@android:id/summary"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@android:id/title"
+            android:layout_alignStart="@android:id/title"
+            android:maxLines="10"
+            android:text="@string/pref_appcategorization_enable_summary"
+            android:textAlignment="viewStart"
+            android:textAppearance="?android:attr/textAppearanceListItemSecondary"
+            android:textColor="?android:attr/textColorSecondary" />
+
+    </RelativeLayout>
+
+    <!-- Preference should place its actual preference widget here. -->
+    <LinearLayout
+        android:id="@android:id/widget_frame"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:gravity="end|center_vertical"
+        android:orientation="vertical"
+        android:paddingStart="16dp">
+
+        <include layout="@layout/preference_switch_widget" />
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/Omega/res/layout/app_categorization_type_item.xml b/Omega/res/layout/app_categorization_type_item.xml
new file mode 100644
index 0000000000..02427ba51f
--- /dev/null
+++ b/Omega/res/layout/app_categorization_type_item.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~     This file is part of Lawnchair Launcher.
+  ~
+  ~     Lawnchair Launcher is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     Lawnchair Launcher is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<com.saggitt.omega.groups.ui.AppCategorizationTypeItem xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginStart="56dp"
+    android:layout_marginEnd="?android:attr/listPreferredItemPaddingEnd"
+    android:layout_marginBottom="16dp"
+    android:background="@drawable/app_categorization_type_item_background"
+    android:clipToPadding="false"
+    android:focusable="true"
+    android:gravity="center_vertical"
+    android:minHeight="?android:attr/listPreferredItemHeightSmall"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
+
+    <RelativeLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:paddingTop="10dp"
+        android:paddingBottom="10dp">
+
+        <TextView
+            android:id="@android:id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="marquee"
+            android:singleLine="true"
+            android:textAppearance="?android:attr/textAppearanceListItem"
+            tools:text="Tabs" />
+
+        <TextView
+            android:id="@android:id/summary"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@android:id/title"
+            android:layout_alignStart="@android:id/title"
+            android:maxLines="10"
+            android:textAlignment="viewStart"
+            android:textAppearance="?android:attr/textAppearanceListItemSecondary"
+            android:textColor="?android:attr/textColorSecondary"
+            tools:text="Tap to open pop-up." />
+
+    </RelativeLayout>
+
+    <!-- Preference should place its actual preference widget here. -->
+    <LinearLayout
+        android:id="@android:id/widget_frame"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:gravity="end|center_vertical"
+        android:orientation="vertical"
+        android:paddingStart="16dp">
+
+        <ImageView
+            android:id="@+id/checkMark"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/ic_check" />
+    </LinearLayout>
+
+</com.saggitt.omega.groups.ui.AppCategorizationTypeItem>
diff --git a/Omega/res/layout/app_edit_bottom_sheet.xml b/Omega/res/layout/app_edit_bottom_sheet.xml
new file mode 100644
index 0000000000..131789927e
--- /dev/null
+++ b/Omega/res/layout/app_edit_bottom_sheet.xml
@@ -0,0 +1,72 @@
+<?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.
+-->
+
+<com.saggitt.omega.views.CustomBottomSheet xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/content"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="bottom"
+    android:background="@drawable/top_round_rect_primary"
+    android:elevation="@dimen/deep_shortcuts_elevation"
+    android:orientation="vertical"
+    android:paddingTop="28dp"
+    android:theme="?attr/widgetsTheme">
+
+    <ImageView
+        android:id="@+id/icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:paddingBottom="12dp" />
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/title"
+        style="@style/TextTitle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="32dp"
+        android:gravity="center_horizontal"
+        android:textColor="?android:attr/textColorPrimary"
+        android:textSize="24sp" />
+
+    <EditText
+        android:id="@+id/edit_title"
+        style="@style/TextTitle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="32dp"
+        android:background="@android:color/transparent"
+        android:gravity="center_horizontal"
+        android:singleLine="true"
+        android:textColor="?android:attr/textColorPrimary"
+        android:textSize="24sp"
+        android:visibility="gone" />
+
+    <fragment
+        android:id="@+id/sheet_prefs"
+        android:name="com.saggitt.omega.views.CustomBottomSheet$PrefsFragment"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="40dp" />
+
+    <View
+        android:id="@+id/nav_bar_bg"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_gravity="bottom"
+        android:background="?attr/bottomSheetNavBarColor"
+        android:focusable="false" />
+
+</com.saggitt.omega.views.CustomBottomSheet>
\ No newline at end of file
diff --git a/Omega/res/layout/app_groups_adapter_add.xml b/Omega/res/layout/app_groups_adapter_add.xml
new file mode 100644
index 0000000000..fb54ca8f86
--- /dev/null
+++ b/Omega/res/layout/app_groups_adapter_add.xml
@@ -0,0 +1,67 @@
+<?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
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?android:attr/selectableItemBackground"
+    android:clipToPadding="false"
+    android:focusable="true"
+    android:gravity="center_vertical"
+    android:minHeight="?android:attr/listPreferredItemHeightSmall"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
+
+    <LinearLayout
+        android:id="@+id/icon_frame"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="start|center_vertical"
+        android:minWidth="56dp"
+        android:orientation="horizontal"
+        android:paddingTop="4dp"
+        android:paddingEnd="8dp"
+        android:paddingBottom="4dp">
+
+        <androidx.preference.internal.PreferenceImageView
+            android:id="@android:id/icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/ic_add"
+            app:maxHeight="48dp"
+            app:maxWidth="48dp" />
+    </LinearLayout>
+
+    <RelativeLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:paddingTop="16dp"
+        android:paddingBottom="16dp">
+
+        <TextView
+            android:id="@android:id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="marquee"
+            android:singleLine="true"
+            android:text="@string/pref_app_groups_create"
+            android:textAppearance="?android:attr/textAppearanceListItem" />
+
+    </RelativeLayout>
+
+</LinearLayout>
diff --git a/Omega/res/layout/app_groups_adapter_header.xml b/Omega/res/layout/app_groups_adapter_header.xml
new file mode 100644
index 0000000000..d35d088d73
--- /dev/null
+++ b/Omega/res/layout/app_groups_adapter_header.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~     This file is part of Lawnchair Launcher.
+  ~
+  ~     Lawnchair Launcher is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     Lawnchair Launcher is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <include
+        android:id="@+id/categoryHeader"
+        layout="@layout/settings_category_v2" />
+
+    <LinearLayout
+        android:id="@+id/tipRow"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:clipToPadding="false"
+        android:focusable="true"
+        android:gravity="center_vertical"
+        android:minHeight="?android:attr/listPreferredItemHeightSmall"
+        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
+
+        <LinearLayout
+            android:id="@+id/icon_frame"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="start|center_vertical"
+            android:minWidth="56dp"
+            android:orientation="horizontal"
+            android:paddingTop="4dp"
+            android:paddingEnd="8dp"
+            android:paddingBottom="4dp">
+
+            <androidx.preference.internal.PreferenceImageView
+                android:id="@android:id/icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/ic_info"
+                app:maxHeight="48dp"
+                app:maxWidth="48dp" />
+        </LinearLayout>
+
+        <RelativeLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:paddingTop="16dp"
+            android:paddingBottom="16dp">
+
+            <TextView
+                android:id="@android:id/summary"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@android:id/title"
+                android:layout_alignStart="@android:id/title"
+                android:maxLines="10"
+                android:text="@string/pref_app_groups_edit_tip"
+                android:textAlignment="viewStart"
+                android:textAppearance="?android:attr/textAppearanceListItemSecondary"
+                android:textColor="?android:attr/textColorSecondary" />
+
+        </RelativeLayout>
+
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/Omega/res/layout/app_item.xml b/Omega/res/layout/app_item.xml
new file mode 100644
index 0000000000..acbd79fa75
--- /dev/null
+++ b/Omega/res/layout/app_item.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:foreground="?android:attr/selectableItemBackground">
+
+    <LinearLayout
+        android:id="@+id/iconContainer"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentStart="true"
+        android:orientation="horizontal">
+
+        <ImageView
+            android:id="@+id/shortcutIcon"
+            android:layout_width="36dp"
+            android:layout_height="36dp"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="28dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="8dp"
+            android:visibility="gone" />
+
+        <ImageView
+            android:id="@+id/icon"
+            android:layout_width="@android:dimen/app_icon_size"
+            android:layout_height="@android:dimen/app_icon_size"
+            android:layout_margin="8dp"
+            tools:src="@mipmap/ic_launcher" />
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/label"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:layout_gravity="center_vertical"
+        android:layout_margin="8dp"
+        android:layout_toEndOf="@+id/iconContainer"
+        android:textColor="?android:textColorPrimary"
+        android:textSize="18sp"
+        tools:text="@string/derived_app_name" />
+
+    <CheckBox
+        android:id="@+id/check"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignEnd="@+id/label"
+        android:layout_alignParentEnd="true"
+        android:layout_centerInParent="true"
+        android:layout_gravity="center_vertical"
+        android:clickable="false"
+        android:duplicateParentState="true"
+        android:focusable="false"
+        android:padding="8dp"
+        android:visibility="gone" />
+
+    <FrameLayout
+        android:id="@+id/caretContainer"
+        android:layout_width="64dp"
+        android:layout_height="64dp"
+        android:layout_alignEnd="@+id/label"
+        android:layout_alignParentEnd="true"
+        android:background="?attr/selectableItemBackground"
+        android:visibility="gone">
+
+        <ImageView
+            android:id="@+id/caretImageView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginTop="4dp" />
+    </FrameLayout>
+</RelativeLayout>
diff --git a/Omega/res/layout/apps_search_icon_template.xml b/Omega/res/layout/apps_search_icon_template.xml
new file mode 100644
index 0000000000..1bcb611084
--- /dev/null
+++ b/Omega/res/layout/apps_search_icon_template.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2018 CypherOS
+
+     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.
+-->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="fill_parent"
+    android:theme="@style/LauncherTheme">
+
+    <FrameLayout
+        android:id="@+id/click_feedback_wrapper"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:duplicateParentState="true">
+
+        <FrameLayout
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:background="@drawable/qsb_icon_feedback"
+            android:duplicateParentState="true" />
+    </FrameLayout>
+
+    <ImageView
+        android:id="@android:id/icon"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:duplicateParentState="true"
+        android:scaleType="fitXY"
+        android:tint="@color/qsb_icon_tint" />
+
+    <TextView
+        android:id="@android:id/title"
+        style="@style/BaseIcon"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:paddingLeft="4.0dip"
+        android:paddingRight="4.0dip" />
+</FrameLayout>
\ No newline at end of file
diff --git a/Omega/res/layout/apps_search_qsb_template.xml b/Omega/res/layout/apps_search_qsb_template.xml
new file mode 100644
index 0000000000..0de78cae6c
--- /dev/null
+++ b/Omega/res/layout/apps_search_qsb_template.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2018 CypherOS
+
+     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.
+-->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="fill_parent">
+
+    <LinearLayout
+        android:id="@+id/qsb_background_container"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layoutDirection="ltr"
+        android:orientation="horizontal"
+        android:padding="@dimen/qsb_shadow_margin">
+
+        <ImageView
+            android:id="@+id/qsb_background_1"
+            android:layout_width="wrap_content"
+            android:layout_height="fill_parent"
+            android:scaleType="matrix" />
+
+        <ImageView
+            android:id="@+id/qsb_background_2"
+            android:layout_width="0.0dip"
+            android:layout_height="fill_parent"
+            android:layout_weight="1.0"
+            android:scaleType="fitXY" />
+
+        <ImageView
+            android:id="@+id/qsb_background_3"
+            android:layout_width="wrap_content"
+            android:layout_height="fill_parent"
+            android:scaleType="matrix"
+            android:scaleX="-1.0" />
+    </LinearLayout>
+
+    <FrameLayout
+        android:id="@+id/qsb_icon_container"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent">
+
+        <ImageView
+            android:id="@+id/g_icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="start|center"
+            android:src="@drawable/ic_qsb_logo" />
+
+        <ImageView
+            android:id="@+id/mic_icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="end|center"
+            android:src="@drawable/ic_qsb_mic" />
+    </FrameLayout>
+</FrameLayout>
\ No newline at end of file
diff --git a/Omega/res/layout/backup_blank.xml b/Omega/res/layout/backup_blank.xml
new file mode 100644
index 0000000000..0990258a82
--- /dev/null
+++ b/Omega/res/layout/backup_blank.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:paddingStart="16dp"
+        android:paddingTop="48dp"
+        android:paddingEnd="16dp"
+        android:paddingBottom="40dp"
+        android:text="@string/no_recent_backups" />
+</FrameLayout>
\ No newline at end of file
diff --git a/Omega/res/layout/backup_bottom_sheet.xml b/Omega/res/layout/backup_bottom_sheet.xml
new file mode 100644
index 0000000000..dd42c62d52
--- /dev/null
+++ b/Omega/res/layout/backup_bottom_sheet.xml
@@ -0,0 +1,71 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:paddingTop="28dp">
+
+    <TextView
+        android:id="@android:id/title"
+        style="@style/TextTitle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:textColor="?android:attr/textColorPrimary"
+        android:textSize="24sp"
+        tools:text="Backup item" />
+
+    <TextView
+        android:id="@android:id/summary"
+        style="@style/TextTitle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="32dp"
+        android:gravity="center_horizontal"
+        android:textColor="?android:attr/textColorSecondary"
+        android:textSize="16sp"
+        tools:text="Oct 11, 2018 17:18:43" />
+
+    <TextView
+        android:id="@+id/action_restore_backup"
+        android:layout_width="match_parent"
+        android:layout_height="60dp"
+        android:layout_gravity="center"
+        android:background="?selectableItemBackground"
+        android:drawableStart="@drawable/ic_restore"
+        android:drawablePadding="16dp"
+        android:gravity="center_vertical"
+        android:padding="16dp"
+        android:text="@string/restore_backup" />
+
+    <View
+        android:id="@+id/divider"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="?android:listDivider" />
+
+    <TextView
+        android:id="@+id/action_share_backup"
+        android:layout_width="match_parent"
+        android:layout_height="60dp"
+        android:layout_gravity="center"
+        android:background="?selectableItemBackground"
+        android:drawableStart="@drawable/ic_share"
+        android:drawablePadding="16dp"
+        android:gravity="center_vertical"
+        android:padding="16dp"
+        android:text="@string/backup_share" />
+
+    <TextView
+        android:id="@+id/action_remove_backup_from_list"
+        android:layout_width="match_parent"
+        android:layout_height="60dp"
+        android:layout_gravity="center"
+        android:background="?selectableItemBackground"
+        android:drawableStart="@drawable/ic_list_remove"
+        android:drawablePadding="16dp"
+        android:gravity="center_vertical"
+        android:padding="16dp"
+        android:text="@string/backup_remove_from_recents" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/Omega/res/layout/backup_item.xml b/Omega/res/layout/backup_item.xml
new file mode 100644
index 0000000000..8a64f9102b
--- /dev/null
+++ b/Omega/res/layout/backup_item.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <androidx.cardview.widget.CardView
+        android:id="@+id/backup_item"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="8dp"
+        android:foreground="?selectableItemBackground"
+        app:cardCornerRadius="8dp">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <com.saggitt.omega.views.ScreenshotPreview
+                android:id="@+id/preview_container"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <ImageView
+                    android:id="@+id/wallpaper"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:scaleType="centerCrop" />
+
+                <ImageView
+                    android:id="@+id/preview"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:adjustViewBounds="true" />
+            </com.saggitt.omega.views.ScreenshotPreview>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:padding="16dp">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:paddingEnd="8dp"
+                    android:src="@drawable/ic_file_restore"
+                    tools:ignore="RtlSymmetry" />
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:id="@android:id/title"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="start"
+                        android:layout_weight="1"
+                        android:ellipsize="end"
+                        android:maxLines="1"
+                        android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+                        tools:text="Backup item" />
+
+                    <TextView
+                        android:id="@android:id/summary"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="start"
+                        android:layout_weight="1"
+                        android:lines="2"
+                        android:textAppearance="@style/TextAppearance.AppCompat.Caption"
+                        tools:text="Oct 11, 2019 17:18:43" />
+                </LinearLayout>
+            </LinearLayout>
+        </LinearLayout>
+    </androidx.cardview.widget.CardView>
+</FrameLayout>
\ No newline at end of file
diff --git a/Omega/res/layout/backup_menu.xml b/Omega/res/layout/backup_menu.xml
new file mode 100644
index 0000000000..464b00a3ae
--- /dev/null
+++ b/Omega/res/layout/backup_menu.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <androidx.cardview.widget.CardView
+        android:id="@+id/action_new_backup"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="8dp"
+        android:foreground="?selectableItemBackground"
+        app:cardCornerRadius="8dp"
+        app:layout_constraintEnd_toStartOf="@+id/action_restore_backup"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="60dp"
+            android:layout_gravity="center"
+            android:drawableStart="@drawable/ic_backup"
+            android:drawablePadding="16dp"
+            android:gravity="center_vertical"
+            android:padding="16dp"
+            android:text="@string/new_backup"
+            android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
+    </androidx.cardview.widget.CardView>
+
+    <androidx.cardview.widget.CardView
+        android:id="@+id/action_restore_backup"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="16dp"
+        android:foreground="?selectableItemBackground"
+        app:cardCornerRadius="8dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toEndOf="@+id/action_new_backup"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="60dp"
+            android:layout_gravity="center"
+            android:drawableStart="@drawable/ic_restore"
+            android:drawablePadding="16dp"
+            android:gravity="center_vertical"
+            android:padding="16dp"
+            android:text="@string/restore_backup"
+            android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
+    </androidx.cardview.widget.CardView>
+
+    <TextView
+        android:id="@+id/local_backup_title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+        android:paddingTop="16dip"
+        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+        android:paddingBottom="8dp"
+        android:text="@string/local_backups"
+        android:textAppearance="@android:style/TextAppearance.Material.Body2"
+        android:textColor="?android:attr/colorAccent"
+        app:layout_constraintTop_toBottomOf="@+id/action_new_backup" />
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/Omega/res/layout/base_bottom_sheet.xml b/Omega/res/layout/base_bottom_sheet.xml
new file mode 100644
index 0000000000..2e3efc8056
--- /dev/null
+++ b/Omega/res/layout/base_bottom_sheet.xml
@@ -0,0 +1,39 @@
+<?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.
+-->
+
+<com.saggitt.omega.views.BaseBottomSheet xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/content"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="bottom"
+    android:background="@drawable/top_round_rect_primary"
+    android:elevation="@dimen/deep_shortcuts_elevation"
+    android:orientation="vertical"
+    android:theme="?attr/widgetsTheme">
+
+    <FrameLayout
+        android:id="@+id/sheet_contents"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+    <View
+        android:id="@+id/nav_bar_bg"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_gravity="bottom"
+        android:background="?attr/bottomSheetNavBarColor"
+        android:focusable="false" />
+
+</com.saggitt.omega.views.BaseBottomSheet>
diff --git a/Omega/res/layout/base_center_sheet.xml b/Omega/res/layout/base_center_sheet.xml
new file mode 100644
index 0000000000..2e3c46d74d
--- /dev/null
+++ b/Omega/res/layout/base_center_sheet.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~  Copyright (c) 2020 Omega Launcher
+  ~
+  ~  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.
+  ~
+  -->
+
+<com.saggitt.omega.views.CenterFloatingView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/content"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center"
+    android:background="@android:color/transparent"
+    android:elevation="@dimen/deep_shortcuts_elevation"
+    android:orientation="vertical"
+    android:theme="?attr/widgetsTheme">
+
+    <FrameLayout
+        android:id="@+id/sheet_contents"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+</com.saggitt.omega.views.CenterFloatingView>
\ No newline at end of file
diff --git a/Omega/res/layout/custom_icon_adaptive.xml b/Omega/res/layout/custom_icon_adaptive.xml
new file mode 100644
index 0000000000..50f9aefd72
--- /dev/null
+++ b/Omega/res/layout/custom_icon_adaptive.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2020 Omega Launcher
+  ~
+  ~  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.
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?android:attr/selectableItemBackground"
+    android:baselineAligned="false"
+    android:clipToPadding="false"
+    android:focusable="true"
+    android:gravity="center_vertical"
+    android:minHeight="?android:attr/listPreferredItemHeightSmall"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
+
+    <RelativeLayout
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:paddingTop="16dp"
+        android:paddingBottom="16dp">
+
+        <TextView
+            android:id="@android:id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:text="@string/title_adaptify_pack"
+            android:textAppearance="?android:attr/textAppearanceListItem" />
+
+    </RelativeLayout>
+    <!-- Preference should place its actual preference widget here. -->
+    <LinearLayout
+        android:id="@android:id/widget_frame"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:gravity="end|center_vertical"
+        android:orientation="vertical"
+        android:paddingStart="16dp">
+
+        <include layout="@layout/preference_switch_widget" />
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/Omega/res/layout/custom_icon_colored.xml b/Omega/res/layout/custom_icon_colored.xml
new file mode 100644
index 0000000000..beedefc55b
--- /dev/null
+++ b/Omega/res/layout/custom_icon_colored.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2020 Omega Launcher
+  ~
+  ~  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.
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?android:attr/selectableItemBackground"
+    android:baselineAligned="false"
+    android:clipToPadding="false"
+    android:focusable="true"
+    android:gravity="center_vertical"
+    android:minHeight="?android:attr/listPreferredItemHeightSmall"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
+
+    <RelativeLayout
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:paddingTop="16dp"
+        android:paddingBottom="16dp">
+
+        <TextView
+            android:id="@android:id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:text="@string/title_legacy_colored_backgrounds"
+            android:textAppearance="?android:attr/textAppearanceListItem" />
+    </RelativeLayout>
+    <!-- Preference should place its actual preference widget here. -->
+    <LinearLayout
+        android:id="@android:id/widget_frame"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:gravity="end|center_vertical"
+        android:orientation="vertical"
+        android:paddingStart="16dp">
+
+        <include layout="@layout/preference_switch_widget" />
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/Omega/res/layout/custom_icon_legacy.xml b/Omega/res/layout/custom_icon_legacy.xml
new file mode 100644
index 0000000000..ac00547954
--- /dev/null
+++ b/Omega/res/layout/custom_icon_legacy.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2020 Omega Launcher
+  ~
+  ~  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.
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:baselineAligned="false"
+    android:background="?android:attr/selectableItemBackground"
+    android:clipToPadding="false"
+    android:focusable="true"
+    android:gravity="center_vertical"
+    android:minHeight="?android:attr/listPreferredItemHeightSmall"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
+
+    <RelativeLayout
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:paddingTop="16dp"
+        android:paddingBottom="16dp">
+
+        <TextView
+            android:id="@android:id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:text="@string/title_legacy_treatment"
+            android:textAppearance="?android:attr/textAppearanceListItem" />
+
+    </RelativeLayout>
+    <!-- Preference should place its actual preference widget here. -->
+    <LinearLayout
+        android:id="@android:id/widget_frame"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:gravity="end|center_vertical"
+        android:orientation="vertical"
+        android:paddingStart="16dp">
+
+        <include layout="@layout/preference_switch_widget" />
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/Omega/res/layout/custom_icon_shapeless.xml b/Omega/res/layout/custom_icon_shapeless.xml
new file mode 100644
index 0000000000..561f8e5222
--- /dev/null
+++ b/Omega/res/layout/custom_icon_shapeless.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2020 Omega Launcher
+  ~
+  ~  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.
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:baselineAligned="false"
+    android:background="?android:attr/selectableItemBackground"
+    android:clipToPadding="false"
+    android:focusable="true"
+    android:gravity="center_vertical"
+    android:minHeight="?android:attr/listPreferredItemHeightSmall"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
+
+    <RelativeLayout
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:paddingTop="16dp"
+        android:paddingBottom="16dp">
+
+        <TextView
+            android:id="@android:id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:text="@string/title_force_shapeless"
+            android:textAppearance="?android:attr/textAppearanceListItem" />
+
+    </RelativeLayout>
+    <!-- Preference should place its actual preference widget here. -->
+    <LinearLayout
+        android:id="@android:id/widget_frame"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:gravity="end|center_vertical"
+        android:orientation="vertical"
+        android:paddingStart="16dp">
+
+        <include layout="@layout/preference_switch_widget" />
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/Omega/res/layout/custom_icon_white.xml b/Omega/res/layout/custom_icon_white.xml
new file mode 100644
index 0000000000..16cb6a6cf8
--- /dev/null
+++ b/Omega/res/layout/custom_icon_white.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2020 Omega Launcher
+  ~
+  ~  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.
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:baselineAligned="false"
+    android:background="?android:attr/selectableItemBackground"
+    android:clipToPadding="false"
+    android:focusable="true"
+    android:gravity="center_vertical"
+    android:minHeight="?android:attr/listPreferredItemHeightSmall"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
+
+    <RelativeLayout
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:paddingTop="16dp"
+        android:paddingBottom="16dp">
+
+        <TextView
+            android:id="@android:id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:text="@string/title_white_only_treatment"
+            android:textAppearance="?android:attr/textAppearanceListItem" />
+
+    </RelativeLayout>
+    <!-- Preference should place its actual preference widget here. -->
+    <LinearLayout
+        android:id="@android:id/widget_frame"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:gravity="end|center_vertical"
+        android:orientation="vertical"
+        android:paddingStart="16dp">
+
+        <include layout="@layout/preference_switch_widget" />
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/Omega/res/layout/dash_dialog_item.xml b/Omega/res/layout/dash_dialog_item.xml
index df63092393..6e61bd9149 100644
--- a/Omega/res/layout/dash_dialog_item.xml
+++ b/Omega/res/layout/dash_dialog_item.xml
@@ -19,7 +19,7 @@
         android:paddingTop="4dp"
         android:paddingBottom="4dp"
         android:scaleType="centerInside"
-        tools:src="@mipmap/ic_launcher_home" />
+        tools:src="@mipmap/ic_launcher" />
 
     <LinearLayout
         android:layout_width="0dp"
diff --git a/Omega/res/layout/dash_item.xml b/Omega/res/layout/dash_item.xml
index 47d1f58522..dcf24e7b1e 100644
--- a/Omega/res/layout/dash_item.xml
+++ b/Omega/res/layout/dash_item.xml
@@ -26,6 +26,5 @@
         android:layout_height="50dp"
         android:background="@drawable/ripple_circle_bg"
         android:padding="10dp"
-        android:theme="@style/DashTheme.Item"
-        android:tint="#5C02DA" />
+        android:theme="@style/DashTheme.Item" />
 </LinearLayout>
diff --git a/Omega/res/layout/activity_dash.xml b/Omega/res/layout/dash_view.xml
similarity index 84%
rename from Omega/res/layout/activity_dash.xml
rename to Omega/res/layout/dash_view.xml
index c832fb844b..bfaa682362 100644
--- a/Omega/res/layout/activity_dash.xml
+++ b/Omega/res/layout/dash_view.xml
@@ -16,14 +16,14 @@
   -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/activity_main"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="wrap_content"
+    android:layout_gravity="center">
 
     <com.saggitt.omega.dash.DashListView
         android:id="@+id/my_circular_list"
         android:layout_width="300dp"
         android:layout_height="300dp"
-        android:layout_centerInParent="true"
-        android:background="@android:color/transparent" />
+        android:layout_centerInParent="true" />
+
 </RelativeLayout>
\ No newline at end of file
diff --git a/Omega/res/layout/date_widget.xml b/Omega/res/layout/date_widget.xml
new file mode 100644
index 0000000000..128909d66b
--- /dev/null
+++ b/Omega/res/layout/date_widget.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.saggitt.omega.superg.DateWidgetView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:launcher="http://schemas.android.com/apk/res-auto"
+    android:gravity="end|center"
+    android:layout_gravity="end"
+    android:orientation="vertical"
+    android:clipChildren="false"
+    android:clipToPadding="false"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent">
+
+    <com.saggitt.omega.superg.DoubleShadowTextClock
+        android:textSize="36sp"
+        android:textColor="#ffffffff"
+        android:id="@+id/date_text1"
+        android:paddingBottom="4dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:includeFontPadding="false"
+        android:fontFamily="sans-serif-light"
+        launcher:ambientShadowColor="#44000000"
+        launcher:keyShadowColor="#22000000"
+        launcher:ambientShadowBlur="6dp"
+        launcher:keyShadowBlur="2dp"
+        launcher:keyShadowOffset="0.5dp" />
+
+    <com.saggitt.omega.superg.DoubleShadowTextClock
+        android:textSize="12sp"
+        android:textColor="#ffffffff"
+        android:id="@+id/date_text2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:includeFontPadding="false"
+        android:textAllCaps="true"
+        android:fontFamily="sans-serif"
+        launcher:ambientShadowColor="#66000000"
+        launcher:keyShadowColor="#33000000"
+        launcher:ambientShadowBlur="2dp"
+        launcher:keyShadowBlur="1dp"
+        launcher:keyShadowOffset="0.5dp" />
+</com.saggitt.omega.superg.DateWidgetView>
\ No newline at end of file
diff --git a/Omega/res/layout/desktop_preview.xml b/Omega/res/layout/desktop_preview.xml
new file mode 100644
index 0000000000..5818916ad5
--- /dev/null
+++ b/Omega/res/layout/desktop_preview.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2020 Omega Launcher
+  ~
+  ~  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.
+  -->
+
+<com.saggitt.omega.icons.IconPreview xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/icon_preview"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/dock_preview_height" />
\ No newline at end of file
diff --git a/Omega/res/layout/dialog_preference_recyclerview.xml b/Omega/res/layout/dialog_preference_recyclerview.xml
new file mode 100644
index 0000000000..c855eae848
--- /dev/null
+++ b/Omega/res/layout/dialog_preference_recyclerview.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/list"
+        style="?attr/preferenceFragmentListStyle"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginTop="8dp"
+        android:clipToPadding="false"
+        android:overScrollMode="ifContentScrolls"
+        android:paddingTop="0dp"
+        android:paddingBottom="0dp" />
+</FrameLayout>
\ No newline at end of file
diff --git a/Omega/res/layout/drawer_tab_apps_row.xml b/Omega/res/layout/drawer_tab_apps_row.xml
new file mode 100644
index 0000000000..f34dc55f8e
--- /dev/null
+++ b/Omega/res/layout/drawer_tab_apps_row.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~     This file is part of Lawnchair Launcher.
+  ~
+  ~     Lawnchair Launcher is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     Lawnchair Launcher is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/manage_apps"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?android:attr/selectableItemBackground"
+    android:baselineAligned="false"
+    android:clipToPadding="false"
+    android:focusable="true"
+    android:gravity="center_vertical"
+    android:minHeight="?android:attr/listPreferredItemHeightSmall"
+    android:paddingStart="16dp"
+    android:paddingEnd="16dp">
+
+    <ImageView
+        android:id="@+id/manage_apps_icon"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_marginEnd="16dp"
+        android:src="@drawable/tab_manage_apps" />
+
+    <LinearLayout
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:orientation="vertical"
+        android:paddingTop="16dp"
+        android:paddingBottom="16dp">
+
+        <TextView
+            android:id="@+id/manage_apps_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="marquee"
+            android:singleLine="true"
+            android:text="@string/tab_manage_apps"
+            android:textAppearance="?android:attr/textAppearanceListItem" />
+
+        <TextView
+            android:id="@+id/apps_count"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:maxLines="10"
+            android:textAlignment="viewStart"
+            android:textAppearance="?android:attr/textAppearanceListItemSecondary"
+            android:textColor="?android:attr/textColorSecondary"
+            tools:text="0 apps" />
+    </LinearLayout>
+
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_marginStart="16dp"
+        android:gravity="end|center_vertical"
+        android:src="@drawable/chevron_right" />
+</LinearLayout>
diff --git a/Omega/res/layout/drawer_tab_custom_title_row.xml b/Omega/res/layout/drawer_tab_custom_title_row.xml
new file mode 100644
index 0000000000..0f8fffa770
--- /dev/null
+++ b/Omega/res/layout/drawer_tab_custom_title_row.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~     This file is part of Lawnchair Launcher.
+  ~
+  ~     Lawnchair Launcher is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     Lawnchair Launcher is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/name_label"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="56dp"
+        android:layout_marginEnd="16dp"
+        android:text="@string/name"
+        android:textAlignment="viewStart"
+        android:textColor="?android:colorAccent"
+        app:customFontType="preferenceTitle" />
+
+    <EditText
+        android:id="@+id/name"
+        style="@style/TextAppearance.AppCompat.Title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="52dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="16dp"
+        android:inputType="textCapWords"
+        android:selectAllOnFocus="true"
+        android:singleLine="true"
+        android:textAlignment="viewStart"
+        app:customFontType="title"
+        tools:text="Favorites" />
+</LinearLayout>
diff --git a/Omega/res/layout/drawer_tab_edit_bottom_sheet.xml b/Omega/res/layout/drawer_tab_edit_bottom_sheet.xml
new file mode 100644
index 0000000000..dbb7f2a6f4
--- /dev/null
+++ b/Omega/res/layout/drawer_tab_edit_bottom_sheet.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~     This file is part of Lawnchair Launcher.
+  ~
+  ~     Lawnchair Launcher is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     Lawnchair Launcher is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/customization_container"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:paddingTop="28dp">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="20dp"
+        android:gravity="end"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp">
+
+        <Button
+            android:id="@+id/cancel"
+            style="@style/SettingsTheme.Widget.OutlinedButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@android:string/cancel" />
+
+        <Button
+            android:id="@+id/save"
+            style="@style/SettingsTheme.Widget.OutlinedButton.Colored"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/tab_bottom_sheet_save" />
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/Omega/res/layout/drawer_tab_flowerpot_row.xml b/Omega/res/layout/drawer_tab_flowerpot_row.xml
new file mode 100644
index 0000000000..4f90af8db9
--- /dev/null
+++ b/Omega/res/layout/drawer_tab_flowerpot_row.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~     This file is part of Lawnchair Launcher.
+  ~
+  ~     Lawnchair Launcher is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     Lawnchair Launcher is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/select_category"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?android:attr/selectableItemBackground"
+    android:baselineAligned="false"
+    android:clipToPadding="false"
+    android:focusable="true"
+    android:gravity="center_vertical"
+    android:minHeight="?android:attr/listPreferredItemHeightSmall"
+    android:paddingStart="16dp"
+    android:paddingEnd="16dp">
+
+    <ImageView
+        android:id="@+id/category_icon"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_marginEnd="16dp"
+        android:src="@drawable/ic_category" />
+
+    <LinearLayout
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:orientation="vertical"
+        android:paddingTop="16dp"
+        android:paddingBottom="16dp">
+
+        <TextView
+            android:id="@+id/category_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="marquee"
+            android:singleLine="true"
+            android:text="@string/pref_appcategorization_flowerpot_title"
+            android:textAppearance="?android:attr/textAppearanceListItem" />
+
+        <TextView
+            android:id="@+id/current_category"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:maxLines="10"
+            android:textAlignment="viewStart"
+            android:textAppearance="?android:attr/textAppearanceListItemSecondary"
+            android:textColor="?android:attr/textColorSecondary"
+            tools:text="Personalization" />
+    </LinearLayout>
+
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_marginStart="16dp"
+        android:gravity="end|center_vertical"
+        android:src="@drawable/chevron_right" />
+</LinearLayout>
diff --git a/Omega/res/layout/drawer_tab_hidden_apps_row.xml b/Omega/res/layout/drawer_tab_hidden_apps_row.xml
new file mode 100644
index 0000000000..a2485d9ae4
--- /dev/null
+++ b/Omega/res/layout/drawer_tab_hidden_apps_row.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~     This file is part of Lawnchair Launcher.
+  ~
+  ~     Lawnchair Launcher is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     Lawnchair Launcher is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/manage_apps"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?android:attr/selectableItemBackground"
+    android:baselineAligned="false"
+    android:clipToPadding="false"
+    android:focusable="true"
+    android:gravity="center_vertical"
+    android:minHeight="?android:attr/listPreferredItemHeightSmall"
+    android:paddingStart="16dp"
+    android:paddingEnd="16dp">
+
+    <ImageView
+        android:id="@+id/manage_apps_icon"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_marginEnd="16dp"
+        android:src="@drawable/tab_hide_from_main" />
+
+    <LinearLayout
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:orientation="vertical"
+        android:paddingTop="16dp"
+        android:paddingBottom="16dp">
+
+        <TextView
+            android:id="@+id/manage_apps_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="marquee"
+            android:singleLine="true"
+            android:text="@string/title__drawer_hide_apps"
+            android:textAppearance="?android:attr/textAppearanceListItem" />
+
+        <TextView
+            android:id="@+id/apps_count"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:maxLines="10"
+            android:textAlignment="viewStart"
+            android:textAppearance="?android:attr/textAppearanceListItemSecondary"
+            android:textColor="?android:attr/textColorSecondary"
+            tools:text="0 apps" />
+    </LinearLayout>
+
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_marginStart="16dp"
+        android:gravity="end|center_vertical"
+        android:src="@drawable/chevron_right" />
+</LinearLayout>
diff --git a/Omega/res/layout/drawer_tab_select_type_bottom_sheet.xml b/Omega/res/layout/drawer_tab_select_type_bottom_sheet.xml
new file mode 100644
index 0000000000..5c521a448f
--- /dev/null
+++ b/Omega/res/layout/drawer_tab_select_type_bottom_sheet.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~     This file is part of Lawnchair Launcher.
+  ~
+  ~     Lawnchair Launcher is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     Lawnchair Launcher is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<!--
+  ~     This file is part of Lawnchair Launcher.
+  ~
+  ~     Lawnchair Launcher is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     Lawnchair Launcher is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/types_container"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:paddingTop="28dp"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
+
+    <TextView
+        android:id="@android:id/title"
+        style="@style/TextAppearance.AppCompat.Title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingBottom="16dp"
+        android:text="@string/select_tab_type"
+        android:textColor="?android:colorAccent" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/Omega/res/layout/drawer_tab_switch_row.xml b/Omega/res/layout/drawer_tab_switch_row.xml
new file mode 100644
index 0000000000..891eb0251d
--- /dev/null
+++ b/Omega/res/layout/drawer_tab_switch_row.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~     This file is part of Lawnchair Launcher.
+  ~
+  ~     Lawnchair Launcher is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     Lawnchair Launcher is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?android:attr/selectableItemBackground"
+    android:baselineAligned="false"
+    android:clipToPadding="false"
+    android:focusable="true"
+    android:gravity="center_vertical"
+    android:minHeight="?android:attr/listPreferredItemHeightSmall"
+    android:paddingStart="16dp"
+    android:paddingEnd="16dp">
+
+    <ImageView
+        android:id="@+id/icon"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_marginEnd="16dp" />
+
+    <LinearLayout
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:orientation="vertical"
+        android:paddingTop="16dp"
+        android:paddingBottom="16dp">
+
+        <TextView
+            android:id="@+id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="marquee"
+            android:singleLine="true"
+            android:textAppearance="?android:attr/textAppearanceListItem"
+            app:customFontType="preferenceTitle" />
+    </LinearLayout>
+
+    <Switch
+        android:id="@+id/switch_widget"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="end|center_vertical"
+        android:layout_marginStart="16dp"
+        android:background="@null"
+        android:clickable="false"
+        android:focusable="false" />
+</LinearLayout>
diff --git a/Omega/res/layout/drawer_tab_type_item.xml b/Omega/res/layout/drawer_tab_type_item.xml
new file mode 100644
index 0000000000..f7fb201e56
--- /dev/null
+++ b/Omega/res/layout/drawer_tab_type_item.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~     This file is part of Lawnchair Launcher.
+  ~
+  ~     Lawnchair Launcher is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     Lawnchair Launcher is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_weight="1"
+    android:background="@drawable/app_categorization_type_item_background"
+    android:clipToPadding="false"
+    android:focusable="true"
+    android:gravity="center_vertical"
+    android:minHeight="?android:attr/listPreferredItemHeightSmall"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
+
+    <ImageView
+        android:id="@android:id/icon"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_marginEnd="16dp"
+        android:src="@drawable/ic_category" />
+
+    <LinearLayout
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:orientation="vertical"
+        android:paddingTop="16dp"
+        android:paddingBottom="16dp">
+
+        <TextView
+            android:id="@android:id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="marquee"
+            android:singleLine="true"
+            android:textAppearance="?android:attr/textAppearanceListItem"
+            app:customFontType="preferenceTitle"
+            tools:text="@string/tab_type_custom" />
+
+        <TextView
+            android:id="@android:id/summary"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:maxLines="10"
+            android:textAlignment="viewStart"
+            android:textAppearance="?android:attr/textAppearanceListItemSecondary"
+            android:textColor="?android:attr/textColorSecondary"
+            tools:text="@string/tab_type_custom_desc" />
+    </LinearLayout>
+
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_marginStart="16dp"
+        android:gravity="end|center_vertical"
+        android:src="@drawable/chevron_right" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/Omega/res/layout/event_provider_dialog_item.xml b/Omega/res/layout/event_provider_dialog_item.xml
new file mode 100644
index 0000000000..f105f74641
--- /dev/null
+++ b/Omega/res/layout/event_provider_dialog_item.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="?android:attr/listPreferredItemHeightSmall"
+    android:background="?selectableItemBackground"
+    android:gravity="center_vertical"
+    android:orientation="horizontal">
+
+    <LinearLayout
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:layout_gravity="center_vertical"
+        android:layout_marginStart="@dimen/dialog_horizontal_padding"
+        android:orientation="vertical"
+        android:paddingEnd="16dp">
+
+        <TextView
+            android:id="@android:id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:textColor="?android:attr/textColorPrimary"
+            android:textSize="18sp"
+            tools:text="Dummy provider" />
+
+        <TextView
+            android:id="@android:id/summary"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:textColor="?android:attr/textColorSecondary"
+            android:textSize="14sp"
+            android:visibility="gone"
+            tools:text="com.saggitt.omega.smartspace.DummyProvider"
+            tools:visibility="visible" />
+    </LinearLayout>
+
+    <ImageView
+        android:id="@+id/drag_handle"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:paddingStart="?android:attr/listPreferredItemPaddingEnd"
+        android:paddingEnd="21dp"
+        android:src="@drawable/ic_drag_handle"
+        android:background="@android:color/transparent"
+        android:clickable="false"
+        android:duplicateParentState="true"
+        android:focusable="false"
+        android:gravity="center_vertical|end"
+        android:visibility="gone"
+        tools:visibility="visible" />
+</LinearLayout>
diff --git a/Omega/res/layout/event_provider_text_item.xml b/Omega/res/layout/event_provider_text_item.xml
new file mode 100644
index 0000000000..c1f30e7133
--- /dev/null
+++ b/Omega/res/layout/event_provider_text_item.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~     This file is part of Lawnchair Launcher.
+  ~
+  ~     Lawnchair Launcher is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     Lawnchair Launcher is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@android:id/text1"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="20dp"
+    android:layout_marginBottom="13dp"
+    android:paddingStart="@dimen/dialog_horizontal_padding"
+    android:paddingEnd="@dimen/dialog_horizontal_padding"
+    app:customFontType="categoryTitle" />
diff --git a/Omega/res/layout/event_providers_divider_item.xml b/Omega/res/layout/event_providers_divider_item.xml
new file mode 100644
index 0000000000..45b0a92672
--- /dev/null
+++ b/Omega/res/layout/event_providers_divider_item.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~     This file is part of Lawnchair Launcher.
+  ~
+  ~     Lawnchair Launcher is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     Lawnchair Launcher is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_marginStart="@dimen/dialog_horizontal_padding"
+        android:layout_marginEnd="@dimen/dialog_horizontal_padding"
+        android:background="?android:attr/listDivider"
+        android:layout_marginTop="13dp"
+        android:layout_marginBottom="13dp"
+        android:importantForAccessibility="no" />
+
+    <include
+        layout="@layout/event_provider_text_item"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="7dp"
+        android:layout_marginBottom="13dp" />
+</LinearLayout>
diff --git a/Omega/res/layout/fragment_app_categorization.xml b/Omega/res/layout/fragment_app_categorization.xml
new file mode 100644
index 0000000000..97fbc84a27
--- /dev/null
+++ b/Omega/res/layout/fragment_app_categorization.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~     This file is part of Lawnchair Launcher.
+  ~
+  ~     Lawnchair Launcher is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     Lawnchair Launcher is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<com.saggitt.omega.views.PreferenceNestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <com.saggitt.omega.views.InsettableLinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:clipChildren="false"
+        android:clipToPadding="false"
+        android:orientation="vertical">
+
+        <include
+            android:id="@+id/enableToggle"
+            layout="@layout/app_categorization_enable_toggle" />
+
+        <include
+            android:id="@+id/styleHeader"
+            layout="@layout/settings_category_v2"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="16dp" />
+
+        <include
+            android:id="@+id/folderTypeItem"
+            layout="@layout/app_categorization_type_item" />
+
+        <include
+            android:id="@+id/tabTypeItem"
+            layout="@layout/app_categorization_type_item" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/recyclerView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:nestedScrollingEnabled="false" />
+    </com.saggitt.omega.views.InsettableLinearLayout>
+</com.saggitt.omega.views.PreferenceNestedScrollView>
diff --git a/Omega/res/layout/fragment_icon_customization.xml b/Omega/res/layout/fragment_icon_customization.xml
new file mode 100644
index 0000000000..bfabd556da
--- /dev/null
+++ b/Omega/res/layout/fragment_icon_customization.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2020 Omega Launcher
+  ~
+  ~  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.
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <include
+        android:id="@+id/preview_frame"
+        layout="@layout/desktop_preview" />
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:nestedScrollingEnabled="true"
+        android:scrollbarStyle="insideOverlay"
+        android:scrollbars="horizontal">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/shape_view"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal|center_vertical"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="10dp"
+            android:clipChildren="true"
+            android:clipToPadding="true" />
+
+        <include layout="@layout/list_divider" />
+
+        <include
+            android:id="@+id/shapeless_icons"
+            layout="@layout/custom_icon_shapeless"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/list_divider" />
+
+        <include
+            android:id="@+id/legacy_icons"
+            layout="@layout/custom_icon_legacy"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/shapeless_icons" />
+
+        <include
+            android:id="@+id/colored_icons"
+            layout="@layout/custom_icon_colored"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/legacy_icons" />
+
+        <include
+            android:id="@+id/white_icons"
+            layout="@layout/custom_icon_white"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/colored_icons" />
+
+        <include
+            android:id="@+id/adaptive_icons"
+            layout="@layout/custom_icon_adaptive"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/white_icons" />
+    </RelativeLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/Omega/res/layout/gesture_item.xml b/Omega/res/layout/gesture_item.xml
new file mode 100644
index 0000000000..431b7ee032
--- /dev/null
+++ b/Omega/res/layout/gesture_item.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+     Copyright (C) 2014 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.
+-->
+
+<CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@android:id/text1"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?android:attr/selectableItemBackground"
+    android:drawableStart="?android:listChoiceIndicatorSingle"
+    android:drawablePadding="@dimen/select_dialog_drawable_padding_start_material"
+    android:ellipsize="marquee"
+    android:gravity="center_vertical"
+    android:minHeight="?android:attr/listPreferredItemHeightSmall"
+    android:paddingStart="@dimen/select_dialog_padding_start_material"
+    android:paddingEnd="@dimen/select_dialog_padding_material"
+    android:textAppearance="?android:textAppearanceMedium"
+    android:textColor="?android:attr/textColorAlertDialogListItem" />
\ No newline at end of file
diff --git a/Omega/res/layout/home_preference.xml b/Omega/res/layout/home_preference.xml
index 7dc9a5da11..ac95036692 100644
--- a/Omega/res/layout/home_preference.xml
+++ b/Omega/res/layout/home_preference.xml
@@ -24,7 +24,7 @@
         android:id="@android:id/icon"
         android:layout_width="@dimen/dashboard_tile_image_size"
         android:layout_height="@dimen/dashboard_tile_image_size"
-        android:scaleType="centerInside"
+        android:scaleType="center"
         android:layout_marginStart="@dimen/dashboard_tile_image_margin_start"
         android:layout_marginEnd="@dimen/dashboard_tile_image_margin_end" />
 
diff --git a/Omega/res/layout/icon_category.xml b/Omega/res/layout/icon_category.xml
new file mode 100644
index 0000000000..b8de0c9bee
--- /dev/null
+++ b/Omega/res/layout/icon_category.xml
@@ -0,0 +1,27 @@
+<?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.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <TextView
+        android:id="@android:id/title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+        tools:text="Category" />
+</LinearLayout>
diff --git a/Omega/res/layout/icon_item.xml b/Omega/res/layout/icon_item.xml
new file mode 100644
index 0000000000..3f48ebcfca
--- /dev/null
+++ b/Omega/res/layout/icon_item.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.saggitt.omega.views.FadingImageView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
+    android:layout_height="@dimen/icon_preview_size"
+    android:layout_marginTop="@dimen/icon_preview_padding"
+    android:layout_marginBottom="@dimen/icon_preview_padding"
+    android:background="?android:attr/selectableItemBackgroundBorderless"
+    android:scaleType="fitCenter"
+    tools:src="@mipmap/ic_launcher" />
diff --git a/Omega/res/layout/icon_loading.xml b/Omega/res/layout/icon_loading.xml
new file mode 100644
index 0000000000..d594359616
--- /dev/null
+++ b/Omega/res/layout/icon_loading.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ProgressBar xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/Widget.AppCompat.ProgressBar"
+    android:layout_width="@dimen/icon_preview_size"
+    android:layout_height="@dimen/icon_preview_size"
+    android:layout_margin="@dimen/icon_preview_padding" />
diff --git a/Omega/res/layout/icon_pack_dialog_item.xml b/Omega/res/layout/icon_pack_dialog_item.xml
new file mode 100644
index 0000000000..fb288369a3
--- /dev/null
+++ b/Omega/res/layout/icon_pack_dialog_item.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?selectableItemBackground"
+    android:gravity="center_vertical"
+    android:minHeight="?android:attr/listPreferredItemHeightSmall"
+    android:orientation="horizontal">
+
+    <ImageView
+        android:id="@android:id/icon"
+        android:layout_width="@dimen/icon_preview_size"
+        android:layout_height="@dimen/icon_preview_size"
+        android:layout_gravity="center_vertical"
+        android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
+        android:layout_marginTop="4dp"
+        android:layout_marginBottom="4dp"
+        android:paddingTop="4dp"
+        android:paddingBottom="4dp"
+        android:scaleType="centerInside"
+        tools:src="@mipmap/ic_launcher" />
+
+    <LinearLayout
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_weight="1"
+        android:orientation="vertical"
+        android:paddingStart="8dp"
+        android:paddingEnd="16dp">
+
+        <TextView
+            android:id="@android:id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:textColor="?android:attr/textColorPrimary"
+            android:textSize="18sp"
+            tools:text="Icon pack" />
+
+        <TextView
+            android:id="@android:id/summary"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:textColor="?android:attr/textColorSecondary"
+            android:textSize="14sp"
+            android:visibility="gone"
+            tools:text="com.example.iconpack"
+            tools:visibility="visible" />
+    </LinearLayout>
+
+    <ImageView
+        android:id="@+id/drag_handle"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:background="@android:color/transparent"
+        android:clickable="false"
+        android:duplicateParentState="true"
+        android:focusable="false"
+        android:gravity="center_vertical|end"
+        android:paddingStart="?android:attr/listPreferredItemPaddingEnd"
+        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+        android:src="@drawable/deep_shortcuts_drag_handle"
+        android:visibility="gone"
+        tools:visibility="visible" />
+</LinearLayout>
diff --git a/Omega/res/layout/icon_pack_divider_item.xml b/Omega/res/layout/icon_pack_divider_item.xml
new file mode 100644
index 0000000000..fe017c378d
--- /dev/null
+++ b/Omega/res/layout/icon_pack_divider_item.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~     This file is part of Lawnchair Launcher.
+  ~
+  ~     Lawnchair Launcher is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     Lawnchair Launcher is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <include layout="@layout/icon_pack_dialog_item" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="13dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="13dp"
+        android:background="?android:attr/listDivider"
+        android:importantForAccessibility="no" />
+
+    <include
+        layout="@layout/icon_pack_text_item"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="7dp"
+        android:layout_marginBottom="13dp" />
+</LinearLayout>
diff --git a/Omega/res/layout/icon_pack_item.xml b/Omega/res/layout/icon_pack_item.xml
new file mode 100644
index 0000000000..f61395dccc
--- /dev/null
+++ b/Omega/res/layout/icon_pack_item.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?android:attr/selectableItemBackground"
+    android:orientation="horizontal"
+    android:paddingStart="32dp"
+    android:paddingTop="16dp"
+    android:paddingEnd="32dp"
+    android:paddingBottom="16dp">
+
+    <ImageView
+        android:id="@android:id/icon"
+        android:layout_width="@dimen/icon_preview_size"
+        android:layout_height="@dimen/icon_preview_size"
+        android:scaleType="fitCenter"
+        tools:src="@mipmap/ic_launcher" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:orientation="vertical"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp">
+
+        <TextView
+            android:id="@android:id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="?android:attr/textColorPrimary"
+            android:textSize="18sp"
+            tools:text="Icon pack" />
+
+        <TextView
+            android:id="@android:id/text1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="?android:attr/textColorSecondary"
+            android:textSize="14sp"
+            android:visibility="gone"
+            tools:text="com.example.iconpack"
+            tools:visibility="visible" />
+    </LinearLayout>
+</LinearLayout>
diff --git a/Omega/res/layout/icon_pack_text_item.xml b/Omega/res/layout/icon_pack_text_item.xml
new file mode 100644
index 0000000000..652b05a533
--- /dev/null
+++ b/Omega/res/layout/icon_pack_text_item.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~     This file is part of Lawnchair Launcher.
+  ~
+  ~     Lawnchair Launcher is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     Lawnchair Launcher is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@android:id/text1"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="20dp"
+    android:layout_marginBottom="13dp"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" />
diff --git a/Omega/res/layout/icon_shape_corner_row.xml b/Omega/res/layout/icon_shape_corner_row.xml
new file mode 100644
index 0000000000..0ae1e06628
--- /dev/null
+++ b/Omega/res/layout/icon_shape_corner_row.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~     Copyright (C) 2019 Lawnchair Team.
+  ~
+  ~     This file is part of Lawnchair Launcher.
+  ~
+  ~     Lawnchair Launcher is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     Lawnchair Launcher is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<com.saggitt.omega.adaptive.IconShapeCornerRow xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?android:attr/activatedBackgroundIndicator"
+    android:baselineAligned="false"
+    android:gravity="center_vertical"
+    android:minHeight="?android:attr/listPreferredItemHeightSmall"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
+
+    <RelativeLayout
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:paddingTop="16dp"
+        android:paddingBottom="16dp">
+
+        <TextView
+            android:id="@android:id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="marquee"
+            android:fadingEdge="horizontal"
+            android:singleLine="true"
+            android:textAppearance="?android:attr/textAppearanceListItem" />
+
+        <TextView
+            android:id="@+id/txtValue"
+            android:layout_width="40dp"
+            android:layout_height="30dp"
+            android:layout_below="@android:id/title"
+            android:gravity="center|end"
+            tools:text="100" />
+
+        <SeekBar
+            android:id="@+id/seekbar"
+            android:layout_width="match_parent"
+            android:layout_height="30dp"
+            android:layout_below="@android:id/title"
+            android:layout_toStartOf="@id/spinner"
+            android:layout_toEndOf="@id/txtValue" />
+
+        <Spinner
+            android:id="@+id/spinner"
+            android:layout_width="wrap_content"
+            android:layout_height="30dp"
+            android:layout_below="@android:id/title"
+            android:layout_alignParentEnd="true"
+            android:gravity="center|end" />
+    </RelativeLayout>
+</com.saggitt.omega.adaptive.IconShapeCornerRow>
diff --git a/Omega/res/layout/icon_shape_customize_view.xml b/Omega/res/layout/icon_shape_customize_view.xml
new file mode 100644
index 0000000000..dce8f4dbb7
--- /dev/null
+++ b/Omega/res/layout/icon_shape_customize_view.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~     Copyright (C) 2019 Lawnchair Team.
+  ~
+  ~     This file is part of Lawnchair Launcher.
+  ~
+  ~     Lawnchair Launcher is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     Lawnchair Launcher is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <com.saggitt.omega.adaptive.IconShapeCustomizeView
+        android:id="@+id/customizeView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <ImageView
+            android:id="@+id/shapePreview"
+            android:layout_width="72dp"
+            android:layout_height="72dp"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="16dp" />
+
+        <include
+            android:id="@+id/topLeftRow"
+            layout="@layout/icon_shape_corner_row" />
+
+        <include
+            android:id="@+id/topRightRow"
+            layout="@layout/icon_shape_corner_row" />
+
+        <include
+            android:id="@+id/bottomLeftRow"
+            layout="@layout/icon_shape_corner_row" />
+
+        <include
+            android:id="@+id/bottomRightRow"
+            layout="@layout/icon_shape_corner_row" />
+    </com.saggitt.omega.adaptive.IconShapeCustomizeView>
+</ScrollView>
diff --git a/Omega/res/layout/icon_suggestion_item.xml b/Omega/res/layout/icon_suggestion_item.xml
new file mode 100644
index 0000000000..241737e0cf
--- /dev/null
+++ b/Omega/res/layout/icon_suggestion_item.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="@dimen/icon_preview_size"
+    android:layout_height="@dimen/icon_preview_size"
+    android:layout_margin="@dimen/icon_preview_padding"
+    android:background="?android:attr/selectableItemBackgroundBorderless"
+    android:scaleType="fitCenter"
+    tools:src="@mipmap/ic_launcher" />
diff --git a/Omega/res/layout/import_icon_preview.xml b/Omega/res/layout/import_icon_preview.xml
new file mode 100644
index 0000000000..617d072c10
--- /dev/null
+++ b/Omega/res/layout/import_icon_preview.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~     This file is part of Lawnchair Launcher.
+  ~
+  ~     Lawnchair Launcher is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     Lawnchair Launcher is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:paddingStart="24dp"
+    android:paddingTop="16dp"
+    android:paddingEnd="24dp">
+
+    <ImageView
+        android:id="@android:id/icon"
+        android:layout_width="56dp"
+        android:layout_height="56dp"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginEnd="8dp"
+        tools:src="@mipmap/ic_launcher" />
+
+    <CheckBox
+        android:id="@android:id/checkbox"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:text="@string/import_as_adaptive" />
+</LinearLayout>
diff --git a/Omega/res/layout/item_check.xml b/Omega/res/layout/item_check.xml
new file mode 100644
index 0000000000..afdb24fc10
--- /dev/null
+++ b/Omega/res/layout/item_check.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+     Copyright (C) 2014 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.
+-->
+
+<CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@android:id/text1"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="?android:attr/selectableItemBackground"
+    android:drawableStart="?android:listChoiceIndicatorSingle"
+    android:drawablePadding="@dimen/select_dialog_drawable_padding_start_material"
+    android:ellipsize="marquee"
+    android:gravity="center_vertical"
+    android:minHeight="?android:attr/listPreferredItemHeightSmall"
+    android:paddingStart="@dimen/select_dialog_padding_start_material"
+    android:paddingEnd="@dimen/select_dialog_padding_material"
+    android:textAppearance="?android:textAppearanceMedium"
+    android:textColor="?android:attr/textColorAlertDialogListItem" />
\ No newline at end of file
diff --git a/Omega/res/layout/item_icon_shape.xml b/Omega/res/layout/item_icon_shape.xml
new file mode 100644
index 0000000000..d91fab6e38
--- /dev/null
+++ b/Omega/res/layout/item_icon_shape.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2020 Omega Launcher
+  ~
+  ~  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.
+  -->
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center_horizontal">
+
+    <Button
+        android:id="@+id/shape_icon"
+        android:layout_width="@dimen/icon_preview_size"
+        android:layout_height="@dimen/icon_preview_size"
+        android:layout_margin="8dp"
+        android:gravity="center"
+        android:background="@drawable/shape_teardrop"
+        android:elevation="2dp" />
+
+    <ImageView
+        android:id="@+id/check_mark"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="20dp"
+        android:layout_marginTop="20dp"
+        android:src="@drawable/ic_check"
+        android:elevation="4dp" />
+</RelativeLayout>
\ No newline at end of file
diff --git a/Omega/res/layout/legacy_tab_item.xml b/Omega/res/layout/legacy_tab_item.xml
new file mode 100644
index 0000000000..04db3a2e8c
--- /dev/null
+++ b/Omega/res/layout/legacy_tab_item.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?selectableItemBackground"
+    android:gravity="center_vertical"
+    android:minHeight="?android:attr/listPreferredItemHeightSmall"
+    android:orientation="horizontal"
+    android:paddingTop="8dp"
+    android:paddingBottom="8dp">
+
+    <TextView
+        android:id="@+id/title"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        android:layout_weight="1"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textAlignment="viewStart"
+        android:textColor="?android:attr/textColorPrimary"
+        android:textSize="18sp"
+        app:layout_constraintBottom_toTopOf="@+id/summary"
+        app:layout_constraintEnd_toStartOf="@+id/delete"
+        app:layout_constraintStart_toEndOf="@+id/drag_handle"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="Tab 1" />
+
+    <ImageView
+        android:id="@+id/drag_handle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:background="@android:color/transparent"
+        android:clickable="false"
+        android:duplicateParentState="true"
+        android:focusable="false"
+        android:gravity="center_vertical|end"
+        android:src="@drawable/deep_shortcuts_drag_handle"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/summary"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:textAlignment="viewStart"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="@+id/title"
+        app:layout_constraintStart_toStartOf="@+id/title"
+        app:layout_constraintTop_toBottomOf="@+id/title"
+        tools:text="0 apps"
+        tools:visibility="visible" />
+
+    <ImageView
+        android:id="@+id/edit"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="16dp"
+        android:background="?attr/selectableItemBackgroundBorderless"
+        android:tint="?android:attr/colorAccent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/ic_edit_no_shadow" />
+
+    <ImageView
+        android:id="@+id/delete"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="24dp"
+        android:background="?attr/selectableItemBackgroundBorderless"
+        android:tint="?android:attr/colorAccent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/edit"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/ic_uninstall_no_shadow" />
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/Omega/res/layout/list_divider.xml b/Omega/res/layout/list_divider.xml
new file mode 100644
index 0000000000..25464f1ec4
--- /dev/null
+++ b/Omega/res/layout/list_divider.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2020 Omega Launcher
+  ~
+  ~  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.
+  -->
+
+<View xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/list_divider"
+    android:layout_width="match_parent"
+    android:layout_height="1dp"
+    android:layout_below="@id/shape_view"
+    android:layout_gravity="bottom"
+    android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
+    android:layout_marginTop="8dp"
+    android:layout_marginEnd="?android:attr/listPreferredItemPaddingStart"
+    android:layout_marginBottom="8dp"
+    android:background="?android:listDivider" />
\ No newline at end of file
diff --git a/Omega/res/layout/list_item_icon.xml b/Omega/res/layout/list_item_icon.xml
new file mode 100644
index 0000000000..b38d9990ac
--- /dev/null
+++ b/Omega/res/layout/list_item_icon.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~  Copyright (c) 2020 Omega Launcher
+  ~
+  ~  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.
+  ~
+  -->
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="48dp">
+
+    <include
+        layout="@layout/item_check"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ImageView
+        android:id="@+id/provider_icon"
+        android:layout_width="84dp"
+        android:layout_height="48dp"
+        android:paddingStart="@dimen/select_dialog_padding_material"
+        android:paddingEnd="@dimen/select_dialog_padding_material"
+        android:paddingTop="6dp"
+        android:paddingBottom="6dp"
+        android:scaleType="fitCenter"
+        android:src="@drawable/ic_qsb_logo"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/Omega/res/layout/options_view.xml b/Omega/res/layout/options_view.xml
new file mode 100644
index 0000000000..ff0ded7fdd
--- /dev/null
+++ b/Omega/res/layout/options_view.xml
@@ -0,0 +1,77 @@
+<?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.
+-->
+<com.saggitt.omega.views.OptionsPanel xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:launcher="http://schemas.android.com/apk/res-auto"
+    android:theme="@style/HomeScreenElementTheme"
+    launcher:layout_ignoreInsets="true"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center_horizontal|bottom"
+    android:alpha="0"
+    android:gravity="center"
+    android:orientation="horizontal"
+    android:visibility="invisible"
+    android:weightSum="4">
+
+    <com.saggitt.omega.views.OptionsTextView
+        android:id="@+id/wallpaper_button"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:drawablePadding="4dp"
+        android:drawableTop="@drawable/ic_wallpaper"
+        android:drawableTint="?attr/workspaceTextColor"
+        android:fontFamily="sans-serif-condensed"
+        android:gravity="center_horizontal"
+        android:stateListAnimator="@animator/overview_button_anim"
+        android:text="@string/wallpaper_button_text"
+        android:textAllCaps="true"
+        android:textColor="?attr/workspaceTextColor"
+        android:textSize="12sp" />
+
+    <com.saggitt.omega.views.OptionsTextView
+        android:id="@+id/widget_button"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:drawablePadding="4dp"
+        android:drawableTop="@drawable/ic_widget"
+        android:drawableTint="?attr/workspaceTextColor"
+        android:fontFamily="sans-serif-condensed"
+        android:gravity="center_horizontal"
+        android:stateListAnimator="@animator/overview_button_anim"
+        android:text="@string/widget_button_text"
+        android:textAllCaps="true"
+        android:textColor="?attr/workspaceTextColor"
+        android:textSize="12sp" />
+
+    <com.saggitt.omega.views.OptionsTextView
+        android:id="@+id/settings_button"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:drawablePadding="4dp"
+        android:drawableTop="@drawable/ic_setting"
+        android:drawableTint="?attr/workspaceTextColor"
+        android:fontFamily="sans-serif-condensed"
+        android:gravity="center_horizontal"
+        android:stateListAnimator="@animator/overview_button_anim"
+        android:text="@string/settings_button_text"
+        android:textAllCaps="true"
+        android:textColor="?attr/workspaceTextColor"
+        android:textSize="12sp" />
+
+</com.saggitt.omega.views.OptionsPanel>
diff --git a/Omega/res/layout/perm_request_dialog.xml b/Omega/res/layout/perm_request_dialog.xml
new file mode 100644
index 0000000000..4cd7995918
--- /dev/null
+++ b/Omega/res/layout/perm_request_dialog.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~     This file is part of Lawnchair Launcher.
+  ~
+  ~     Lawnchair Launcher is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     Lawnchair Launcher is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<!-- find out where the permission request width comes from -->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingTop="18dp"
+    android:paddingEnd="@dimen/select_dialog_padding_material"
+    android:paddingStart="@dimen/select_dialog_padding_start_material">
+
+    <ImageView
+        android:layout_width="36dp"
+        android:layout_height="36dp"
+        android:id="@+id/icon"
+        tools:src="@drawable/ic_location" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="?android:dialogPreferredPadding"
+        android:id="@+id/message"
+        android:textAppearance="@style/TextAppearance.AppCompat.Large"
+        android:layout_toEndOf="@id/icon"
+        tools:text="@string/permission_iplocate" />
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/message"
+        android:layout_alignStart="@id/message">
+
+        <ImageView
+            android:layout_width="20dp"
+            android:layout_height="20dp"
+            android:id="@+id/icon_info"
+            android:src="@drawable/ic_info_no_shadow"
+            android:visibility="gone"
+            app:tint="?android:textColorSecondary"
+            android:layout_gravity="center"
+            tools:visibility="visible" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingStart="12dp"
+            android:id="@+id/text_explanation"
+            android:textAppearance="@style/TextAppearance.AppCompat.Caption"
+            android:layout_gravity="center"
+            tools:text="@string/permission_iplocate_twilight_explanation" />
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/Omega/res/layout/pref_with_preview_icon.xml b/Omega/res/layout/pref_with_preview_icon.xml
new file mode 100644
index 0000000000..5de41bcdf6
--- /dev/null
+++ b/Omega/res/layout/pref_with_preview_icon.xml
@@ -0,0 +1,39 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="?android:attr/listPreferredItemHeightSmall"
+    android:gravity="center_vertical"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+    android:background="?selectableItemBackground">
+
+    <RelativeLayout
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:paddingTop="16dp"
+        android:paddingBottom="16dp"
+        android:layout_weight="1">
+
+        <TextView
+            android:id="@android:id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:textAppearance="?android:attr/textAppearanceListItem"
+            android:ellipsize="marquee"
+            android:fadingEdge="horizontal" />
+
+        <TextView
+            android:id="@android:id/summary"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@android:id/title"
+            android:layout_alignStart="@android:id/title"
+            android:textAppearance="?android:attr/textAppearanceListItemSecondary"
+            android:textColor="?android:attr/textColorSecondary"
+            android:maxLines="10"
+            android:ellipsize="end" />
+    </RelativeLayout>
+
+    <include layout="@layout/preview_icon" />
+</LinearLayout>
\ No newline at end of file
diff --git a/Omega/res/layout/preference_grid_size.xml b/Omega/res/layout/preference_grid_size.xml
new file mode 100644
index 0000000000..2985ba033b
--- /dev/null
+++ b/Omega/res/layout/preference_grid_size.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <SeekBar
+        android:id="@+id/numRowsPicker"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="24dp"
+        android:layout_marginEnd="16dp"
+        android:max="6"
+        android:progress="3"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/numRowsLabel"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/numRowsLabel"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="24dp"
+        android:text="0"
+        app:layout_constraintBottom_toBottomOf="@+id/numRowsPicker"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/numRowsPicker" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/Omega/res/layout/preference_preview.xml b/Omega/res/layout/preference_preview.xml
new file mode 100644
index 0000000000..ee762e0f48
--- /dev/null
+++ b/Omega/res/layout/preference_preview.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.saggitt.omega.views.PreviewFrame xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content" />
\ No newline at end of file
diff --git a/Omega/res/layout/preference_preview_icon.xml b/Omega/res/layout/preference_preview_icon.xml
new file mode 100644
index 0000000000..10903021fe
--- /dev/null
+++ b/Omega/res/layout/preference_preview_icon.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?selectableItemBackground"
+    android:gravity="center_vertical"
+    android:minHeight="?android:attr/listPreferredItemHeightSmall"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
+
+    <RelativeLayout
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:paddingTop="16dp"
+        android:paddingBottom="16dp">
+
+        <TextView
+            android:id="@android:id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="marquee"
+            android:fadingEdge="horizontal"
+            android:singleLine="true"
+            android:textAppearance="?android:attr/textAppearanceListItem" />
+
+        <TextView
+            android:id="@android:id/summary"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@android:id/title"
+            android:layout_alignStart="@android:id/title"
+            android:ellipsize="end"
+            android:maxLines="10"
+            android:textAppearance="?android:attr/textAppearanceListItemSecondary"
+            android:textColor="?android:attr/textColorSecondary" />
+    </RelativeLayout>
+
+    <include layout="@layout/preview_icon" />
+</LinearLayout>
\ No newline at end of file
diff --git a/Omega/res/layout/preference_seekbar.xml b/Omega/res/layout/preference_seekbar.xml
new file mode 100644
index 0000000000..995afeadc7
--- /dev/null
+++ b/Omega/res/layout/preference_seekbar.xml
@@ -0,0 +1,54 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?android:attr/activatedBackgroundIndicator"
+    android:baselineAligned="false"
+    android:gravity="center_vertical"
+    android:minHeight="?android:attr/listPreferredItemHeightSmall"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
+
+    <RelativeLayout
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:paddingTop="16dp"
+        android:paddingBottom="16dp">
+
+        <TextView
+            android:id="@android:id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="marquee"
+            android:fadingEdge="horizontal"
+            android:singleLine="true"
+            android:textAppearance="?android:attr/textAppearanceListItem" />
+
+        <TextView
+            android:id="@android:id/summary"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@android:id/title"
+            android:layout_alignStart="@android:id/title"
+            android:ellipsize="end"
+            android:maxLines="10"
+            android:textAppearance="?android:attr/textAppearanceListItemSecondary"
+            android:textColor="?android:attr/textColorSecondary" />
+
+        <TextView
+            android:id="@+id/txtValue"
+            android:layout_width="40dp"
+            android:layout_height="wrap_content"
+            android:layout_below="@android:id/summary" />
+
+        <SeekBar
+            android:id="@+id/seekbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@android:id/summary"
+            android:layout_alignBottom="@id/txtValue"
+            android:layout_alignParentEnd="true"
+            android:layout_marginStart="0dp"
+            android:layout_toEndOf="@+id/txtValue" />
+    </RelativeLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/Omega/res/layout/preference_switch_widget.xml b/Omega/res/layout/preference_switch_widget.xml
new file mode 100644
index 0000000000..8a80913207
--- /dev/null
+++ b/Omega/res/layout/preference_switch_widget.xml
@@ -0,0 +1,25 @@
+<?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
+  -->
+
+<!-- Layout used by SwitchPreference for the switch widget style. This is inflated
+     inside android.R.layout.preference. -->
+<Switch xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/switchWidget"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:background="@null"
+    android:clickable="false"
+    android:focusable="false" />
diff --git a/Omega/res/layout/preview_icon.xml b/Omega/res/layout/preview_icon.xml
new file mode 100644
index 0000000000..8f3a5f969d
--- /dev/null
+++ b/Omega/res/layout/preview_icon.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.preference.internal.PreferenceImageView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@android:id/icon"
+    android:layout_width="36dp"
+    android:layout_height="36dp"
+    android:maxWidth="36dp"
+    android:maxHeight="36dp"
+    android:scaleType="fitCenter" />
\ No newline at end of file
diff --git a/res/layout/search_container_workspace.xml b/Omega/res/layout/qsb_blocker_view.xml
similarity index 51%
rename from res/layout/search_container_workspace.xml
rename to Omega/res/layout/qsb_blocker_view.xml
index 1c617b1742..df5e00a8d7 100644
--- a/res/layout/search_container_workspace.xml
+++ b/Omega/res/layout/qsb_blocker_view.xml
@@ -1,30 +1,28 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?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.
 -->
-<com.android.launcher3.qsb.QsbContainerView
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:id="@id/search_container_workspace"
-        android:padding="0dp" >
+<com.saggitt.omega.superg.QsbBlockerView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:gravity="end|center"
+    android:layout_gravity="end"
+    android:clipChildren="false"
+    android:clipToPadding="false"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
-    <fragment
-        android:name="com.android.launcher3.qsb.QsbContainerView$QsbFragment"
+    <com.android.launcher3.BubbleTextView
+        android:layout_gravity="center"
+        android:id="@+id/dummyBubbleTextView"
+        android:visibility="invisible"
         android:layout_width="match_parent"
-        android:tag="qsb_view"
-        android:layout_height="match_parent"/>
-</com.android.launcher3.qsb.QsbContainerView>
\ No newline at end of file
+        android:layout_height="56dp"
+        android:contentDescription="" />
+</com.saggitt.omega.superg.QsbBlockerView>
\ No newline at end of file
diff --git a/Omega/res/layout/qsb_container.xml b/Omega/res/layout/qsb_container.xml
new file mode 100644
index 0000000000..d912397310
--- /dev/null
+++ b/Omega/res/layout/qsb_container.xml
@@ -0,0 +1,25 @@
+<?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.
+-->
+
+<com.saggitt.omega.superg.SuperGContainerView android:gravity="top"
+    android:orientation="horizontal"
+    android:id="@+id/qsb_container"
+    android:padding="0dp"
+    android:clipToPadding="false"
+    android:layout_width="fill_parent"
+    android:layout_height="0dp"
+    android:layout_marginStart="@dimen/qsb_overlap_margin"
+    xmlns:android="http://schemas.android.com/apk/res/android" />
\ No newline at end of file
diff --git a/Omega/res/layout/qsb_container_preview.xml b/Omega/res/layout/qsb_container_preview.xml
new file mode 100644
index 0000000000..5034ae555e
--- /dev/null
+++ b/Omega/res/layout/qsb_container_preview.xml
@@ -0,0 +1,25 @@
+<?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.
+-->
+
+<com.saggitt.omega.superg.SuperGContainerView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:gravity="top"
+    android:orientation="horizontal"
+    android:id="@+id/qsb_container"
+    android:padding="0dp"
+    android:clipToPadding="false"
+    android:layout_width="fill_parent"
+    android:layout_height="0dp"
+    android:layout_marginStart="16dp" />
diff --git a/Omega/res/layout/qsb_hint.xml b/Omega/res/layout/qsb_hint.xml
new file mode 100644
index 0000000000..b2bc9e6290
--- /dev/null
+++ b/Omega/res/layout/qsb_hint.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/qsb_hint"
+    style="@style/TextTitle"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_gravity="end|center"
+    android:alpha="0.87"
+    android:ellipsize="end"
+    android:gravity="center"
+    android:importantForAccessibility="no"
+    android:includeFontPadding="false"
+    android:maxWidth="220.0dip"
+    android:maxLines="1"
+    android:textColor="#ff80868b"
+    android:textSize="@dimen/qsb_hint_text_size" />
diff --git a/Omega/res/layout/qsb_hotseat_content.xml b/Omega/res/layout/qsb_hotseat_content.xml
new file mode 100644
index 0000000000..7d7e6d3f9d
--- /dev/null
+++ b/Omega/res/layout/qsb_hotseat_content.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~  Copyright (c) 2020 Omega Launcher
+  ~
+  ~  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.
+  ~
+  -->
+
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <ImageView
+        android:id="@+id/g_icon"
+        android:layout_width="@dimen/qsb_mic_width"
+        android:layout_height="fill_parent"
+        android:layout_gravity="start|center"
+        android:layout_marginTop="-6.0dip"
+        android:layout_marginBottom="-6.0dip"
+        android:scaleType="center"
+        android:src="?gIcon" />
+
+    <ImageView
+        android:id="@+id/mic_icon"
+        android:layout_width="48.0dip"
+        android:layout_height="fill_parent"
+        android:layout_gravity="end|center"
+        android:layout_marginTop="-6.0dip"
+        android:layout_marginBottom="-6.0dip"
+        android:background="?android:selectableItemBackgroundBorderless"
+        android:clickable="true"
+        android:contentDescription="@string/label_voice_search"
+        android:scaleType="center"
+        android:src="?micIcon" />
+</merge>
\ No newline at end of file
diff --git a/Omega/res/layout/qsb_without_mic.xml b/Omega/res/layout/qsb_without_mic.xml
new file mode 100644
index 0000000000..8518b7cef0
--- /dev/null
+++ b/Omega/res/layout/qsb_without_mic.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_gravity="start|center"
+    android:id="@+id/g_icon"
+    android:background="@drawable/bg_qsb_pill"
+    android:layout_width="wrap_content"
+    android:layout_height="@dimen/qsb_button_height"
+    android:src="@drawable/ic_super_g_color"
+    android:scaleType="center"
+    android:contentDescription="@string/title__general_search"
+    android:elevation="@dimen/qsb_button_elevation" />
\ No newline at end of file
diff --git a/Omega/res/layout/search_container_all_apps_google.xml b/Omega/res/layout/search_container_all_apps_google.xml
new file mode 100644
index 0000000000..05e42b6314
--- /dev/null
+++ b/Omega/res/layout/search_container_all_apps_google.xml
@@ -0,0 +1,68 @@
+<?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.
+-->
+<com.saggitt.omega.allapps.BlurQsbLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/search_container_all_apps"
+    android:layout_width="fill_parent"
+    android:layout_height="@dimen/qsb_widget_height"
+    android:layout_centerHorizontal="true"
+    android:layout_gravity="center|top"
+    android:background="@drawable/bg_qsb_click_feedback"
+    android:contentDescription="@string/title__general_search"
+    android:translationY="30dp">
+
+    <ImageView
+        android:id="@id/g_icon"
+        android:layout_width="@dimen/qsb_mic_width"
+        android:layout_height="fill_parent"
+        android:layout_gravity="start|center"
+        android:layout_marginTop="-6.0dip"
+        android:layout_marginBottom="-6.0dip"
+        android:scaleType="center"
+        android:src="@drawable/ic_qsb_logo" />
+
+    <ImageView
+        android:id="@+id/g_icon_hotseat"
+        android:layout_width="@dimen/qsb_mic_width"
+        android:layout_height="match_parent"
+        android:layout_gravity="start|center"
+        android:layout_marginTop="-6.0dip"
+        android:layout_marginBottom="-6.0dip"
+        android:scaleType="center"
+        android:src="@drawable/ic_qsb_logo" />
+
+    <FrameLayout
+        android:id="@+id/mic_frame"
+        android:layout_width="@dimen/qsb_mic_width"
+        android:layout_height="match_parent"
+        android:layout_gravity="end|center">
+
+        <ImageView
+            android:id="@id/mic_icon"
+            android:layout_width="@dimen/qsb_mic_width"
+            android:layout_height="fill_parent"
+            android:layout_gravity="end|center"
+            android:layout_marginTop="-6.0dip"
+            android:layout_marginBottom="-6.0dip"
+            android:background="?android:selectableItemBackgroundBorderless"
+            android:clickable="true"
+            android:contentDescription="@string/label_voice_search"
+            android:focusable="false"
+            android:scaleType="center"
+            android:src="@drawable/ic_qsb_mic" />
+
+        <include layout="@layout/qsb_hint" />
+
+    </FrameLayout>
+</com.saggitt.omega.allapps.BlurQsbLayout>
\ No newline at end of file
diff --git a/go/quickstep/res/drawable/default_thumbnail.xml b/Omega/res/layout/search_container_all_apps_hidden.xml
similarity index 63%
rename from go/quickstep/res/drawable/default_thumbnail.xml
rename to Omega/res/layout/search_container_all_apps_hidden.xml
index ab22dcf827..963da5b478 100644
--- a/go/quickstep/res/drawable/default_thumbnail.xml
+++ b/Omega/res/layout/search_container_all_apps_hidden.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2019 The Android Open Source Project
+<?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.
@@ -14,9 +12,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@android:color/darker_gray"/>
-    <corners android:radius="@dimen/task_thumbnail_corner_radius"/>
-</shape>
+<com.saggitt.omega.views.BlankSearchLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@id/search_container_all_apps"
+    android:layout_width="0dp"
+    android:layout_height="48dp" />
\ No newline at end of file
diff --git a/go/quickstep/res/layout/overview_panel.xml b/Omega/res/layout/search_container_all_apps_include.xml
similarity index 55%
rename from go/quickstep/res/layout/overview_panel.xml
rename to Omega/res/layout/search_container_all_apps_include.xml
index 601edceb5d..b9d4d439f3 100644
--- a/go/quickstep/res/layout/overview_panel.xml
+++ b/Omega/res/layout/search_container_all_apps_include.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2019 The Android Open Source Project
+<?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.
@@ -13,9 +11,11 @@
      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.
--->
-<fragment android:name="com.android.quickstep.IconRecentsFragment"
-          xmlns:android="http://schemas.android.com/apk/res/android"
-          android:id="@+id/low_ram_recents_fragment"
-          android:layout_width="match_parent"
-          android:layout_height="match_parent"/>
+--><!-- Note: we are reusing/repurposing a system attribute for search layout, because of a
+ platform bug, which prevents using custom attributes in <include> tag -->
+<merge>
+
+    <include xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@id/search_container_all_apps"
+        layout="@layout/search_container_all_apps_google" />
+</merge>
\ No newline at end of file
diff --git a/Omega/res/layout/search_container_hotseat.xml b/Omega/res/layout/search_container_hotseat.xml
new file mode 100644
index 0000000000..6e7a7c048e
--- /dev/null
+++ b/Omega/res/layout/search_container_hotseat.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~  Copyright (c) 2020 Omega Launcher
+  ~
+  ~  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.
+  ~
+  -->
+<com.saggitt.omega.qsb.HotseatQsbWidget xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@id/search_container_hotseat"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/qsb_widget_height"
+    android:layout_gravity="bottom|center"
+    android:background="@drawable/bg_qsb_click_feedback"
+    android:contentDescription="@string/title__general_search" />
\ No newline at end of file
diff --git a/Omega/res/layout/search_container_workspace.xml b/Omega/res/layout/search_container_workspace.xml
new file mode 100644
index 0000000000..c02e5d8df5
--- /dev/null
+++ b/Omega/res/layout/search_container_workspace.xml
@@ -0,0 +1,34 @@
+<?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.
+-->
+
+<com.saggitt.omega.smartspace.SmartspaceView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@id/search_container_workspace"
+    android:background="?android:selectableItemBackground"
+    android:clickable="true"
+    android:layout_width="fill_parent"
+    android:layout_height="0dp"
+    android:animateLayoutChanges="true">
+
+    <com.android.launcher3.BubbleTextView
+        android:layout_gravity="center"
+        android:id="@+id/dummyBubbleTextView"
+        android:visibility="invisible"
+        android:layout_width="0dp"
+        android:layout_height="36dp"
+        android:contentDescription="" />
+
+    <include layout="@layout/smartspace_singleline" />
+</com.saggitt.omega.smartspace.SmartspaceView>
diff --git a/Omega/res/layout/search_widget.xml b/Omega/res/layout/search_widget.xml
new file mode 100644
index 0000000000..70a6cc35ec
--- /dev/null
+++ b/Omega/res/layout/search_widget.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~  Copyright (c) 2020 Omega Launcher
+  ~
+  ~  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.
+  ~
+  -->
+<com.saggitt.omega.qsb.SearchWidget xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <include layout="@layout/search_container_all_apps_google" />
+</com.saggitt.omega.qsb.SearchWidget>
diff --git a/Omega/res/layout/settings_bottom_sheet.xml b/Omega/res/layout/settings_bottom_sheet.xml
index d98592b127..7c30dc5a79 100644
--- a/Omega/res/layout/settings_bottom_sheet.xml
+++ b/Omega/res/layout/settings_bottom_sheet.xml
@@ -13,7 +13,7 @@
      limitations under the License.
 -->
 
-<ch.deletescape.lawnchair.settings.ui.SettingsBottomSheet xmlns:android="http://schemas.android.com/apk/res/android"
+<com.saggitt.omega.settings.SettingsBottomSheet xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/content"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -35,5 +35,4 @@
         android:layout_gravity="bottom"
         android:background="@android:color/black"
         android:focusable="false" />
-
-</ch.deletescape.lawnchair.settings.ui.SettingsBottomSheet>
+</com.saggitt.omega.settings.SettingsBottomSheet>
diff --git a/Omega/res/layout/settings_category_material.xml b/Omega/res/layout/settings_category_material.xml
index 18e2f3c0da..c9050bc39e 100644
--- a/Omega/res/layout/settings_category_material.xml
+++ b/Omega/res/layout/settings_category_material.xml
@@ -19,7 +19,7 @@
     android:id="@android:id/title"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginBottom="10dip"
+    android:layout_marginBottom="6dip"
     android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-    android:paddingTop="16dip"
+    android:paddingTop="14dip"
     android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" />
diff --git a/Omega/res/layout/settings_category_v2.xml b/Omega/res/layout/settings_category_v2.xml
new file mode 100644
index 0000000000..cf8ef6401f
--- /dev/null
+++ b/Omega/res/layout/settings_category_v2.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~     This file is part of Lawnchair Launcher.
+  ~
+  ~     Lawnchair Launcher is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     Lawnchair Launcher is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingStart="56dp"
+    android:paddingEnd="0dp">
+
+    <TextView
+        android:id="@android:id/title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="10dip"
+        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+        android:paddingTop="16dip"
+        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_gravity="bottom"
+        android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
+        android:layout_marginEnd="0dp"
+        android:background="?android:listDivider" />
+</FrameLayout>
diff --git a/Omega/res/layout/smartspace_date_view.xml b/Omega/res/layout/smartspace_date_view.xml
new file mode 100644
index 0000000000..8ea04b891a
--- /dev/null
+++ b/Omega/res/layout/smartspace_date_view.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/smartspace_content"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_gravity="center"
+    android:animateLayoutChanges="true"
+    android:background="@android:color/transparent">
+
+    <TextClock
+        android:id="@+id/date_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:fontFamily="sans-serif"
+        android:format12Hour="EEEE, MMM d"
+        android:format24Hour="EEEE, MMM d"
+        android:includeFontPadding="false"
+        android:maxLines="1"
+        android:paddingLeft="4dp"
+        android:paddingRight="4dp"
+        android:shadowColor="#dd000000"
+        android:shadowDx="0"
+        android:shadowDy="0"
+        android:shadowRadius="9"
+        android:textColor="#ffffff"
+        android:textSize="24sp" />
+
+</FrameLayout>
diff --git a/Omega/res/layout/smartspace_preview.xml b/Omega/res/layout/smartspace_preview.xml
new file mode 100644
index 0000000000..b37a6ecf2f
--- /dev/null
+++ b/Omega/res/layout/smartspace_preview.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.saggitt.omega.views.SmartspacePreview xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/smartspace_preview_height" />
\ No newline at end of file
diff --git a/Omega/res/layout/smartspace_singleline.xml b/Omega/res/layout/smartspace_singleline.xml
new file mode 100644
index 0000000000..3d484b5986
--- /dev/null
+++ b/Omega/res/layout/smartspace_singleline.xml
@@ -0,0 +1,169 @@
+<?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.
+-->
+
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:launcher="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/smartspace_content"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:layout_gravity="center"
+    android:paddingTop="8dp"
+    android:paddingBottom="8dp"
+    android:animateLayoutChanges="true">
+
+    <com.saggitt.omega.graphics.IcuDateTextView
+        android:id="@+id/time_above"
+        style="@style/SmartspaceTextHeadline"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:paddingLeft="10dp"
+        android:paddingRight="10dp"
+        android:background="@drawable/bg_smartspace"
+        android:clickable="true"
+        android:ellipsize="end"
+        android:gravity="center"
+        android:scrollHorizontally="true"
+        android:textColor="?workspaceTextColor"
+        android:textSize="@dimen/smartspace_clock_above_size"
+        android:visibility="gone"
+        launcher:layout_constraintBottom_toTopOf="@+id/linearLayout"
+        launcher:layout_constraintEnd_toEndOf="parent"
+        launcher:layout_constraintHorizontal_bias="0.5"
+        launcher:layout_constraintStart_toStartOf="parent"
+        launcher:layout_constraintTop_toTopOf="parent"
+        tools:visibility="visible" />
+
+    <LinearLayout
+        android:id="@+id/linearLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:animateLayoutChanges="true"
+        android:gravity="center_vertical"
+        android:orientation="vertical"
+        launcher:layout_constraintBottom_toBottomOf="parent"
+        launcher:layout_constraintEnd_toEndOf="parent"
+        launcher:layout_constraintHorizontal_bias="0.0"
+        launcher:layout_constraintStart_toStartOf="parent"
+        launcher:layout_constraintTop_toBottomOf="@+id/time_above">
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:orientation="horizontal">
+
+            <com.saggitt.omega.graphics.IcuDateTextView
+                android:id="@+id/clock"
+                style="@style/SmartspaceTextHeadline"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:paddingStart="10dp"
+                android:paddingEnd="4dp"
+                android:background="@drawable/bg_smartspace"
+                android:clickable="true"
+                android:ellipsize="end"
+                android:gravity="center"
+                android:maxLines="1"
+                android:scrollHorizontally="true"
+                android:textColor="?workspaceTextColor"
+                android:textSize="@dimen/smartspace_title_size" />
+
+            <com.saggitt.omega.smartspace.SmartspaceDividerView
+                android:id="@+id/title_sep"
+                android:layout_width="@dimen/smartspace_title_sep_width"
+                android:layout_height="20dp"
+                android:layout_gravity="center_vertical"
+                android:visibility="gone"
+                tools:visibility="visible" />
+
+            <LinearLayout
+                android:id="@+id/title_weather_content"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:layout_gravity="center_vertical"
+                android:paddingStart="4dp"
+                android:paddingEnd="10dp"
+                android:background="@drawable/bg_smartspace"
+                android:clickable="true"
+                android:clipChildren="false"
+                android:gravity="center"
+                android:orientation="horizontal"
+                android:visibility="gone"
+                tools:visiblity="visible">
+
+                <ImageView
+                    android:id="@+id/title_weather_icon"
+                    android:layout_width="@dimen/smartspace_title_weather_icon_size"
+                    android:layout_height="@dimen/smartspace_title_weather_icon_size"
+                    android:layout_marginRight="4dp"
+                    android:layout_gravity="center"
+                    android:scaleType="fitXY"
+                    tools:src="@drawable/weather_01" />
+
+                <com.saggitt.omega.graphics.DoubleShadowTextView
+                    android:id="@+id/title_weather_text"
+                    style="@style/SmartspaceTextHeadline"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:drawablePadding="6dp"
+                    android:textColor="?workspaceTextColor"
+                    android:textSize="@dimen/smartspace_title_size"
+                    tools:text="30°C" />
+            </LinearLayout>
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/subtitle_line"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="4dp"
+            android:layout_marginLeft="20dp"
+            android:layout_marginRight="20dp"
+            android:layout_gravity="center"
+            android:animateLayoutChanges="true"
+            android:clipChildren="false"
+            android:orientation="horizontal"
+            android:visibility="gone">
+
+            <ImageView
+                android:id="@+id/subtitle_icon"
+                android:layout_width="16dp"
+                android:layout_height="16dp"
+                android:layout_weight="0.0"
+                android:layout_marginRight="6dp"
+                android:layout_gravity="center_vertical" />
+
+            <com.saggitt.omega.graphics.DoubleShadowTextView
+                android:id="@+id/subtitle_text"
+                style="@style/SmartspaceTextTitle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1.0"
+                android:layout_gravity="center_vertical"
+                android:paddingTop="4dp"
+                android:paddingBottom="4dp"
+                android:drawablePadding="6dp"
+                android:includeFontPadding="false"
+                android:maxLines="1"
+                android:textColor="?workspaceTextColor"
+                android:textSize="16dp" />
+        </LinearLayout>
+    </LinearLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/Omega/res/layout/smartspace_twolines.xml b/Omega/res/layout/smartspace_twolines.xml
new file mode 100644
index 0000000000..9e6e5cd935
--- /dev/null
+++ b/Omega/res/layout/smartspace_twolines.xml
@@ -0,0 +1,133 @@
+<?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.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/smartspace_content"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center"
+    android:orientation="vertical">
+
+    <com.saggitt.omega.graphics.IcuDateTextView
+        android:id="@+id/time_above"
+        style="@style/SmartspaceTextHeadline"
+        android:scrollHorizontally="true"
+        android:ellipsize="end"
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:layout_gravity="center"
+        android:background="@drawable/bg_smartspace"
+        android:clickable="true"
+        android:gravity="center"
+        android:layout_weight="1.25"
+        android:paddingLeft="10dp"
+        android:paddingRight="10dp"
+        android:textColor="?workspaceTextColor"
+        android:textSize="@dimen/smartspace_title_size"
+        android:visibility="gone"
+        android:layout_marginBottom="4dp"
+        tools:visibility="visible" />
+
+    <com.saggitt.omega.graphics.DoubleShadowTextView
+        android:id="@+id/title_text"
+        style="@style/SmartspaceTextHeadline"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:maxLines="1"
+        android:textColor="?workspaceTextColor"
+        android:textSize="@dimen/smartspace_title_size" />
+
+    <LinearLayout
+        android:id="@+id/subtitle_line"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
+        android:layout_marginTop="4dp"
+        android:clipChildren="false"
+        android:animateLayoutChanges="true"
+        android:orientation="horizontal">
+
+        <ImageView
+            android:id="@+id/subtitle_icon"
+            android:layout_width="16dp"
+            android:layout_height="16dp"
+            android:layout_gravity="center_vertical"
+            android:layout_marginRight="6dp"
+            android:layout_weight="0.0" />
+
+        <com.saggitt.omega.graphics.DoubleShadowTextView
+            android:id="@+id/subtitle_text"
+            style="@style/SmartspaceTextTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_weight="1.0"
+            android:drawablePadding="6dp"
+            android:includeFontPadding="false"
+            android:maxLines="1"
+            android:paddingBottom="4dp"
+            android:paddingTop="4dp"
+            android:textColor="?workspaceTextColor"
+            android:textSize="16dp" />
+
+        <LinearLayout
+            android:id="@+id/subtitle_weather_content"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginLeft="6dp"
+            android:layout_weight="0.0"
+            android:background="@drawable/bg_smartspace"
+            android:clickable="true"
+            android:clipChildren="false"
+            android:gravity="center"
+            android:orientation="horizontal"
+            android:paddingBottom="6dp"
+            android:paddingRight="6dp"
+            android:paddingTop="6dp">
+
+            <com.saggitt.omega.smartspace.SmartspaceDividerView
+                android:id="@+id/subtitle_sep"
+                android:layout_width="@dimen/smartspace_title_sep_width"
+                android:layout_height="fill_parent"
+                android:layout_marginTop="4dp"
+                android:layout_marginRight="6dp"
+                android:layout_marginBottom="4dp" />
+
+            <ImageView
+                android:id="@+id/subtitle_weather_icon"
+                android:layout_width="16dp"
+                android:layout_height="16dp"
+                android:layout_gravity="center"
+                android:layout_marginRight="4dp"
+                android:scaleType="fitXY" />
+
+            <com.saggitt.omega.graphics.DoubleShadowTextView
+                android:id="@+id/subtitle_weather_text"
+                style="@style/SmartspaceTextTitle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:drawablePadding="6dp"
+                android:textColor="?workspaceTextColor"
+                android:textSize="16dp" />
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/Omega/res/layout/smartspace_widget.xml b/Omega/res/layout/smartspace_widget.xml
new file mode 100644
index 0000000000..469ea42bce
--- /dev/null
+++ b/Omega/res/layout/smartspace_widget.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~     This file is part of Lawnchair Launcher.
+  ~
+  ~     Lawnchair Launcher is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     Lawnchair Launcher is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<com.saggit.omega.views.HomeWidgetSwitchLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@id/search_container_workspace"
+    android:background="?android:selectableItemBackground"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" />
diff --git a/Omega/res/layout/snackbar.xml b/Omega/res/layout/snackbar.xml
deleted file mode 100644
index a4df60c0d3..0000000000
--- a/Omega/res/layout/snackbar.xml
+++ /dev/null
@@ -1,47 +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.
--->
-
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <TextView
-        android:id="@+id/label"
-        android:layout_width="0dp"
-        android:layout_height="@dimen/snackbar_content_height"
-        android:layout_weight="1"
-        android:ellipsize="end"
-        android:gravity="center_vertical"
-        android:lines="1"
-        android:paddingLeft="8dp"
-        android:paddingRight="8dp"
-        android:textColor="?android:attr/textColorPrimary"
-        android:textSize="@dimen/snackbar_max_text_size"
-        android:theme="@style/TextTitle" />
-
-    <TextView
-        android:id="@+id/action"
-        android:layout_width="wrap_content"
-        android:layout_height="@dimen/snackbar_content_height"
-        android:layout_weight="0"
-        android:background="?android:attr/selectableItemBackground"
-        android:gravity="center"
-        android:paddingLeft="8dp"
-        android:paddingRight="8dp"
-        android:textColor="?android:attr/colorAccent"
-        android:textSize="@dimen/snackbar_max_text_size"
-        android:textStyle="bold"
-        android:theme="@style/TextTitle" />
-</merge>
\ No newline at end of file
diff --git a/Omega/res/layout/tab_item.xml b/Omega/res/layout/tab_item.xml
new file mode 100644
index 0000000000..44773e168b
--- /dev/null
+++ b/Omega/res/layout/tab_item.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?selectableItemBackground"
+    android:gravity="center_vertical"
+    android:minHeight="?android:attr/listPreferredItemHeightSmall"
+    android:orientation="horizontal"
+    android:paddingTop="8dp"
+    android:paddingBottom="8dp">
+
+    <ImageView
+        android:id="@+id/drag_handle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="16dp"
+        android:background="@android:color/transparent"
+        android:clickable="false"
+        android:duplicateParentState="true"
+        android:focusable="false"
+        android:gravity="center_vertical|end"
+        android:src="@drawable/deep_shortcuts_drag_handle"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ImageView
+        android:id="@+id/delete"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="24dp"
+        android:background="?attr/selectableItemBackgroundBorderless"
+        android:tint="?android:attr/colorAccent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/drag_handle"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/ic_uninstall_no_shadow" />
+
+    <TextView
+        android:id="@+id/summary"
+        android:layout_width="0dp"
+        android:layout_height="17dp"
+        android:layout_marginStart="4dp"
+        android:layout_marginEnd="24dp"
+        android:textAlignment="viewStart"
+        app:layout_constraintBaseline_toBaselineOf="@+id/title"
+        app:layout_constraintEnd_toStartOf="@+id/delete"
+        app:layout_constraintStart_toEndOf="@+id/title"
+        tools:text="0 apps"
+        tools:visibility="visible" />
+
+    <TextView
+        android:id="@+id/title"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_marginStart="72dp"
+        android:layout_weight="1"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textAlignment="viewStart"
+        android:textColor="?android:attr/textColorPrimary"
+        android:textSize="18sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="Tab 1" />
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/Omega/res/layout/tab_item_check.xml b/Omega/res/layout/tab_item_check.xml
new file mode 100644
index 0000000000..7c2a4c6daa
--- /dev/null
+++ b/Omega/res/layout/tab_item_check.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+     Copyright (C) 2014 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.
+-->
+
+<CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@android:id/text1"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?android:attr/selectableItemBackground"
+    android:drawableStart="?android:listChoiceIndicatorMultiple"
+    android:drawablePadding="@dimen/select_dialog_drawable_padding_start_material"
+    android:ellipsize="marquee"
+    android:gravity="center_vertical"
+    android:minHeight="?android:attr/listPreferredItemHeightSmall"
+    android:paddingStart="@dimen/select_dialog_padding_start_material"
+    android:paddingEnd="@dimen/select_dialog_padding_material"
+    android:textAppearance="?android:textAppearanceMedium"
+    android:textColor="?android:attr/textColorAlertDialogListItem" />
diff --git a/Omega/res/layout/weather_widget.xml b/Omega/res/layout/weather_widget.xml
new file mode 100644
index 0000000000..685cb393e9
--- /dev/null
+++ b/Omega/res/layout/weather_widget.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_gravity="end|center"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="end"
+        android:orientation="horizontal">
+
+        <ImageView
+            android:id="@+id/weather_widget_icon"
+            android:layout_width="34.0dip"
+            android:layout_height="34.0dip"
+            android:layout_gravity="bottom"
+            android:layout_marginBottom="5.0dip"
+            android:layout_marginEnd="8.0dip" />
+
+        <TextView
+            android:id="@+id/weather_widget_temperature"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom"
+            android:fontFamily="sans-serif-light"
+            android:includeFontPadding="false"
+            android:paddingBottom="2.0dip"
+            android:textColor="#ffffffff"
+            android:textSize="36.0dip"
+            style="@style/WeatherWidget.Text" />
+    </LinearLayout>
+
+    <TextClock
+        android:id="@+id/weather_widget_time"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="end"
+        android:fontFamily="sans-serif"
+        android:format12Hour="@string/full_wday_month_day_no_year"
+        android:format24Hour="@string/full_wday_month_day_no_year"
+        android:includeFontPadding="false"
+        android:textAllCaps="true"
+        android:textColor="#ffffffff"
+        android:textSize="12.0sp"
+        style="@style/WeatherWidget.Text" />
+</LinearLayout>
\ No newline at end of file
diff --git a/Omega/res/menu/menu_change_default_home.xml b/Omega/res/menu/menu_change_default_home.xml
index 21bb70ae84..146c7d15ca 100644
--- a/Omega/res/menu/menu_change_default_home.xml
+++ b/Omega/res/menu/menu_change_default_home.xml
@@ -1,19 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~     This file is part of Lawnchair Launcher.
-  ~
-  ~     Lawnchair Launcher is free software: you can redistribute it and/or modify
-  ~     it under the terms of the GNU General Public License as published by
-  ~     the Free Software Foundation, either version 3 of the License, or
-  ~     (at your option) any later version.
-  ~
-  ~     Lawnchair Launcher is distributed in the hope that it will be useful,
-  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~     GNU General Public License for more details.
-  ~
-  ~     You should have received a copy of the GNU General Public License
-  ~     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
-  -->
+<?xml version="1.0" encoding="utf-8"?>
 
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
diff --git a/Omega/res/menu/menu_hide_apps.xml b/Omega/res/menu/menu_hide_apps.xml
new file mode 100644
index 0000000000..0ee513c680
--- /dev/null
+++ b/Omega/res/menu/menu_hide_apps.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/action_reset"
+        android:title="@string/hide_app_reset" />
+</menu>
\ No newline at end of file
diff --git a/Omega/res/menu/menu_icon_picker.xml b/Omega/res/menu/menu_icon_picker.xml
new file mode 100644
index 0000000000..15f297840a
--- /dev/null
+++ b/Omega/res/menu/menu_icon_picker.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:id="@+id/action_open_external"
+        android:title="@string/icon_pack_external_picker" />
+</menu>
diff --git a/Omega/res/mipmap-anydpi-v26/ic_allapps_adaptive.xml b/Omega/res/mipmap-anydpi-v26/ic_allapps_adaptive.xml
new file mode 100644
index 0000000000..76fb598879
--- /dev/null
+++ b/Omega/res/mipmap-anydpi-v26/ic_allapps_adaptive.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_allapps_background" />
+    <foreground android:drawable="@drawable/ic_allapps_foreground" />
+</adaptive-icon>
\ No newline at end of file
diff --git a/Omega/res/mipmap-anydpi-v26/ic_launcher.xml b/Omega/res/mipmap-anydpi-v26/ic_launcher.xml
new file mode 100644
index 0000000000..ac94b34f54
--- /dev/null
+++ b/Omega/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
\ No newline at end of file
diff --git a/Omega/res/mipmap-anydpi-v26/ic_launcher_round.xml b/Omega/res/mipmap-anydpi-v26/ic_launcher_round.xml
new file mode 100644
index 0000000000..ac94b34f54
--- /dev/null
+++ b/Omega/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
\ No newline at end of file
diff --git a/Omega/res/mipmap-hdpi/ic_allapps_adaptive.png b/Omega/res/mipmap-hdpi/ic_allapps_adaptive.png
new file mode 100644
index 0000000000..e6e215b064
Binary files /dev/null and b/Omega/res/mipmap-hdpi/ic_allapps_adaptive.png differ
diff --git a/Omega/res/mipmap-hdpi/ic_launcher.png b/Omega/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000000..4085df202f
Binary files /dev/null and b/Omega/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/Omega/res/mipmap-mdpi/ic_allapps_adaptive.png b/Omega/res/mipmap-mdpi/ic_allapps_adaptive.png
new file mode 100644
index 0000000000..7d2187b9f3
Binary files /dev/null and b/Omega/res/mipmap-mdpi/ic_allapps_adaptive.png differ
diff --git a/Omega/res/mipmap-mdpi/ic_launcher.png b/Omega/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000000..75262519fd
Binary files /dev/null and b/Omega/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/Omega/res/mipmap-xhdpi/ic_allapps_adaptive.png b/Omega/res/mipmap-xhdpi/ic_allapps_adaptive.png
new file mode 100644
index 0000000000..8202285f44
Binary files /dev/null and b/Omega/res/mipmap-xhdpi/ic_allapps_adaptive.png differ
diff --git a/Omega/res/mipmap-xhdpi/ic_launcher.png b/Omega/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000000..b7325c9e93
Binary files /dev/null and b/Omega/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/Omega/res/mipmap-xxhdpi/ic_allapps_adaptive.png b/Omega/res/mipmap-xxhdpi/ic_allapps_adaptive.png
new file mode 100644
index 0000000000..96cb1160e3
Binary files /dev/null and b/Omega/res/mipmap-xxhdpi/ic_allapps_adaptive.png differ
diff --git a/Omega/res/mipmap-xxhdpi/ic_launcher.png b/Omega/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000000..1e8e8ffdca
Binary files /dev/null and b/Omega/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/Omega/res/mipmap-xxxhdpi/ic_allapps_adaptive.png b/Omega/res/mipmap-xxxhdpi/ic_allapps_adaptive.png
new file mode 100644
index 0000000000..a8b8c1b192
Binary files /dev/null and b/Omega/res/mipmap-xxxhdpi/ic_allapps_adaptive.png differ
diff --git a/Omega/res/mipmap-xxxhdpi/ic_launcher.png b/Omega/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000000..5cba043bd5
Binary files /dev/null and b/Omega/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/Omega/res/raw/changelog.md b/Omega/res/raw/changelog.md
index fb8435d115..bf74ca1cf8 100644
--- a/Omega/res/raw/changelog.md
+++ b/Omega/res/raw/changelog.md
@@ -1,7 +1,51 @@
-### v0.2.0 (Build 5)
+### v0.6.0 (Build 80)
+* **Add: Show All Apps Label**
+* **Add: Open App from Gesture**
+* **Add: At glance widget**
+* **Add: Search bar widget**
+* **Add: Dock background**
+* **Add: Dock arrow customization**
+* **Add: Dock opacity customization**
+* **Add: Workspace indicator customization**
+* **Add: Drawer color customization**
+* **Add: Drawer opacity customization**
+* **Add: Device Sleep preference**
+* **Add: Full screen preference**
+* **Fix: Search web results**
+
+### v0.5.0 (Build 40)
+* **Add: Desktop grid preference**
+* **Add: Desktop Hide Labels preference**
+* **Add: Desktop Multiline labels preference**
+* **Add: Dock icons count preference**
+* **Add: Swipe down gesture**
+* **Add: Predictions preference**
+* **Add: Search bar radius preference**
+* **Fix: Custom icons when the app is restarted**
+
+### v0.4.0 (Build 32)
+* **Add: Hide apps preference**
+* **Add: Icon Shape preference**
+* **Add: Dock search** 
+* **Add: AllApps Icon Scale**
+* **Add: Dock Icon Scale**
+* **Add: Workspace Icon Scale**
+* **Fixed: Wallpaper chooser crash**
+
+### v0.3.0 (Build 20)
+* **Add gestures preference**
+* **Add dash view to the main screen**
+* **Add dock scale preference**
+* **Add drawer tabs support**
+* **Add drawer folder support**
+* **Add themes support**
+* **Add search voice and assistant preference**
+
+### v0.2.0 (Build 10)
 * **Add color accent preference**
 * **Add notification color and count**
 * **Add Google feed**
+* **Add Search providers**
 
 ### v0.1.0 (Build 1)
 * Based on Launcher3 10 r35.
diff --git a/Omega/res/raw/dash_items.json b/Omega/res/raw/dash_items.json
index cc157e5054..ef3e8f5176 100644
--- a/Omega/res/raw/dash_items.json
+++ b/Omega/res/raw/dash_items.json
@@ -5,7 +5,7 @@
       "item_name": "dash_item_0",
       "item_icon": "ic_pencil",
       "item_action": "EditDash",
-      "item_enabled": true
+      "item_enabled": false
     },
     {
       "item_id": 1,
diff --git a/Omega/res/raw/opensource.md b/Omega/res/raw/opensource.md
index 2f0dfc8b7b..359ce09b79 100644
--- a/Omega/res/raw/opensource.md
+++ b/Omega/res/raw/opensource.md
@@ -2,26 +2,26 @@
 Version 2.0, January 2004<br/>
 
 * **Android AOSP**
-~° Copyright (c) The Android Open Source Project
+~° Copyright (c) The Android Open Source Project<br/>
 ~° ![https://android.googlesource.com/platform/packages/apps/Launcher3](https://android.googlesource.com/platform/packages/apps/Launcher3)<br/>
 
 * **Android Support Library**
-~° Copyright (c) The Android Open Source Project
+~° Copyright (c) The Android Open Source Project<br/>
 ~° ![https://developer.android.com/topic/libraries/support-library](https://developer.android.com/topic/libraries/support-library)<br/>
 
 * **CustomActivityOnCrash**
-~° Copyright (c) Eduard Ereza Martínez
+~° Copyright (c) Eduard Ereza Martínez<br/>
 ~° ![https://github.com/Ereza/CustomActivityOnCrash](https://github.com/Ereza/CustomActivityOnCrash)<br/>
 
 * **jaredrummler colorpicker**
-~° Copyright (c) jaredrummler
+~° Copyright (c) jaredrummler<br/>
 ~° ![https://github.com/jaredrummler/ColorPicker](https://github.com/jaredrummler/ColorPicker)<br/>
 
 * **Simple Markdown Parser**
-~° Copyright (c) Gregor Santner
+~° Copyright (c) Gregor Santner<br/>
 ~° ![https://github.com/gsantner/opoc/](https://github.com/gsantner/opoc/)<br/>
 
-`---------------`
+`---------------`<br/>
 <small>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
@@ -32,15 +32,15 @@ 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.</small>
+limitations under the License.</small><br/>
 `---------------`
 <br/>
 ## GPL v3
 * **Lawnchair Launcher**
-~° Copyright (c) Till Kottmann
+~° Copyright (c) Till Kottmann<br/>
 ~° ![https://github.com/LawnchairLauncher/Lawnchair](https://github.com/LawnchairLauncher/Lawnchair)<br/>
 
-`---------------`
+`---------------`<br/>
 <small>Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
@@ -57,14 +57,15 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.</small>
+SOFTWARE.</small><br/>
 `---------------`
 <br/>
 ## BSD 2-Clause
 * **Protocol Buffer JavaNano API**
-~° Copyright (c) Google
+~° Copyright (c) Google<br/>
 ~° ![https://developers.google.com/protocol-buffers](https://developers.google.com/protocol-buffers)<br/>
-
+<br/>
+`---------------`<br/>
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
 
@@ -86,9 +87,11 @@ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
 OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 <br/>
+`---------------`<br/>
+
 ## SIL Open Font License, Version 1.1.
 * **"Kaushan Script" Font**
-opyright (c) 2011, Pablo Impallari (www.impallari.com|impallari@gmail.com),
+Copyright (c) 2011, Pablo Impallari (www.impallari.com|impallari@gmail.com),
 Copyright (c) 2011, Igino Marini. (www.ikern.com|mail@iginomarini.com),
 with Reserved Font Name Kaushan Script.
 http://scripts.sil.org/OFL
\ No newline at end of file
diff --git a/Omega/res/raw/team.md b/Omega/res/raw/team.md
index 70c6477100..55e875af82 100644
--- a/Omega/res/raw/team.md
+++ b/Omega/res/raw/team.md
@@ -1,3 +1,7 @@
 Saul Henríquez
 Developer
-https://github.com/otakuhqz
\ No newline at end of file
+https://github.com/otakuhqz
+
+Antonios Hazim
+Contributor
+https://github.com/machiav3lli
\ No newline at end of file
diff --git a/Omega/res/values-ar/strings.xml b/Omega/res/values-ar/strings.xml
new file mode 100644
index 0000000000..1832052407
--- /dev/null
+++ b/Omega/res/values-ar/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="title__general_about">حول</string>
+    <string name="title__general_notifications">الإيماءات والإشعارات</string>
+    <string name="title__general_theme">السمة</string>
+    <string name="title__general_search">ابحث</string>
+</resources>
\ No newline at end of file
diff --git a/Omega/res/values-de/strings.xml b/Omega/res/values-de/strings.xml
new file mode 100644
index 0000000000..83057de614
--- /dev/null
+++ b/Omega/res/values-de/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="title__general_desktop">Schreibtisch</string>
+    <string name="title__general_about">Über</string>
+    <string name="title__general_notifications">Gesten und Benachrichtigungen</string>
+    <string name="title__general_advanced">Erweiterte Einstellungen</string>
+    <string name="title__general_search">Suchen</string>
+</resources>
\ No newline at end of file
diff --git a/Omega/res/values-es/strings.xml b/Omega/res/values-es/strings.xml
new file mode 100644
index 0000000000..f4d0fc113b
--- /dev/null
+++ b/Omega/res/values-es/strings.xml
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~  Copyright (c) 2020 Omega Launcher
+  ~
+  ~  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="title__general_about">Acerca de</string>
+    <string name="title__general_desktop">Escritorio</string>
+    <string name="title__general_dock">Dock</string>
+    <string name="title__general_drawer">Aplicaciones</string>
+    <string name="title__general_theme">Temas</string>
+    <string name="title__general_search">Búsqueda</string>
+    <string name="title__general_advanced">Avanzados</string>
+    <string name="pref_category__others">Otras</string>
+    <string name="title__dock_hide">Ocultar Dock</string>
+    <string name="title__dock_hide_labels">Ocultar Nombres</string>
+    <string name="title__dock_search_bar">Mostrar barra de busqueda</string>
+    <string name="title__drawer_sort">Ordenar Aplicaciones</string>
+    <string name="title__dock_scale">Tamaño del Dock</string>
+    <string name="title__drawer_categorization">Categorias</string>
+    <string name="title__sort_mode">Ordenar Aplicaciones</string>
+    <string name="title__sort_alphabetical_az">Alfabetico AZ</string>
+    <string name="title__sort_alphabetical_za">Alfabetico ZA</string>
+    <string name="title__sort_last_installed">Fecha de Instalacion</string>
+    <string name="title__sort_most_used">Mas usados</string>
+    <string name="title__sort_by_color">Por Color</string>
+    <string name="label_turn_off_suggestions">Deshabilitar</string>
+    <string name="pref_appcategorization_style_text">Estilo</string>
+    <string name="pref_appcategorization_folders_title">Carpetas</string>
+    <string name="pref_app_groups_create">Crear</string>
+    <string name="pref_category__gestures">Gestos</string>
+    <string name="action_none">No hacer nada</string>
+    <string name="title__search_action_assistant">Abrir Asistente</string>
+    <string name="title__search_provider">Motor de busqueda</string>
+    <string name="title__advanced_language">Idioma</string>
+    <string name="title__restart_launcher">Reiniciar</string>
+    <string name="title__about_donate">Donar</string>
+    <string name="category__about_licenses">Licencia</string>
+    <string name="tab_bottom_sheet_save">Guardar</string>
+    <string name="name">Nombre</string>
+    <string name="apps_label">Aplicaciones</string>
+    <string name="search_provider_appsearch" translatable="false">Buscar aplicaciones</string>
+    <string name="theme_black">Negro</string>
+    <string name="theme_black_dark_text">Negro con texto oscuro</string>
+    <string name="customize">Personalizar</string>
+    <string name="theme_dark">Oscuro</string>
+    <string name="theme_dark_theme_mode">Tema Oscuro</string>
+    <string name="delete">Borrar</string>
+    <string name="developer_options_title">Opciones de Desarrollador</string>
+    <string name="dismiss_drop_target_label">No mostrar</string>
+    <string name="drawer_folders">Carpetas</string>
+    <string name="default_folder_name">Nueva carpeta</string>
+    <string name="title__about_project_license">Licencia del Proyecto</string>
+    <string name="cat_search_bar">Barra de busqueda</string>
+    <string name="summary__general_desktop">Personaliza tu escritorio</string>
+    <string name="title__general_notifications">Gestos y Notificaciones</string>
+    <string name="summary__general_search">Proveedores de búsqueda, estilos, íconos</string>
+    <string name="title__search_show_assistant">Mostrar el botón de búsqueda por voz</string>
+    <string name="pref_app_groups_edit_tip">Toca para editar, arrastra para reordenar.</string>
+    <string name="title_show_google_app">Mostrar Google App</string>
+    <string name="title__drawer_columns">Número de columnas</string>
+    <string name="title__dev_show_Dev">Mostrar en preferencias</string>
+    <string name="failed">Algo salió mal.</string>
+    <string name="search_menu">Buscar preferencias</string>
+    <string name="title__gesture_swipe_down">Deslizar hacia abajo</string>
+    <string name="title__drawer_hide_icon_labels">Ocultar el nombre de la aplicacion</string>
+    <string name="title__dock_icon_size">Tamaño de Icono</string>
+    <string name="grid_size_width">Ancho</string>
+    <string name="title__desktop_icon_size">Tamaño de icono</string>
+    <string name="allow_rotation_blocked_desc">La configuración actual no permite la rotación de pantalla</string>
+    <string name="pref_category__inputs">Gestos y Búsqueda</string>
+    <string name="pref_category__interfaces">Vistas</string>
+    <string name="summary__general_about">Mas información sobre Omega Launcher</string>
+    <string name="summary__general_advanced">Idioma, respaldo, busqueda de preferencias</string>
+    <string name="summary__general_smartspace">Fecha, Hora, widget inicio</string>
+    <string name="summary__general_theme">Cambiar colores, pack de iconos, forma de icono</string>
+    <string name="title__notification_count">Mostrar cuenta de notificaciones</string>
+    <string name="icon_badging_desc_off">Desactivado</string>
+    <string name="icon_badging_desc_on">Activado</string>
+    <string name="smartspace_preferences">Preferencias</string>
+    <string name="msg_minus_one_on_left">A la izquierda de la pantalla principal</string>
+    <string name="title_smartspace_feed_theme">Tema del Feed</string>
+    <string name="color_presets">Predeterminados</string>
+    <string name="icon_shape_override_label_location">en la pantalla de inicio</string>
+    <string name="get_more_icon_packs">Obtener mas</string>
+    <string name="icon_pack">Pack de Iconos</string>
+    <string name="theme_default">Predeterminado</string>
+    <string name="theme_use_dark_text">Usar texto oscuro</string>
+    <string name="theme_dark_theme_mode_off">Apagado</string>
+    <string name="theme_dark_theme_mode_on">Encendido</string>
+    <string name="theme_dark_dark_text">Oscuro con texto oscuro</string>
+    <string name="theme_dark_text">Claro con texto oscuro</string>
+    <string name="theme_with_dark_text">Texto oscuro</string>
+    <string name="theme_light">Claro</string>
+    <string name="hide_app_reset">Reiniciar</string>
+    <string name="hide_app_selected">  Oculta</string>
+    <plurals name="hidden_apps_count">
+        <item quantity="one">%1$d Ocultas</item>
+        <item quantity="other"/>
+    </plurals>
+    <plurals name="tab_apps_count">
+        <item quantity="one">%1$d Aplicación</item>
+        <item quantity="other">%1$d Aplicaciones</item>
+    </plurals>
+    <string name="selected_count">%1$d seleccionada</string>
+    <string name="tab_type_smart">Automático</string>
+    <string name="tab_type_custom">Personalizada</string>
+    <string name="pref_appcategorization_tabs_title">Tabs</string>
+    <string name="pref_appcategorization_enable_title">Categorizar aplicaciones</string>
+    <string name="pref_appcategorization_flowerpot_title">Categoria de Aplicación</string>
+    <string name="msg_disable_suggestions_prompt">Los datos de uso serán borrados.</string>
+    <string name="title_disable_suggestions_prompt">Deshabilitar sugerencias</string>
+    <string name="summary_all_apps_google_search">Buscar resultados web y aplicaciones</string>
+    <string name="title_all_apps_google_search">Búsqueda global</string>
+    <string name="title__drawer_all_apps">Mostrar la etiqueta All Apps</string>
+    <string name="pref_value_disabled">Deshabilitado</string>
+    <string name="title__dock_hotseat_icons">Cantidad de Iconos</string>
+    <string name="title__dock_colored_icons">Iconos a colores</string>
+    <string name="grid_size_height">Alto</string>
+    <string name="theme_auto_night_mode">Seguir tema del sistema</string>
+    <string name="theme_auto">Seguir wallpaper</string>
+    <string name="title_app_suggestions">Aplicaciones</string>
+    <string name="hotseat_show_page_indicator">Mostrar indicador de página</string>
+    <string name="title_opacity">Opacidad</string>
+    <string name="title__dock_show_arrow">Mostrar flecha</string>
+    <string name="title_dock_background_color">Color de fondo</string>
+    <string name="title_dock_fill">Mostrar fondo</string>
+    <string name="title_desktop_hide_statusbar">Ocultar barra de estado</string>
+    <string name="title__multiline_labels">Nombre de aplicaciones en varias lineas</string>
+    <string name="title__desktop_hide_icon_labels">Ocultar etiquetas en los iconos de la pantalla de inicio</string>
+    <string name="title__desktop_grid_size">Tamaño de la cuadrícula</string>
+    <string name="title__desktop_full_width_widgets">Widgets en ancho completo</string>
+    <string name="pref_category__incubating">Incubando</string>
+    <string name="title__notification_background">Color de la notificación</string>
+</resources>
\ No newline at end of file
diff --git a/Omega/res/values-fr/strings.xml b/Omega/res/values-fr/strings.xml
new file mode 100644
index 0000000000..a1cee2ce7c
--- /dev/null
+++ b/Omega/res/values-fr/strings.xml
@@ -0,0 +1,356 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="title_all_apps_search">Barre de recherche du tiroir d\'applications</string>
+    <string name="summary__general_drawer">Personnalisez votre tiroir d\'applications</string>
+    <string name="title__general_drawer">Tiroir d\'applications</string>
+    <string name="folder_cover_mode">Utiliser le mode couverture</string>
+    <string name="edit_dash">Modifier le tableau de bord</string>
+    <string name="action_open_dash">Ouvrir le tableau de bord</string>
+    <string name="theme_auto">Suivre le fond d\'écran</string>
+    <string name="icon_pack_external_picker">Ouvrir un sélecteur externe</string>
+    <string name="pref_appcategorization_flowerpot_summary">Sélectionner les raccourcis automatiquement.</string>
+    <string name="tab_type_custom_desc">Sélectionner les raccourcis manuellement.</string>
+    <string name="pref_appcategorization_enable_title">Catégoriser les applications</string>
+    <string name="reset_custom_icons_confirmation">Réinitialiser les icônes de ce pack \? Cela ne peut pas être annulé.</string>
+    <string name="reset_custom_icons">Supprimer les icônes personnalisées</string>
+    <string name="loading">Chargement…</string>
+    <string name="folder_cover_mode_desc">Appuyer pour ouvrir la première application, défiler vers le haut pour tout voir.</string>
+    <string name="hide_app">Masquer le raccourci</string>
+    <string name="debug_component_name_copied">Copié dans le presse-papiers.</string>
+    <string name="debug_component_name">Nom du composant</string>
+    <string name="dismiss_drop_target_label">Ne pas afficher</string>
+    <string name="tabs_manage">Gérer</string>
+    <string name="show_in_tabs">Onglets</string>
+    <string name="default_tab_name">Nouvel onglet</string>
+    <string name="custom">Personnalisé</string>
+    <string name="apps_label">Applications</string>
+    <string name="name">Nom</string>
+    <string name="none">Aucun</string>
+    <string name="select_tab_type">Nouvel onglet</string>
+    <string name="delete">Supprimer</string>
+    <string name="tab_manage_apps">Gérer les applications</string>
+    <string name="tab_color">Couleur de l\'onglet</string>
+    <string name="tab_hide_from_main">Masquer de l\'onglet principal</string>
+    <string name="tab_bottom_sheet_save">Enregistrer</string>
+    <string name="customize">Personnaliser</string>
+    <string name="label_voice_search">Recherche vocale</string>
+    <string name="automatic_short">Auto</string>
+    <string name="reset_to_default">Réinitialiser les valeurs par défaut</string>
+    <string name="off">Désactivé</string>
+    <string name="on">Activé</string>
+    <string name="enabled_icon_packs">Activé</string>
+    <string name="drag_to_enable_packs">Glisser vers le haut pour activer</string>
+    <string name="drag_to_disable_packs">Glisser vers le bas pour désactiver</string>
+    <string name="wallpaper_pick">Sélectionner un fond d\'écran</string>
+    <string name="content_storage_permission_required">Pour définir un fond d\'écran, veuillez autoriser l\'accès au stockage.</string>
+    <string name="title_storage_permission_required">Accès au stockage requis</string>
+    <string name="category__about_licenses">Licence</string>
+    <string name="summary__about_donate">Plus d\'informations sur les dons ou autres contributions à ce projet</string>
+    <string name="title__about_project_license">Licence du projet</string>
+    <string name="title__about_open_source">Open Source</string>
+    <string name="title__about_project_team">Équipe de projet</string>
+    <string name="title__about_changelog">Journal des modifications</string>
+    <string name="title__about_donate">Faire un don</string>
+    <string name="title__about_copy_build">Copier les informations de build</string>
+    <string name="change_default_home">Définir comme lanceur par défaut</string>
+    <string name="summary__dev_restart">Peut être utile si certains paramètres ne se sont pas correctement appliqués</string>
+    <string name="title__restart_launcher">Redémarrer</string>
+    <string name="title__dev_show_debug_info">Afficher les informations de débogage</string>
+    <string name="title__dev_show_Dev">Afficher dans les paramètres</string>
+    <string name="developer_options_title">Options pour les développeurs</string>
+    <string name="failed">Une erreur s\'est produite.</string>
+    <string name="search_menu">Rechercher des paramètres</string>
+    <string name="developer_options_enabled">Options pour les développeurs activées</string>
+    <string name="title__advanced_language">Langue</string>
+    <string name="title__advanced_setting_search">Afficher les paramètres de recherche</string>
+    <string name="summary__advanced_language">Modifier la langue de cette application</string>
+    <string name="summary__advanced_setting_search">Afficher les paramètres de recherche dans la barre d\'action</string>
+    <string name="error_no_browser">Aucune activité trouvée pour gérer les URL</string>
+    <string name="search_provider_appsearch">Recherche d\'application</string>
+    <string name="search_no_results">Aucun résultat</string>
+    <string name="cat_search_bar">Barre de recherche</string>
+    <string name="summary__search_show_as_assistant_summary">Ouvrir l\'assistant au lieu de la recherche vocale</string>
+    <string name="title__search_provider">Moteur de recherche</string>
+    <string name="title__search_show_assistant">Afficher le bouton de recherche vocale</string>
+    <string name="title__search_action_assistant">Ouvrir l\'assistant</string>
+    <string name="title__search_bubble_searchbar">Afficher deux bulles</string>
+    <string name="omega_actions">Actions</string>
+    <string name="gesture_swipe_up">Défilement vers le haut</string>
+    <string name="gesture_long_press">Appui long</string>
+    <string name="gesture_double_tap">Appui double</string>
+    <string name="action_open_overview">Afficher la bulle du bureau</string>
+    <string name="action_open_settings">Ouvrir les paramètres du lanceur</string>
+    <string name="action_open_drawer">Ouvrir le tiroir d\'applications</string>
+    <string name="action_none">Ne rien faire</string>
+    <string name="pref_category__gestures">Gestes</string>
+    <string name="pref_category__notifications">Notifications</string>
+    <string name="title__notification_background">Couleur d\'arrière-plan des notifications</string>
+    <string name="title__folder_badge_count">Afficher le badge de notifications</string>
+    <string name="title__notification_count">Afficher le nombre de notifications</string>
+    <string name="icon_badging_desc_off">Désactivé</string>
+    <string name="icon_badging_desc_on">Activé</string>
+    <string name="smartspace_preferences">Préférences</string>
+    <string name="msg_minus_one_on_left">À gauche de l\'écran d\'accueil</string>
+    <string name="pref_show_google_now_summary">\@string/msg_minus_one_on_left</string>
+    <string name="title_show_google_app">Afficher l\'application Google</string>
+    <string name="icon_shape_override_progress">Application des modifications</string>
+    <string name="get_more_icon_packs">En obtenir plus</string>
+    <string name="icon_pack">Pack d\'icônes</string>
+    <string name="theme_default">Par défaut</string>
+    <string name="theme_use_dark_text">Utiliser du texte noir</string>
+    <string name="theme_use_black">Utiliser du noir pur</string>
+    <string name="theme_dark_theme_mode_follow_daylight">Suivre l\'heure de la journée</string>
+    <string name="theme_dark_theme_mode_follow_system">\@string/theme_auto_night_mode</string>
+    <string name="theme_dark_theme_mode_follow_wallpaper">\@string/theme_auto</string>
+    <string name="theme_dark_theme_mode_off">Désactivé</string>
+    <string name="theme_dark_theme_mode_on">Activé</string>
+    <string name="theme_dark_theme_mode">Thème sombre</string>
+    <string name="theme_black_dark_text">Noir avec texte noir</string>
+    <string name="theme_black">Noir</string>
+    <string name="theme_dark_dark_text">Sombre avec texte clair</string>
+    <string name="theme_dark">Sombre</string>
+    <string name="theme_with_dark_text">texte sombre</string>
+    <string name="theme_dark_text">Clair avec texte sombre</string>
+    <string name="theme_light">Clair</string>
+    <string name="theme_auto_night_mode">Suivre le thème du système</string>
+    <string name="summary__theme_blur">Flouter l\'arrière-plan des page</string>
+    <string name="title__theme_blur_radius">Intensité du flou</string>
+    <string name="title__theme_blur">Flou</string>
+    <string name="title__theme_accent_color">Couleur d\'accentuation</string>
+    <plurals name="hidden_apps_count">
+        <item quantity="one">%1$d masqué</item>
+        <item quantity="other"/>
+    </plurals>
+    <plurals name="tab_apps_count">
+        <item quantity="one">%1$d application</item>
+        <item quantity="other">%1$d applications</item>
+    </plurals>
+    <string name="playstore_query_icon_pack">Pack d\'icône</string>
+    <string name="import_as_adaptive">En tant qu\'icône adaptative</string>
+    <string name="import_icon">Importer un icône</string>
+    <string name="open_image_picker">Ouvrir le sélectionneur d\'image</string>
+    <string name="icon_pack_default">Icônes du système</string>
+    <string name="icon_pack_applied_toast">%s appliqué</string>
+    <string name="color_presets">Réglages</string>
+    <string name="title__theme_icon_shape">Modifier le style d\'icône</string>
+    <string name="icon_shape_corner_cut">Couper</string>
+    <string name="icon_shape_corner_squircle">Carré arrondi</string>
+    <string name="icon_shape_corner_round">Rond</string>
+    <string name="icon_shape_bottom_right">En bas à droite</string>
+    <string name="icon_shape_bottom_left">En bas à gauche</string>
+    <string name="icon_shape_top_right">En haut à droite</string>
+    <string name="icon_shape_top_left">En haut à gauche</string>
+    <string name="icon_shape_rounded_square">Carré arrondi</string>
+    <string name="icon_shape_cylinder">Cylindre</string>
+    <string name="icon_shape_teardrop">Goutte</string>
+    <string name="icon_shape_circle">Cercle</string>
+    <string name="icon_shape_squircle">Carré arrondi</string>
+    <string name="icon_shape_square">Carré</string>
+    <string name="icon_shape_system_default">Paramètres du système</string>
+    <string name="icon_shape_override_label_location">sur l\'écran d\'accueil</string>
+    <string name="icon_shape_override_label">Modifier le style d\'icône</string>
+    <string name="action_preferences">\@string/customize</string>
+    <string name="hide_app_reset">Réinitialiser</string>
+    <string name="hide_app_selected">  masqué</string>
+    <string name="selected_count">%1$d sélectionné</string>
+    <string name="drawer_tabs">Onglets</string>
+    <string name="drawer_folders">Dossiers</string>
+    <string name="tab_type_smart">Automatique</string>
+    <string name="tab_type_custom">Personnalisé</string>
+    <string name="default_folder_name">Nouveau dossier</string>
+    <string name="pref_app_groups_edit_tip">Appuyer pour modifier, glisser pour réorganiser.</string>
+    <string name="pref_appcategorization_tabs_summary">Basculer entre les groupes.</string>
+    <string name="pref_appcategorization_tabs_title">Onglets</string>
+    <string name="pref_appcategorization_folders_summary">Appuyer pour ouvrir la popup.</string>
+    <string name="pref_appcategorization_folders_title">Dossiers</string>
+    <string name="pref_app_groups_create">Créer</string>
+    <string name="pref_appcategorization_style_text">Style</string>
+    <string name="pref_appcategorization_enable_summary">Sélectionner la disposition du tiroir d\'applications</string>
+    <string name="pref_appcategorization_flowerpot_title">Catégorie de l\'application</string>
+    <string name="label_turn_off_suggestions">Désactiver</string>
+    <string name="msg_disable_suggestions_prompt">Les données d\'utilisation vont être supprimées.</string>
+    <string name="title_disable_suggestions_prompt">Désactiver les suggestions d\'application</string>
+    <string name="summary__drawer_hide_apps">Masquer l\'application du tiroir d\'applications</string>
+    <string name="summary_all_apps_google_search">Rechercher des résultats sur le Web et des applications</string>
+    <string name="title_all_apps_google_search">Recherche globale</string>
+    <string name="title__sort_by_color">Par couleur</string>
+    <string name="title__sort_most_used">Les plus utilisées</string>
+    <string name="title__sort_last_installed">Installé récemment</string>
+    <string name="title__sort_alphabetical_za">Antialphabétique</string>
+    <string name="title__sort_alphabetical_az">Alphabétique</string>
+    <string name="title__sort_mode">Tri des applications</string>
+    <string name="title__drawer_columns">Nombre de colonnes</string>
+    <string name="title__drawer_icon_popup_menu">Bulle de raccourci</string>
+    <string name="title__drawer_categorization">Catégories</string>
+    <string name="title__drawer_icon_size">Taille d\'icône de toutes les applications</string>
+    <string name="title__drawer_hide_apps">Raccourcis des applications cachées</string>
+    <string name="title__drawer_hide_icon_labels">Masquer le nom des applications</string>
+    <string name="title__drawer_paged_apps">Vue des applications avec pagination</string>
+    <string name="title__drawer_all_apps">Afficher le nom des applications</string>
+    <string name="title__drawer_sort">Tri des applications</string>
+    <string name="pref_value_disabled">Désactivé</string>
+    <string name="title__dock_search_bar">Afficher la barre de recherche</string>
+    <string name="title__dock_colored_icons">Icônes colorées</string>
+    <string name="title__dock_hide_labels">Masquer les étiquettes</string>
+    <string name="title__dock_hide">Masquer le dock</string>
+    <string name="title__dock_scale">Échelle du dock</string>
+    <string name="summary__full_width_widgets">Autoriser les widgets à s\'étendre sur toute la largeur sans remplissage</string>
+    <string name="title__desktop_full_width_widgets">Widgets en pleine largeur</string>
+    <string name="allow_rotation_blocked_desc">Le paramètre d’affichage actuel ne permet pas la rotation</string>
+    <string name="pref_category__others">Autres</string>
+    <string name="pref_category__inputs">Gestes et recherche</string>
+    <string name="pref_category__interfaces">Interfaces</string>
+    <string name="summary__general_about">Plus d\'informations sur Omega Launcher</string>
+    <string name="summary__general_advanced">Langue, sauvegarde, configuration de la recherche</string>
+    <string name="summary__general_notifications">Compteur du badge, couleur du badge, gestes</string>
+    <string name="summary__general_smartspace">Date, heure, widget d\'accueil</string>
+    <string name="summary__general_search">Fournisseur de recherche, style, icônes</string>
+    <string name="summary__general_theme">Modifiez les couleurs, le pack d\'icônes, le style d\'icône</string>
+    <string name="summary__general_dock">Icônes Hotseat, barre de recherche</string>
+    <string name="summary__general_desktop">Personnalisez votre bureau</string>
+    <string name="title__general_notifications">Gestes et notifications</string>
+    <string name="title__general_advanced">Paramètres avancés</string>
+    <string name="title__general_smartspace">Widget d\'accueil</string>
+    <string name="title__general_search">Recherche</string>
+    <string name="title__general_theme">Thème</string>
+    <string name="title__general_dock">Dock</string>
+    <string name="title__general_desktop">Bureau</string>
+    <string name="title__general_about">À propos</string>
+    <string name="dialog_default">Par défaut</string>
+    <string name="dialog_ok">OK</string>
+    <string name="dialog_cancel">Annuler</string>
+    <string name="title__dock_icon_size">Taille d\'icône</string>
+    <string name="title__desktop_icon_size">Taille d\'icône</string>
+    <string name="action_app_search">Ouvrir la recherche d\'applications</string>
+    <string name="action_global_search">Lancer la recherche globale</string>
+    <string name="action_close_notifications">Fermer les notifications</string>
+    <string name="action_open_notifications">Ouvrir les notifications</string>
+    <string name="title__gesture_swipe_down">Glisser vers le bas</string>
+    <string name="title__dock_hotseat_icons">Compteur de l\'icône</string>
+    <string name="grid_size_width">Largeur</string>
+    <string name="grid_size_height">Hauteur</string>
+    <string name="title__multiline_labels">Nom des applications sur plusieurs lignes</string>
+    <string name="title__desktop_hide_icon_labels">Masquer l\'étiquette des icônes sur l\'écran d\'accueil</string>
+    <string name="title__desktop_grid_size">Taille de la grille</string>
+    <string name="gesture_dock_swipe_up">Glisser vers le haut à partir du Dock</string>
+    <string name="title__search_bar_radius">Arrondi</string>
+    <string name="title_smartspace_feed_theme">Thème de flux</string>
+    <string name="theme_based">Défini par le thème</string>
+    <string name="action_open_app_select_app">Obtenir l\'application</string>
+    <string name="action_open_app_with_target">Ouvrir « %s »</string>
+    <string name="action_open_app">Ouvrir l\'application</string>
+    <string name="icu_abbrev_date">dd MMMM</string>
+    <string name="icu_abbrev_time_12h">hh:mm aa</string>
+    <string name="icu_abbrev_time">HH:mm</string>
+    <string name="icu_abbrev_wday_month_day_no_year">EEEEMMMd</string>
+    <string name="full_wday_month_day_no_year">EEEE, MMMM d</string>
+    <string name="battery_status">État de la batterie</string>
+    <string name="event_provider_unread_notifications">Notifications</string>
+    <string name="event_provider_now_playing">En cours de lecture</string>
+    <string name="weather_provider_oneplus_weather">Météo OnePlus</string>
+    <string name="weather_provider_pe">Expérience des pixels</string>
+    <string name="weather_provider_testing">Débogage</string>
+    <string name="weather_provider_disabled">Désactivé</string>
+    <string name="weather_icons_default">Par défaut</string>
+    <string name="onboarding_swipe_up">Glissez vers le haut pour ouvrir le tiroir d\'applications.</string>
+    <string name="onbording_settings_summary">Restez appuyez sur l\'écran d\'accueil.</string>
+    <string name="onbording_settings_title">Configuration de %s</string>
+    <string name="onbording">Démarrage</string>
+    <string name="personality_provider">Fêtes</string>
+    <string name="smartspace_provider_calendar">Évènements du calendrier</string>
+    <string name="deny">Refuser</string>
+    <string name="allow">Autoriser</string>
+    <string name="permission_iplocate_twilight_explanation">Autoriser l\'accès à votre emplacement approximatif \? Cela aura pour effet un meilleur calcul de l\'heure de la journée.</string>
+    <string name="permission_iplocate">Emplacement approximatif</string>
+    <string name="event_provider_missing_notification_dots">Pour utiliser &lt;xliff:g xmlns:xliff=\"urn:oasis:names:tc:xliff:document:1.2\" example=\"My Provider\" id=\"providerName\"&gt;“%1$s”&lt;/xliff:g&gt;, activez les notifications.<xliff:g example="My Provider" id="providerName">“%1$s”</xliff:g>, enable Notification Dots.</string>
+    <string name="event_provider_missing_notification_access">Pour utiliser &lt;xliff:g xmlns:xliff=\"urn:oasis:names:tc:xliff:document:1.2\" example=\"My Provider\" id=\"providerName\"&gt;“%1$s”&lt;/xliff:g&gt;, activez les notifications depuis &lt;xliff:g xmlns:xliff=\"urn:oasis:names:tc:xliff:document:1.2\" example=\"My App\" id=\"name\"&gt;“%2$s”.&lt;/xliff:g&gt;<xliff:g example="My Provider" id="providerName">“%1$s”</xliff:g>, enable notifications from <xliff:g example="My App" id="name">“%2$s”.</xliff:g></string>
+    <string name="battery_low">Batterie faible</string>
+    <string name="battery_full">Chargé</string>
+    <string name="battery_charging">En cours de chargement</string>
+    <string name="home_widget">En un coup d’œil</string>
+    <string name="zen_mode_enabled">Le mode Ne pas déranger est activé.</string>
+    <string name="smartspace_widget_provider_not_found">Obtenir l\'application Google.</string>
+    <string name="smartspace_hours_mins">%1$s %2$s</string>
+    <string name="smartspace_in_time">dans %1$s</string>
+    <string name="smartspace_now">maintenant</string>
+    <string name="smartspace_setup_text">Appuyez pour définir</string>
+    <string name="smartspace_add_to_home">Ajouter à l\'écran d\'accueil</string>
+    <string name="title_white_only_treatment">Remplacer les arrière-plans blancs</string>
+    <string name="title_legacy_treatment">Créer des icônes adaptatives</string>
+    <string name="title_legacy_colored_backgrounds">Arrière-plans colorés</string>
+    <string name="title_force_shapeless">Forcer la mise en forme des icônes</string>
+    <string name="title_adaptify_pack">Créer des icônes adaptatives pour le pack d\'icônes</string>
+    <string name="title_app_suggestions">Applications</string>
+    <string name="summary_search_hidden_apps">Afficher les raccourcis masqués dans les résultats.</string>
+    <string name="title_search_hidden_apps">Rechercher les raccourcis masqués</string>
+    <string name="units_romer">Rømer</string>
+    <string name="units_reaumur">Réaumur</string>
+    <string name="units_delisle">Delisle</string>
+    <string name="units_newton">Newton</string>
+    <string name="units_rakine">Rankine</string>
+    <string name="units_kelvin">Kelvin</string>
+    <string name="units_imperial">Fahrenheit</string>
+    <string name="units_metric">Celsius</string>
+    <string name="week_day_format">%1$s, %2$s</string>
+    <string name="smartspace_provider_bridge">Pont sans pixel</string>
+    <string name="category__behavior_weather">Météo</string>
+    <string name="title_smartspace_event_providers">Source des évènements</string>
+    <string name="title_smartspace_weather_units">Unité de température</string>
+    <string name="title_smartspace_widget_provider">Source météo</string>
+    <string name="title_smartspace_time_above">Afficher l\'heure en grand</string>
+    <string name="title_smartspace_time_24_h">Utiliser le format 24 heures</string>
+    <string name="title_smartspace_date">Afficher la date</string>
+    <string name="title_smartspace_time">Afficher l\'heure</string>
+    <string name="title_use_pill_qsb">Afficher le raccourci de recherche</string>
+    <string name="hotseat_show_page_indicator">Afficher l\'indicateur de pages</string>
+    <string name="title_opacity">Opacité</string>
+    <string name="title__dock_show_arrow">Afficher la flèche</string>
+    <string name="title_dock_background_color">Couleur d\'arrière-plan</string>
+    <string name="title_dock_fill">Afficher l\'arrière-plan</string>
+    <string name="backup_loading">Chargement…</string>
+    <string name="local_backups">Dans le stockage</string>
+    <string name="read_external_storage_required">Pour créer une sauvegarde, accordez l\'autorisation de stockage.</string>
+    <string name="backup_location_device_storage">Dossier Omega</string>
+    <string name="backup_location">Emplacement</string>
+    <string name="backup_share_text">Fichier de sauvegarde Omega</string>
+    <string name="backup_share_title">Partager la sauvegarde</string>
+    <string name="restore_read_meta_fail">Fichier de sauvegarde invalide</string>
+    <string name="restore_failed">Échec de la restauration</string>
+    <string name="backup_failed">Échec de la sauvegarde</string>
+    <string name="restore_success">Succès de la restauration</string>
+    <string name="restore_contents">Restaurer les contenus</string>
+    <string name="backup_restarting">Redémarrage</string>
+    <string name="backup_restoring">Restauration de la sauvegarde</string>
+    <string name="backup_timestamp">Créé à</string>
+    <string name="backup_remove_from_recents">Retirer de la liste</string>
+    <string name="backup_invalid">Indisponible</string>
+    <string name="no_recent_backups">Aucune sauvegarde récente</string>
+    <string name="backup_creating">Création de la sauvegarde</string>
+    <string name="backup_error_blank_contents">Les contenus ne doivent pas être vides</string>
+    <string name="backup_error_blank_name">Le nom ne doit pas être vide</string>
+    <string name="backup_wallpaper">Fond d\'écran</string>
+    <string name="backup_settings">Paramètres</string>
+    <string name="backup_contents">Contenus de la sauvegarde</string>
+    <string name="backup_homescreen">Écran d\'accueil</string>
+    <string name="backup_name">Nom</string>
+    <string name="restore_backup">Restaurer</string>
+    <string name="new_backup">Créer</string>
+    <string name="backup_pref_summary">Enregistrer l’écran d’accueil, restaurer les sauvegardes</string>
+    <string name="backup_share">Partager</string>
+    <string name="backup_delete_failed">Une erreur s\'est produite</string>
+    <string name="backup_delete">Masquer</string>
+    <string name="backups">Sauvegardes</string>
+    <string name="dt2s_admin_hint">Pour utiliser « Double appui pour dormir », accordez l\'autorisation d\'administrateur.</string>
+    <string name="title_desktop_hide_statusbar">Masquer la barre d\'état</string>
+    <string name="title_desktop_icon_popup_menu">Éléments du menu pop-up</string>
+    <string name="dt2s_admin_warning">La fonction « Double appui pour la veille » sera désactivée.</string>
+    <string name="action_sleep">Veille</string>
+    <string name="action_sleep_timeout">Veille à l’aide du délai d’expiration de l’écran</string>
+    <string name="name_provider_alarm_events">Alarmes à venir</string>
+    <string name="resuable_text_alarm">Alarme</string>
+    <string name="title_feed_provider_package">Fournisseur de flux</string>
+    <string name="pref_category__incubating">En incubation</string>
+    <string name="title_theme_icon_packs">Packs d\'icône</string>
+    <string name="title_text_color">Couleur du texte</string>
+    <string name="title_drawer_enable_background">Utiliser une couleur d\'arrière-plan personnalisée</string>
+</resources>
\ No newline at end of file
diff --git a/Omega/res/values-it/strings.xml b/Omega/res/values-it/strings.xml
new file mode 100644
index 0000000000..18a4d9f275
--- /dev/null
+++ b/Omega/res/values-it/strings.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~  Copyright (c) 2020 Omega Launcher
+  ~
+  ~  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="tab_bottom_sheet_save">Guardare</string>
+    <string name="pref_appcategorization_folders_title">Cartellas</string>
+    <string name="default_folder_name">Nuova cartella</string>
+    <string name="title__general_notifications">Gesti e notifiche</string>
+    <string name="title__general_advanced">Impostazioni avanzate</string>
+    <string name="title__general_search">Cerca</string>
+    <string name="title__general_theme">Tema</string>
+    <string name="title__general_about">Informazioni</string>
+</resources>
\ No newline at end of file
diff --git a/Omega/res/values-nb-rNO/strings.xml b/Omega/res/values-nb-rNO/strings.xml
new file mode 100644
index 0000000000..698f3d1045
--- /dev/null
+++ b/Omega/res/values-nb-rNO/strings.xml
@@ -0,0 +1,322 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="summary__general_search">Søketilbyder, stil, ikoner</string>
+    <string name="summary__general_theme">Endre farger, ikonpakke og -form</string>
+    <string name="summary__general_drawer">Tilpass din skuff</string>
+    <string name="summary__general_desktop">Tilpass skrivebordet ditt</string>
+    <string name="title__general_notifications">Håndvendinger og merknader</string>
+    <string name="title__general_advanced">Avansert</string>
+    <string name="title__general_smartspace">Hjemmeskjerms-miniprogram</string>
+    <string name="title__general_search">Søk</string>
+    <string name="title__general_theme">Drakt</string>
+    <string name="title__general_drawer">Skuff</string>
+    <string name="title__general_dock">Dokk</string>
+    <string name="title__general_desktop">Skrivebord</string>
+    <string name="title__general_about">Om</string>
+    <string name="title__dock_hide">Dokk-skjuling</string>
+    <string name="title__dock_hide_labels">Skjul etiketter</string>
+    <string name="title__dock_scale">Dokk-skala</string>
+    <string name="summary__full_width_widgets">Tillat miniprogrammer å dekke hele bredden uten kanter</string>
+    <string name="title__desktop_full_width_widgets">Fullskjerms-miniporgrammer</string>
+    <string name="allow_rotation_blocked_desc">Nåværende skjerminnstillinger tillater ikke rotasjon</string>
+    <string name="pref_category__others">Annet</string>
+    <string name="pref_category__inputs">Grensesnitt og søk</string>
+    <string name="pref_category__interfaces">Grensesnitt</string>
+    <string name="summary__general_about">Mer info om Omega-oppstarteren</string>
+    <string name="summary__general_advanced">Språk, sikkerhetskopi, innstillingssøk</string>
+    <string name="title__dock_colored_icons">Fargede ikoner</string>
+    <string name="pref_value_disabled">Avskrudd</string>
+    <string name="title__dock_search_bar">Vis søkefelt</string>
+    <string name="title__drawer_hide_icon_labels">Skjul programnavn</string>
+    <string name="title__drawer_paged_apps">Sideinndelt programoversikt</string>
+    <string name="title__drawer_all_apps">Vis alle programetiketter</string>
+    <string name="title__drawer_sort">Programsortering</string>
+    <string name="pref_appcategorization_folders_title">Mapper</string>
+    <string name="pref_app_groups_create">Opprett</string>
+    <string name="pref_appcategorization_style_text">Stil</string>
+    <string name="pref_appcategorization_enable_summary">Velg visning for skuff</string>
+    <string name="pref_appcategorization_enable_title">Kategoriser programmer</string>
+    <string name="pref_appcategorization_flowerpot_title">Programkategori</string>
+    <string name="label_turn_off_suggestions">Skru av</string>
+    <string name="msg_disable_suggestions_prompt">Bruksdata vil bli slettet.</string>
+    <string name="title_disable_suggestions_prompt">Skru av programforslag</string>
+    <string name="summary__drawer_hide_apps">Skjul program fra programskuffen</string>
+    <string name="summary_all_apps_google_search">Finn resultater og programmer på nett</string>
+    <string name="title_all_apps_search">Skuffesøkefelt</string>
+    <string name="title__sort_by_color">Etter farge</string>
+    <string name="title__sort_most_used">Mest brukt</string>
+    <string name="title__sort_last_installed">Sist installert</string>
+    <string name="title__sort_alphabetical_za">Å-A</string>
+    <string name="title__sort_alphabetical_az">A-Z</string>
+    <string name="title__sort_mode">Programsortering</string>
+    <string name="title__drawer_columns">Antall kolonner</string>
+    <string name="title__drawer_icon_popup_menu">Snarveisboble</string>
+    <string name="title__drawer_categorization">Kategorier</string>
+    <string name="title__drawer_hide_apps">Skjulte programsnarveier</string>
+    <string name="title__drawer_icon_size">Ikonstørrelse for alle programmer</string>
+    <string name="tab_type_custom">Tilpasset</string>
+    <string name="default_folder_name">Ny mappe</string>
+    <string name="pref_app_groups_edit_tip">Trykk for å redigere, dra for å omorganisere.</string>
+    <string name="pref_appcategorization_tabs_summary">Dra mellom grupper.</string>
+    <string name="pref_appcategorization_tabs_title">Faner</string>
+    <string name="pref_appcategorization_folders_summary">Fane for åpning av oppsprettsvindu.</string>
+    <string name="pref_appcategorization_flowerpot_summary">Velg snarveier automatisk.</string>
+    <string name="tab_type_smart">Automatisk</string>
+    <string name="tab_type_custom_desc">Velg snarveier manuelt.</string>
+    <string name="reset_custom_icons_confirmation">Tilbakestill til forvalgte ikoner fra denne ikonpakken\? Dette kan ikke angres.</string>
+    <string name="reset_custom_icons">Tilbakestill tilpassede ikoner</string>
+    <string name="loading">Laster inn …</string>
+    <string name="folder_cover_mode_desc">Trykk for å åpne det første programmet, dra oppover for å vise alle.</string>
+    <string name="folder_cover_mode">Bruk omslagsmodus</string>
+    <string name="hide_app">Skjul snarvei</string>
+    <string name="debug_component_name_copied">Kopiert til utklippstavle.</string>
+    <string name="debug_component_name">Komponentnavn</string>
+    <string name="dismiss_drop_target_label">Ikke vis</string>
+    <string name="tabs_manage">Håndter</string>
+    <string name="show_in_tabs">Faner</string>
+    <string name="default_tab_name">Ny fane</string>
+    <string name="custom">Tilpasset</string>
+    <string name="apps_label">Programmer</string>
+    <string name="name">Navn</string>
+    <string name="none">Ingen</string>
+    <string name="select_tab_type">Ny fane</string>
+    <string name="delete">Slett</string>
+    <string name="tab_manage_apps">Håndter programmer</string>
+    <string name="tab_color">Fanefarge</string>
+    <string name="tab_hide_from_main">Skjul fra hovedfane</string>
+    <string name="tab_bottom_sheet_save">Lagre</string>
+    <string name="customize">Tilpass</string>
+    <string name="label_voice_search">Stemmesøk</string>
+    <string name="automatic_short">Auto</string>
+    <string name="reset_to_default">Tilbakestill til forvalg</string>
+    <string name="off">Av</string>
+    <string name="on">På</string>
+    <string name="enabled_icon_packs">Påskrudd</string>
+    <string name="drag_to_enable_packs">Dra oppover for å skru på</string>
+    <string name="drag_to_disable_packs">Dra nedover for å skru av</string>
+    <string name="content_storage_permission_required">Innvilg lagringstilgang for å sette bakgrunnsbilde.</string>
+    <string name="wallpaper_pick">Velg bakgrunnsbilde</string>
+    <string name="title_storage_permission_required">Lagringstilgang trengs</string>
+    <string name="category__about_licenses">Lisens</string>
+    <string name="summary__about_donate">Mer info om donering og annen støtte av programmet</string>
+    <string name="title__about_project_license">Prosjektlisens</string>
+    <string name="title__about_open_source">Friprog-bibliotek</string>
+    <string name="title__about_project_team">Prosjektlag</string>
+    <string name="title__about_changelog">Endringslogg</string>
+    <string name="title__about_donate">Doner</string>
+    <string name="title__about_copy_build">Kopier bygginfo</string>
+    <string name="change_default_home">Bruk som hjemmeprogram</string>
+    <string name="summary__dev_restart">Kan være nyttig når noen innstillinger ikke har trådt i kraft</string>
+    <string name="title__restart_launcher">Omstart</string>
+    <string name="title__dev_show_debug_info">Vis avlusingsinfo</string>
+    <string name="title__dev_show_Dev">Vis i innstillinger</string>
+    <string name="developer_options_title">Utviklervalg</string>
+    <string name="failed">Noe gikk galt</string>
+    <string name="developer_options_enabled">Utviklerfunksjoner påslått</string>
+    <string name="title__advanced_language">Språk</string>
+    <string name="title__advanced_setting_search">Vis innstillingssøk</string>
+    <string name="summary__advanced_language">Endre programspråk</string>
+    <string name="summary__advanced_setting_search">Vis innstillingssøk i handlingsfelt</string>
+    <string name="error_no_browser">Ingenting kan håndtere nettadresser</string>
+    <string name="search_provider_appsearch">Programsøk</string>
+    <string name="search_no_results">Resultatløst</string>
+    <string name="cat_search_bar">Søkefelt</string>
+    <string name="summary__search_show_as_assistant_summary">Åpne assistent istedenfor stemmesøk</string>
+    <string name="title__search_provider">Søkemotor</string>
+    <string name="title__search_show_assistant">Vis stemmesøkeknapp</string>
+    <string name="title__search_action_assistant">Åpne assistent</string>
+    <string name="title__search_bubble_searchbar">Vis to bobler</string>
+    <string name="omega_actions">Handlinger</string>
+    <string name="gesture_swipe_up">Dra oppover</string>
+    <string name="gesture_long_press">Trykk og hold</string>
+    <string name="gesture_double_tap">Dobbelttrykk</string>
+    <string name="action_open_overview">Vis skrivebordsboble</string>
+    <string name="action_open_settings">Åpne oppstarter-innstillinger</string>
+    <string name="action_open_drawer">Åpne programskuff</string>
+    <string name="action_none">Ikke gjør noe</string>
+    <string name="pref_category__gestures">Håndvendinger</string>
+    <string name="pref_category__notifications">Merknader</string>
+    <string name="title__notification_background">Merknadsbakgrunnsfarge</string>
+    <string name="title__notification_count">Vis merkandsantall</string>
+    <string name="icon_badging_desc_off">Av</string>
+    <string name="icon_badging_desc_on">På</string>
+    <string name="smartspace_preferences">Innstillinger</string>
+    <string name="msg_minus_one_on_left">Til venstre for hovedhjemmeskjermen</string>
+    <string name="title_show_google_app">Vis Google-program</string>
+    <string name="icon_shape_override_progress">Bruker ikonformsendringer</string>
+    <string name="get_more_icon_packs">Hent flere</string>
+    <string name="icon_pack">Ikonpakke</string>
+    <string name="theme_default">Forvalg</string>
+    <string name="theme_use_dark_text">Bruk mørk tekst</string>
+    <string name="theme_use_black">Bruk helsort</string>
+    <string name="theme_dark_theme_mode_follow_daylight">Følg dagslys</string>
+    <string name="theme_dark_theme_mode_off">Av</string>
+    <string name="theme_dark_theme_mode_on">På</string>
+    <string name="theme_dark_theme_mode">Mørk drakt</string>
+    <string name="theme_black_dark_text">Svart med mørk tekst</string>
+    <string name="theme_black">Svart</string>
+    <string name="theme_dark_dark_text">Mørk med mørk tekst</string>
+    <string name="theme_dark">Mørk</string>
+    <string name="theme_with_dark_text">mørk tekst</string>
+    <string name="theme_dark_text">Lys med mørk tekst</string>
+    <string name="theme_light">Lys</string>
+    <string name="theme_auto_night_mode">Følg systemdrakt</string>
+    <string name="theme_auto">Følg bakgrunnsbilde</string>
+    <string name="summary__theme_blur">Tilslør sidebakgrunner</string>
+    <string name="title__theme_blur_radius">Tilsløringsgrad</string>
+    <string name="title__theme_blur">Tilslør</string>
+    <plurals name="hidden_apps_count">
+        <item quantity="one">%1$d skjulte</item>
+        <item quantity="other"/>
+    </plurals>
+    <plurals name="tab_apps_count">
+        <item quantity="one">%1$d program</item>
+        <item quantity="other">%1$d programmer</item>
+    </plurals>
+    <string name="playstore_query_icon_pack">Ikonpakke</string>
+    <string name="icon_pack_external_picker">Åpne ekstern bildevelger</string>
+    <string name="import_icon">Importer ikon</string>
+    <string name="open_image_picker">Åpne bildevelger</string>
+    <string name="icon_pack_default">Systemikoner</string>
+    <string name="icon_pack_applied_toast">%s brukt</string>
+    <string name="color_presets">Forhåndsinnstillinger</string>
+    <string name="title__theme_icon_shape">Endre ikonform</string>
+    <string name="icon_shape_corner_cut">Avkuttet</string>
+    <string name="icon_shape_corner_round">Rund</string>
+    <string name="icon_shape_bottom_right">Nederst til høyre</string>
+    <string name="icon_shape_bottom_left">Nederst til venstre</string>
+    <string name="icon_shape_top_right">Øverst til høyre</string>
+    <string name="icon_shape_top_left">Øverst til venstre</string>
+    <string name="icon_shape_rounded_square">Avrundet firkant</string>
+    <string name="icon_shape_cylinder">Sylinder</string>
+    <string name="action_app_search">Åpne programsøk</string>
+    <string name="action_open_notifications">Åpne merknader</string>
+    <string name="action_close_notifications">Lukk merknader</string>
+    <string name="search_menu">Finn innstillinger</string>
+    <string name="title__gesture_swipe_down">Dra nedover</string>
+    <string name="dialog_default">Forvalg</string>
+    <string name="dialog_ok">OK</string>
+    <string name="dialog_cancel">Avbryt</string>
+    <string name="icon_shape_corner_squircle">Kvirkel</string>
+    <string name="icon_shape_teardrop">Dråpe</string>
+    <string name="icon_shape_circle">Sirkel</string>
+    <string name="icon_shape_squircle">Kvirkel</string>
+    <string name="icon_shape_square">Firkant</string>
+    <string name="icon_shape_system_default">Systemforvalg</string>
+    <string name="icon_shape_override_label">Endre ikonstørrelse</string>
+    <string name="title__theme_accent_color">Aksentfarge</string>
+    <string name="hide_app_reset">Tilbakestill</string>
+    <string name="hide_app_selected">  skjult</string>
+    <string name="selected_count">%1$d valgt</string>
+    <string name="drawer_tabs">Faner</string>
+    <string name="drawer_folders">Mapper</string>
+    <string name="title__dock_hotseat_icons">Ikonantall</string>
+    <string name="title__dock_icon_size">Ikonstørrelse</string>
+    <string name="grid_size_width">Bredde</string>
+    <string name="grid_size_height">Høyde</string>
+    <string name="title__desktop_hide_icon_labels">Skjul ikonetiketter på hjemmeskjermen</string>
+    <string name="title__desktop_grid_size">Ruttenettstørrelse</string>
+    <string name="title__desktop_icon_size">Ikonstørrelse</string>
+    <string name="title_app_suggestions">Programmer</string>
+    <string name="summary_search_hidden_apps">Vis skjulte snarveier i resultatene.</string>
+    <string name="title_search_hidden_apps">Finn skjulte snarveier</string>
+    <string name="hotseat_show_page_indicator">Vis sideindikator</string>
+    <string name="title_opacity">Dekkevne</string>
+    <string name="title__dock_show_arrow">Vis pil</string>
+    <string name="title_dock_background_color">Bakgrunnsfarge</string>
+    <string name="title_dock_fill">Vis bakgrunn</string>
+    <string name="read_external_storage_required">Innvilg lagringstilgang for å opprette sikkerhetskopi.</string>
+    <string name="backup_error_blank_contents">Innholdet kan ikke være tomt</string>
+    <string name="backup_error_blank_name">Navnet kan ikke stå tomt</string>
+    <string name="backup_wallpaper">Bakgrunnsbilde</string>
+    <string name="backup_contents">Sikkerhetskopier innhold</string>
+    <string name="backup_pref_summary">Lagre hjemmeskjerm, gjenopprett sikkerhetskopier</string>
+    <string name="title__search_bar_radius">Hjørneavrunding</string>
+    <string name="action_open_app_select_app">Velg program</string>
+    <string name="action_open_app">Åpne program</string>
+    <string name="units_romer">Rømer</string>
+    <string name="units_reaumur">Réaumur</string>
+    <string name="units_delisle">Delisle</string>
+    <string name="units_newton">Newton</string>
+    <string name="units_rakine">Rankine</string>
+    <string name="weather_provider_oneplus_weather">OnePlus-vær</string>
+    <string name="weather_provider_pe">Pixel-opplevelse</string>
+    <string name="onboarding_swipe_up">Dra oppover for å åpne skuffen.</string>
+    <string name="onbording_settings_summary">Trykk og hold på skrivebordet</string>
+    <string name="personality_provider">Velkommen</string>
+    <string name="permission_iplocate">Omtrentlig posisjon</string>
+    <string name="battery_full">Ladet</string>
+    <string name="battery_charging">Lading</string>
+    <string name="smartspace_setup_text">Trykk for å sette opp</string>
+    <string name="title_feed_provider_package">Informasjonskanaltilbyder</string>
+    <string name="title_smartspace_event_providers">Hendelseskilder</string>
+    <string name="title_smartspace_time">Vis tid</string>
+    <string name="title_smartspace_feed_theme">Informasjonskanalens drakt</string>
+    <string name="title_white_only_treatment">Erstatt hvite bakgrunner</string>
+    <string name="title_legacy_colored_backgrounds">Fargede bakgrunner</string>
+    <string name="icon_shape_override_label_location">på hjemmeskjermen</string>
+    <string name="theme_based">Satt av drakt</string>
+    <string name="title_desktop_hide_statusbar">Skjul statusfelt</string>
+    <string name="backup_location_device_storage">Omega-mappe</string>
+    <string name="backup_location">Posisjon</string>
+    <string name="backup_share_text">Omega-sikkerhetskopifil</string>
+    <string name="backup_share_title">Del sikkerhetskopi</string>
+    <string name="restore_read_meta_fail">Ugyldig sikkerhetskopifil</string>
+    <string name="restore_failed">Klarte ikke å gjenopprette sikkerhetskopi</string>
+    <string name="backup_failed">Klarte ikke å sikkerhetskopiere</string>
+    <string name="restore_success">Gjenopprettet</string>
+    <string name="backup_loading">Laster inn…</string>
+    <string name="restore_contents">Gjenopprett innhold</string>
+    <string name="backup_restarting">Starter på ny</string>
+    <string name="backup_restoring">Gjenoppretter sikkerhetkopi</string>
+    <string name="backup_timestamp">Opprettet</string>
+    <string name="backup_remove_from_recents">Fjern fra listen</string>
+    <string name="backup_invalid">Utilgjengelig</string>
+    <string name="no_recent_backups">Ingen nylige sikkerhetskopier</string>
+    <string name="backup_creating">Oppretter sikkerhetskopi</string>
+    <string name="backup_settings">Innstillinger</string>
+    <string name="backup_homescreen">Hjemmeskjerm</string>
+    <string name="new_backup">Opprett</string>
+    <string name="backup_share">Del</string>
+    <string name="backup_delete_failed">Noe gikk galt</string>
+    <string name="backup_delete">Skjul</string>
+    <string name="backups">Sikkerhetskopier</string>
+    <string name="action_open_app_with_target">Åpne «%s»</string>
+    <string name="units_kelvin">Kelvin</string>
+    <string name="units_imperial">Fahrenheit</string>
+    <string name="units_metric">Celcius</string>
+    <string name="event_provider_unread_notifications">Merknader</string>
+    <string name="event_provider_now_playing">Nå spilles</string>
+    <string name="weather_provider_testing">Avlusing</string>
+    <string name="summary__general_smartspace">Dato, tid, hjemmeksjermsminiprogram</string>
+    <string name="restore_backup">Gjenopprett</string>
+    <string name="backup_name">Navn</string>
+    <string name="week_day_format">%1$s, %2$s</string>
+    <string name="battery_status">Batteristatus</string>
+    <string name="weather_provider_disabled">Avskrudd</string>
+    <string name="weather_icons_default">Forvalg</string>
+    <string name="onbording_settings_title">Sett opp %s</string>
+    <string name="smartspace_provider_calendar">Kalenderhendelser</string>
+    <string name="deny">Nekt</string>
+    <string name="allow">Tillat</string>
+    <string name="battery_low">Lavt batterinivå</string>
+    <string name="name_provider_alarm_events">Kommende alarmer</string>
+    <string name="resuable_text_alarm">Alarm</string>
+    <string name="smartspace_hours_mins">%1$s %2$s</string>
+    <string name="smartspace_in_time">om %1$s</string>
+    <string name="smartspace_now">nå</string>
+    <string name="smartspace_add_to_home">Legg til på skrivebord</string>
+    <string name="category__behavior_weather">Vær</string>
+    <string name="title_smartspace_weather_units">Temperaturenhet</string>
+    <string name="title_smartspace_widget_provider">Værkilde</string>
+    <string name="title_smartspace_time_above">Vis stor klokke</string>
+    <string name="title_smartspace_time_24_h">Bruk 24-timersformat</string>
+    <string name="title_smartspace_date">Vis dato</string>
+    <string name="event_provider_missing_notification_dots">For å bruke &lt;xliff:g xmlns:xliff=\"urn:oasis:names:tc:xliff:document:1.2\" example=\"My Provider\" id=\"providerName\"&gt;«%1$s»&lt;/xliff:g&gt; må du skru på merknadsdotter.<xliff:g example="My Provider" id="providerName">“%1$s”</xliff:g>, enable Notification Dots.</string>
+    <string name="event_provider_missing_notification_access">Skru på merknader fra &lt;xliff:g xmlns:xliff=\"urn:oasis:names:tc:xliff:document:1.2\" example=\"My App\" id=\"name\"&gt;“%2$s”.&lt;/xliff:g&gt; for å bruke &lt;xliff:g xmlns:xliff=\"urn:oasis:names:tc:xliff:document:1.2\" example=\"My Provider\" id=\"providerName\"&gt;“%1$s”&lt;/xliff:g&gt;,<xliff:g example="My Provider" id="providerName">“%1$s”</xliff:g>, enable notifications from <xliff:g example="My App" id="name">“%2$s”.</xliff:g></string>
+    <string name="zen_mode_enabled">«Ikke forstyrr» er påslått</string>
+    <string name="title_theme_icon_packs">Ikonpakker</string>
+    <string name="title_text_color">Tekstfarge</string>
+    <string name="title_drawer_enable_background">Bruk tilpasset bakgrunnsfarge</string>
+    <string name="title__multiline_labels">Programnavn med linjeskift</string>
+</resources>
\ No newline at end of file
diff --git a/Omega/res/values-pt-rBR/strings.xml b/Omega/res/values-pt-rBR/strings.xml
new file mode 100644
index 0000000000..315dfae2a6
--- /dev/null
+++ b/Omega/res/values-pt-rBR/strings.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="icon_shape_override_progress">Aplicando as mudanças no formato do ícone</string>
+    <string name="get_more_icon_packs">Obter mais</string>
+    <string name="icon_pack">Pacote de ícones</string>
+    <string name="theme_default">Padrão</string>
+    <string name="theme_use_dark_text">Usar um texto escuro</string>
+    <string name="theme_use_black">Usar um preto absoluto</string>
+    <string name="theme_dark_theme_mode_follow_daylight">Acompanhar a luz do dia</string>
+    <string name="theme_dark_theme_mode_follow_wallpaper">\@string/theme_auto</string>
+    <string name="theme_dark_theme_mode_off">Desativado</string>
+    <string name="theme_dark_theme_mode_on">Ativado</string>
+    <string name="theme_dark_theme_mode">Tema escuro</string>
+    <string name="theme_dark_dark_text">Escuro com texto escuro</string>
+    <string name="theme_dark_text">Claro com texto escuro</string>
+    <string name="theme_dark">Escuro</string>
+    <string name="theme_black_dark_text">Preto com texto escuro</string>
+    <string name="theme_black">Preto</string>
+    <string name="theme_with_dark_text">Texto escuro</string>
+    <string name="theme_light">Claro</string>
+    <string name="theme_based">Definido pelo tema</string>
+    <string name="theme_auto_night_mode">Baseado no tema do sistema</string>
+    <string name="theme_auto">Baseado no papel de parede</string>
+    <string name="summary__theme_blur">Desfocar o fundo da página</string>
+    <string name="title__theme_icon_shape">Mudar a forma do ícone</string>
+    <string name="title__theme_blur_radius">Intensidade do Fosco (blur)</string>
+    <string name="title__theme_blur">Fosco (blur)</string>
+    <string name="title__theme_accent_color">Cor de destaque</string>
+    <string name="hide_app_reset">Resetar</string>
+    <string name="hide_app_selected">  oculto</string>
+    <plurals name="hidden_apps_count">
+        <item quantity="one">%1$d Oculto</item>
+        <item quantity="other">%1$d Ocultos</item>
+    </plurals>
+    <plurals name="tab_apps_count">
+        <item quantity="one">%1$d Aplicativo</item>
+        <item quantity="other">%1$d Aplicativos</item>
+    </plurals>
+    <string name="selected_count">%1$d selecionado</string>
+    <string name="drawer_tabs">Abas</string>
+    <string name="drawer_folders">Pastas</string>
+    <string name="pref_appcategorization_flowerpot_summary">Selecionar os apps automaticamente.</string>
+    <string name="tab_type_smart">Automático</string>
+    <string name="tab_type_custom_desc">Selecionar os apps manualmente.</string>
+    <string name="tab_type_custom">Personalizado</string>
+    <string name="default_folder_name">Nova pasta</string>
+    <string name="pref_app_groups_edit_tip">Toque para editar, arraste para reorganizar.</string>
+    <string name="pref_appcategorization_tabs_summary">Deslizar entre os grupos.</string>
+    <string name="pref_appcategorization_tabs_title">Abas</string>
+    <string name="pref_appcategorization_folders_summary">Toque para abrir o pop-up.</string>
+    <string name="pref_appcategorization_folders_title">Pastas</string>
+    <string name="pref_app_groups_create">Criar</string>
+    <string name="pref_appcategorization_style_text">Estilo</string>
+    <string name="pref_appcategorization_enable_summary">Escolha o modo do \'layout\' da Gaveta de Apps</string>
+    <string name="pref_appcategorization_enable_title">Categorizar os aplicativos</string>
+    <string name="pref_appcategorization_flowerpot_title">Categoria de aplicativo</string>
+    <string name="label_turn_off_suggestions">Desativar</string>
+    <string name="msg_disable_suggestions_prompt">Os dados de uso serão excluídos.</string>
+    <string name="title_disable_suggestions_prompt">Desativar a sugestão de apps</string>
+    <string name="summary__drawer_hide_apps">Ocultar aplicativo da Gaveta de Apps</string>
+    <string name="summary_all_apps_google_search">Encontrar resultados e aplicativos na internet</string>
+    <string name="title_all_apps_google_search">Pesquisa global</string>
+    <string name="title_all_apps_search">Barra de pesquisas na Gaveta de Apps</string>
+    <string name="title__sort_by_color">Por cor</string>
+    <string name="title__sort_most_used">Mais usados</string>
+    <string name="title__sort_last_installed">Mais recentes primeiro</string>
+    <string name="title__sort_alphabetical_za">Ordem alfabética (Z-A)</string>
+    <string name="title__sort_alphabetical_az">Ordem alfabética (A-Z)</string>
+    <string name="title__sort_mode">Classificar os aplicativos</string>
+    <string name="title__drawer_columns">Número de colunas</string>
+    <string name="title__drawer_categorization">Categorias</string>
+    <string name="title__drawer_icon_size">Tamanho do ícone para todos os apps</string>
+    <string name="title__drawer_hide_apps">Esconder os atalhos dos apps</string>
+    <string name="title__drawer_hide_icon_labels">Esconder o nome dos apps</string>
+    <string name="title__drawer_paged_apps">Visualizar os apps em página</string>
+    <string name="title__drawer_all_apps">Mostrar o rótulo de todos os apps</string>
+    <string name="title__drawer_sort">Classificação dos apps</string>
+    <string name="pref_value_disabled">Desativado</string>
+    <string name="title__dock_hotseat_icons">Quantidade de ícones</string>
+    <string name="title__dock_search_bar">Mostrar a barra de pesquisa</string>
+    <string name="title__dock_colored_icons">Ícones coloridos</string>
+    <string name="title__dock_hide_labels">Esconder os rótulos</string>
+    <string name="title__dock_hide">Esconder a \'Dock\'</string>
+    <string name="title__dock_scale">Escala da \'Dock\'</string>
+    <string name="title__dock_icon_size">Tamanho do ícone</string>
+    <string name="grid_size_width">Largura</string>
+    <string name="grid_size_height">Altura</string>
+    <string name="summary__full_width_widgets">Permitir que os widgets ocupem toda a largura sem preenchimento</string>
+    <string name="title__multiline_labels">Nome dos apps em multilinha</string>
+    <string name="title__desktop_hide_icon_labels">Esconder o rótulo dos ícones na tela inicial</string>
+    <string name="title__desktop_grid_size">Tamanho da grade</string>
+    <string name="title__desktop_icon_size">Tamanho do ícone</string>
+    <string name="title__desktop_full_width_widgets">Widgets com 100% de largura</string>
+    <string name="allow_rotation_blocked_desc">A configuração atual da sua tela não permite rotação!</string>
+
+    <string name="dock_search_value" translatable="false">%1$s %2$s</string>
+
+</resources>
\ No newline at end of file
diff --git a/Omega/res/values-ru/strings.xml b/Omega/res/values-ru/strings.xml
new file mode 100644
index 0000000000..7b78acf351
--- /dev/null
+++ b/Omega/res/values-ru/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="icon_shape_cylinder">Цилиндр</string>
+    <string name="hide_app_reset">Сброс</string>
+    <string name="drawer_tabs">Вкладки</string>
+    <string name="drawer_folders">Папки</string>
+    <string name="tab_type_smart">Автоматически</string>
+    <string name="default_folder_name">Новая папка</string>
+    <string name="pref_appcategorization_tabs_title">Вкладки</string>
+    <string name="pref_appcategorization_folders_title">Папки</string>
+    <string name="pref_app_groups_create">Создать</string>
+    <string name="pref_appcategorization_style_text">Стиль</string>
+    <string name="pref_appcategorization_enable_title">Категоризация приложений</string>
+    <string name="pref_appcategorization_flowerpot_title">Категория приложения</string>
+    <string name="label_turn_off_suggestions">Отключить</string>
+    <string name="title_all_apps_google_search">Глобальный поиск</string>
+    <string name="title__sort_by_color">По цвету</string>
+    <string name="title__sort_mode">Сортировка приложений</string>
+    <string name="title__drawer_categorization">Категории</string>
+    <string name="title__drawer_sort">Сортировка приложений</string>
+    <string name="pref_value_disabled">Отключено</string>
+    <string name="title__dock_colored_icons">Цветные значки</string>
+    <string name="pref_category__inputs">Жесты и поиск</string>
+    <string name="pref_category__interfaces">Интерфейсы</string>
+    <string name="summary__general_notifications">Уведомления и жесты</string>
+    <string name="summary__general_desktop">Настройте свой рабочий стол</string>
+    <string name="title__general_notifications">Жесты и уведомления</string>
+    <string name="title__general_search">Поиск</string>
+    <string name="title__general_theme">Тема</string>
+    <string name="title__general_desktop">Рабочий стол</string>
+    <string name="title__general_about">О программе</string>
+</resources>
\ No newline at end of file
diff --git a/Omega/res/values/arrays.xml b/Omega/res/values/arrays.xml
index 55e887ddfe..65337a60e4 100644
--- a/Omega/res/values/arrays.xml
+++ b/Omega/res/values/arrays.xml
@@ -33,4 +33,81 @@
         <item>3</item>
         <item>4</item>
     </string-array>
+    <string-array name="themes" translatable="false">
+        <item>@string/theme_auto</item>
+        <item>@string/theme_auto_night_mode</item>
+        <item>@string/theme_light</item>
+        <item>@string/theme_dark_text</item>
+        <item>@string/theme_dark</item>
+        <item>@string/theme_dark_dark_text</item>
+        <item>@string/theme_black</item>
+        <item>@string/theme_black_dark_text</item>
+    </string-array>
+
+    <string-array name="themeValues" translatable="false">
+        <item>1</item>  <!-- 00001 -->
+        <item>17</item> <!-- 10001 -->
+        <item>0</item>  <!-- 00000 -->
+        <item>2</item>  <!-- 00010 -->
+        <item>4</item>  <!-- 00100 -->
+        <item>6</item>  <!-- 00110 -->
+        <item>12</item> <!-- 01100 -->
+        <item>14</item> <!-- 01110 -->
+    </string-array>
+
+    <!-- Values for icon shape overrides. These should correspond to entries defined
+   in icon_shape_override_paths_names -->
+    <string-array name="icon_shape_values" translatable="false">
+        <item></item>
+        <item>circle</item>
+        <item>square</item>
+        <item>roundedSquare</item>
+        <item>squircle</item>
+        <item>teardrop</item>
+        <item>cylinder</item>
+    </string-array>
+
+    <string-array name="icon_shape_names" translatable="false">
+        <!-- Option to not change the icon shape on home screen. [CHAR LIMIT=50] -->
+        <item>@string/icon_shape_system_default</item>
+        <item>@string/icon_shape_square</item>
+        <item>@string/icon_shape_rounded_square</item>
+        <item>@string/icon_shape_squircle</item>
+        <item>@string/icon_shape_circle</item>
+        <item>@string/icon_shape_teardrop</item>
+        <item>@string/icon_shape_cylinder</item>
+    </string-array>
+
+    <string-array name="feedThemes" translatable="false">
+        <item>@string/theme_based</item>
+        <item>@string/theme_light</item>
+        <item>@string/theme_dark</item>
+    </string-array>
+
+    <string-array name="feedThemeValues">
+        <item>1</item>  <!-- 01 -->
+        <item>0</item>  <!-- 00 -->
+        <item>2</item>  <!-- 10 -->
+    </string-array>
+
+    <string-array name="unitsTexts">
+        <item>@string/units_metric</item>
+        <item>@string/units_imperial</item>
+        <item>@string/units_kelvin</item>
+        <item>@string/units_rakine</item>
+        <item>@string/units_delisle</item>
+        <item>@string/units_newton</item>
+        <item>@string/units_reaumur</item>
+        <item>@string/units_romer</item>
+    </string-array>
+    <string-array name="unitsValues">
+        <item>metric</item>
+        <item>imperial</item>
+        <item>kelvin</item>
+        <item>rakine</item>
+        <item>delisle</item>
+        <item>newton</item>
+        <item>reaumur</item>
+        <item>romer</item>
+    </string-array>
 </resources>
\ No newline at end of file
diff --git a/Omega/res/values/attrs.xml b/Omega/res/values/attrs.xml
index c80bc8a62c..6860ec723f 100644
--- a/Omega/res/values/attrs.xml
+++ b/Omega/res/values/attrs.xml
@@ -84,10 +84,33 @@
         <attr name="numMinColumns" format="integer" />
     </declare-styleable>
 
+    <declare-styleable name="GesturePreference">
+        <attr name="gestureClass" format="string" />
+    </declare-styleable>
+
+    <declare-styleable name="ThemeFlagSwitchPreference">
+        <attr name="switchFlag" format="integer" />
+    </declare-styleable>
+
     <attr name="settingsBackground" format="color" />
     <attr name="bottomSheetScrimColor" format="color" />
     <attr name="settingsSearchBackground" format="color" />
     <attr name="settingsPopupBackground" format="color" />
     <attr name="bottomSheetNavBarColor" format="color" />
     <attr name="useLightSystemBars" format="boolean" />
+    <attr name="qsbEdgeRadius" format="dimension" />
+
+    <attr name="omegaColorAllAppsOverlay" format="color" />
+    <attr name="omegaColorSearchBar" format="color" />
+
+    <attr name="dashIconTint" format="color" />
+    <attr name="dashIconBackground" format="color" />
+
+    <!-- Pixel -->
+    <attr name="gIcon" format="reference" />
+    <attr name="micIcon" format="reference" />
+
+    <declare-styleable name="PreviewPreference">
+        <attr name="previewLayout" format="float" />
+    </declare-styleable>
 </resources>
diff --git a/Omega/res/values/bridge.xml b/Omega/res/values/bridge.xml
new file mode 100644
index 0000000000..7e67789793
--- /dev/null
+++ b/Omega/res/values/bridge.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <integer name="bridge_signature_hash">0xB662CC2F</integer>
+    <string name="bridge_version" translatable="false">v2</string>
+    <integer name="lawnfeed_signature_hash">0x7F7A957A</integer>
+</resources>
diff --git a/Omega/res/values/colors.xml b/Omega/res/values/colors.xml
index a848c0b4c8..3935446c3f 100644
--- a/Omega/res/values/colors.xml
+++ b/Omega/res/values/colors.xml
@@ -16,18 +16,45 @@
   -->
 <resources>
     <color name="white">#FFFFFF</color>
+    <color name="ic_allapps_background">#FAFAFA</color>
+    <color name="ic_launcher_background">#0F111A</color>
+    <color name="ic_launcher_foreground">#0988d1</color>
 
     <color name="colorPrimary">#0788EF</color>
     <color name="colorPrimaryDark">#03419F</color>
     <color name="colorAccent">#E80142</color>
+    <color name="colorAccentDark">#ff8AB4f8</color>
     <color name="textColorPrimary">#ffffffff</color>
     <color name="textColorSecondary">#ffffffff</color>
     <color name="textColorPrimaryInverse">#de000000</color>
     <color name="textColorSecondaryInverse">#8a000000</color>
 
+    <color name="lollipopStatusBar">#61000000</color>
     <color name="all_apps_navbar_color">#28000000</color>
 
     <color name="notification_background">#EB0854</color>
     <color name="transparentish">#B0101010</color>
+
+    <color name="setting_icon_color">#8705B6</color>
+
+    <color name="qsb_icon_shadow_color">#20000000</color>
+    <color name="qsb_dark_icon_tint">#ff757575</color>
+
+    <color name="qsb_drawer_text_color_normal">#ff212121</color>
+
+    <color name="settings_background_dark">#ff303030</color>
+    <color name="settings_background_dark_2dp">#ff252628</color>
+    <color name="settings_background_dark_8dp">#ff303133</color>
+    <color name="settings_background_black">#ff000000</color>
+    <color name="settings_background_black_2dp">#ff121212</color>
+    <color name="settings_background_black_8dp">#ff1e1e1e</color>
+
+    <color name="search_ripple">#0D888888</color>
+
+    <!-- Pixel 1 -->
+    <color name="qsb_connector">#fff2f2f2</color>
+    <color name="qsb_background">#ffffffff</color>
+    <color name="qsb_background_dark">#ff333333</color>
+    <color name="qsb_connector_gradient_end_color">#66ffffff</color>
 </resources>
 
diff --git a/Omega/res/values/config.xml b/Omega/res/values/config.xml
index c4ad2e9d5c..ce087ecae5 100644
--- a/Omega/res/values/config.xml
+++ b/Omega/res/values/config.xml
@@ -1,29 +1,53 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ /*
-  ~  *
-  ~  *  * Copyright (c) 2020 Omega Launcher
-  ~  *  *
-  ~  *  * 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.
-  ~  *
-  ~  */
+  ~
+  ~  Copyright (c) 2020 Omega Launcher
+  ~
+  ~  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 representing the fragment class for settings activity.-->
     <string name="settings_fragment_name" translatable="false">com.saggitt.omega.settings.SettingsActivity$LauncherSettingsFragment</string>
-    <string name="user_event_dispatcher_class" translatable="false">com.saggitt.omega.predictions.CustomAppPredictor</string>
+    <string name="user_event_dispatcher_class" translatable="false">com.saggitt.omega.predictions.OmegaAppPredictor</string>
+    <string name="icon_provider_class" translatable="false">com.saggitt.omega.icons.CustomIconProvider</string>
+    <string name="drawable_factory_class" translatable="false">com.saggitt.omega.icons.CustomDrawableFactory</string>
+    <string name="config_default_search_provider" translatable="false">com.saggitt.omega.search.providers.GoogleSearchProvider</string>
+    <string name="default_live_wallpaper" translatable="false">com.breel.wallpapers/com.breel.wallpapers.dioramas.lagos.LagosWallpaperService</string>
+    <string name="app_filter_class" translatable="false">com.saggitt.omega.allapps.CustomAppFilter</string>
+    <!-- Name of a custom shortcut class. -->
+    <string name="custom_shortcut_class" translatable="false">com.saggitt.omega.views.CustomEditShortcut</string>
 
-    <bool name="config_default_enable_blur">false</bool>
+    <!-- The default icon packs to use -->
+    <!-- (Deprecated) The default icon pack to use; empty = system icons -->
+    <string name="config_default_icon_pack" translatable="false" />
+    <string-array name="config_default_icon_packs">
+        <item>@string/config_default_icon_pack</item>
+    </string-array>
+
+    <!-- Whitelisted package to retrieve packagename for badge. Can be empty. -->
+    <string name="shortcutinfocompat_badgepkg_whitelist" translatable="false"></string>
+
+    <bool name="config_default_enable_blur">true</bool>
     <!-- Tag id used for view scrim -->
     <item name="view_scrim" type="id" />
+
+    <!-- Out of 100, the percent to shrink the workspace during options mode. -->
+    <integer name="config_workspaceOptionsShrinkPercentage">70</integer>
+
+    <string name="action_do_nothing_class" translatable="false">com.saggitt.omega.gestures.BlankGestureHandler</string>
+    <string name="action_open_notifications_class" translatable="false">com.saggitt.omega.gestures.handlers.NotificationsOpenGestureHandler</string>
+    <string name="action_open_drawer_class" translatable="false">com.saggitt.omega.gestures.handlers.OpenDrawerGestureHandler</string>
+    <string name="action_open_overview_class" translatable="false">com.saggitt.omega.gestures.handlers.OpenOverviewGestureHandler</string>
+
 </resources>
\ No newline at end of file
diff --git a/Omega/res/values/dimens.xml b/Omega/res/values/dimens.xml
index 0a27500f21..57b96a6a2e 100644
--- a/Omega/res/values/dimens.xml
+++ b/Omega/res/values/dimens.xml
@@ -1,29 +1,37 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ /*
-  ~  *
-  ~  *  * Copyright (c) 2020 Omega Launcher
-  ~  *  *
-  ~  *  * 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.
-  ~  *
-  ~  */
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~
+  ~  Copyright (c) 2020 Omega Launcher
+  ~
+  ~  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>
-    <dimen name="dashboard_tile_minimum_height">72dp</dimen>
-    <dimen name="dashboard_tile_image_size">38dp</dimen>
-    <dimen name="dashboard_tile_image_margin_start">16dp</dimen>
-    <dimen name="dashboard_tile_image_margin_end">20dp</dimen>
+
+    <!-- All Apps -->
+    <dimen name="all_apps_caret_stroke_width">2dp</dimen>
+    <dimen name="all_apps_caret_shadow_spread">1dp</dimen>
+    <dimen name="all_apps_caret_size">13dp</dimen>
+
+    <dimen name="dynamic_grid_drawer_additional_padding">30dp</dimen>
+    <dimen name="all_apps_search_vertical_offset">30dp</dimen>
+
+    <!-- Dashboard tile image margin start / end -->
+    <dimen name="margin_normal">16dp</dimen>
+    <dimen name="button_corner_radius">4dp</dimen>
+    <dimen name="dialog_horizontal_padding">24dp</dimen>
+    <dimen name="shelf_surface_radius">16dp</dimen>
+
     <!-- The default blur strength -->
     <item name="config_default_blur_strength" format="float" type="dimen">75</item>
     <dimen name="large_title_height">16dp</dimen>
@@ -39,6 +47,57 @@
     <dimen name="dashboard_padding_end">0dp</dimen>
     <dimen name="dashboard_padding_top">0dp</dimen>
     <dimen name="dashboard_padding_bottom">0dp</dimen>
+    <dimen name="dashboard_tile_minimum_height">72dp</dimen>
+    <dimen name="dashboard_tile_image_size">40dp</dimen>
+    <dimen name="dashboard_tile_image_margin_start">16dp</dimen>
+    <dimen name="dashboard_tile_image_margin_end">20dp</dimen>
 
     <dimen name="icon_preview_size">48dp</dimen>
+    <dimen name="icon_preview_padding">16dp</dimen>
+
+    <!-- Hotseat -->
+    <dimen name="v1_dynamic_grid_hotseat_top_padding">4dp</dimen>
+    <dimen name="v1_dynamic_grid_hotseat_bottom_padding">2dp</dimen>
+    <dimen name="v1_dynamic_grid_hotseat_size">80dp</dimen>
+    <dimen name="dynamic_grid_hotseat_size">70dp</dimen>
+    <dimen name="dynamic_grid_cell_layout_bottom_padding">0dp</dimen>
+    <dimen name="dynamic_grid_workspace_page_spacing">4dp</dimen>
+    <dimen name="dynamic_grid_workspace_top_padding">4dp</dimen>
+    <dimen name="dock_preview_height">150dp</dimen>
+
+    <!-- QSB -->
+    <dimen name="hotseat_qsb_bottom_margin">5dp</dimen>
+    <dimen name="hotseat_qsb_scroll_key_shadow_offset">2dp</dimen>
+    <dimen name="hotseat_qsb_scroll_shadow_blur_radius">1.5dp</dimen>
+    <dimen name="hotseat_navbar_padding">24dp</dimen>
+    <dimen name="qsb_margin_top_adjusting">20dp</dimen>
+    <dimen name="qsb_mic_width">48dp</dimen>
+    <dimen name="qsb_shadow_margin">6dp</dimen>
+    <dimen name="qsb_widget_height">56dp</dimen>
+    <dimen name="qsb_widget_padding">8dp</dimen>
+    <dimen name="qsb_doodle_tap_target_logo_width">106dp</dimen>
+    <dimen name="qsb_text_spacing">20dp</dimen>
+    <dimen name="qsb_hint_text_size">13sp</dimen>
+    <dimen name="qsb_two_bubble_gap">8dp</dimen>
+    <dimen name="qsb_max_hint_length">130dp</dimen>
+    <dimen name="qsb_radius_square">8dp</dimen>
+    <dimen name="qsb_radius_squircle">16dp</dimen>
+
+    <dimen name="smartspace_title_size">24dp</dimen>
+    <dimen name="smartspace_clock_above_size">40dp</dimen>
+    <dimen name="smartspace_title_min_size">14dp</dimen>
+    <dimen name="smartspace_horizontal_padding">56dp</dimen>
+    <dimen name="smartspace_title_sep_width">1dp</dimen>
+    <dimen name="smartspace_title_weather_icon_size">24dp</dimen>
+    <dimen name="smartspace_preview_height">100dp</dimen>
+    <dimen name="smartspace_preview_widget_margin">24dp</dimen>
+    <dimen name="smartspaceAmbientShadowBlur">1.5dp</dimen>
+    <dimen name="smartspaceKeyShadowBlur">2dp</dimen>
+    <dimen name="smartspaceKeyShadowOffset">0.5dp</dimen>
+    <dimen name="smartspaceLetterSpacing">0.02</dimen>
+
+    <dimen name="select_dialog_padding_start_material">20dp</dimen>
+    <dimen name="select_dialog_padding_material">24dp</dimen>
+    <dimen name="select_dialog_drawable_padding_start_material">20dp</dimen>
+
 </resources>
\ No newline at end of file
diff --git a/Omega/res/values/ids.xml b/Omega/res/values/ids.xml
index e613159e25..b98f1506a6 100644
--- a/Omega/res/values/ids.xml
+++ b/Omega/res/values/ids.xml
@@ -1,24 +1,25 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ /*
-  ~  *
-  ~  *  * Copyright (c) 2020 Omega Launcher
-  ~  *  *
-  ~  *  * 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.
-  ~  *
-  ~  */
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~
+  ~  Copyright (c) 2020 Omega Launcher
+  ~
+  ~  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>
     <item name="preference_highlighted" type="id" />
+
+    <item name="hotseat_qsb_menu_item" type="id" />
+
+    <item name="message_search" type="id" />
 </resources>
\ No newline at end of file
diff --git a/Omega/res/values/plurals.xml b/Omega/res/values/plurals.xml
new file mode 100644
index 0000000000..383f196a20
--- /dev/null
+++ b/Omega/res/values/plurals.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <plurals name="smartspace_minutes">
+        <item quantity="other">%d min</item>
+        <item quantity="one">%d min</item>
+    </plurals>
+    <plurals name="smartspace_hours">
+        <item quantity="other">%d hr</item>
+        <item quantity="one">%d hr</item>
+    </plurals>
+</resources>
diff --git a/Omega/res/values/strings.xml b/Omega/res/values/strings.xml
index 96c9b058fe..a45682c230 100644
--- a/Omega/res/values/strings.xml
+++ b/Omega/res/values/strings.xml
@@ -1,89 +1,433 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~
-  ~  Copyright (c) 2020 Omega Launcher
-  ~
-  ~  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.
-  ~
+
+  Copyright (c) 2020 Omega Launcher
+
+  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="derived_app_name" translatable="false">Omega Launcher</string>
-    <string name="app_version">Version</string>
-    <string name="app_build">Build</string>
+    <string name="app_version" translatable="false">Version</string>
+    <string name="app_build" translatable="false">Build</string>
     <!-- PREFERENCES GENERAL -->
     <string name="title__general_about">About</string>
     <string name="title__general_desktop">Desktop</string>
+    <string name="title__general_dock">Dock</string>
     <string name="title__general_drawer">Drawer</string>
     <string name="title__general_theme">Theme</string>
+    <string name="title__general_search">Search</string>
     <string name="title__general_smartspace">Home Widget</string>
-    <string name="title__general_advanced">Advanced</string>
+    <string name="title__general_advanced">Advanced Settings</string>
     <string name="title__general_notifications">Gestures and Notifications</string>
     <string name="summary__general_desktop">Customize your desktop</string>
+    <string name="summary__general_dock">Hotseat icons, search bar</string>
     <string name="summary__general_drawer">Customize your Drawer</string>
     <string name="summary__general_theme">Change colors, icon pack, icon shape</string>
+    <string name="summary__general_search">Search Provider, style, icons</string>
     <string name="summary__general_smartspace">Date, time, home widget</string>
-    <string name="summary__general_notifications">Notifications and Gestures</string>
-    <string name="summary__general_advanced">Languaje, back up, setting search</string>
+    <string name="summary__general_notifications">Badge count, badge color, gestures</string>
+    <string name="summary__general_advanced">Language, back up, setting search</string>
     <string name="summary__general_about">More information about Omega Launcher</string>
 
     <string name="pref_category__interfaces">Interfaces</string>
     <string name="pref_category__inputs">Gestures and Search</string>
     <string name="pref_category__others">Others</string>
+    <string name="pref_category__incubating">Incubating</string>
+
     <!-- PREFERENCES DESKTOP -->
     <string name="allow_rotation_blocked_desc">Current Display setting doesn\'t permit rotation</string>
     <string name="title__desktop_full_width_widgets">Full width widgets</string>
+    <string name="title__desktop_icon_size">Icon size</string>
+    <string name="title__desktop_grid_size">Grid size</string>
+    <string name="title__desktop_hide_icon_labels">Hide icon labels on home screen</string>
+    <string name="title__multiline_labels">Multiline app names</string>
+    <string name="title_desktop_icon_popup_menu">Popup menu items</string>
+    <string name="title_desktop_hide_statusbar">Hide status bar</string>
     <string name="summary__full_width_widgets">Allow widgets to span over the whole width without padding</string>
-
+    <string name="grid_size_height">Height</string>
+    <string name="grid_size_width">Width</string>
 
     <!-- PREFERENCES DOCK -->
+    <string name="title__dock_icon_size">Icon size</string>
+    <string name="title__dock_scale">Dock scale</string>
+    <string name="title_dock_fill">Show Background</string>
+    <string name="title_dock_background_color">Background Color</string>
+    <string name="title__dock_hide">Dock Hide</string>
+    <string name="title__dock_hide_labels">Hide Labels</string>
+    <string name="title__dock_colored_icons">Colored icons</string>
+    <string name="title__dock_search_bar">Show Search Bar</string>
+    <string name="title__dock_hotseat_icons">Icon Count</string>
+    <string name="title__dock_show_arrow">Show Arrow</string>
+
+    <string name="title_opacity">Opacity</string>
+    <string name="hotseat_show_page_indicator">Show Page Indicator</string>
+    <string name="pref_value_disabled">"Disabled"</string>
+    <string name="dock_search_value" translatable="false">%1$s %2$s</string>
+
     <!-- PREFERENCES DRAWER -->
     <string name="title__drawer_sort">Apps Sort</string>
     <string name="title__drawer_all_apps">Show "All Apps" label</string>
+    <string name="title__drawer_paged_apps">Paged Apps view</string>
+    <string name="title__drawer_hide_icon_labels">Hide app names</string>
+    <string name="title__drawer_hide_apps">Hidden App Shortcuts</string>
+    <string name="title__drawer_icon_size">All Apps Icon Size</string>
+    <string name="title__drawer_categorization">Categories</string>
+    <string name="title__drawer_icon_popup_menu">Shortcut Bubble</string>
+    <string name="title__drawer_columns">Number of columns</string>
+    <string name="title_drawer_enable_background">Use custom background color</string>
     <string name="title__sort_mode">App Sort</string>
     <string name="title__sort_alphabetical_az">Alphabetical AZ</string>
     <string name="title__sort_alphabetical_za">Alphabetical ZA</string>
     <string name="title__sort_last_installed">Last Installed</string>
     <string name="title__sort_most_used">Most Used</string>
     <string name="title__sort_by_color">By Color</string>
-
+    <string name="title_all_apps_search">Drawer search bar</string>
+    <string name="title_all_apps_google_search">Global search</string>
+    <string name="title_search_hidden_apps">Find Hidden Shortcuts</string>
+    <string name="summary_search_hidden_apps">Show hidden shortcuts in results.</string>
+    <string name="summary_all_apps_google_search">Find web results and apps</string>
+    <string name="summary__drawer_hide_apps">Hide app from the app drawer</string>
     <string name="title_disable_suggestions_prompt">Disable App Suggestions</string>
     <string name="msg_disable_suggestions_prompt">"Usage data will be deleted."</string>
     <string name="label_turn_off_suggestions">Disable</string>
 
+    <string name="title_app_suggestions">Apps</string>
+    <string name="title_text_color">Text Color</string>
+
+    <string name="pref_appcategorization_flowerpot_title">App Category</string>
+    <string name="pref_appcategorization_enable_title">Categorize Apps</string>
+    <string name="pref_appcategorization_enable_summary">Choose the drawer layout mode</string>
+    <string name="pref_appcategorization_style_text">Style</string>
+    <string name="pref_app_groups_create">Create</string>
+    <string name="pref_appcategorization_folders_title">Folders</string>
+    <string name="pref_appcategorization_folders_summary">Tap to open pop-up.</string>
+    <string name="pref_appcategorization_tabs_title">Tabs</string>
+    <string name="pref_appcategorization_tabs_summary">Swipe between groups.</string>
+    <string name="pref_app_groups_edit_tip">Tap to edit, drag to reorder.</string>
+    <string name="default_folder_name">New folder</string>
+    <string name="tab_type_custom">Custom</string>
+    <string name="tab_type_custom_desc">Pick shortcuts manually.</string>
+    <string name="tab_type_smart">Automatic</string>
+    <string name="pref_appcategorization_flowerpot_summary">Pick shortcuts automatically.</string>
+    <string name="drawer_folders">Folders</string>
+    <string name="drawer_tabs">Tabs</string>
+    <string name="selected_count">%1$d selected</string>
+    <plurals name="tab_apps_count">
+        <item quantity="one">%1$d App</item>
+        <item quantity="other">%1$d Apps</item>
+    </plurals>
+    <plurals name="hidden_apps_count">
+        <item quantity="other">%1$d Hidden</item>
+    </plurals>
+    <string name="hide_app_selected">&#160; hidden</string>
+    <string name="hide_app_reset">Reset</string>
+    <string name="action_preferences" translatable="false">@string/customize</string>
+
     <!-- PREFERENCES THEME -->
     <string name="title__theme_accent_color">Accent Color</string>
+    <string name="title__theme_blur">Blur</string>
+    <string name="title__theme_blur_radius">Blur Intensity</string>
+    <string name="title__theme_icon_shape">Change icon shape</string>
+    <string name="title_theme_icon_packs">Icon Packs</string>
+
+    <string name="summary__theme_blur">Blur page backgrounds</string>
+
+    <string name="theme_auto">Follow wallpaper</string>
+    <string name="theme_auto_night_mode">Follow system theme</string>
+    <string name="theme_based">Set by Theme</string>
+    <string name="theme_light">Light</string>
+    <string name="theme_with_dark_text">dark text</string>
+    <string name="theme_black">Black</string>
+    <string name="theme_black_dark_text">Black with dark text</string>
+    <string name="theme_dark">Dark</string>
+    <string name="theme_dark_text">Light with dark text</string>
+    <string name="theme_dark_dark_text">Dark with dark text</string>
+    <string name="theme_dark_theme_mode">Dark theme</string>
+    <string name="theme_dark_theme_mode_on">On</string>
+    <string name="theme_dark_theme_mode_off">Off</string>
+    <string name="theme_dark_theme_mode_follow_wallpaper" translatable="false">@string/theme_auto</string>
+    <string name="theme_dark_theme_mode_follow_system" translatable="false">@string/theme_auto_night_mode</string>
+    <string name="theme_dark_theme_mode_follow_daylight">Follow daylight</string>
+    <string name="theme_use_black">Use pure black</string>
+    <string name="theme_use_dark_text">Use dark text</string>
+    <string name="theme_default">Default</string>
+
+    <string name="icon_pack">Icon pack</string>
+    <string name="get_more_icon_packs">Get more</string>
+    <string name="icon_shape_override_progress">"Applying icon shape changes"</string>
+    <!-- Developer setting to change the shape of icons on home screen. [CHAR LIMIT=50] -->
+    <string name="icon_shape_override_label">Change icon shape</string>
+    <!-- Subtext explaining that the icons will only be affected on the home screen. This text follows the actual icon action: Change icon shape, on Home screen [CHAR LIMIT=100] -->
+    <string name="icon_shape_override_label_location">on Home screen</string>
+    <!-- Option to not change the icon shape on home screen and use the system default setting instead. [CHAR LIMIT=50] -->
+    <string name="icon_shape_system_default">System default</string>
+    <!-- Option to change the shape of the home screen icons to a square. [CHAR LIMIT=50] -->
+    <string name="icon_shape_square">Square</string>
+    <!-- Option to change the shape of the home screen icons to a squircle. This represents the name of the shape somewhere between a circle and a square. [CHAR LIMIT=50] -->
+    <string name="icon_shape_squircle">Squircle</string>
+    <!-- Option to change the shape of the home screen icons to a circle. [CHAR LIMIT=50] -->
+    <string name="icon_shape_circle">Circle</string>
+    <!-- Option to change the shape of the home screen icons to a teardrop. This represents the name of the shape similar to a circle with with the bottom right corner pushed out like a square [CHAR LIMIT=50] -->
+    <string name="icon_shape_teardrop">Teardrop</string>
+    <!-- Option to change the shape of the home screen icons to a cylinder. [CHAR LIMIT=50] -->
+    <string name="icon_shape_cylinder">Cylinder</string>
+    <string name="icon_shape_rounded_square">Rounded Square</string>
+    <string name="icon_shape_top_left">Top left</string>
+    <string name="icon_shape_top_right">Top right</string>
+    <string name="icon_shape_bottom_left">Bottom left</string>
+    <string name="icon_shape_bottom_right">Bottom right</string>
+    <string name="icon_shape_corner_round">Round</string>
+    <string name="icon_shape_corner_squircle">Squircle</string>
+    <string name="icon_shape_corner_cut">Cut</string>
+
+    <string name="icon_pack_applied_toast">%s applied</string>
+    <string name="icon_pack_default">System icons</string>
+    <string name="icon_pack_external_picker">Open external picker</string>
+    <string name="open_image_picker">Open image picker</string>
+    <string name="import_icon">Import icon</string>
+    <string name="import_as_adaptive">As adaptive icon</string>
+    <string name="playstore_query_icon_pack">Icon pack</string>
+
+    <string name="dialog_cancel">Cancel</string>
+    <string name="dialog_ok">OK</string>
+    <string name="dialog_default">Default</string>
+    <string name="reset_custom_icons">Remove Custom Icons</string>
+    <string name="reset_custom_icons_confirmation">Revert to default icons from this Icon Pack? This can’t be undone.</string>
+
+    <string name="color_presets">Presets</string>
+
+    <string name="title_adaptify_pack">Create adaptive icons for icon pack</string>
+    <string name="title_force_shapeless">Force shapeless icons</string>
+    <string name="title_legacy_colored_backgrounds">Coloured backgrounds</string>
+    <string name="title_legacy_treatment">Create Adaptive Icons</string>
+    <string name="title_white_only_treatment">Replace White Backgrounds</string>
 
     <!-- PREFERENCES SMARTSPACE -->
     <string name="title_show_google_app">Show Google app</string>
-    <string name="pref_show_google_now_summary">@string/msg_minus_one_on_left</string>
-    <string name="google_app">Google app</string>
-    <string name="msg_minus_one_on_left">To the left of the main Home screen</string>
+    <string name="title_smartspace_feed_theme">Feed Theme</string>
+    <string name="title_use_pill_qsb">Show Pill Search Shortcut</string>
+    <string name="title_smartspace_time">Show Time</string>
+    <string name="title_smartspace_date">Show Date</string>
+    <string name="title_smartspace_time_24_h">Use 24-Hour Format</string>
+    <string name="title_smartspace_time_above">Show Large Clock</string>
+    <string name="title_smartspace_widget_provider">Weather source</string>
+    <string name="title_smartspace_weather_units">Temperature unit</string>
+    <string name="title_smartspace_event_providers">Events sources</string>
+    <string name="pref_show_google_now_summary" translatable="false">@string/msg_minus_one_on_left</string>
+    <string name="title_feed_provider_package">Feed provider</string>
+
+    <string name="category__behavior_weather">Weather</string>
+    <string name="google_app" translatable="false">Google app</string>
+    <string name="msg_minus_one_on_left">To the left of the main Home screen</string> <!-- SmartSpace -->
+    <string name="smartspace_preferences">Preferences</string>
+    <string name="smartspace_add_to_home">Add to Desktop</string>
+    <string name="smartspace_setup_text">Tap to Set Up</string>
+    <string name="smartspace_now">now</string>
+    <string name="smartspace_in_time">in %1$s</string>
+    <string name="smartspace_hours_mins">%1$s %2$s</string>
+    <string name="smartspace_provider_bridge">Rootless Pixel Bridge</string>
+
+    <string name="resuable_text_alarm">Alarm</string>
+    <string name="name_provider_alarm_events">Upcoming alarms</string>
+    <string name="smartspace_widget_provider_not_found">Get the Google App.</string>
+    <string name="zen_mode_enabled">Do Not Disturb is enabled.</string>
+    <string name="home_widget">At a Glance</string>
+    <string name="battery_charging">Charging</string>
+    <string name="battery_full">Charged</string>
+    <string name="battery_low">Battery Low</string>
+    <string name="event_provider_missing_notification_access">To use <xliff:g example="My Provider" id="providerName">“%1$s”</xliff:g>, enable notifications from <xliff:g example="My App" id="name">“%2$s”.</xliff:g></string>
+    <string name="event_provider_missing_notification_dots">To use <xliff:g example="My Provider" id="providerName">“%1$s”</xliff:g>, enable Notification Dots.</string>
+
+    <string name="permission_iplocate">Approximate Location</string>
+    <string name="permission_iplocate_twilight_explanation">Allow access to your approximate location? This enables more accurate daylight calculation.</string>
+    <string name="allow">Allow</string>
+    <string name="deny">Deny</string>
+    <string name="smartspace_provider_calendar">Calendar events</string>
+    <string name="personality_provider">Greetings</string>
+
+    <string name="onbording">Onboarding</string>
+    <string name="onbording_settings_title">Set Up %s</string>
+    <string name="onbording_settings_summary">Touch &amp; hold on the Desktop.</string>
+    <string name="onboarding_swipe_up">Swipe up to open the Drawer.</string>
+
+    <string name="weather_icons_default">Default</string>
+    <string name="weather_provider_disabled">Disabled</string>
+    <string name="weather_provider_testing">Debug</string>
+    <string name="weather_provider_pe">Pixel Experience</string>
+    <string name="weather_provider_oneplus_weather">OnePlus Weather</string>
+    <string name="event_provider_now_playing">Now Playing</string>
+    <string name="event_provider_unread_notifications">Notifications</string>
+    <string name="battery_status">Battery Status</string>
+
+    <string name="week_day_format">%1$s, %2$s</string>
+    <string name="full_wday_month_day_no_year">EEEE, MMMM d</string>
+    <string name="icu_abbrev_wday_month_day_no_year">EEEEMMMd</string>
+    <string name="icu_abbrev_time">HH:mm</string>
+    <string name="icu_abbrev_time_12h">hh:mm aa</string>
+    <string name="icu_abbrev_date"> dd MMMM</string>
+
+    <string name="units_metric">Celsius</string>
+    <string name="units_imperial">Fahrenheit</string>
+    <string name="units_kelvin">Kelvin</string>
+    <string name="units_rakine">Rankine</string>
+    <string name="units_newton">Newton</string>
+    <string name="units_delisle">Delisle</string>
+    <string name="units_reaumur">Réaumur</string>
+    <string name="units_romer">Rømer</string>
+
+    <string-array name="greetings_morning">
+        <item>Good morning!</item>
+        <item>Have a great day!</item>
+        <item>It’s a beautiful day outside!</item>
+    </string-array>
+
+    <string-array name="greetings_evening">
+        <item>What’s up?</item>
+        <item>Good evening!</item>
+        <item>How did your day go?</item>
+        <item>How was your day?</item>
+    </string-array>
+
+    <string-array name="greetings_night">
+        <item>Sleep well!</item>
+        <item>See you tomorrow!</item>
+        <item>Good night!</item>
+        <item>Don’t stay up too late!</item>
+    </string-array>
+
+    <!-- Pixel 1 -->
+    <dimen name="qsb_overlap_margin">0dp</dimen>
+    <dimen name="qsb_button_height">56dp</dimen>
+    <dimen name="qsb_button_elevation">3dp</dimen>
+    <dimen name="qsb_touch_extension">20dp</dimen>
+    <dimen name="qsb_shadow_blur_radius">1dp</dimen>
+    <dimen name="qsb_key_shadow_offset">1dp</dimen>
+    <dimen name="qsb_connector_gradient_end_padding">20dp</dimen>
+    <dimen name="qsb_min_width_with_mic">124dp</dimen>
+    <dimen name="qsb_min_width_portrait">96dp</dimen>
 
     <!-- PREFERENCES NOTIFICATION -->
     <string name="icon_badging_desc_on">On</string>
     <string name="icon_badging_desc_off">Off</string>
     <string name="title__notification_count">Show Notification Count</string>
+    <string name="title__folder_badge_count">Show folder badge Count</string>
     <string name="title__notification_background">Notification Background Color</string>
+    <string name="title__gesture_swipe_down">Swipe down</string>
+
+    <string name="pref_category__notifications">Notifications</string>
+    <string name="pref_category__gestures">Gestures</string>
+
+    <string name="action_none">Do Nothing</string>
+    <string name="action_open_drawer">Open app drawer</string>
+    <string name="action_open_settings">Open Launcher Settings</string>
+    <string name="action_open_overview">Show Desktop Bubble</string>
+    <string name="action_open_dash">Open Dash</string>
+    <string name="action_open_app">Open App</string>
+    <string name="action_open_app_with_target">Open “%s”</string>
+    <string name="action_open_app_select_app">Pick app</string>
+    <string name="action_app_search">Open app search</string>
+    <string name="action_open_notifications">Open notifications</string>
+    <string name="action_close_notifications">Close notifications</string>
+    <string name="action_global_search">Launch Global Search</string>
+    <string name="action_sleep">Sleep</string>
+    <string name="action_sleep_timeout">Sleep Using Screen Timeout</string>
+    <string name="gesture_double_tap">Double tap</string>
+    <string name="gesture_long_press">Touch &amp; Hold</string>
+    <string name="gesture_swipe_up">Swipe Up</string>
+    <string name="gesture_dock_swipe_up">Swipe Up From Dock</string>
+    <string name="omega_actions">Actions</string>
+    <string name="dt2s_admin_hint">To use Double Tap to Sleep, grant the Admin permission.</string>
+    <string name="dt2s_admin_warning">Double Tap to Sleep will be disabled.</string>
 
     <!-- SEARCH -->
+    <string name="title__search_bubble_searchbar">Show Two Bubbles</string>
+    <string name="title__search_action_assistant">Open Assistant</string>
+    <string name="title__search_show_assistant">Show Voice Search Button</string>
+    <string name="title__search_provider">Search engine</string>
+    <string name="title__search_bar_radius">Corner Radius</string>
+    <string name="summary__search_show_as_assistant_summary">Open Assistant instead of Voice Search</string>
+    <string name="cat_search_bar">Search Bar</string>
     <string name="search_no_results">No Results</string>
     <string name="search_breadcrumb_connector" translatable="false">
         <xliff:g name="first_item">%1$s</xliff:g> >
         <xliff:g name="second_item">%2$s</xliff:g>
     </string>
+    <string name="search_provider_yandex" translatable="false">Yandex</string>
+    <string name="search_provider_ddg" translatable="false">DuckDuckGo</string>
+    <string name="search_provider_baidu" translatable="false">Baidu</string>
+    <string name="search_provider_s_finder" translatable="false">S Finder</string>
+    <string name="google" translatable="false">Google</string>
+    <string name="search_provider_google_go" translatable="false">Google Go</string>
+    <string name="search_provider_firefox" translatable="false">Firefox</string>
+    <string name="search_provider_search_lite" translatable="false">Search Lite</string>
+    <string name="search_provider_cool_search" translatable="false">Cool Search</string>
+    <string name="search_provider_appsearch">App search</string>
+    <string name="search_provider_bing" translatable="false">Bing</string>
+    <string name="search_provider_edge" translatable="false">Edge</string>
+    <string name="search_provider_qwant" translatable="false">Qwant</string>
+    <string name="web_search_google" translatable="false">Google (web)</string>
+    <string name="web_search_ddg" translatable="false">DuckDuckGo (web)</string>
+    <string name="web_search_startpage" translatable="false">Startpage.com (web)</string>
+    <string name="web_search_bing" translatable="false">Bing (web)</string>
+    <string name="web_search_qwant" translatable="false">Qwant (web)</string>
+    <string name="web_search_ecosia" translatable="false">Ecosia (web)</string>
+    <string name="web_search_yandex" translatable="false">Yandex (web)</string>
+    <string name="web_search_naver" translatable="false">Naver (web)</string>
+    <string name="web_search_baidu" translatable="false">Baidu (web)</string>
+    <string name="web_search_yahoo" translatable="false">Yahoo (web)</string>
+    <string name="error_no_browser">No activity found to handle URLs</string>
 
     <!-- ADVANCED -->
     <string name="summary__advanced_setting_search">Display setting search in the action bar</string>
+    <string name="summary__advanced_language">Change language of this app</string>
     <string name="title__advanced_setting_search">Show settings search</string>
+    <string name="title__advanced_language">Language</string>
+
+    <!-- PREFERENCES BACKUP -->
+    <string name="backups">Backups</string>
+    <string name="backup_delete">Hide</string>
+    <string name="backup_delete_failed">Something went wrong</string>
+    <string name="backup_share">Share</string>
+    <string name="backup_pref_summary">Save home screen, restore backups</string>
+    <string name="new_backup">Create</string>
+    <string name="restore_backup">Restore</string>
+    <string name="backup_name">Name</string>
+    <string name="backup_homescreen">Homescreen</string>
+    <string name="backup_contents">Backup contents</string>
+    <string name="backup_settings">Settings</string>
+    <string name="backup_wallpaper">Wallpaper</string>
+    <string name="backup_error_blank_name">Name must not be blank</string>
+    <string name="backup_error_blank_contents">Contents must not be blank</string>
+    <string name="backup_creating">Creating backup</string>
+    <string name="no_recent_backups">No recent backups</string>
+    <string name="backup_loading">Loading...</string>
+    <string name="backup_invalid">Unavailable</string>
+    <string name="backup_remove_from_recents">Remove from list</string>
+    <string name="backup_timestamp">Created at</string>
+    <string name="backup_restoring">Restoring backup</string>
+    <string name="backup_restarting">Restarting</string>
+    <string name="restore_contents">Restore contents</string>
+    <string name="restore_success">Restore success</string>
+    <string name="backup_failed">Backup failed</string>
+    <string name="restore_failed">Restore failed</string>
+    <string name="restore_read_meta_fail">Invalid backup file</string>
+    <string name="backup_share_title">Share backup</string>
+    <string name="backup_share_text">Omega backup file</string>
+    <string name="backup_location">Location</string>
+    <string name="backup_location_device_storage">Omega Folder</string>
+    <string name="read_external_storage_required">To create a Backup, grant the Storage permission.</string>
+    <string name="application_id" translatable="false">com.saggitt.omega</string>
+    <string name="local_backups">In Storage</string>
 
     <!-- DEVELOPER -->
     <string name="developer_options_enabled">Developer options enabled</string>
@@ -101,7 +445,7 @@
     <string name="title__about_donate">Donate</string>
     <string name="title__about_changelog">Changelog</string>
     <string name="title__about_project_team">Project Team</string>
-    <string name="title__about_open_source">Open Source Libraries</string>
+    <string name="title__about_open_source">Open Source</string>
     <string name="title__about_project_license">Project License</string>
     <string name="summary__about_donate">More information on donating or otherwise supporting this project</string>
     <string name="category__about_licenses">License</string>
@@ -119,4 +463,35 @@
     <string name="on">On</string>
     <string name="off">Off</string>
 
+    <!-- SEEKBAR PREFERENCE -->
+    <string name="reset_to_default">Reset to default</string>
+    <string name="automatic_short">Auto</string>
+
+    <!-- QSB -->
+    <string name="label_voice_search">Voice search</string>
+    <string name="customize">Customize</string>
+
+    <!-- TABS -->
+    <string name="tab_bottom_sheet_save">Save</string>
+    <string name="tab_hide_from_main">Hide from main tab</string>
+    <string name="tab_color">Tab color</string>
+    <string name="tab_manage_apps">Manage apps</string>
+    <string name="delete">Delete</string>
+    <string name="select_tab_type">New Tab</string>
+    <string name="none">None</string>
+    <string name="name">Name</string>
+    <string name="apps_label">Apps</string>
+    <string name="custom">Custom</string>
+    <string name="default_tab_name">New tab</string>
+    <string name="show_in_tabs">Tabs</string>
+    <string name="tabs_manage">Manage</string>
+    <string name="dismiss_drop_target_label">"Don\’t show"</string>
+
+    <string name="debug_component_name">Component Name</string>
+    <string name="debug_component_name_copied">Copied to clipboard.</string>
+    <string name="hide_app">Hide Shortcut</string>
+    <string name="folder_cover_mode">Use Cover Mode</string>
+    <string name="folder_cover_mode_desc">Tap to open first app, swipe up to view all.</string>
+
+    <string name="loading">Loading…</string>
 </resources>
diff --git a/Omega/res/values/styles.xml b/Omega/res/values/styles.xml
index 42c27b24c0..7c29cd6f92 100644
--- a/Omega/res/values/styles.xml
+++ b/Omega/res/values/styles.xml
@@ -16,6 +16,16 @@
   -->
 <resources xmlns:tools="http://schemas.android.com/tools">
 
+    <style name="AppTheme" parent="@style/LauncherTheme">
+        <item name="omegaColorSearchBar">?popupColorPrimary</item>
+        <item name="omegaColorAllAppsOverlay">@android:color/transparent</item>
+    </style>
+
+    <style name="AppTheme.DarkMainColor" parent="@style/LauncherTheme.DarkMainColor">
+        <item name="omegaColorSearchBar">?popupColorPrimary</item>
+        <item name="omegaColorAllAppsOverlay">@android:color/transparent</item>
+    </style>
+
     <style name="Toolbar" parent="ThemeOverlay.AppCompat.ActionBar">
         <item name="android:textSize">16sp</item>
         <item name="titleTextColor">@color/white</item>
@@ -57,6 +67,32 @@
         <item name="popupMenuStyle">@style/SettingsTheme.PopupMenu</item>
     </style>
 
+    <!-- Theme for the widget container. Overridden on API 26. -->
+    <style name="WidgetContainerTheme" parent="@android:style/Theme.Material.Settings">
+        <item name="android:colorEdgeEffect">?android:attr/textColorSecondaryInverse</item>
+        <item name="android:textColorPrimary">?android:attr/textColorPrimaryInverse</item>
+        <item name="android:textColorSecondary">?android:attr/textColorSecondaryInverse</item>
+        <item name="bottomSheetNavBarColor">@color/all_apps_navbar_color</item>
+
+        <!-- Backports -->
+        <item name="android:textColorPrimaryInverse">@color/primary_text_material_light</item>
+        <item name="android:textColorSecondaryInverse">@color/secondary_text_material_light</item>
+
+        <item name="android:colorPrimary">@color/colorPrimary</item>
+        <item name="android:colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="android:colorAccent">@color/colorAccent</item>
+    </style>
+
+    <style name="WidgetContainerTheme.Dark" parent="AppTheme.Dark">
+        <item name="android:colorPrimaryDark">#616161</item> <!-- Gray 700 -->
+        <item name="bottomSheetNavBarColor">#00000000</item>
+    </style>
+
+    <style name="WidgetContainerTheme.Black" parent="AppTheme.Black">
+        <item name="android:colorPrimaryDark">#000000</item>
+        <item name="bottomSheetNavBarColor">#00000000</item>
+    </style>
+
     <style name="DashTheme" parent="@style/Theme.AppCompat.Light.NoActionBar">
         <item name="background">@android:color/transparent</item>
     </style>
@@ -65,11 +101,127 @@
         <item name="cpv_borderColor">@color/colorAccent</item>
     </style>
 
-    <style name="SettingsTheme_Light" parent="@style/SettingsTheme.Base" />
+    <style name="SettingsTheme_Light" parent="@style/SettingsTheme.Base">
+        <item name="android:statusBarColor">@color/lollipopStatusBar</item>
+    </style>
+
+    <style name="SettingsTheme_Dark">
+        <item name="android:windowBackground">@color/settings_background_dark</item>
+        <item name="colorPrimary">?android:windowBackground</item>
+        <item name="colorPrimaryDark">?android:windowBackground</item>
+        <item name="colorAccent">@color/colorAccentDark</item>
+        <item name="android:textColorPrimary">#D5D2D2</item>
+        <item name="android:textColorSecondary">#A8A7A7</item>
+        <item name="android:textColorTertiary">#7C7C7C</item>
+        <item name="actionBarTheme">@style/SettingsTheme_Dark.ActionBar</item>
+        <item name="android:colorEdgeEffect">?colorAccent</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="useLightSystemBars">false</item>
+        <item name="alertDialogTheme">@style/SettingsTheme_Dark.Dialog</item>
+        <item name="buttonStyle">@style/SettingsTheme_Light.Button</item>
+        <item name="settingsBackground">@color/settings_background_dark</item>
+        <item name="settingsSearchBackground">@color/settings_background_dark_2dp</item>
+        <item name="settingsPopupBackground">@color/settings_background_dark_8dp</item>
+        <item name="bottomSheetDialogTheme">@style/SettingsTheme.BottomSheetDialog</item>
+        <item name="bottomSheetNavBarColor">@android:color/transparent</item>
+        <item name="bottomSheetScrimColor">@android:color/black</item>
+        <item name="actionOverflowMenuStyle">@style/SettingsTheme.PopupMenu.Overflow</item>
+        <item name="popupMenuStyle">@style/SettingsTheme.PopupMenu</item>
+    </style>
+
+    <style name="SettingsTheme_Dark.Dialog" parent="Theme.AppCompat.Dialog.Alert">
+        <item name="android:windowBackground">@drawable/dialog_material_background</item>
+        <item name="colorAccent">@color/colorAccent</item>
+        <item name="buttonStyle">@style/SettingsTheme_Light.Button</item>
+        <item name="android:buttonStyle">@style/SettingsTheme_Light.Button</item>
+    </style>
 
-    <style name="SettingsTheme_Dark"></style>
+    <style name="SettingsTheme_Dark.ActionBar" parent="SettingsTheme_Dark">
+        <item name="titleTextAppearance">@style/SettingsTheme_Light.ActionBar.Title</item>
+    </style>
 
-    <style name="SettingsTheme_Black"></style>
+    <style name="SettingsTheme_Black.ActionBar" parent="SettingsTheme_Black">
+        <item name="titleTextAppearance">@style/SettingsTheme_Light.ActionBar.Title</item>
+    </style>
+
+    <style name="SettingsTheme.BottomSheetDialog" parent="Theme.Design.BottomSheetDialog">
+        <item name="android:colorPrimary">@color/settings_background_dark</item>
+        <item name="android:colorPrimaryDark">@color/settings_background_dark</item>
+        <item name="android:colorAccent">@color/colorAccent</item>
+        <item name="android:windowLightStatusBar" tools:ignore="NewApi">true</item>
+        <item name="android:windowLightNavigationBar" tools:ignore="NewApi">false</item>
+        <item name="bottomSheetStyle">@style/SettingsTheme.BottomSheet</item>
+    </style>
+
+    <style name="SettingsTheme_Black" parent="@style/SettingsTheme_Dark">
+        <item name="android:windowBackground">@android:color/black</item>
+        <item name="settingsBackground">@android:color/black</item>
+        <item name="settingsSearchBackground">@color/settings_background_black_2dp</item>
+        <item name="settingsPopupBackground">@color/settings_background_black_8dp</item>
+        <item name="actionBarTheme">@style/SettingsTheme_Black.ActionBar</item>
+
+        <item name="workspaceTextColor">#FF212121</item>
+        <item name="workspaceShadowColor">@android:color/transparent</item>
+        <item name="workspaceAmbientShadowColor">@android:color/transparent</item>
+        <item name="workspaceKeyShadowColor">@android:color/transparent</item>
+        <item name="isWorkspaceDarkText">true</item>
+    </style>
+
+    <style name="SettingsTheme_Light.Transparent" parent="SettingsTheme_Light">
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowShowWallpaper">true</item>
+        <item name="workspaceTextColor">@android:color/white</item>
+        <item name="workspaceShadowColor">#B0000000</item>
+        <item name="workspaceAmbientShadowColor">#33000000</item>
+        <item name="workspaceKeyShadowColor">#44000000</item>
+    </style>
+
+    <style name="SettingsTheme_Black.Transparent" parent="SettingsTheme_Black">
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowShowWallpaper">true</item>
+        <item name="workspaceTextColor">@android:color/white</item>
+        <item name="workspaceShadowColor">#B0000000</item>
+        <item name="workspaceAmbientShadowColor">#33000000</item>
+        <item name="workspaceKeyShadowColor">#44000000</item>
+    </style>
+
+    <style name="SettingsTheme_DarkText.Transparent" parent="SettingsTheme_Light">
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowShowWallpaper">true</item>
+        <item name="workspaceTextColor">#FF212121</item>
+        <item name="workspaceShadowColor">@android:color/transparent</item>
+        <item name="workspaceAmbientShadowColor">@android:color/transparent</item>
+        <item name="workspaceKeyShadowColor">@android:color/transparent</item>
+    </style>
+
+    <style name="SettingsTheme_Dark.Transparent" parent="SettingsTheme_Dark">
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowShowWallpaper">true</item>
+        <item name="workspaceTextColor">@android:color/white</item>
+        <item name="workspaceShadowColor">#B0000000</item>
+        <item name="workspaceAmbientShadowColor">#33000000</item>
+        <item name="workspaceKeyShadowColor">#44000000</item>
+    </style>
+
+    <style name="SleepTimeoutTheme" parent="@android:style/Theme.Material.NoActionBar.Fullscreen">
+        <item name="android:windowBackground">@android:color/black</item>
+        <item name="android:windowAnimationStyle">@null</item>
+        <item name="android:windowLightStatusBar" tools:ignore="NewApi">true</item>
+        <item name="android:windowLightNavigationBar" tools:ignore="NewApi">true</item>
+    </style>
+
+    <style name="Theme.Transparent" parent="Theme.AppCompat.Light">
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowAnimationStyle">@null</item>
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:backgroundDimEnabled">false</item>
+        <item name="windowNoTitle">true</item>
+        <item name="alertDialogTheme">@style/SettingsTheme_Light.Dialog</item>
+    </style>
 
     <style name="SettingsTheme_Light.ActionBar" parent="SettingsTheme_Light">
         <item name="titleTextAppearance">@style/SettingsTheme_Light.ActionBar.Title</item>
@@ -157,4 +309,61 @@
         <item name="android:textSize">15sp</item>
         <item name="fontWeight">200</item>
     </style>
+
+    <!-- Pixel -->
+    <style name="HotseatQsbTheme">
+        <item name="gIcon">@drawable/ic_super_g_shadow</item>
+        <item name="micIcon">@drawable/ic_mic_shadow</item>
+    </style>
+
+    <style name="HotseatQsbTheme.Colored" parent="@style/HotseatQsbTheme">
+        <item name="gIcon">@drawable/ic_qsb_logo</item>
+        <item name="micIcon">@drawable/ic_qsb_mic</item>
+    </style>
+
+    <style name="SettingsTheme.Widget.Button" parent="Widget.AppCompat.Button.Borderless">
+        <item name="customFontType">button</item>
+        <item name="android:textAllCaps">false</item>
+    </style>
+
+    <style name="SettingsTheme.Widget.OutlinedButton" parent="SettingsTheme.Widget.Button">
+        <item name="android:background">@drawable/btn_outlined_material</item>
+        <item name="android:textColor">?android:textColorSecondary</item>
+    </style>
+
+    <style name="SettingsTheme.Widget.OutlinedButton.Colored" parent="SettingsTheme.Widget.Button">
+        <item name="android:background">@drawable/btn_outlined_colored_material</item>
+        <item name="android:textColor">?android:colorAccent</item>
+    </style>
+
+    <style name="SmartspaceTextHeadline">
+        <item name="android:textColor">?attr/workspaceTextColor</item>
+        <item name="android:letterSpacing">@dimen/smartspaceLetterSpacing</item>
+        <item name="ambientShadowBlur">@dimen/smartspaceAmbientShadowBlur</item>
+        <item name="ambientShadowColor">?attr/workspaceAmbientShadowColor</item>
+        <item name="keyShadowBlur">@dimen/smartspaceKeyShadowBlur</item>
+        <item name="keyShadowColor">?attr/workspaceKeyShadowColor</item>
+        <item name="keyShadowOffset">@dimen/smartspaceKeyShadowOffset</item>
+        <item name="customFontType">smartspaceText</item>
+    </style>
+
+    <style name="SmartspaceTextTitle">
+        <item name="android:textColor">?attr/workspaceTextColor</item>
+        <item name="android:letterSpacing">@dimen/smartspaceLetterSpacing</item>
+        <item name="ambientShadowBlur">@dimen/smartspaceAmbientShadowBlur</item>
+        <item name="ambientShadowColor">?attr/workspaceAmbientShadowColor</item>
+        <item name="keyShadowBlur">@dimen/smartspaceKeyShadowBlur</item>
+        <item name="keyShadowColor">?attr/workspaceKeyShadowColor</item>
+        <item name="keyShadowOffset">@dimen/smartspaceKeyShadowOffset</item>
+        <item name="customFontType">smartspaceText</item>
+    </style>
+
+    <!-- Weather widget -->
+    <style name="WeatherWidget" />
+
+    <style name="WeatherWidget.Text">
+        <item name="android:shadowRadius">3.0</item>
+        <item name="android:shadowDy">0.5</item>
+        <item name="android:shadowColor">#33000000</item>
+    </style>
 </resources>
\ No newline at end of file
diff --git a/Omega/res/xml/app_edit_prefs.xml b/Omega/res/xml/app_edit_prefs.xml
new file mode 100644
index 0000000000..05c2f00aed
--- /dev/null
+++ b/Omega/res/xml/app_edit_prefs.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2015 Google Inc.
+
+     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.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <SwitchPreference
+        android:defaultValue="false"
+        android:key="pref_app_hide"
+        android:persistent="false"
+        android:title="@string/hide_app" />
+
+    <com.saggitt.omega.preferences.MultiSelectTabPreference
+        android:key="pref_show_in_tabs"
+        android:title="@string/show_in_tabs" />
+
+    <com.saggitt.omega.gestures.ui.LauncherGesturePreference
+        android:dependency="pref_cover_mode"
+        android:key="pref_swipe_up_gesture"
+        android:title="@string/gesture_swipe_up" />
+
+    <SwitchPreference
+        android:defaultValue="false"
+        android:disableDependentsState="true"
+        android:key="pref_cover_mode"
+        android:persistent="false"
+        android:summary="@string/folder_cover_mode_desc"
+        android:title="@string/folder_cover_mode" />
+
+    <PreferenceCategory
+        android:key="debug"
+        android:layout="@layout/settings_category_material"
+        android:title="@string/developer_options_title">
+
+        <Preference
+            android:key="componentName"
+            android:title="@string/debug_component_name" />
+
+        <Preference
+            android:key="versionName"
+            android:title="Version" />
+    </PreferenceCategory>
+
+</PreferenceScreen>
diff --git a/Omega/res/xml/custom_widgets.xml b/Omega/res/xml/custom_widgets.xml
new file mode 100644
index 0000000000..55abfc7ca0
--- /dev/null
+++ b/Omega/res/xml/custom_widgets.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~  Copyright (c) 2020 Omega Launcher
+  ~
+  ~  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.
+  ~
+  -->
+
+<widgets xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:launcher="http://schemas.android.com/apk/res-auto">
+
+    <widget
+        android:label="@string/home_widget"
+        android:initialLayout="@layout/smartspace_widget"
+        android:icon="@mipmap/ic_launcher"
+        android:previewImage="@drawable/smartspace_widget"
+        android:resizeMode="horizontal|vertical"
+        launcher:numRows="1"
+        launcher:numColumns="5"
+        launcher:numMinRows="1"
+        launcher:numMinColumns="3"
+        launcher:providerId="1"
+        launcher:noPadding="true"
+        launcher:customizeTitle="@string/home_widget"
+        launcher:customizeScreen="@xml/omega_preferences_smartspace"
+        launcher:customizeHasPreview="true" />
+
+    <widget
+        android:label="@string/cat_search_bar"
+        android:initialLayout="@layout/search_widget"
+        android:icon="@mipmap/ic_launcher"
+        android:previewImage="@drawable/qsb_widget"
+        android:resizeMode="horizontal|vertical"
+        launcher:numRows="1"
+        launcher:numColumns="5"
+        launcher:numMinRows="1"
+        launcher:numMinColumns="3"
+        launcher:providerId="2"
+        launcher:noPadding="true"
+        launcher:customizeTitle="@string/cat_search_bar"
+        launcher:customizeScreen="@xml/omega_preferences_search"
+        launcher:customizeHasPreview="false" />
+</widgets>
\ No newline at end of file
diff --git a/Omega/res/xml/omega_desktop_icon_popup_menu_preferences.xml b/Omega/res/xml/omega_desktop_icon_popup_menu_preferences.xml
new file mode 100644
index 0000000000..f0ba2b7705
--- /dev/null
+++ b/Omega/res/xml/omega_desktop_icon_popup_menu_preferences.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~     This file is part of Lawnchair Launcher.
+  ~
+  ~     Lawnchair Launcher is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     Lawnchair Launcher is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <com.saggitt.omega.preferences.StyledSwitchPreferenceCompat
+        android:defaultValue="false"
+        android:key="pref_iconPopup_remove"
+        android:icon="@drawable/ic_remove_no_shadow"
+        android:persistent="true"
+        android:title="@string/remove_drop_target_label" />
+
+    <com.saggitt.omega.preferences.StyledSwitchPreferenceCompat
+        android:defaultValue="true"
+        android:icon="@drawable/ic_edit_no_shadow"
+        android:key="pref_iconPopup_edit"
+        android:persistent="true"
+        android:title="@string/action_preferences" />
+</PreferenceScreen>
diff --git a/Omega/res/xml/omega_drawer_icon_popup_menu_preferences.xml b/Omega/res/xml/omega_drawer_icon_popup_menu_preferences.xml
new file mode 100644
index 0000000000..7484bad635
--- /dev/null
+++ b/Omega/res/xml/omega_drawer_icon_popup_menu_preferences.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~     This file is part of Lawnchair Launcher.
+  ~
+  ~     Lawnchair Launcher is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     Lawnchair Launcher is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <com.saggitt.omega.preferences.StyledSwitchPreferenceCompat
+        android:defaultValue="false"
+        android:icon="@drawable/ic_uninstall_no_shadow"
+        android:key="pref_iconPopup_uninstall"
+        android:persistent="true"
+        android:title="@string/uninstall_drop_target_label" />
+
+    <com.saggitt.omega.preferences.StyledSwitchPreferenceCompat
+        android:defaultValue="true"
+        android:icon="@drawable/ic_edit_no_shadow"
+        android:key="pref_iconPopup_edit"
+        android:persistent="true"
+        android:title="@string/action_preferences" />
+</PreferenceScreen>
diff --git a/Omega/res/xml/omega_preferences.xml b/Omega/res/xml/omega_preferences.xml
index 265bde1ec3..e752ba09e9 100644
--- a/Omega/res/xml/omega_preferences.xml
+++ b/Omega/res/xml/omega_preferences.xml
@@ -29,7 +29,14 @@
             app:content="@xml/omega_preferences_desktop" />
 
         <com.saggitt.omega.preferences.SubPreference
-            android:icon="@drawable/ic_apps"
+            android:icon="@drawable/ic_dock"
+            android:layout="@layout/home_preference"
+            android:summary="@string/summary__general_dock"
+            android:title="@string/title__general_dock"
+            app:content="@xml/omega_preferences_dock" />
+
+        <com.saggitt.omega.preferences.SubPreference
+            android:icon="@drawable/ic_apps_colored"
             android:layout="@layout/home_preference"
             android:summary="@string/summary__general_drawer"
             android:title="@string/title__general_drawer"
@@ -44,11 +51,19 @@
     </com.saggitt.omega.preferences.ThemedPreferenceCategory>
 
     <com.saggitt.omega.preferences.ThemedPreferenceCategory android:title="@string/pref_category__inputs">
+        <com.saggitt.omega.preferences.SubPreference
+            android:icon="@drawable/ic_search_colored"
+            android:layout="@layout/home_preference"
+            android:summary="@string/summary__general_search"
+            android:title="@string/title__general_search"
+            app:content="@xml/omega_preferences_search" />
+
         <com.saggitt.omega.preferences.SubPreference
             android:icon="@drawable/ic_widgets"
             android:layout="@layout/home_preference"
             android:summary="@string/summary__general_smartspace"
             android:title="@string/title__general_smartspace"
+            app:hasPreview="true"
             app:content="@xml/omega_preferences_smartspace" />
 
         <com.saggitt.omega.preferences.SubPreference
@@ -70,8 +85,9 @@
         <com.saggitt.omega.preferences.SubPreference
             android:icon="@drawable/ic_code"
             android:key="developerOptions"
-        android:layout="@layout/home_preference"
+            android:layout="@layout/home_preference"
             android:title="@string/developer_options_title"
+            app:hasPreview="true"
             app:content="@xml/omega_preferences_developer"
             app:controllerClass="com.saggitt.omega.settings.controllers.DeveloperOptionsController" />
 
diff --git a/Omega/res/xml/omega_preferences_about.xml b/Omega/res/xml/omega_preferences_about.xml
index d80669f9f5..0a1a01f91f 100644
--- a/Omega/res/xml/omega_preferences_about.xml
+++ b/Omega/res/xml/omega_preferences_about.xml
@@ -26,7 +26,7 @@
         android:summary="@string/summary__about_donate"
         android:title="@string/title__about_donate" />
 
-    <PreferenceCategory
+    <com.saggitt.omega.preferences.ThemedPreferenceCategory
         android:key="pref_key__project_team"
         android:title="@string/title__about_project_team" />
 
diff --git a/Omega/res/xml/omega_preferences_advanced.xml b/Omega/res/xml/omega_preferences_advanced.xml
index 14641da768..08e47117ed 100644
--- a/Omega/res/xml/omega_preferences_advanced.xml
+++ b/Omega/res/xml/omega_preferences_advanced.xml
@@ -15,14 +15,32 @@
   ~
   -->
 
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
-<com.saggitt.omega.preferences.StyledSwitchPreference
+    <com.saggitt.omega.preferences.StyledSwitchPreference
         android:defaultValue="true"
+        android:icon="@drawable/ic_allapps_search"
         android:key="pref_settings_search"
         android:persistent="true"
         android:summary="@string/summary__advanced_setting_search"
-        android:title="@string/title__advanced_setting_search"
-        app:iconSpaceReserved="false" />
+        android:title="@string/title__advanced_setting_search" />
+
+    <net.gsantner.opoc.preference.LanguagePreferenceCompat
+        android:defaultValue=""
+        android:icon="@drawable/ic_language"
+        android:key="pref_key__language"
+        android:summary="@string/summary__advanced_language"
+        android:title="@string/title__advanced_language" />
+
+    <Preference
+        android:icon="@drawable/ic_import_export"
+        android:key="backups"
+        android:summary="@string/backup_pref_summary"
+        android:title="@string/backups">
+
+        <!--suppress AndroidDomInspection (Injected at compile time) -->
+        <intent
+            android:targetClass="com.saggitt.omega.backup.BackupListActivity"
+            android:targetPackage="@string/application_id" />
+    </Preference>
 </PreferenceScreen>
diff --git a/Omega/res/xml/omega_preferences_desktop.xml b/Omega/res/xml/omega_preferences_desktop.xml
index 1fbd994cb7..9196661a63 100644
--- a/Omega/res/xml/omega_preferences_desktop.xml
+++ b/Omega/res/xml/omega_preferences_desktop.xml
@@ -18,6 +18,39 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
+    <com.saggitt.omega.preferences.GridSizePreference
+        android:key="pref_desktop_grid_size"
+        android:title="@string/title__desktop_grid_size"
+        android:persistent="true"
+        app:iconSpaceReserved="false" />
+
+    <com.saggitt.omega.preferences.SeekbarPreference
+        android:key="pref_iconSize"
+        android:persistent="true"
+        android:title="@string/title__desktop_icon_size"
+        app:defaultSeekbarValue="1.0"
+        app:maxValue="2.0"
+        app:minValue="0.5"
+        app:steps="150"
+        app:summaryFormat="%.0f%%"
+        app:summaryMultiplier="100" />
+
+    <com.saggitt.omega.preferences.StyledSwitchPreference
+        android:defaultValue="false"
+        android:disableDependentsState="true"
+        android:key="pref_hideAppLabels"
+        android:persistent="true"
+        android:title="@string/title__desktop_hide_icon_labels"
+        app:iconSpaceReserved="false" />
+
+    <com.saggitt.omega.preferences.StyledSwitchPreference
+        android:defaultValue="false"
+        android:dependency="pref_hideAppLabels"
+        android:key="pref_homeIconLabelsInTwoLines"
+        android:persistent="true"
+        android:title="@string/title__multiline_labels"
+        app:iconSpaceReserved="false" />
+
     <com.saggitt.omega.preferences.StyledSwitchPreference
         android:defaultValue="true"
         android:key="pref_add_icon_to_home"
@@ -26,6 +59,12 @@
         android:title="@string/auto_add_shortcuts_label"
         app:iconSpaceReserved="false" />
 
+    <com.saggitt.omega.settings.PreferenceDialogPreference
+        android:key="pref_iconPopupMenu"
+        android:title="@string/title_desktop_icon_popup_menu"
+        app:content="@xml/omega_desktop_icon_popup_menu_preferences"
+        app:iconSpaceReserved="false" />
+
     <com.saggitt.omega.preferences.StyledSwitchPreference
         android:defaultValue="@bool/allow_rotation"
         android:key="pref_allowRotation"
@@ -34,6 +73,13 @@
         android:title="@string/allow_rotation_title"
         app:iconSpaceReserved="false" />
 
+    <com.saggitt.omega.preferences.StyledSwitchPreferenceCompat
+        android:defaultValue="falser"
+        android:key="pref_hideStatusBar"
+        android:persistent="true"
+        android:title="@string/title_desktop_hide_statusbar"
+        app:iconSpaceReserved="false" />
+
     <com.saggitt.omega.preferences.StyledSwitchPreference
         android:defaultValue="false"
         android:key="pref_fullWidthWidgets"
diff --git a/Omega/res/xml/omega_preferences_developer.xml b/Omega/res/xml/omega_preferences_developer.xml
index 8c141b0696..dfba43744b 100644
--- a/Omega/res/xml/omega_preferences_developer.xml
+++ b/Omega/res/xml/omega_preferences_developer.xml
@@ -36,8 +36,16 @@
         android:title="@string/title__dev_show_debug_info"
         app:iconSpaceReserved="false" />
 
-    <Preference
-        android:key="dash_activity"
-        android:title="Dash Test Activity"
-        app:iconSpaceReserved="false" />
+    <com.saggitt.omega.preferences.ThemedPreferenceCategory android:title="@string/pref_category__incubating">
+
+        <com.saggitt.omega.preferences.StyledSwitchPreference
+            android:defaultValue="false"
+            android:key="pref_key__paged_drawer"
+            android:persistent="true"
+            android:summary="Feature under development. Not working yet"
+            android:title="@string/title__drawer_paged_apps"
+            app:iconSpaceReserved="false" />
+        
+    </com.saggitt.omega.preferences.ThemedPreferenceCategory>
+
 </PreferenceScreen>
diff --git a/Omega/res/xml/omega_preferences_dock.xml b/Omega/res/xml/omega_preferences_dock.xml
new file mode 100644
index 0000000000..910ab8fa3f
--- /dev/null
+++ b/Omega/res/xml/omega_preferences_dock.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~  Copyright (c) 2020 Omega Launcher
+  ~
+  ~  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.
+  ~
+  -->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <com.saggitt.omega.preferences.StyledSwitchPreference
+        android:defaultValue="false"
+        android:key="pref_hideHotseat"
+        android:persistent="true"
+        android:title="@string/title__dock_hide"
+        android:disableDependentsState="true"
+        app:iconSpaceReserved="false" />
+
+    <com.saggitt.omega.preferences.StyledSwitchPreference
+        android:key="pref_dockBackground"
+        android:title="@string/title_dock_fill"
+        android:dependency="pref_hideHotseat"
+        android:persistent="true"
+        app:iconSpaceReserved="false" />
+
+    <com.saggitt.omega.preferences.ColorPreferenceCompat
+        android:key="pref_dock_background_color"
+        android:title="@string/title_dock_background_color"
+        android:dependency="pref_dockBackground"
+        android:defaultValue="@color/transparentish"
+        app:cpv_dialogTitle="@string/title_dock_background_color"
+        app:cpv_showAlphaSlider="true"
+        app:iconSpaceReserved="false" />
+
+    <com.saggitt.omega.preferences.AutoModeSeekbarPreference
+        android:key="pref_hotseatCustomOpacity"
+        android:title="@string/title_opacity"
+        android:dependency="pref_dockBackground"
+        app:minValue="0"
+        app:maxValue="1"
+        app:summaryFormat="%.0f%%"
+        app:summaryMultiplier="100"
+        android:persistent="true" />
+
+    <com.saggitt.omega.preferences.StyledSwitchPreference
+        android:key="pref_dock_search"
+        android:title="@string/title__dock_search_bar"
+        android:defaultValue="true"
+        android:persistent="true"
+        app:iconSpaceReserved="false" />
+
+    <com.saggitt.omega.preferences.StyledSwitchPreference
+        android:defaultValue="true"
+        android:key="pref_hideDockLabels"
+        android:persistent="true"
+        android:disableDependentsState="true"
+        android:title="@string/title__dock_hide_labels"
+        app:iconSpaceReserved="false" />
+
+    <com.saggitt.omega.preferences.StyledSwitchPreferenceCompat
+        android:key="pref_dockIconLabelsInTwoLines"
+        android:title="@string/title__multiline_labels"
+        android:defaultValue="false"
+        android:dependency="pref_hideDockLabels"
+        android:persistent="true"
+        app:iconSpaceReserved="false" />
+
+    <com.saggitt.omega.preferences.DockGridSizePreference
+        android:key="pref_dock_grid_size"
+        android:title="@string/title__dock_hotseat_icons"
+        app:iconSpaceReserved="false" />
+
+    <com.saggitt.omega.preferences.AutoModeScalePreference
+        android:key="pref_hotseatIconSize"
+        android:persistent="true"
+        android:title="@string/title__dock_icon_size"
+        app:defaultSeekbarValue="0"
+        app:iconSpaceReserved="false"
+        app:maxValue="2.0"
+        app:minValue="0.5"
+        app:steps="150"
+        app:summaryFormat="%.0f%%"
+        app:summaryMultiplier="100" />
+
+    <com.saggitt.omega.preferences.AutoModeScalePreference
+        android:key="pref_dockScale"
+        android:persistent="true"
+        android:title="@string/title__dock_scale"
+        app:defaultSeekbarValue="0.80"
+        app:maxValue="1.75"
+        app:minValue="0.70"
+        app:summaryFormat="%.0f%%"
+        app:summaryMultiplier="100" />
+
+    <com.saggitt.omega.preferences.StyledSwitchPreferenceCompat
+        android:key="pref_hotseatShowArrow"
+        android:title="@string/title__dock_show_arrow"
+        android:defaultValue="true"
+        android:persistent="true"
+        app:iconSpaceReserved="false" />
+
+    <com.saggitt.omega.preferences.StyledSwitchPreferenceCompat
+        android:key="pref_hotseatShowPageIndicator"
+        android:title="@string/hotseat_show_page_indicator"
+        android:defaultValue="true"
+        android:persistent="true"
+        app:iconSpaceReserved="false" />
+</PreferenceScreen>
\ No newline at end of file
diff --git a/Omega/res/xml/omega_preferences_drawer.xml b/Omega/res/xml/omega_preferences_drawer.xml
index ad76d577cf..022293d2aa 100644
--- a/Omega/res/xml/omega_preferences_drawer.xml
+++ b/Omega/res/xml/omega_preferences_drawer.xml
@@ -16,7 +16,19 @@
   -->
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:title="Settings">
+    android:title="Drawer">
+
+    <com.saggitt.omega.preferences.SeekbarPreference
+        android:key="allAppsIconSize"
+        android:persistent="true"
+        android:title="@string/title__drawer_icon_size"
+        app:defaultSeekbarValue="1.0"
+        app:maxValue="2.0"
+        app:minValue="0.5"
+        app:steps="150"
+        app:summaryFormat="%.0f%%"
+        app:summaryMultiplier="100" />
+
     <ListPreference
         android:defaultValue="3"
         android:disableDependentsState="false"
@@ -28,17 +40,112 @@
         android:title="@string/title__drawer_sort"
         app:iconSpaceReserved="false" />
 
+    <com.saggitt.omega.preferences.StyledSwitchPreference
+        android:defaultValue="false"
+        android:disableDependentsState="true"
+        android:key="pref_hideAllAppsAppLabels"
+        android:persistent="true"
+        android:title="@string/title__drawer_hide_icon_labels"
+        app:iconSpaceReserved="false" />
+
+    <com.saggitt.omega.preferences.StyledSwitchPreference
+        android:defaultValue="false"
+        android:dependency="pref_hideAllAppsAppLabels"
+        android:key="pref_iconLabelsInTwoLines"
+        android:persistent="true"
+        android:title="@string/title__multiline_labels"
+        app:iconSpaceReserved="false" />
+
+    <com.saggitt.omega.preferences.ColorPreferenceCompat
+        android:key="pref_drawer_label_color"
+        android:title="@string/title_text_color"
+        android:defaultValue="@color/transparentish"
+        app:cpv_dialogTitle="@string/title_text_color"
+        app:cpv_showAlphaSlider="true"
+        app:iconSpaceReserved="false" />
+
+    <com.saggitt.omega.settings.PreferenceDialogPreference
+        android:key="pref_iconPopupMenu"
+        android:title="@string/title__drawer_icon_popup_menu"
+        app:content="@xml/omega_drawer_icon_popup_menu_preferences"
+        app:iconSpaceReserved="false" />
+
+    <com.saggitt.omega.preferences.DrawerGridSizePreference
+        android:key="pref_drawer_grid_size"
+        android:title="@string/title__drawer_columns"
+        app:iconSpaceReserved="false" />
+
     <com.saggitt.omega.preferences.StyledSwitchPreference
         android:defaultValue="false"
         android:key="pref_show_predictions"
         android:title="@string/title_app_suggestions"
-        app:iconSpaceReserved="false"
-        app:searchTitle="@string/title_app_suggestions" />
-    <!--
-        <com.saggitt.omega.preferences.StyledSwitchPreference
-            android:key="pref_showAllAppsLabel"
-            android:title="@string/title__drawer_all_apps"
-            android:defaultValue="false"
-            android:persistent="true"
-            app:iconSpaceReserved="false"/> -->
+        app:iconSpaceReserved="false" />
+
+    <com.saggitt.omega.preferences.StyledSwitchPreference
+        android:key="pref_showAllAppsLabel"
+        android:title="@string/title__drawer_all_apps"
+        android:dependency="pref_show_predictions"
+        android:defaultValue="false"
+        android:persistent="true"
+        app:iconSpaceReserved="false" />
+
+    <androidx.preference.Preference
+        android:fragment="com.saggitt.omega.groups.ui.AppCategorizationFragment"
+        android:key="pref_categorization"
+        android:title="@string/title__drawer_categorization"
+        app:iconSpaceReserved="false" />
+
+    <com.saggitt.omega.preferences.AutoModeSeekbarPreference
+        android:key="pref_allAppsOpacitySB"
+        android:title="@string/title_opacity"
+        app:minValue="0"
+        app:maxValue="1"
+        app:summaryFormat="%.0f%%"
+        app:summaryMultiplier="100"
+        android:persistent="true" />
+
+    <com.saggitt.omega.preferences.StyledSwitchPreference
+        android:defaultValue="true"
+        android:key="pref_enable_custom_background"
+        android:title="@string/title_drawer_enable_background"
+        app:defaultValue="false"
+        app:iconSpaceReserved="false" />
+
+    <com.saggitt.omega.preferences.ColorPreferenceCompat
+        android:key="pref_drawer_background_color"
+        android:title="@string/title_dock_background_color"
+        android:dependency="pref_enable_custom_background"
+        android:defaultValue="@color/transparentish"
+        app:cpv_dialogTitle="@string/title_dock_background_color"
+        app:cpv_showAlphaSlider="true"
+        app:iconSpaceReserved="false" />
+
+    <androidx.preference.Preference
+        android:fragment="com.saggitt.omega.preferences.HiddenAppsFragment"
+        android:key="pref_hiddenApps"
+        android:summary="@string/summary__drawer_hide_apps"
+        android:title="@string/title__drawer_hide_apps"
+        app:iconSpaceReserved="false" />
+
+    <com.saggitt.omega.preferences.StyledSwitchPreference
+        android:defaultValue="true"
+        android:key="pref_allAppsSearch"
+        android:title="@string/title_all_apps_search"
+        app:iconSpaceReserved="false" />
+
+    <com.saggitt.omega.preferences.StyledSwitchPreference
+        android:defaultValue="true"
+        android:dependency="pref_allAppsSearch"
+        android:disableDependentsState="true"
+        android:key="pref_allAppsGoogleSearch"
+        android:summary="@string/summary_all_apps_google_search"
+        android:title="@string/title_all_apps_google_search"
+        app:iconSpaceReserved="false" />
+
+    <com.saggitt.omega.preferences.StyledSwitchPreferenceCompat
+        android:key="pref_search_hidden_apps"
+        android:title="@string/title_search_hidden_apps"
+        android:summary="@string/summary_search_hidden_apps"
+        android:defaultValue="false"
+        app:iconSpaceReserved="false" />
 </PreferenceScreen>
\ No newline at end of file
diff --git a/Omega/res/xml/omega_preferences_notification.xml b/Omega/res/xml/omega_preferences_notification.xml
index 7e44ff047d..e9053144b1 100644
--- a/Omega/res/xml/omega_preferences_notification.xml
+++ b/Omega/res/xml/omega_preferences_notification.xml
@@ -17,34 +17,87 @@
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
-    <com.android.launcher3.settings.NotificationDotsPreference
-        android:key="pref_icon_badging"
-        android:persistent="false"
-        android:title="@string/notification_dots_title"
-        android:widgetLayout="@layout/notification_pref_warning"
-        app:iconSpaceReserved="false">
-        <intent android:action="android.settings.NOTIFICATION_SETTINGS">
-            <!-- This extra highlights the "Allow notification dots" field in Notification settings -->
-            <extra
-                android:name=":settings:fragment_args_key"
-                android:value="notification_badging" />
-        </intent>
-    </com.android.launcher3.settings.NotificationDotsPreference>
-
-    <com.saggitt.omega.preferences.StyledSwitchPreference
-        android:defaultValue="false"
-        android:dependency="pref_icon_badging"
-        android:key="pref_notification_count"
-        android:persistent="true"
-        android:title="@string/title__notification_count"
-        app:iconSpaceReserved="false" />
-
-    <com.saggitt.omega.preferences.ColorPreferenceCompat
-        android:defaultValue="@color/notification_background"
-        android:dependency="pref_notification_count"
-        android:key="pref_notification_background"
-        android:title="@string/title__notification_background"
-        app:cpv_dialogTitle="@string/title__notification_background"
-        app:cpv_showAlphaSlider="true"
-        app:iconSpaceReserved="false" />
+    <com.saggitt.omega.preferences.ThemedPreferenceCategory android:title="@string/pref_category__notifications">
+        <com.saggitt.omega.preferences.ButtonPreference
+            android:key="pref_icon_badging"
+            android:title="@string/notification_dots_title"
+            android:persistent="false"
+            app:iconSpaceReserved="false"
+            android:widgetLayout="@layout/notification_pref_warning">
+            <intent android:action="android.settings.NOTIFICATION_SETTINGS">
+                <!-- This extra highlights the "Allow notification dots" field in Notification settings -->
+                <extra
+                    android:name=":settings:fragment_args_key"
+                    android:value="notification_badging" />
+            </intent>
+        </com.saggitt.omega.preferences.ButtonPreference>
+
+        <com.saggitt.omega.preferences.StyledSwitchPreference
+            android:defaultValue="false"
+            android:dependency="pref_icon_badging"
+            android:key="pref_notification_count"
+            android:persistent="true"
+            android:title="@string/title__notification_count"
+            app:iconSpaceReserved="false" />
+
+        <com.saggitt.omega.preferences.StyledSwitchPreference
+            android:defaultValue="true"
+            android:dependency="pref_icon_badging"
+            android:key="pref_folder_badge_count"
+            android:persistent="true"
+            android:title="@string/title__folder_badge_count"
+            app:iconSpaceReserved="false" />
+
+        <com.saggitt.omega.preferences.ColorPreferenceCompat
+            android:defaultValue="@color/notification_background"
+            android:dependency="pref_notification_count"
+            android:key="pref_notification_background"
+            android:title="@string/title__notification_background"
+            app:cpv_dialogTitle="@string/title__notification_background"
+            app:cpv_showAlphaSlider="true"
+            app:iconSpaceReserved="false" />
+    </com.saggitt.omega.preferences.ThemedPreferenceCategory>
+
+    <com.saggitt.omega.preferences.ThemedPreferenceCategory android:title="@string/pref_category__gestures">
+        <com.saggitt.omega.gestures.ui.GesturePreference
+            android:defaultValue="@string/action_do_nothing_class"
+            android:key="pref_gesture_double_tap"
+            android:persistent="true"
+            android:title="@string/gesture_double_tap"
+            app:gestureClass="com.saggitt.omega.gestures.gestures.DoubleTapGesture"
+            app:iconSpaceReserved="false" />
+
+        <com.saggitt.omega.gestures.ui.GesturePreference
+            android:defaultValue="@string/action_open_overview_class"
+            android:key="pref_gesture_long_press"
+            android:persistent="true"
+            android:title="@string/gesture_long_press"
+            app:gestureClass="com.saggitt.omega.gestures.gestures.LongPressGesture"
+            app:iconSpaceReserved="false" />
+
+        <com.saggitt.omega.gestures.ui.GesturePreference
+            android:defaultValue="@string/action_open_notifications_class"
+            android:key="pref_gesture_swipe_down"
+            android:persistent="true"
+            android:title="@string/title__gesture_swipe_down"
+            app:gestureClass="com.saggitt.omega.gestures.gestures.VerticalSwipeGesture"
+            app:iconSpaceReserved="false" />
+
+        <com.saggitt.omega.gestures.ui.GesturePreference
+            android:defaultValue="@string/action_open_drawer_class"
+            android:key="pref_gesture_swipe_up"
+            android:persistent="true"
+            android:title="@string/gesture_swipe_up"
+            app:gestureClass="com.saggitt.omega.gestures.gestures.VerticalSwipeGesture"
+            app:iconSpaceReserved="false" />
+
+        <com.saggitt.omega.gestures.ui.GesturePreference
+            android:defaultValue="@string/action_open_drawer_class"
+            android:key="pref_gesture_dock_swipe_up"
+            android:persistent="true"
+            android:title="@string/gesture_dock_swipe_up"
+            app:gestureClass="com.saggitt.omega.gestures.gestures.VerticalSwipeGesture"
+            app:iconSpaceReserved="false" />
+
+    </com.saggitt.omega.preferences.ThemedPreferenceCategory>
 </PreferenceScreen>
\ No newline at end of file
diff --git a/Omega/res/xml/omega_preferences_search.xml b/Omega/res/xml/omega_preferences_search.xml
new file mode 100644
index 0000000000..e3ff0d3bde
--- /dev/null
+++ b/Omega/res/xml/omega_preferences_search.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~  Copyright (c) 2020 Omega Launcher
+  ~
+  ~  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.
+  ~
+  -->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <com.saggitt.omega.preferences.SearchProviderPreference
+        android:defaultValue="@string/config_default_search_provider"
+        android:key="pref_globalSearchProvider"
+        android:title="@string/title__search_provider"
+        android:persistent="true"
+        app:iconSpaceReserved="false" />
+
+    <com.saggitt.omega.preferences.StyledSwitchPreferenceCompat
+        android:defaultValue="false"
+        android:key="opa_enabled"
+        android:persistent="true"
+        android:title="@string/title__search_show_assistant"
+        app:iconSpaceReserved="false" />
+
+    <com.saggitt.omega.preferences.StyledSwitchPreferenceCompat
+        android:defaultValue="true"
+        android:dependency="opa_enabled"
+        android:key="opa_assistant"
+        android:persistent="true"
+        android:summary="@string/summary__search_show_as_assistant_summary"
+        android:title="@string/title__search_action_assistant"
+        app:iconSpaceReserved="false" />
+
+    <com.saggitt.omega.preferences.StyledSwitchPreferenceCompat
+        android:defaultValue="false"
+        android:key="pref_bubbleSearchStyle"
+        android:title="@string/title__search_bubble_searchbar"
+        app:iconSpaceReserved="false" />
+
+    <com.saggitt.omega.preferences.AutoModeSeekbarPreference
+        android:key="pref_searchbar_radius"
+        android:title="@string/title__search_bar_radius"
+        app:defaultSeekbarValue="-1.0"
+        app:maxValue="24"
+        app:minValue="0.0"
+        app:steps="24"
+        app:summaryFormat="%.0fdp" />
+</PreferenceScreen>
\ No newline at end of file
diff --git a/Omega/res/xml/omega_preferences_smartspace.xml b/Omega/res/xml/omega_preferences_smartspace.xml
index 53416017b1..4b6222617a 100644
--- a/Omega/res/xml/omega_preferences_smartspace.xml
+++ b/Omega/res/xml/omega_preferences_smartspace.xml
@@ -17,6 +17,52 @@
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <com.saggitt.omega.preferences.PreviewPreference
+        android:key="pref_smartspace_preview"
+        app:previewLayout="@layout/smartspace_preview" />
+
+    <com.saggitt.omega.preferences.SmartspaceAddToHomePreference
+        android:key="pref_smartspace_add_to_home"
+        android:title="@string/smartspace_add_to_home"
+        app:iconSpaceReserved="false"
+        app:indexable="false" />
+
+    <com.saggitt.omega.preferences.StyledSwitchPreferenceCompat
+        android:defaultValue="true"
+        android:dependency="pref_use_pill_qsb"
+        android:key="pref_smartspace_date"
+        android:title="@string/title_smartspace_date"
+        app:iconSpaceReserved="false" />
+
+    <com.saggitt.omega.preferences.StyledSwitchPreferenceCompat
+        android:defaultValue="false"
+        android:dependency="pref_use_pill_qsb"
+        android:key="pref_smartspace_time"
+        android:title="@string/title_smartspace_time"
+        app:iconSpaceReserved="false" />
+
+    <com.saggitt.omega.preferences.StyledSwitchPreferenceCompat
+        android:defaultValue="false"
+        android:dependency="pref_smartspace_time"
+        android:key="pref_smartspace_time_above"
+        android:title="@string/title_smartspace_time_above"
+        app:iconSpaceReserved="false" />
+
+    <com.saggitt.omega.preferences.StyledSwitchPreferenceCompat
+        android:defaultValue="false"
+        android:dependency="pref_smartspace_time"
+        android:key="pref_smartspace_time_24_h"
+        android:title="@string/title_smartspace_time_24_h"
+        app:iconSpaceReserved="false" />
+
+    <com.saggitt.omega.preferences.StyledSwitchPreference
+        android:defaultValue="false"
+        android:disableDependentsState="true"
+        android:key="pref_use_pill_qsb"
+        android:title="@string/title_use_pill_qsb"
+        app:iconSpaceReserved="false" />
+
     <com.saggitt.omega.preferences.StyledSwitchPreferenceCompat
         android:defaultValue="true"
         android:key="pref_enable_minus_one"
@@ -24,4 +70,42 @@
         android:title="@string/title_show_google_app"
         app:controllerClass=".MinusOneController"
         app:iconSpaceReserved="false" />
+
+    <ListPreference
+        android:defaultValue="1"
+        android:dependency="pref_enable_minus_one"
+        android:entries="@array/feedThemes"
+        android:entryValues="@array/feedThemeValues"
+        android:key="pref_feed_theme"
+        android:persistent="true"
+        android:summary="%s"
+        android:title="@string/title_smartspace_feed_theme"
+        app:controllerClass=".GFeedBackgroundController"
+        app:iconSpaceReserved="false" />
+    <com.saggitt.omega.preferences.ThemedPreferenceCategory android:title="@string/category__behavior_weather">
+
+        <com.saggitt.omega.preferences.SmartspaceProviderPreference
+            android:key="pref_smartspace_widget_provider"
+            android:summary="%s"
+            android:title="@string/title_smartspace_widget_provider"
+            app:iconSpaceReserved="false" />
+
+        <androidx.preference.ListPreference
+            android:defaultValue="metric"
+            android:dependency="pref_smartspace_widget_provider"
+            android:entries="@array/unitsTexts"
+            android:entryValues="@array/unitsValues"
+            android:key="pref_weather_units"
+            android:summary="%s"
+            android:title="@string/title_smartspace_weather_units"
+            app:iconSpaceReserved="false" />
+
+
+        <com.saggitt.omega.preferences.SmartspaceEventProvidersPreference
+            android:dependency="pref_use_pill_qsb"
+            android:key="pref_smartspace_event_providers"
+            android:summary="%s"
+            android:title="@string/title_smartspace_event_providers"
+            app:iconSpaceReserved="false" />
+    </com.saggitt.omega.preferences.ThemedPreferenceCategory>
 </PreferenceScreen>
\ No newline at end of file
diff --git a/Omega/res/xml/omega_preferences_theme.xml b/Omega/res/xml/omega_preferences_theme.xml
index b2b1db3b15..a3b8088fbc 100644
--- a/Omega/res/xml/omega_preferences_theme.xml
+++ b/Omega/res/xml/omega_preferences_theme.xml
@@ -18,6 +18,35 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
+    <com.saggitt.omega.iconpack.IconPackPreference
+        android:defaultValue="@string/config_default_icon_pack"
+        android:key="pref_icon_packs"
+        android:persistent="true"
+        android:title="@string/title_theme_icon_packs" />
+
+    <!--
+    <com.saggitt.omega.adaptive.IconShapePreference
+        android:defaultValue="@string/icon_shape_system_default"
+        android:entries="@array/icon_shape_names"
+        android:entryValues="@array/icon_shape_values"
+        android:key="pref_iconShape"
+        android:persistent="true"
+        android:summary="%s"
+        android:title="@string/title__theme_icon_shape"
+        app:controllerClass=".IconShapeOverrideController"
+        app:iconSpaceReserved="false" /> -->
+
+    <com.saggitt.omega.icons.IconPreference
+        android:key="pref_icons"
+        android:defaultValue="@string/icon_shape_system_default"
+        android:title="Customize Icons"
+        app:iconSpaceReserved="false" />
+
+    <Preference
+        android:key="pref_reset_custom_icon"
+        android:title="@string/reset_custom_icons"
+        app:iconSpaceReserved="false" />
+
     <com.saggitt.omega.preferences.ColorPreferenceCompat
         android:defaultValue="@color/colorAccent"
         android:key="pref_key__accent_color"
@@ -25,4 +54,31 @@
         app:cpv_dialogTitle="@string/title__theme_accent_color"
         app:cpv_showAlphaSlider="true"
         app:iconSpaceReserved="false" />
+
+    <com.saggitt.omega.theme.ui.ThemePreference
+        android:key="pref_launcherTheme"
+        android:title="@string/title__general_theme"
+        app:content="@xml/omega_preferences_theme_dialog"
+        app:iconSpaceReserved="false" />
+
+    <com.saggitt.omega.preferences.StyledSwitchPreferenceCompat
+        android:defaultValue="@bool/config_default_enable_blur"
+        android:key="pref_enableBlur"
+        android:persistent="true"
+        android:summary="@string/summary__theme_blur"
+        android:title="@string/title__theme_blur"
+        app:iconSpaceReserved="false" />
+
+    <com.saggitt.omega.preferences.SeekbarPreference
+        android:dependency="pref_enableBlur"
+        android:key="pref_blurRadius"
+        android:persistent="true"
+        android:title="@string/title__theme_blur_radius"
+        app:defaultSeekbarValue="@dimen/config_default_blur_strength"
+        app:iconSpaceReserved="false"
+        app:maxValue="150"
+        app:minValue="10"
+        app:steps="140"
+        app:summaryFormat="%.0f" />
+
 </PreferenceScreen>
\ No newline at end of file
diff --git a/Omega/res/xml/omega_preferences_theme_dialog.xml b/Omega/res/xml/omega_preferences_theme_dialog.xml
new file mode 100644
index 0000000000..52f097144f
--- /dev/null
+++ b/Omega/res/xml/omega_preferences_theme_dialog.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <com.saggitt.omega.theme.ui.ThemeDarkModeListPreference
+        android:key="pref_dark_theme_mode"
+        android:summary="%s"
+        android:title="@string/theme_dark_theme_mode"
+        app:iconSpaceReserved="false" />
+
+    <com.saggitt.omega.theme.ui.ThemeBlackSwitchPreference
+        android:title="@string/theme_use_black"
+        app:iconSpaceReserved="false"
+        app:switchFlag="8" />
+
+    <com.saggitt.omega.theme.ui.ThemeFlagSwitchPreference
+        android:title="@string/theme_use_dark_text"
+        app:iconSpaceReserved="false"
+        app:switchFlag="2" />
+</androidx.preference.PreferenceScreen>
diff --git a/Omega/res/xml/provider_paths.xml b/Omega/res/xml/provider_paths.xml
index fafa14f895..7d264a5cd5 100644
--- a/Omega/res/xml/provider_paths.xml
+++ b/Omega/res/xml/provider_paths.xml
@@ -1,4 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~
+  ~  Copyright (c) 2020 Omega Launcher
+  ~
+  ~  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.
+  ~
+  -->
 <paths>
     <external-path
         name="external_files"
diff --git a/Omega/res/xml/sleep_admin_policy.xml b/Omega/res/xml/sleep_admin_policy.xml
new file mode 100644
index 0000000000..86ae545bb5
--- /dev/null
+++ b/Omega/res/xml/sleep_admin_policy.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<device-admin>
+    <uses-policies>
+        <force-lock />
+    </uses-policies>
+</device-admin>
diff --git a/Omega/src/com/saggitt/omega/BlankActivity.kt b/Omega/src/com/saggitt/omega/BlankActivity.kt
index 942fdb970f..23e8a7c30b 100644
--- a/Omega/src/com/saggitt/omega/BlankActivity.kt
+++ b/Omega/src/com/saggitt/omega/BlankActivity.kt
@@ -17,24 +17,24 @@
 
 package com.saggitt.omega
 
-import android.app.Activity
 import android.app.AlertDialog
 import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.os.Bundle
-import android.os.Handler
 import android.os.ResultReceiver
 import android.view.ContextThemeWrapper
+import androidx.appcompat.app.AppCompatActivity
 import androidx.core.app.ActivityCompat
+import com.android.launcher3.util.Executors.MAIN_EXECUTOR
 import com.saggitt.omega.theme.ThemeOverride
 import com.saggitt.omega.util.applyAccent
 
-class BlankActivity : Activity() {
+class BlankActivity : AppCompatActivity() {
 
-    private val requestCode by lazy { intent.getIntExtra("requestCode", 0) }
+   private val requestCode by lazy { intent.getIntExtra("requestCode", 0) }
     private val permissionRequestCode by lazy { intent.getIntExtra("permissionRequestCode", 0) }
-    private val resultReceiver by lazy { intent.getParcelableArrayExtra("callback")!! as ResultReceiver }
+    private val resultReceiver by lazy { intent.getParcelableExtra("callback") as ResultReceiver? }
     private var resultSent = false
     private var firstResume = true
     private var targetStarted = false
@@ -73,10 +73,9 @@ class BlankActivity : Activity() {
                     startActivityForResult(intent.getParcelableExtra("intent"), requestCode)
                 }
             }
-            intent.hasExtra("permissions") -> intent.getStringArrayExtra("permissions")?.let {
-                ActivityCompat.requestPermissions(
-                        this, it, permissionRequestCode)
-            }
+            intent.hasExtra("permissions") -> ActivityCompat.requestPermissions(
+                    this, intent.getStringArrayExtra("permissions")!!, permissionRequestCode)
+
             else -> {
                 finish()
                 return
@@ -87,7 +86,7 @@ class BlankActivity : Activity() {
 
     override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<String>, grantResults: IntArray) {
         if (requestCode == permissionRequestCode) {
-            resultReceiver.send(RESULT_OK, Bundle(2).apply {
+            resultReceiver?.send(RESULT_OK, Bundle(2).apply {
                 putStringArray("permissions", permissions)
                 putIntArray("grantResults", grantResults)
             })
@@ -100,11 +99,12 @@ class BlankActivity : Activity() {
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         if (requestCode == this.requestCode) {
-            resultReceiver.send(resultCode, data?.extras)
+            if (data != null) {
+                resultReceiver?.send(resultCode, data.extras)
+            }
             resultSent = true
             finish()
         }
-
         super.onActivityResult(requestCode, resultCode, data)
     }
 
@@ -113,7 +113,7 @@ class BlankActivity : Activity() {
 
         if (!resultSent && intent.hasExtra("callback")) {
             resultSent = true
-            resultReceiver.send(RESULT_CANCELED, null)
+            resultReceiver?.send(RESULT_CANCELED, null)
         }
     }
 
@@ -124,7 +124,7 @@ class BlankActivity : Activity() {
             val intent = Intent(context, BlankActivity::class.java).apply {
                 putExtra("intent", targetIntent)
                 putExtra("requestCode", requestCode)
-                putExtra("callback", object : ResultReceiver(Handler()) {
+                putExtra("callback", object : ResultReceiver(MAIN_EXECUTOR.handler) {
 
                     override fun onReceiveResult(resultCode: Int, resultData: Bundle?) {
                         callback(resultCode, resultData)
@@ -144,7 +144,7 @@ class BlankActivity : Activity() {
                 putExtra("dialogTitle", dialogTitle)
                 putExtra("dialogMessage", dialogMessage)
                 putExtra("positiveButton", positiveButton)
-                putExtra("callback", object : ResultReceiver(Handler()) {
+                putExtra("callback", object : ResultReceiver(MAIN_EXECUTOR.handler) {
 
                     override fun onReceiveResult(resultCode: Int, resultData: Bundle?) {
                         callback(resultCode)
@@ -166,7 +166,7 @@ class BlankActivity : Activity() {
             val intent = Intent(context, BlankActivity::class.java).apply {
                 putExtra("permissions", permissions)
                 putExtra("permissionRequestCode", requestCode)
-                putExtra("callback", object : ResultReceiver(Handler()) {
+                putExtra("callback", object : ResultReceiver(MAIN_EXECUTOR.handler) {
 
                     override fun onReceiveResult(resultCode: Int, resultData: Bundle?) {
                         if (resultCode == RESULT_OK && resultData != null) {
diff --git a/Omega/src/com/saggitt/omega/OmegaAccessibilityService.java b/Omega/src/com/saggitt/omega/OmegaAccessibilityService.java
new file mode 100644
index 0000000000..9f411dc039
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/OmegaAccessibilityService.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ */
+
+package com.saggitt.omega;
+
+import android.accessibilityservice.AccessibilityService;
+import android.accessibilityservice.AccessibilityServiceInfo;
+import android.content.Intent;
+import android.view.accessibility.AccessibilityEvent;
+
+public class OmegaAccessibilityService extends AccessibilityService {
+
+    @Override
+    protected void onServiceConnected() {
+        AccessibilityServiceInfo serviceInfo = new AccessibilityServiceInfo();
+        serviceInfo.eventTypes = 0;
+        serviceInfo.packageNames = new String[0];
+        setServiceInfo(serviceInfo);
+        OmegaAppKt.getOmegaApp(getApplicationContext()).setAccessibilityService(this);
+    }
+
+    @Override
+    public void onDestroy() {
+        OmegaAppKt.getOmegaApp(getApplicationContext()).setAccessibilityService(null);
+        super.onDestroy();
+    }
+
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        return START_STICKY;
+    }
+
+    @Override
+    public void onAccessibilityEvent(AccessibilityEvent accessibilityEvent) {
+
+    }
+
+    @Override
+    public void onInterrupt() {
+
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/OmegaApp.kt b/Omega/src/com/saggitt/omega/OmegaApp.kt
index 68b8af17fc..e3297fede8 100644
--- a/Omega/src/com/saggitt/omega/OmegaApp.kt
+++ b/Omega/src/com/saggitt/omega/OmegaApp.kt
@@ -19,20 +19,33 @@ package com.saggitt.omega
 
 import android.app.Activity
 import android.app.Application
+import android.content.ComponentName
 import android.content.Context
+import android.content.Intent
 import android.content.res.Configuration
+import android.os.Build
 import android.os.Bundle
+import android.provider.Settings
+import android.util.Log
+import androidx.annotation.Keep
 import com.android.launcher3.Utilities
+import com.android.quickstep.RecentsActivity
 import com.saggitt.omega.blur.BlurWallpaperProvider
+import com.saggitt.omega.flowerpot.Flowerpot
+import com.saggitt.omega.smartspace.OmegaSmartspaceController
 import com.saggitt.omega.theme.ThemeManager
 
 class OmegaApp : Application() {
     val activityHandler = ActivityHandler()
+    val smartspace by lazy { OmegaSmartspaceController(this) }
+    var mismatchedQuickstepTarget = false
+    val recentsEnabled by lazy { checkRecentsComponent() }
+    var accessibilityService: OmegaAccessibilityService? = null
 
     fun onLauncherAppStateCreated() {
         registerActivityLifecycleCallbacks(activityHandler)
         BlurWallpaperProvider.getInstance(this)
-        //Flowerpot.Manager.getInstance(this)
+        Flowerpot.Manager.getInstance(this)
     }
 
     fun restart(recreateLauncher: Boolean = true) {
@@ -43,6 +56,16 @@ class OmegaApp : Application() {
         }
     }
 
+    fun performGlobalAction(action: Int): Boolean {
+        return if (accessibilityService != null) {
+            accessibilityService!!.performGlobalAction(action)
+        } else {
+            startActivity(Intent(Settings.ACTION_ACCESSIBILITY_SETTINGS)
+                    .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK))
+            false
+        }
+    }
+
     override fun onConfigurationChanged(newConfig: Configuration) {
         super.onConfigurationChanged(newConfig)
         ThemeManager.getInstance(this).updateNightMode(newConfig)
@@ -87,6 +110,41 @@ class OmegaApp : Application() {
             activities.add(activity)
         }
     }
+
+    @Keep
+    fun checkRecentsComponent(): Boolean {
+        if (!Utilities.ATLEAST_P) {
+            Log.d("OmegaApp", "API < P, disabling recents")
+            return false
+        }
+        if (!Utilities.HIDDEN_APIS_ALLOWED) {
+            Log.d("OmegaApp", "Hidden APIs not allowed, disabling recents")
+            return false
+        }
+
+        val resId = resources.getIdentifier("config_recentsComponentName", "string", "android")
+        if (resId == 0) {
+            Log.d("OmegaApp", "config_recentsComponentName not found, disabling recents")
+            return false
+        }
+        val recentsComponent = ComponentName.unflattenFromString(resources.getString(resId))
+        if (recentsComponent == null) {
+            Log.d("OmegaApp", "config_recentsComponentName is empty, disabling recents")
+            return false
+        }
+        val isRecentsComponent = recentsComponent.packageName == packageName
+                && recentsComponent.className == RecentsActivity::class.java.name
+        if (!isRecentsComponent) {
+            Log.d("OmegaApp", "config_recentsComponentName ($recentsComponent) is not Lawnchair, disabling recents")
+            return false
+        }
+        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.Q) {
+            Log.d("OmegaApp", "Quickstep target doesn't match, disabling recents")
+            mismatchedQuickstepTarget = true
+            return false
+        }
+        return true
+    }
 }
 
 val Context.omegaApp get() = applicationContext as OmegaApp
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/OmegaLauncher.java b/Omega/src/com/saggitt/omega/OmegaLauncher.java
index 77c88fe67f..64ed7711d0 100644
--- a/Omega/src/com/saggitt/omega/OmegaLauncher.java
+++ b/Omega/src/com/saggitt/omega/OmegaLauncher.java
@@ -17,41 +17,78 @@
 
 package com.saggitt.omega;
 
-import android.app.AppOpsManager;
+import android.animation.AnimatorSet;
+import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
+import android.content.SharedPreferences;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
-import android.provider.Settings;
+import android.util.Log;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowManager;
 
+import androidx.annotation.Nullable;
 import androidx.core.app.ActivityCompat;
 
+import com.android.launcher3.AppInfo;
+import com.android.launcher3.FolderInfo;
+import com.android.launcher3.ItemInfo;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
+import com.android.launcher3.WorkspaceItemInfo;
+import com.android.launcher3.util.ComponentKey;
+import com.saggitt.omega.gestures.GestureController;
+import com.saggitt.omega.iconpack.EditIconActivity;
+import com.saggitt.omega.override.CustomInfoProvider;
+import com.saggitt.omega.smartspace.FeedBridge;
+import com.saggitt.omega.smartspace.SmartspaceView;
+import com.saggitt.omega.util.Config;
+import com.saggitt.omega.util.ContextUtils;
+import com.saggitt.omega.util.CustomLauncherClient;
+import com.saggitt.omega.views.OmegaBackgroundView;
+import com.saggitt.omega.views.OptionsPanel;
 
-import static com.saggitt.omega.util.Config.MY_PERMISSIONS_REQUEST_PACKAGE_USAGE_STATS;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Objects;
+
+import kotlin.Unit;
+import kotlin.jvm.functions.Function0;
+
+import static com.saggitt.omega.iconpack.IconPackManager.Companion;
+import static com.saggitt.omega.iconpack.IconPackManager.CustomIconEntry;
 import static com.saggitt.omega.util.Config.REQUEST_PERMISSION_LOCATION_ACCESS;
 import static com.saggitt.omega.util.Config.REQUEST_PERMISSION_STORAGE_ACCESS;
 
-public class OmegaLauncher extends Launcher {
+public class OmegaLauncher extends Launcher implements OmegaPreferences.OnPreferenceChangeListener {
+    public static boolean showFolderNotificationCount;
+    public static Drawable currentEditIcon = null;
+    public ItemInfo currentEditInfo = null;
     public Context mContext;
     private boolean paused = false;
     private boolean sRestart = false;
-    private OmegaPreferences mOmegaPrefs;
     private OmegaPreferencesChangeCallback prefCallback = new OmegaPreferencesChangeCallback(this);
+    private OmegaLauncherCallbacks launcherCallbacks;
+    private GestureController mGestureController;
+    public View dummyView;
+    public OmegaBackgroundView background;
+    private OptionsPanel optionsView;
+    private String hideStatusBarKey = "pref_hideStatusBar";
 
-    public static OmegaLauncher getLauncher(Context context) {
-        if (context instanceof OmegaLauncher) {
-            return (OmegaLauncher) context;
-        } else {
-            return (OmegaLauncher) LauncherAppState.getInstance(context).getLauncher();
-        }
+    public OmegaLauncher() {
+        launcherCallbacks = new OmegaLauncherCallbacks(this);
+        setLauncherCallbacks(launcherCallbacks);
     }
 
-    public OmegaLauncher() {
-        setLauncherCallbacks(new OmegaLauncherCallbacks(this));
+    public static OmegaLauncher getLauncher(Context context) {
+        return context instanceof OmegaLauncher ? (OmegaLauncher) context :
+                (OmegaLauncher) LauncherAppState.getInstance(context).getLauncher();
     }
 
     @Override
@@ -59,17 +96,28 @@ public void onCreate(Bundle savedInstanceState) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1 && !Utilities.hasStoragePermission(this)) {
             Utilities.requestStoragePermission(this);
         }
+
         super.onCreate(savedInstanceState);
-        if (Utilities.ATLEAST_Q) {
-            AppOpsManager appOps = (AppOpsManager) getSystemService(Context.APP_OPS_SERVICE);
-            int mode = appOps.checkOpNoThrow(AppOpsManager.OPSTR_GET_USAGE_STATS, android.os.Process.myUid(), getPackageName());
-            if (mode != AppOpsManager.MODE_ALLOWED)
-                startActivityForResult(new Intent(Settings.ACTION_USAGE_ACCESS_SETTINGS), MY_PERMISSIONS_REQUEST_PACKAGE_USAGE_STATS);
+
+        SharedPreferences prefs = Utilities.getPrefs(this);
+        if (!FeedBridge.Companion.getInstance(this).isInstalled()) {
+            prefs.edit().putBoolean("pref_enable_minus_one", false).apply();
         }
-        mContext = this;
 
-        mOmegaPrefs = Utilities.getOmegaPrefs(mContext);
+        mContext = this;
+        OmegaPreferences mOmegaPrefs = Utilities.getOmegaPrefs(mContext);
         mOmegaPrefs.registerCallback(prefCallback);
+        mOmegaPrefs.addOnPreferenceChangeListener(hideStatusBarKey, this);
+        ContextUtils contextUtils = new ContextUtils(this);
+        contextUtils.setAppLanguage(mOmegaPrefs.getLanguage());
+        showFolderNotificationCount = mOmegaPrefs.getFolderBadgeCount();
+        dummyView = findViewById(R.id.dummy_view);
+    }
+
+    public GestureController getGestureController() {
+        if (mGestureController == null)
+            mGestureController = new GestureController(this);
+        return mGestureController;
     }
 
     @Override
@@ -83,11 +131,24 @@ public void onResume() {
     public void onPause() {
         super.onPause();
         paused = true;
+
+    }
+
+    @Override
+    public void onRestart() {
+        super.onRestart();
+        Utilities.onLauncherStart();
+        Utilities.getOmegaPrefs(this).unregisterCallback();
+    }
+
+    public void refreshGrid() {
+        mWorkspace.refreshChildren();
     }
 
     public void onDestroy() {
         super.onDestroy();
         Utilities.getOmegaPrefs(this).unregisterCallback();
+        Utilities.getOmegaPrefs(this).removeOnPreferenceChangeListener(hideStatusBarKey, this);
 
         if (sRestart) {
             sRestart = false;
@@ -95,6 +156,72 @@ public void onDestroy() {
         }
     }
 
+    public void onValueChanged(String key, OmegaPreferences prefs, boolean force) {
+        if (key.equals(hideStatusBarKey)) {
+            if (prefs.getHideStatusBar()) {
+                getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
+            } else if (!force) {
+                getWindow().clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
+            }
+        }
+    }
+
+    public OmegaBackgroundView getBackground() {
+        return background = findViewById(R.id.omega_background);
+    }
+
+    public OptionsPanel getOptionsView() {
+        return optionsView = findViewById(R.id.options_view);
+    }
+
+    public void startEditIcon(ItemInfo itemInfo, CustomInfoProvider<ItemInfo> infoProvider) {
+        ComponentKey component;
+        currentEditInfo = itemInfo;
+
+        if (itemInfo instanceof AppInfo) {
+            component = ((AppInfo) itemInfo).toComponentKey();
+            currentEditIcon = Objects.requireNonNull(Companion.getInstance(this)
+                    .getEntryForComponent(component)).getDrawable();
+        } else if (itemInfo instanceof WorkspaceItemInfo) {
+            component = new ComponentKey(itemInfo.getTargetComponent(), itemInfo.user);
+            currentEditIcon = new BitmapDrawable(mContext.getResources(), ((WorkspaceItemInfo) itemInfo).iconBitmap);
+        } else if (itemInfo instanceof FolderInfo) {
+            component = ((FolderInfo) itemInfo).toComponentKey();
+            currentEditIcon = ((FolderInfo) itemInfo).getDefaultIcon(this);
+        } else {
+            component = null;
+            currentEditIcon = null;
+        }
+
+        boolean folderInfo = itemInfo instanceof FolderInfo;
+        int flags = Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS | Intent.FLAG_ACTIVITY_CLEAR_TASK;
+        Intent intent = EditIconActivity.Companion.newIntent(this, infoProvider.getTitle(itemInfo), folderInfo, component);
+
+        BlankActivity.Companion.startActivityForResult(this, intent, Config.CODE_EDIT_ICON, flags, (resultCode, data) -> {
+            handleEditIconResult(resultCode, data);
+            return null;
+        });
+
+    }
+
+    private void handleEditIconResult(int resultCode, Bundle data) {
+        if (resultCode == Activity.RESULT_OK) {
+            if (currentEditInfo == null) {
+                return;
+            }
+            ItemInfo itemInfo = currentEditInfo;
+            String entryString = data.getString(EditIconActivity.EXTRA_ENTRY);
+            if (entryString != null) {
+                CustomIconEntry customIconEntry = CustomIconEntry.Companion.fromString(entryString);
+                (CustomInfoProvider.Companion.forItem(this, itemInfo)).setIcon(itemInfo, customIconEntry);
+                Log.d("OmegaLauncher", "Provider " + CustomInfoProvider
+                        .Companion.forItem(this, itemInfo).toString());
+            } else {
+                CustomInfoProvider.Companion.forItem(this, itemInfo).setIcon(itemInfo, null);
+            }
+        }
+    }
+
     @Override
     public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
         if (requestCode == REQUEST_PERMISSION_STORAGE_ACCESS) {
@@ -109,7 +236,7 @@ public void onRequestPermissionsResult(int requestCode, String[] permissions, in
             }
         }
         if (requestCode == REQUEST_PERMISSION_LOCATION_ACCESS) {
-            //OmegaAppKt.getOmegaApp(this).getSmartspace().updateWeatherData();
+            OmegaAppKt.getOmegaApp(this).getSmartspace().updateWeatherData();
         }
         super.onRequestPermissionsResult(requestCode, permissions, grantResults);
     }
@@ -131,4 +258,40 @@ public void restartIfPending() {
             OmegaAppKt.getOmegaApp(this).restart(false);
         }
     }
+
+    @Nullable
+    public CustomLauncherClient getGoogleNow() {
+        return launcherCallbacks.getClient();
+    }
+
+    public void playQsbAnimation() {
+        launcherCallbacks.getQsbController().dZ();
+    }
+
+    public AnimatorSet openQsb() {
+        return launcherCallbacks.getQsbController().openQsb();
+    }
+
+    public void prepareDummyView(int left, int top, @NotNull Function0<Unit> callback) {
+        int size = getResources().getDimensionPixelSize(R.dimen.options_menu_thumb_size);
+        int halfSize = size / 2;
+        prepareDummyView(left - halfSize, top - halfSize, left + halfSize, top + halfSize, callback);
+    }
+
+    public void prepareDummyView(int left, int top, int right, int bottom, @NotNull Function0<Unit> callback) {
+        ViewGroup.MarginLayoutParams lp = (ViewGroup.MarginLayoutParams) dummyView.getLayoutParams();
+        lp.leftMargin = left;
+        lp.topMargin = top;
+        lp.height = bottom - top;
+        lp.width = right - left;
+        dummyView.setLayoutParams(lp);
+        dummyView.requestLayout();
+        dummyView.post(callback::invoke);
+    }
+
+    public void registerSmartspaceView(SmartspaceView smartspace) {
+        launcherCallbacks.registerSmartspaceView(smartspace);
+    }
+
+
 }
diff --git a/Omega/src/com/saggitt/omega/OmegaLauncherCallbacks.java b/Omega/src/com/saggitt/omega/OmegaLauncherCallbacks.java
index 13b3b2c169..ddd836795a 100644
--- a/Omega/src/com/saggitt/omega/OmegaLauncherCallbacks.java
+++ b/Omega/src/com/saggitt/omega/OmegaLauncherCallbacks.java
@@ -26,7 +26,6 @@
 import androidx.core.graphics.ColorUtils;
 
 import com.android.launcher3.LauncherCallbacks;
-import com.android.launcher3.LauncherModel;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.appprediction.PredictionUiStateManager;
@@ -37,29 +36,34 @@
 import com.android.launcher3.util.Themes;
 import com.google.android.libraries.gsa.launcherclient.ClientOptions;
 import com.google.android.libraries.gsa.launcherclient.ClientService;
-import com.google.android.libraries.gsa.launcherclient.LauncherClient;
+import com.saggitt.omega.qsb.QsbAnimationController;
 import com.saggitt.omega.settings.SettingsActivity;
+import com.saggitt.omega.smartspace.SmartspaceView;
 import com.saggitt.omega.util.Config;
+import com.saggitt.omega.util.CustomLauncherClient;
 
 import java.io.FileDescriptor;
 import java.io.PrintWriter;
+import java.util.Collections;
+import java.util.Set;
+import java.util.WeakHashMap;
 
 public class OmegaLauncherCallbacks implements LauncherCallbacks,
         SharedPreferences.OnSharedPreferenceChangeListener, OnChangeListener {
-    public static final String SEARCH_PACKAGE = "com.google.android.googlequicksearchbox";
+
+    private Set<SmartspaceView> mSmartspaceViews = Collections.newSetFromMap(new WeakHashMap<>());
 
     private final OmegaLauncher mLauncher;
     private final Bundle mUiInformation = new Bundle();
     private OverlayCallbackImpl mOverlayCallbacks;
-    private LauncherClient mLauncherClient;
-    //private QsbAnimationController mQsbController;
+    private CustomLauncherClient mLauncherClient;
+    private QsbAnimationController mQsbController;
     private SharedPreferences mPrefs;
     private boolean mStarted;
     private boolean mResumed;
     private boolean mAlreadyOnHome;
-    PredictionUiStateManager predictionUiStateManager;
-    private Handler handler = new Handler(LauncherModel.getUiWorkerLooper());
     private final Runnable mUpdatePredictionsIfResumed = this::updatePredictionsIfResumed;
+    private PredictionUiStateManager predictionUiStateManager;
 
     public OmegaLauncherCallbacks(OmegaLauncher launcher) {
         mLauncher = launcher;
@@ -81,15 +85,16 @@ public static int compositeAllApps(int color, Context context) {
     public void onCreate(Bundle savedInstanceState) {
         mPrefs = Utilities.getPrefs(mLauncher);
         mOverlayCallbacks = new OverlayCallbackImpl(mLauncher);
-        mLauncherClient = new LauncherClient(mLauncher, mOverlayCallbacks, getClientOptions(mPrefs));
-        //mQsbController = new QsbAnimationController(mLauncher);
+
+        mLauncherClient = new CustomLauncherClient(mLauncher, mOverlayCallbacks, getClientOptions(mPrefs));
+        mQsbController = new QsbAnimationController(mLauncher);
         mOverlayCallbacks.setClient(mLauncherClient);
         mUiInformation.putInt("system_ui_visibility", mLauncher.getWindow().getDecorView().getSystemUiVisibility());
+        applyFeedTheme(false);
         WallpaperColorInfo instance = WallpaperColorInfo.getInstance(mLauncher);
         instance.addOnChangeListener(this);
         onExtractedColorsChanged(instance);
         mPrefs.registerOnSharedPreferenceChangeListener(this);
-
         predictionUiStateManager = PredictionUiStateManager.INSTANCE.get(mLauncher);
         predictionUiStateManager.setTargetAppsView(mLauncher.getAppsView());
         if (FeatureFlags.REFLECTION_FORCE_OVERVIEW_MODE) {
@@ -133,6 +138,9 @@ public void onStop() {
     public void onPause() {
         mResumed = false;
         mLauncherClient.onPause();
+        for (SmartspaceView smartspace : mSmartspaceViews) {
+            smartspace.onPause();
+        }
     }
 
     @Override
@@ -151,7 +159,7 @@ public void onDestroy() {
         }
 
         ClientService service = mLauncherClient.getClientService();
-        LauncherClient client = service.getClient();
+        CustomLauncherClient client = (CustomLauncherClient) service.getClient();
         if (client != null && client.equals(mLauncherClient)) {
             service.mWeakReference = null;
             if (!mLauncherClient.getActivity().isChangingConfigurations()) {
@@ -168,13 +176,6 @@ public void onDestroy() {
     }
 
     private void updatePredictionsIfResumed() {
-        if (mLauncher.hasBeenResumed()) {
-            //ReflectionClient.getInstance(mLauncher).updatePredictionsNow(FeatureFlags.REFLECTION_FORCE_OVERVIEW_MODE ? Client.OVERVIEW.id : Client.HOME.id);
-            handler.post(() -> {
-                mLauncher.getUserEventDispatcher().updatePredictions();
-
-            });
-        }
     }
 
     @Override
@@ -202,6 +203,10 @@ public void onDetachedFromWindow() {
         }
     }
 
+    void registerSmartspaceView(SmartspaceView smartspace) {
+        mSmartspaceViews.add(smartspace);
+    }
+
     @Override
     public void dump(String prefix, FileDescriptor fd, PrintWriter w, String[] args) {
     }
@@ -229,10 +234,10 @@ public boolean startSearch(String initialQuery, boolean selectInitialQuery, Bund
         return false;
     }
 
-    /*@Override
+    @Override
     public QsbAnimationController getQsbController() {
         return mQsbController;
-    }*/
+    }
 
     @Override
     public void onSharedPreferenceChanged(SharedPreferences prefs, String key) {
@@ -246,6 +251,8 @@ public void onSharedPreferenceChanged(SharedPreferences prefs, String key) {
                 mLauncherClient.getEventInfo().parse("setClientOptions ", mLauncherClient.mFlags);
             }
         }
+        if (SettingsActivity.FEED_THEME_PREF.equals(key))
+            applyFeedTheme(true);
     }
 
     @Override
@@ -254,15 +261,34 @@ public void onExtractedColorsChanged(WallpaperColorInfo wallpaperColorInfo) {
         mUiInformation.putInt("background_color_hint", primaryColor(wallpaperColorInfo, mLauncher.getApplicationContext(), alpha));
         mUiInformation.putInt("background_secondary_color_hint", secondaryColor(wallpaperColorInfo, mLauncher, alpha));
         mUiInformation.putBoolean("is_background_dark", Themes.getAttrBoolean(mLauncher, R.attr.isMainColorDark));
-        mLauncherClient.redraw(mUiInformation);
+
+        applyFeedTheme(true);
+    }
+
+    private void applyFeedTheme(boolean redraw) {
+        String prefValue = Utilities.getPrefs(mLauncher).getString(SettingsActivity.FEED_THEME_PREF, null);
+        int feedTheme;
+        try {
+            feedTheme = Integer.parseInt(prefValue == null ? "1" : prefValue);
+        } catch (Exception e) {
+            feedTheme = 1;
+        }
+        boolean auto = (feedTheme & 1) != 0;
+        boolean preferDark = (feedTheme & 2) != 0;
+        boolean isDark = auto ? Themes.getAttrBoolean(mLauncher, R.attr.isMainColorDark) : preferDark;
+        mUiInformation.putBoolean("is_background_dark", isDark);
+
+        if (redraw) {
+            mLauncherClient.redraw(mUiInformation);
+        }
     }
 
-    public LauncherClient getClient() {
+    public CustomLauncherClient getClient() {
         return mLauncherClient;
     }
 
     private ClientOptions getClientOptions(SharedPreferences prefs) {
-        boolean hasPackage = Config.hasPackageInstalled(mLauncher, SEARCH_PACKAGE);
+        boolean hasPackage = Config.hasPackageInstalled(mLauncher, Config.GOOGLE_QSB);
         boolean isEnabled = prefs.getBoolean(SettingsActivity.ENABLE_MINUS_ONE_PREF, true);
         int canUse = hasPackage && isEnabled ? 1 : 0;
         return new ClientOptions(canUse | 2 | 4 | 8);
diff --git a/Omega/src/com/saggitt/omega/OmegaLayoutInflater.kt b/Omega/src/com/saggitt/omega/OmegaLayoutInflater.kt
index a26c111052..2b7e26f437 100644
--- a/Omega/src/com/saggitt/omega/OmegaLayoutInflater.kt
+++ b/Omega/src/com/saggitt/omega/OmegaLayoutInflater.kt
@@ -29,7 +29,7 @@ import org.xmlpull.v1.XmlPullParser
 class OmegaLayoutInflater(original: LayoutInflater, newContext: Context) : LayoutInflater(original, newContext) {
 
     fun installFactory(delegate: AppCompatDelegate) {
-        factory2 = object : LayoutInflater.Factory2 {
+        factory2 = object : Factory2 {
             override fun onCreateView(parent: View?, name: String, context: Context, attrs: AttributeSet): View? {
                 val view = onCreateViewImpl(parent, name, context, attrs)
                 if (view != null) {
@@ -59,9 +59,7 @@ class OmegaLayoutInflater(original: LayoutInflater, newContext: Context) : Layou
     }
 
     private fun onViewCreated(view: View, attrs: AttributeSet?) {
-        if (view is TextView) {
-            //fontManager.loadCustomFont(view, attrs)
-        }
+
     }
 
     override fun onCreateView(parent: View?, name: String?, attrs: AttributeSet?): View {
diff --git a/Omega/src/com/saggitt/omega/OmegaPreferences.kt b/Omega/src/com/saggitt/omega/OmegaPreferences.kt
index 37afc05d50..e1ae3930b4 100644
--- a/Omega/src/com/saggitt/omega/OmegaPreferences.kt
+++ b/Omega/src/com/saggitt/omega/OmegaPreferences.kt
@@ -20,13 +20,33 @@ package com.saggitt.omega
 import android.annotation.SuppressLint
 import android.content.Context
 import android.content.SharedPreferences
+import android.net.Uri
 import android.os.Looper
-import com.android.launcher3.LauncherFiles
-import com.android.launcher3.R
+import android.text.TextUtils
+import com.android.launcher3.*
+import com.android.launcher3.Utilities.makeComponentKey
+import com.android.launcher3.allapps.search.DefaultAppSearchAlgorithm
+import com.android.launcher3.util.ComponentKey
 import com.android.launcher3.util.Executors
-import com.saggitt.omega.allapps.PredictionsFloatingHeader
+import com.saggitt.omega.gestures.BlankGestureHandler
+import com.saggitt.omega.gestures.handlers.NotificationsOpenGestureHandler
+import com.saggitt.omega.gestures.handlers.OpenDrawerGestureHandler
+import com.saggitt.omega.gestures.handlers.StartAppSearchGestureHandler
+import com.saggitt.omega.gestures.handlers.StartGlobalSearchGestureHandler
+import com.saggitt.omega.groups.AppGroupsManager
+import com.saggitt.omega.groups.DrawerTabs
+import com.saggitt.omega.iconpack.IconPackManager
+import com.saggitt.omega.preferences.GridSize
+import com.saggitt.omega.preferences.GridSize2D
+import com.saggitt.omega.search.SearchProviderController
+import com.saggitt.omega.smartspace.BlankDataProvider
+import com.saggitt.omega.smartspace.SmartspaceDataWidget
+import com.saggitt.omega.smartspace.eventprovider.BatteryStatusProvider
+import com.saggitt.omega.smartspace.eventprovider.NotificationUnreadProvider
+import com.saggitt.omega.smartspace.eventprovider.NowPlayingProvider
+import com.saggitt.omega.smartspace.eventprovider.PersonalityProvider
 import com.saggitt.omega.theme.ThemeManager
-import com.saggitt.omega.util.Config
+import com.saggitt.omega.util.*
 import org.json.JSONArray
 import org.json.JSONObject
 import java.io.File
@@ -36,18 +56,25 @@ import java.util.concurrent.ExecutionException
 import kotlin.collections.ArrayList
 import kotlin.collections.HashMap
 import kotlin.collections.HashSet
+import kotlin.math.roundToInt
 import kotlin.reflect.KProperty
 
 class OmegaPreferences(val context: Context) : SharedPreferences.OnSharedPreferenceChangeListener {
-    val mContext = context;
+    val mContext = context
 
     val doNothing = { }
     val restart = { restart() }
     val reloadApps = { reloadApps() }
+    val reloadAll = { reloadAll() }
+    private val refreshGrid = { refreshGrid() }
     val updateBlur = { updateBlur() }
+    private val updateWeatherData = { onChangeCallback?.updateWeatherData() ?: Unit }
+    val reloadIcons = { reloadIcons() }
+    private val reloadIconPacks = { IconPackManager.getInstance(context).packList.reloadPacks() }
     val recreate = { recreate() }
-    val omegaConfig = Config(context)
+    val appsRecreate = { updateSortApps() }
 
+    private val omegaConfig = Config(context)
     private val onChangeMap: MutableMap<String, () -> Unit> = HashMap()
     val onChangeListeners: MutableMap<String, MutableSet<OnPreferenceChangeListener>> = HashMap()
     private var onChangeCallback: OmegaPreferencesChangeCallback? = null
@@ -56,46 +83,157 @@ class OmegaPreferences(val context: Context) : SharedPreferences.OnSharedPrefere
     /* --APP DRAWER-- */
     var sortMode by StringIntPref("pref_key__sort_mode", 0, recreate)
     val showPredictions by BooleanPref("pref_show_predictions", false, doNothing)
-    val showAllAppsLabel by BooleanPref("pref_showAllAppsLabel", false) {
-        val header = onChangeCallback?.launcher?.appsView?.floatingHeaderView as? PredictionsFloatingHeader
-        header?.updateShowAllAppsLabel()
-    }
-    var hiddenAppSet by StringSetPref("hidden-app-set", Collections.emptySet(), reloadApps)
+    val showAllAppsLabel by BooleanPref("pref_showAllAppsLabel", false, recreate)
+    var hiddenAppSet by StringSetPref("hidden-app-set", Collections.emptySet(), appsRecreate)
     var hiddenPredictionAppSet by StringSetPref("pref_hidden_prediction_set", Collections.emptySet(), doNothing)
+    val drawerLabelColor by IntPref("pref_drawer_label_color", R.color.qsb_drawer_text_color_normal, reloadApps)
+    var allAppsGlobalSearch by BooleanPref("pref_allAppsGoogleSearch", true, doNothing)
+    val allAppsSearch by BooleanPref("pref_allAppsSearch", true, recreate)
+    val drawerTextScale by FloatPref("pref_allAppsIconTextScale", 1f, recreate)
+    val drawerPaddingScale by FloatPref("pref_allAppsPaddingScale", 1.0f, recreate)
+    private val drawerMultilineLabel by BooleanPref("pref_iconLabelsInTwoLines", false, recreate)
+    val drawerLabelRows get() = if (drawerMultilineLabel) 2 else 1
+    val hideAllAppsAppLabels by BooleanPref("pref_hideAllAppsAppLabels", false, recreate)
+    val currentTabsModel
+        get() = appGroupsManager.getEnabledModel() as? DrawerTabs ?: appGroupsManager.drawerTabs
+    val drawerTabs get() = appGroupsManager.drawerTabs
+    val appGroupsManager by lazy { AppGroupsManager(this) }
+    val separateWorkApps by BooleanPref("pref_separateWorkApps", true, recreate)
+    private val drawerGridSizeDelegate = ResettableLazy { GridSize(this, "numColsDrawer", LauncherAppState.getIDP(context), recreate) }
+    val drawerGridSize by drawerGridSizeDelegate
+    private val predictionGridSizeDelegate = ResettableLazy { GridSize(this, "numPredictions", LauncherAppState.getIDP(context), recreate) }
+    val predictionGridSize by predictionGridSizeDelegate
+    var allAppsIconScale by FloatPref("allAppsIconSize", 1f, reloadApps)
+    val allAppsOpacity by AlphaPref("pref_allAppsOpacitySB", -1, recreate)
+    val customBackground by BooleanPref("pref_enable_custom_background", false, doNothing)
+    val drawerBackgroundColor by IntPref("pref_drawer_background_color", R.color.white, recreate)
 
     /* --DESKTOP-- */
     var autoAddInstalled by BooleanPref("pref_add_icon_to_home", true, doNothing)
-    val dashEnable by BooleanPref("pref_key__dash_enable", true, recreate)
-    fun setDashEnable(enable: Boolean) {
-        sharedPrefs.edit().putBoolean("pref_key__dash_enable", enable).apply()
-    }
-
+    var dashEnable by BooleanPref("pref_key__dash_enable", true, recreate)
     val allowFullWidthWidgets by BooleanPref("pref_fullWidthWidgets", false, restart)
+    val desktopTextScale by FloatPref("pref_iconTextScale", 1f, reloadAll)
+    private val homeMultilineLabel by BooleanPref("pref_homeIconLabelsInTwoLines", false, recreate)
+    val homeLabelRows get() = if (homeMultilineLabel) 2 else 1
+    val usePopupMenuView by BooleanPref("pref_desktopUsePopupMenuView", true, doNothing)
+    val lockDesktop by BooleanPref("pref_lockDesktop", false, reloadAll)
+    val desktopIconScale by FloatPref("pref_iconSize", 1f, recreate)
+    private var gridSizeDelegate = ResettableLazy { GridSize2D(this, "numRows", "numColumns", LauncherAppState.getIDP(context), refreshGrid) }
+    val gridSize by gridSizeDelegate
+    val hideAppLabels by BooleanPref("pref_hideAppLabels", false, recreate)
+    val hideStatusBar by BooleanPref("pref_hideStatusBar", false, restart)
+
+    /* --DOCK-- */
+    var dockHide by BooleanPref("pref_hideHotseat", false, restart)
+    val dockTextScale by FloatPref("pref_dockTextScale", -1f, restart)
+    private val dockMultilineLabel by BooleanPref("pref_dockIconLabelsInTwoLines", false, recreate)
+    val dockLabelRows get() = if (dockMultilineLabel) 2 else 1
+    val hideDockLabels by BooleanPref("pref_hideDockLabels", true, restart)
+    var dockScale by FloatPref("pref_dockScale", -1f, recreate)
+    var dockSearchBarPref by BooleanPref("pref_dock_search", true, restart)
+    inline val dockSearchBar get() = !dockHide && dockSearchBarPref
+    val dockIconScale by FloatPref("pref_hotseatIconSize", 1f, recreate)
+    private val dockGridSizeDelegate = ResettableLazy { GridSize(this, "numHotseatIcons", LauncherAppState.getIDP(context), restart) }
+    val dockGridSize by dockGridSizeDelegate
+    var dockRadius by FloatPref("pref_dockRadius", 16f, recreate)
+    var dockShadow by BooleanPref("pref_dockShadow", false, recreate)
+    var dockShowArrow by BooleanPref("pref_hotseatShowArrow", true, recreate)
+    val dockShowPageIndicator by BooleanPref("pref_hotseatShowPageIndicator", true, { onChangeCallback?.updatePageIndicator() })
+    val dockBackground by BooleanPref("pref_dockBackground", false, recreate)
+    inline val dockGradientStyle get() = !dockBackground
+    var dockOpacity by AlphaPref("pref_hotseatCustomOpacity", -1, recreate)
+    val dockBackgroundColor by IntPref("pref_dock_background_color", R.color.transparentish, recreate)
 
     /* --THEME-- */
     var launcherTheme by StringIntPref("pref_launcherTheme", 1) { ThemeManager.getInstance(context).updateTheme() }
     val accentColor by IntPref("pref_key__accent_color", R.color.colorAccent, recreate)
+    var iconShape by StringPref("pref_iconShape", "", doNothing)
+    private var iconPack by StringPref("pref_icon_pack", "", reloadIconPacks)
+    val iconPacks = object : MutableListPref<String>("pref_iconPacks", reloadIconPacks,
+            if (!TextUtils.isEmpty(iconPack)) listOf(iconPack) else omegaConfig.defaultIconPacks.asList()) {
+        override fun unflattenValue(value: String) = value
+    }
+
+    val iconPackMasking by BooleanPref("pref_iconPackMasking", true, reloadIcons)
+    var colorizedLegacyTreatment by BooleanPref("pref_colorizeGeneratedBackgrounds", false, doNothing)
+    var enableWhiteOnlyTreatment by BooleanPref("pref_enableWhiteOnlyTreatment", false, doNothing)
+    var enableLegacyTreatment by BooleanPref("pref_enableLegacyTreatment", false, doNothing)
+    var adaptifyIconPacks by BooleanPref("pref_generateAdaptiveForIconPack", false, doNothing)
+    var forceShapeless by BooleanPref("pref_forceShapeless", false, doNothing)
 
     /* --NOTIFICATION-- */
-    val notificationCount: Boolean by BooleanPref("pref_notification_count", true, restart)
+    val notificationCount by BooleanPref("pref_notification_count", true, restart)
+    val folderBadgeCount by BooleanPref("pref_folder_badge_count", true, recreate)
     val notificationBackground by IntPref("pref_notification_background", R.color.notification_background, recreate)
 
+    /* --SMARTSPACE-- */
+    var usePillQsb by BooleanPref("pref_use_pill_qsb", false, recreate)
+    val smartspaceTime by BooleanPref("pref_smartspace_time", false, refreshGrid)
+    val smartspaceDate by BooleanPref("pref_smartspace_date", true, refreshGrid)
+    val smartspaceTimeAbove by BooleanPref("pref_smartspace_time_above", false, refreshGrid)
+    val smartspaceTime24H by BooleanPref("pref_smartspace_time_24_h", false, refreshGrid)
+    var feedProviderPackage by StringPref("pref_feed_provider_package", BuildConfig.APPLICATION_ID, restart)
+    val weatherUnit by StringBasedPref("pref_weather_units", Temperature.Unit.Celsius, ::updateSmartspaceProvider,
+            Temperature.Companion::unitFromString, Temperature.Companion::unitToString) { }
+    var smartspaceWidgetId by IntPref("smartspace_widget_id", -1, doNothing)
+    var weatherIconPack by StringPref("pref_weatherIcons", "", updateWeatherData)
+    var weatherProvider by StringPref("pref_smartspace_widget_provider",
+            SmartspaceDataWidget::class.java.name, ::updateSmartspaceProvider)
+    var eventProvider by StringPref("pref_smartspace_event_provider",
+            SmartspaceDataWidget::class.java.name, ::updateSmartspaceProvider)
+    var eventProviders = StringListPref("pref_smartspace_event_providers",
+            ::updateSmartspaceProvider, listOf(eventProvider,
+            NotificationUnreadProvider::class.java.name,
+            NowPlayingProvider::class.java.name,
+            BatteryStatusProvider::class.java.name,
+            PersonalityProvider::class.java.name))
+
     /* --ADVANCED-- */
     var settingsSearch by BooleanPref("pref_settings_search", true, recreate)
+    var language by StringPref("pref_key__language", "", recreate)
 
     /* --BLUR--*/
     var enableBlur by BooleanPref("pref_enableBlur", omegaConfig.defaultEnableBlur(), updateBlur)
     val blurRadius by FloatPref("pref_blurRadius", omegaConfig.defaultBlurStrength, updateBlur)
 
+    /* --SEARCH-- */
+    var searchBarRadius by DimensionPref("pref_searchbar_radius", -1f)
+    val dockColoredGoogle by BooleanPref("pref_dockColoredGoogle", true, doNothing)
+    var searchProvider by StringPref("pref_globalSearchProvider", omegaConfig.defaultSearchProvider) {
+        SearchProviderController.getInstance(context).onSearchProviderChanged()
+    }
+    val dualBubbleSearch by BooleanPref("pref_bubbleSearchStyle", false, recreate)
+    val searchHiddenApps by BooleanPref(DefaultAppSearchAlgorithm.SEARCH_HIDDEN_APPS, false)
+
+    val recentBackups = object : MutableListPref<Uri>(
+            Utilities.getDevicePrefs(context), "pref_recentBackups") {
+        override fun unflattenValue(value: String) = Uri.parse(value)
+    }
+
     /* --DEV-- */
     var developerOptionsEnabled by BooleanPref("pref_showDevOptions", false, recreate)
     val showDebugInfo by BooleanPref("pref_showDebugInfo", false, doNothing)
     val lowPerformanceMode by BooleanPref("pref_lowPerformanceMode", false, recreate)
     val enablePhysics get() = !lowPerformanceMode
+    val debugOkHttp by BooleanPref("pref_debugOkhttp", onChange = restart)
 
     var restoreSuccess by BooleanPref("pref_restoreSuccess", false)
     var configVersion by IntPref("config_version", if (restoreSuccess) 0 else CURRENT_VERSION)
 
+    val customAppName = object : MutableMapPref<ComponentKey, String>("pref_appNameMap", reloadAll) {
+        override fun flattenKey(key: ComponentKey) = key.toString()
+        override fun unflattenKey(key: String) = makeComponentKey(context, key)
+        override fun flattenValue(value: String) = value
+        override fun unflattenValue(value: String) = value
+    }
+
+    val customAppIcon = object : MutableMapPref<ComponentKey, IconPackManager.CustomIconEntry>("pref_appIconMap", reloadAll) {
+        override fun flattenKey(key: ComponentKey) = key.toString()
+        override fun unflattenKey(key: String) = makeComponentKey(context, key)
+        override fun flattenValue(value: IconPackManager.CustomIconEntry) = value.toString()
+        override fun unflattenValue(value: String) = IconPackManager.CustomIconEntry.fromString(value)
+    }
+
     private fun migratePrefs(): SharedPreferences {
         val dir = mContext.cacheDir.parent
         val oldFile = File(dir, "shared_prefs/" + LauncherFiles.OLD_SHARED_PREFERENCES_KEY + ".xml")
@@ -111,15 +249,11 @@ class OmegaPreferences(val context: Context) : SharedPreferences.OnSharedPrefere
                 }
     }
 
-    fun migrateConfig(prefs: SharedPreferences) {
+    private fun migrateConfig(prefs: SharedPreferences) {
         val version = prefs.getInt(VERSION_KEY, CURRENT_VERSION)
         if (version != CURRENT_VERSION) {
             with(prefs.edit()) {
-                // Migration codes here
-
-                if (version == 100) {
-                    initialConfig(this, prefs)
-                }
+                initialConfig(this, prefs)
 
                 putInt(VERSION_KEY, CURRENT_VERSION)
                 commit()
@@ -132,11 +266,51 @@ class OmegaPreferences(val context: Context) : SharedPreferences.OnSharedPrefere
         putBoolean("pref_legacyUpgrade", true)
         putBoolean("pref_restoreSuccess", false)
 
+        putString("pref_iconShape", "square")
+
         // misc
         putBoolean("pref_add_icon_to_home", prefs.getBoolean("pref_autoAddShortcuts", true))
-        putString("pref_iconShape", "")
         putInt("pref_notification_background", R.color.notification_background)
-
+        putInt("pref_key__accent_color", R.color.colorAccent)
+        putBoolean("pref_allAppsGoogleSearch", false)
+        putFloat("pref_dockScale", 0.90f)
+
+        // Home widget
+        val pillQsb = prefs.getBoolean("pref_showPixelBar", true)
+                // The new dock qsb should be close enough I guess
+                && !prefs.getBoolean("pref_fullWidthSearchbar", false)
+        putBoolean("pref_use_pill_qsb", pillQsb)
+        if (pillQsb) {
+            putBoolean("pref_dockSearchBar", false)
+        }
+        if (!prefs.getBoolean("pref_showDateOrWeather", true)) {
+            putString("pref_smartspace_widget_provider", BlankDataProvider::class.java.name)
+        }
+        val showAssistant = prefs.getBoolean("pref_showMic", false)
+        putBoolean("opa_enabled", showAssistant)
+        putBoolean("opa_assistant", showAssistant)
+
+        // Theme
+        putString("pref_launcherTheme",
+                when (prefs.getString("pref_theme", "0")) {
+                    "1" -> ThemeManager.THEME_DARK
+                    "2" -> ThemeManager.THEME_USE_BLACK or ThemeManager.THEME_DARK
+                    else -> 0
+                }.toString())
+
+        // Gestures
+        putString("pref_gesture_swipe_down",
+                when (Integer.parseInt(prefs.getString("pref_pulldownAction", "1"))) {
+                    1 -> NotificationsOpenGestureHandler(context, null)
+                    2 -> StartGlobalSearchGestureHandler(context, null)
+                    3 -> StartAppSearchGestureHandler(context, null)
+                    else -> BlankGestureHandler(context, null)
+                }.toString())
+
+        if (prefs.getBoolean("pref_homeOpensDrawer", false)) {
+            putString("pref_gesture_press_home",
+                    OpenDrawerGestureHandler(context, null).toString())
+        }
     }
 
     override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
@@ -180,10 +354,25 @@ class OmegaPreferences(val context: Context) : SharedPreferences.OnSharedPrefere
         onChangeCallback?.restart()
     }
 
+    fun refreshGrid() {
+        onChangeCallback?.refreshGrid()
+    }
+
     private fun updateBlur() {
         onChangeCallback?.updateBlur()
     }
 
+    private fun updateSmartspaceProvider() {
+        onChangeCallback?.updateSmartspaceProvider()
+    }
+
+    fun reloadIcons() {
+        LauncherAppState.getInstance(context).reloadIconCache()
+        runOnMainThread {
+            onChangeCallback?.recreate()
+        }
+    }
+
     fun updateSortApps() {
         onChangeCallback?.forceReloadApps()
     }
@@ -262,6 +451,16 @@ class OmegaPreferences(val context: Context) : SharedPreferences.OnSharedPrefere
     }
 
     //PREFERENCE CLASSES
+
+    inner class StringListPref(prefKey: String,
+                               onChange: () -> Unit = doNothing,
+                               default: List<String> = emptyList())
+        : MutableListPref<String>(prefKey, onChange, default) {
+
+        override fun unflattenValue(value: String) = value
+        override fun flattenValue(value: String) = value
+    }
+
     abstract inner class MutableListPref<T>(private val prefs: SharedPreferences, private val prefKey: String,
                                             onChange: () -> Unit = doNothing,
                                             default: List<T> = emptyList()) : PrefDelegate<List<T>>(prefKey, default, onChange) {
@@ -506,6 +705,41 @@ class OmegaPreferences(val context: Context) : SharedPreferences.OnSharedPrefere
         }
     }
 
+    open inner class AlphaPref(key: String, defaultValue: Int = 0, onChange: () -> Unit = doNothing) :
+            PrefDelegate<Int>(key, defaultValue, onChange) {
+        override fun onGetValue(): Int = (sharedPrefs.getFloat(getKey(), defaultValue.toFloat() / 255) * 255).roundToInt()
+
+        override fun onSetValue(value: Int) {
+            edit { putFloat(getKey(), value.toFloat() / 255) }
+        }
+    }
+
+    inline fun <reified T : Enum<T>> EnumPref(key: String, defaultValue: T,
+                                              noinline onChange: () -> Unit = doNothing): PrefDelegate<T> {
+        return IntBasedPref(key, defaultValue, onChange, { value ->
+            enumValues<T>().firstOrNull { item -> item.ordinal == value } ?: defaultValue
+        }, { it.ordinal }, { })
+    }
+
+    open inner class IntBasedPref<T : Any>(key: String, defaultValue: T, onChange: () -> Unit = doNothing,
+                                           private val fromInt: (Int) -> T,
+                                           private val toInt: (T) -> Int,
+                                           private val dispose: (T) -> Unit) : PrefDelegate<T>(key, defaultValue, onChange) {
+        override fun onGetValue(): T {
+            return if (sharedPrefs.contains(key)) {
+                fromInt(sharedPrefs.getInt(getKey(), toInt(defaultValue)))
+            } else defaultValue
+        }
+
+        override fun onSetValue(value: T) {
+            edit { putInt(getKey(), toInt(value)) }
+        }
+
+        override fun disposeOldValue(oldValue: T) {
+            dispose(oldValue)
+        }
+    }
+
     open inner class BooleanPref(key: String, defaultValue: Boolean = false, onChange: () -> Unit = doNothing) : PrefDelegate<Boolean>(key, defaultValue, onChange) {
         override fun onGetValue(): Boolean = sharedPrefs.getBoolean(getKey(), defaultValue)
 
@@ -522,6 +756,23 @@ class OmegaPreferences(val context: Context) : SharedPreferences.OnSharedPrefere
         }
     }
 
+    open inner class StringBasedPref<T : Any>(key: String, defaultValue: T, onChange: () -> Unit = doNothing,
+                                              private val fromString: (String) -> T,
+                                              private val toString: (T) -> String,
+                                              private val dispose: (T) -> Unit) :
+            PrefDelegate<T>(key, defaultValue, onChange) {
+        override fun onGetValue(): T = sharedPrefs.getString(getKey(), null)?.run(fromString)
+                ?: defaultValue
+
+        override fun onSetValue(value: T) {
+            edit { putString(getKey(), toString(value)) }
+        }
+
+        override fun disposeOldValue(oldValue: T) {
+            dispose(oldValue)
+        }
+    }
+
     open inner class StringPref(key: String, defaultValue: String = "", onChange: () -> Unit = doNothing) : PrefDelegate<String>(key, defaultValue, onChange) {
         override fun onGetValue(): String = sharedPrefs.getString(getKey(), defaultValue)!!
 
@@ -551,6 +802,16 @@ class OmegaPreferences(val context: Context) : SharedPreferences.OnSharedPrefere
         }
     }
 
+    open inner class DimensionPref(key: String, defaultValue: Float = 0f, onChange: () -> Unit = doNothing) :
+            PrefDelegate<Float>(key, defaultValue, onChange) {
+
+        override fun onGetValue(): Float = dpToPx(sharedPrefs.getFloat(getKey(), defaultValue))
+
+        override fun onSetValue(value: Float) {
+            edit { putFloat(getKey(), pxToDp(value)) }
+        }
+    }
+
     interface OnPreferenceChangeListener {
         fun onValueChanged(key: String, prefs: OmegaPreferences, force: Boolean)
     }
@@ -586,6 +847,9 @@ class OmegaPreferences(val context: Context) : SharedPreferences.OnSharedPrefere
             INSTANCE?.apply {
                 onChangeListeners.clear()
                 onChangeCallback = null
+                dockGridSizeDelegate.resetValue()
+                drawerGridSizeDelegate.resetValue()
+                predictionGridSizeDelegate.resetValue()
             }
         }
     }
diff --git a/Omega/src/com/saggitt/omega/OmegaPreferencesChangeCallback.kt b/Omega/src/com/saggitt/omega/OmegaPreferencesChangeCallback.kt
index 309f09e8d9..7b5d1264c0 100644
--- a/Omega/src/com/saggitt/omega/OmegaPreferencesChangeCallback.kt
+++ b/Omega/src/com/saggitt/omega/OmegaPreferencesChangeCallback.kt
@@ -18,6 +18,7 @@
 package com.saggitt.omega
 
 import com.android.launcher3.compat.UserManagerCompat
+import com.android.launcher3.pageindicators.WorkspacePageIndicator
 import com.saggitt.omega.blur.BlurWallpaperProvider
 
 class OmegaPreferencesChangeCallback(val launcher: OmegaLauncher) {
@@ -26,8 +27,8 @@ class OmegaPreferencesChangeCallback(val launcher: OmegaLauncher) {
     }
 
     fun reloadApps() {
-        UserManagerCompat.getInstance(launcher.mContext).userProfiles.forEach { launcher.model.onPackagesReload(it) }
-    }
+        UserManagerCompat.getInstance(launcher).userProfiles.forEach { launcher.model.onPackagesReload(it) }
+   }
 
     fun reloadAll() {
         launcher.model.forceReload()
@@ -41,12 +42,34 @@ class OmegaPreferencesChangeCallback(val launcher: OmegaLauncher) {
         launcher.scheduleRestart()
     }
 
+    fun refreshGrid() {
+        launcher.refreshGrid()
+    }
+
     fun updateBlur() {
         BlurWallpaperProvider.getInstance(launcher).updateAsync()
     }
 
-
     fun forceReloadApps() {
         UserManagerCompat.getInstance(launcher).userProfiles.forEach { launcher.model.forceReload() }
     }
+
+    fun resetAllApps() {
+        launcher.mAllAppsController.reset()
+    }
+
+    fun updatePageIndicator() {
+        val indicator = launcher.workspace.pageIndicator
+        if (indicator is WorkspacePageIndicator) {
+            indicator.updateLineHeight()
+        }
+    }
+
+    fun updateSmartspaceProvider() {
+        launcher.omegaApp.smartspace.onProviderChanged()
+    }
+
+    fun updateWeatherData() {
+        launcher.omegaApp.smartspace.forceUpdateWeather()
+    }
 }
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/adaptive/AdaptiveIconGenerator.java b/Omega/src/com/saggitt/omega/adaptive/AdaptiveIconGenerator.java
new file mode 100644
index 0000000000..d88704f34c
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/adaptive/AdaptiveIconGenerator.java
@@ -0,0 +1,361 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.adaptive;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.Color;
+import android.graphics.RectF;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
+import android.util.Log;
+import android.util.SparseIntArray;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.graphics.ColorUtils;
+
+import com.android.launcher3.AdaptiveIconCompat;
+import com.android.launcher3.Utilities;
+import com.android.launcher3.icons.ColorExtractor;
+import com.android.launcher3.icons.FixedScaleDrawable;
+import com.android.launcher3.icons.IconNormalizer;
+import com.android.launcher3.icons.LauncherIcons;
+import com.saggitt.omega.OmegaPreferences;
+import com.saggitt.omega.icons.CustomIconProvider;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import kotlin.collections.ArraysKt;
+
+import static java.lang.Math.max;
+import static java.lang.Math.min;
+import static java.lang.Math.round;
+
+// TODO: Make this thing async somehow (maybe using some drawable wrappers?)
+public class AdaptiveIconGenerator {
+
+    // Average number of derived colors (based on averages with ~100 icons and performance testing)
+    private static final int NUMBER_OF_COLORS_GUESSTIMATION = 45;
+
+    // Found after some experimenting, might be improved with some more testing
+    private static final float FULL_BLEED_ICON_SCALE = 1.44f;
+    // Found after some experimenting, might be improved with some more testing
+    private static final float NO_MIXIN_ICON_SCALE = 1.40f;
+    // Icons with less than 5 colors are considered as "single color"
+    private static final int SINGLE_COLOR_LIMIT = 5;
+    // Minimal alpha to be considered opaque
+    private static final int MIN_VISIBLE_ALPHA = 0xEF;
+    private final boolean extractColor;
+    private final boolean treatWhite;
+    private Context context;
+    private Drawable icon;
+    private Drawable roundIcon;
+
+    private boolean ranLoop;
+    private boolean shouldWrap;
+    private int backgroundColor = Color.WHITE;
+    private boolean isFullBleed;
+    private boolean noMixinNeeded;
+    private boolean fullBleedChecked;
+    private boolean matchesMaskShape;
+    private boolean isBackgroundWhite;
+    private float scale;
+    private int height;
+    private float aHeight;
+    private int width;
+    private float aWidth;
+    private Drawable result;
+
+    private AdaptiveIconCompat tmp;
+
+    public AdaptiveIconGenerator(Context context, @NonNull Drawable icon, @Nullable Drawable roundIcon) {
+        this.context = context;
+        this.icon = AdaptiveIconCompat.wrap(icon);
+        this.roundIcon = AdaptiveIconCompat.wrapNullable(roundIcon);
+        OmegaPreferences prefs = Utilities.getOmegaPrefs(context);
+        shouldWrap = prefs.getEnableLegacyTreatment();
+        extractColor = shouldWrap && prefs.getColorizedLegacyTreatment();
+        treatWhite = extractColor && prefs.getEnableWhiteOnlyTreatment();
+    }
+
+    public static boolean isSingleColor(Drawable drawable, int color) {
+        if (drawable == null) return true;
+        final int testColor = ColorExtractor.posterize(color);
+        if (drawable instanceof ColorDrawable) {
+            return ColorExtractor.posterize(((ColorDrawable) drawable).getColor()) == testColor;
+        }
+        final Bitmap bitmap = Utilities.drawableToBitmap(drawable);
+        if (bitmap == null) {
+            return false;
+        }
+        final int height = bitmap.getHeight();
+        final int width = bitmap.getWidth();
+
+        int[] pixels = new int[height * width];
+        bitmap.getPixels(pixels, 0, width, 0, 0, width, height);
+        Set<Integer> set = new HashSet<>(ArraysKt.asList(pixels));
+        Integer[] distinctPixels = new Integer[set.size()];
+        set.toArray(distinctPixels);
+
+        for (int pixel : distinctPixels) {
+            if (testColor != ColorExtractor.posterize(pixel)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    private void loop() {
+        if (Utilities.ATLEAST_OREO && shouldWrap) {
+            if (roundIcon != null && roundIcon instanceof AdaptiveIconCompat) {
+                icon = roundIcon;
+            }
+            Drawable extractee = icon;
+            if (icon instanceof AdaptiveIconCompat) {
+                if (!treatWhite) {
+                    onExitLoop();
+                    return;
+                }
+                AdaptiveIconCompat aid = (AdaptiveIconCompat) extractee;
+                // we still check this seperately as this is the only information we need from the background
+                if (!isSingleColor(aid.getBackground(), Color.WHITE)) {
+                    onExitLoop();
+                    return;
+                }
+                isBackgroundWhite = true;
+                extractee = aid.getForeground();
+            }
+
+            if (extractee == null) {
+                Log.e("AdaptiveIconGenerator", "extractee is null, skipping.");
+                onExitLoop();
+                return;
+            }
+
+            LauncherIcons li = LauncherIcons.obtain(context);
+            IconNormalizer normalizer = li.getNormalizer();
+            li.recycle();
+
+            boolean[] outShape = new boolean[1];
+            RectF bounds = new RectF();
+
+            initTmpIfNeeded();
+            //scale = normalizer.getScale(extractee, bounds, tmp.getIconMask(), outShape);
+            scale = normalizer.getScale(extractee, bounds, tmp.getIconMask(), outShape, MIN_VISIBLE_ALPHA);
+            matchesMaskShape = outShape[0];
+
+            if (extractee instanceof ColorDrawable) {
+                isFullBleed = true;
+                fullBleedChecked = true;
+            }
+
+            width = extractee.getIntrinsicWidth();
+            height = extractee.getIntrinsicHeight();
+            aWidth = width * (1 - (bounds.left + bounds.right));
+            aHeight = height * (1 - (bounds.top + bounds.bottom));
+
+            // Check if the icon is squareish
+            final float ratio = aHeight / aWidth;
+            boolean isSquareish = 0.999 < ratio && ratio < 1.0001;
+            boolean almostSquarish = isSquareish || (0.97 < ratio && ratio < 1.005);
+            if (!isSquareish) {
+                isFullBleed = false;
+                fullBleedChecked = true;
+            }
+
+            final Bitmap bitmap = Utilities.drawableToBitmap(extractee);
+            if (bitmap == null) {
+                onExitLoop();
+                return;
+            }
+
+            if (!bitmap.hasAlpha()) {
+                isFullBleed = true;
+                fullBleedChecked = true;
+            }
+
+            final int size = height * width;
+            SparseIntArray rgbScoreHistogram = new SparseIntArray(NUMBER_OF_COLORS_GUESSTIMATION);
+            final int[] pixels = new int[size];
+            bitmap.getPixels(pixels, 0, width, 0, 0, width, height);
+
+            /*
+             *   Calculate the number of padding pixels around the actual icon (i)
+             *   +----------------+
+             *   |      top       |
+             *   +---+--------+---+
+             *   |   |        |   |
+             *   | l |    i   | r |
+             *   |   |        |   |
+             *   +---+--------+---+
+             *   |     bottom     |
+             *   +----------------+
+             */
+            float adjHeight = height - bounds.top - bounds.bottom;
+            float l = bounds.left * width * adjHeight;
+            float top = bounds.top * height * width;
+            float r = bounds.right * width * adjHeight;
+            float bottom = bounds.bottom * height * width;
+            int addPixels = Math.round(l + top + r + bottom);
+
+            // Any icon with less than 10% transparent pixels (padding excluded) is considered "full-bleed-ish"
+            final int maxTransparent = (int) (round(size * .10) + addPixels);
+            // Any icon with less than 27% transparent pixels (padding excluded) doesn't need a color mix-in
+            final int noMixinScore = (int) (round(size * .27) + addPixels);
+
+            int highScore = 0;
+            int bestRGB = 0;
+            int transparentScore = 0;
+            for (int pixel : pixels) {
+                int alpha = 0xFF & (pixel >> 24);
+                if (alpha < MIN_VISIBLE_ALPHA) {
+                    // Drop mostly-transparent pixels.
+                    transparentScore++;
+                    if (transparentScore > maxTransparent) {
+                        isFullBleed = false;
+                        fullBleedChecked = true;
+                        if (!extractColor && transparentScore > noMixinScore) {
+                            break;
+                        }
+                    }
+                    continue;
+                }
+                // Reduce color complexity.
+                int rgb = ColorExtractor.posterize(pixel);
+                if (rgb < 0) {
+                    // Defensively avoid array bounds violations.
+                    continue;
+                }
+                int currentScore = rgbScoreHistogram.get(rgb) + 1;
+                rgbScoreHistogram.append(rgb, currentScore);
+                if (currentScore > highScore) {
+                    highScore = currentScore;
+                    bestRGB = rgb;
+                }
+            }
+
+            // add back the alpha channel
+            bestRGB |= 0xff << 24;
+
+            // not yet checked = not set to false = has to be full bleed, isBackgroundWhite = true = is adaptive
+            isFullBleed |= !fullBleedChecked && !isBackgroundWhite;
+
+            // return early if a mix-in isnt needed
+            noMixinNeeded = !isFullBleed && !isBackgroundWhite && almostSquarish && transparentScore <= noMixinScore;
+            if (isFullBleed || noMixinNeeded) {
+                backgroundColor = bestRGB;
+                onExitLoop();
+                return;
+            }
+
+            if (!extractColor) {
+                backgroundColor = Color.WHITE;
+                onExitLoop();
+                return;
+            }
+
+            // "single color"
+            final int numColors = rgbScoreHistogram.size();
+            boolean singleColor = numColors <= SINGLE_COLOR_LIMIT;
+
+            // Convert to HSL to get the lightness and adjust the color
+            final float[] hsl = new float[3];
+            ColorUtils.colorToHSL(bestRGB, hsl);
+            float lightness = hsl[2];
+
+            boolean light = lightness > .5;
+            // Apply dark background to mostly white icons
+            boolean veryLight = lightness > .75 && singleColor;
+            // Apply light background to mostly dark icons
+            boolean veryDark = lightness < .35 && singleColor;
+
+            // Adjust color to reach suitable contrast depending on the relationship between the colors
+            final int opaqueSize = size - transparentScore;
+            final float pxPerColor = opaqueSize / (float) numColors;
+            float mixRatio = min(max(pxPerColor / highScore, .15f), .7f);
+
+            // Vary color mix-in based on lightness and amount of colors
+            int fill = (light && !veryLight) || veryDark ? 0xFFFFFFFF : 0xFF333333;
+            backgroundColor = ColorUtils.blendARGB(bestRGB, fill, mixRatio);
+            //backgroundColor = Utilities.findDominantColorByHue(bitmap, 20);
+        }
+        onExitLoop();
+    }
+
+    private void onExitLoop() {
+        ranLoop = true;
+        result = genResult();
+    }
+
+    private Drawable genResult() {
+        if (!Utilities.ATLEAST_OREO || !shouldWrap) {
+            if (roundIcon != null) {
+                if (icon instanceof AdaptiveIconCompat &&
+                        !(roundIcon instanceof AdaptiveIconCompat)) {
+                    return icon;
+                }
+                return roundIcon;
+            }
+            return icon;
+        }
+        if (icon instanceof AdaptiveIconCompat) {
+            if (!treatWhite || !isBackgroundWhite) {
+                return icon;
+            }
+            if (((AdaptiveIconCompat) icon).getBackground() instanceof ColorDrawable) {
+                AdaptiveIconCompat mutIcon = (AdaptiveIconCompat) icon.mutate();
+                ((ColorDrawable) mutIcon.getBackground()).setColor(backgroundColor);
+                return mutIcon;
+            }
+            return new AdaptiveIconCompat(new ColorDrawable(backgroundColor), ((AdaptiveIconCompat) icon).getForeground());
+        }
+        initTmpIfNeeded();
+        ((FixedScaleDrawable) tmp.getForeground()).setDrawable(icon);
+        if (matchesMaskShape || isFullBleed || noMixinNeeded) {
+            float scale;
+            if (noMixinNeeded) {
+                float upScale = min(width / aWidth, height / aHeight);
+                scale = NO_MIXIN_ICON_SCALE * upScale;
+            } else {
+                float upScale = max(width / aWidth, height / aHeight);
+                scale = FULL_BLEED_ICON_SCALE * upScale;
+            }
+            ((FixedScaleDrawable) tmp.getForeground()).setScale(scale);
+        } else {
+            ((FixedScaleDrawable) tmp.getForeground()).setScale(scale);
+        }
+        ((ColorDrawable) tmp.getBackground()).setColor(backgroundColor);
+        return tmp;
+    }
+
+    private void initTmpIfNeeded() {
+        if (tmp == null) {
+            tmp = CustomIconProvider.getAdaptiveIconDrawableWrapper(context);
+            tmp.setBounds(0, 0, 1, 1);
+        }
+    }
+
+    public Drawable getResult() {
+        if (!ranLoop) {
+            loop();
+        }
+        return result;
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/adaptive/IconCornerShape.kt b/Omega/src/com/saggitt/omega/adaptive/IconCornerShape.kt
new file mode 100644
index 0000000000..c93924a798
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/adaptive/IconCornerShape.kt
@@ -0,0 +1,169 @@
+/*
+ *     Copyright (C) 2019 paphonb@xda
+ *
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.adaptive
+
+import android.graphics.Path
+import android.graphics.PointF
+import com.android.launcher3.Utilities
+
+abstract class IconCornerShape {
+
+    abstract fun addCorner(path: Path, position: Position, size: PointF, progress: Float, offsetX: Float, offsetY: Float)
+
+    abstract class BaseBezierPath : IconCornerShape() {
+
+        protected abstract val controlDistance: Float
+        protected val roundControlDistance = .447771526f
+
+        private fun getControl1X(position: Position, controlDistance: Float): Float {
+            return Utilities.mapRange(controlDistance, position.controlX, position.startX)
+        }
+
+        private fun getControl1Y(position: Position, controlDistance: Float): Float {
+            return Utilities.mapRange(controlDistance, position.controlY, position.startY)
+        }
+
+        private fun getControl2X(position: Position, controlDistance: Float): Float {
+            return Utilities.mapRange(controlDistance, position.controlX, position.endX)
+        }
+
+        private fun getControl2Y(position: Position, controlDistance: Float): Float {
+            return Utilities.mapRange(controlDistance, position.controlY, position.endY)
+        }
+
+        override fun addCorner(path: Path, position: Position, size: PointF, progress: Float,
+                               offsetX: Float, offsetY: Float) {
+            val controlDistance = Utilities.mapRange(progress, controlDistance, roundControlDistance)
+            path.cubicTo(
+                    getControl1X(position, controlDistance) * size.x + offsetX,
+                    getControl1Y(position, controlDistance) * size.y + offsetY,
+                    getControl2X(position, controlDistance) * size.x + offsetX,
+                    getControl2Y(position, controlDistance) * size.y + offsetY,
+                    position.endX * size.x + offsetX,
+                    position.endY * size.y + offsetY)
+        }
+    }
+
+    class Cut : BaseBezierPath() {
+
+        override val controlDistance = 1f
+
+        override fun addCorner(path: Path, position: Position, size: PointF, progress: Float,
+                               offsetX: Float, offsetY: Float) {
+            if (progress == 0f) {
+                path.lineTo(
+                        position.endX * size.x + offsetX,
+                        position.endY * size.y + offsetY)
+            } else {
+                super.addCorner(path, position, size, progress, offsetX, offsetY)
+            }
+        }
+
+        override fun toString(): String {
+            return "cut"
+        }
+    }
+
+    class Squircle : BaseBezierPath() {
+
+        override val controlDistance = .2f
+
+        override fun toString(): String {
+            return "squircle"
+        }
+    }
+
+    class Arc : BaseBezierPath() {
+
+        override val controlDistance = roundControlDistance
+
+        override fun toString(): String {
+            return "arc"
+        }
+    }
+
+    sealed class Position {
+
+        abstract val startX: Float
+        abstract val startY: Float
+
+        abstract val controlX: Float
+        abstract val controlY: Float
+
+        abstract val endX: Float
+        abstract val endY: Float
+
+        object TopLeft : Position() {
+
+            override val startX = 0f
+            override val startY = 1f
+            override val controlX = 0f
+            override val controlY = 0f
+            override val endX = 1f
+            override val endY = 0f
+        }
+
+        object TopRight : Position() {
+
+            override val startX = 0f
+            override val startY = 0f
+            override val controlX = 1f
+            override val controlY = 0f
+            override val endX = 1f
+            override val endY = 1f
+        }
+
+        object BottomRight : Position() {
+
+            override val startX = 1f
+            override val startY = 0f
+            override val controlX = 1f
+            override val controlY = 1f
+            override val endX = 0f
+            override val endY = 1f
+        }
+
+        object BottomLeft : Position() {
+
+            override val startX = 1f
+            override val startY = 1f
+            override val controlX = 0f
+            override val controlY = 1f
+            override val endX = 0f
+            override val endY = 0f
+        }
+    }
+
+    companion object {
+
+        val cut = Cut()
+        val squircle = Squircle()
+        val arc = Arc()
+
+        fun fromString(value: String): IconCornerShape {
+            return when (value) {
+                "cut" -> cut
+                "cubic", "squircle" -> squircle
+                "arc" -> arc
+                else -> error("invalid corner shape $value")
+            }
+        }
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/adaptive/IconShape.kt b/Omega/src/com/saggitt/omega/adaptive/IconShape.kt
new file mode 100644
index 0000000000..ce6ccec46e
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/adaptive/IconShape.kt
@@ -0,0 +1,288 @@
+/*
+ *     Copyright (C) 2019 paphonb@xda
+ *
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.adaptive
+
+import android.graphics.Path
+import android.graphics.PointF
+import com.android.launcher3.R
+import com.android.launcher3.Utilities
+
+open class IconShape(val topLeft: Corner,
+                     val topRight: Corner,
+                     val bottomLeft: Corner,
+                     val bottomRight: Corner) {
+
+    constructor(topLeftShape: IconCornerShape,
+                topRightShape: IconCornerShape,
+                bottomLeftShape: IconCornerShape,
+                bottomRightShape: IconCornerShape,
+                topLeftScale: Float,
+                topRightScale: Float,
+                bottomLeftScale: Float,
+                bottomRightScale: Float) : this(Corner(topLeftShape, topLeftScale),
+            Corner(topRightShape, topRightScale),
+            Corner(bottomLeftShape, bottomLeftScale),
+            Corner(bottomRightShape, bottomRightScale))
+
+    constructor(topLeftShape: IconCornerShape,
+                topRightShape: IconCornerShape,
+                bottomLeftShape: IconCornerShape,
+                bottomRightShape: IconCornerShape,
+                topLeftScale: PointF,
+                topRightScale: PointF,
+                bottomLeftScale: PointF,
+                bottomRightScale: PointF) : this(Corner(topLeftShape, topLeftScale),
+            Corner(topRightShape, topRightScale),
+            Corner(bottomLeftShape, bottomLeftScale),
+            Corner(bottomRightShape, bottomRightScale))
+
+    constructor(shape: IconShape) : this(
+            shape.topLeft, shape.topRight, shape.bottomLeft, shape.bottomRight)
+
+    private val isCircle =
+            topLeft == Corner.fullArc &&
+                    topRight == Corner.fullArc &&
+                    bottomLeft == Corner.fullArc &&
+                    bottomRight == Corner.fullArc
+
+    private val tmpPoint = PointF()
+    open val qsbEdgeRadius = 0
+    open val windowTransitionRadius = 1f
+
+    open fun getMaskPath(): Path {
+        return Path().also { addToPath(it, 0f, 0f, 100f, 100f, 50f) }
+    }
+
+    open fun addShape(path: Path, x: Float, y: Float, radius: Float) {
+        if (isCircle) {
+            path.addCircle(x + radius, y + radius, radius, Path.Direction.CW)
+        } else {
+            val size = radius * 2
+            addToPath(path, x, y, x + size, y + size, radius)
+        }
+    }
+
+    @JvmOverloads
+    fun addToPath(path: Path, left: Float, top: Float, right: Float, bottom: Float,
+                  size: Float = 50f, endSize: Float = size, progress: Float = 0f) {
+        val topLeftSizeX = Utilities.mapRange(progress, topLeft.scale.x * size, endSize)
+        val topLeftSizeY = Utilities.mapRange(progress, topLeft.scale.y * size, endSize)
+        val topRightSizeX = Utilities.mapRange(progress, topRight.scale.x * size, endSize)
+        val topRightSizeY = Utilities.mapRange(progress, topRight.scale.y * size, endSize)
+        val bottomLeftSizeX = Utilities.mapRange(progress, bottomLeft.scale.x * size, endSize)
+        val bottomLeftSizeY = Utilities.mapRange(progress, bottomLeft.scale.y * size, endSize)
+        val bottomRightSizeX = Utilities.mapRange(progress, bottomRight.scale.x * size, endSize)
+        val bottomRightSizeY = Utilities.mapRange(progress, bottomRight.scale.y * size, endSize)
+
+        // Start from the bottom right corner
+        path.moveTo(right, bottom - bottomRightSizeY)
+        bottomRight.shape.addCorner(path, IconCornerShape.Position.BottomRight,
+                tmpPoint.apply {
+                    x = bottomRightSizeX
+                    y = bottomRightSizeY
+                },
+                progress,
+                right - bottomRightSizeX,
+                bottom - bottomRightSizeY)
+
+        // Move to bottom left
+        addLine(path,
+                right - bottomRightSizeX, bottom,
+                left + bottomLeftSizeX, bottom)
+        bottomLeft.shape.addCorner(path, IconCornerShape.Position.BottomLeft,
+                tmpPoint.apply {
+                    x = bottomLeftSizeX
+                    y = bottomLeftSizeY
+                },
+                progress,
+                left,
+                bottom - bottomLeftSizeY)
+
+        // Move to top left
+        addLine(path,
+                left, bottom - bottomLeftSizeY,
+                left, top + topLeftSizeY)
+        topLeft.shape.addCorner(path, IconCornerShape.Position.TopLeft,
+                tmpPoint.apply {
+                    x = topLeftSizeX
+                    y = topLeftSizeY
+                },
+                progress,
+                left,
+                top)
+
+        // And then finally top right
+        addLine(path,
+                left + topLeftSizeX, top,
+                right - topRightSizeX, top)
+        topRight.shape.addCorner(path, IconCornerShape.Position.TopRight,
+                tmpPoint.apply {
+                    x = topRightSizeX
+                    y = topRightSizeY
+                },
+                progress,
+                right - topRightSizeX,
+                top)
+
+        path.close()
+    }
+
+    private fun addLine(path: Path, x1: Float, y1: Float, x2: Float, y2: Float) {
+        if (x1 == x2 && y1 == y2) return
+        path.lineTo(x2, y2)
+    }
+
+    override fun toString(): String {
+        return "v1|$topLeft|$topRight|$bottomLeft|$bottomRight"
+    }
+
+    open fun getHashString() = toString()
+
+    data class Corner(val shape: IconCornerShape, val scale: PointF) {
+        constructor(shape: IconCornerShape, scale: Float) : this(shape, PointF(scale, scale))
+
+        override fun toString(): String {
+            return "$shape,${scale.x},${scale.y}"
+        }
+
+        companion object {
+            val fullArc = Corner(IconCornerShape.arc, 1f)
+            fun fromString(value: String): Corner {
+                val parts = value.split(",")
+                val scaleX = parts[1].toFloat()
+                val scaleY = if (parts.size >= 3) parts[2].toFloat() else scaleX
+                if (scaleX !in 0f..1f) error("scaleX must be in [0, 1]")
+                if (scaleY !in 0f..1f) error("scaleY must be in [0, 1]")
+                return Corner(IconCornerShape.fromString(parts[0]), PointF(scaleX, scaleY))
+            }
+        }
+    }
+
+    object Circle : IconShape(IconCornerShape.arc,
+            IconCornerShape.arc,
+            IconCornerShape.arc,
+            IconCornerShape.arc,
+            1f, 1f, 1f, 1f) {
+
+        override fun addShape(path: Path, x: Float, y: Float, radius: Float) {
+            path.addCircle(x + radius, y + radius, radius, Path.Direction.CW)
+        }
+
+        override fun toString(): String {
+            return "circle"
+        }
+    }
+
+    object Square : IconShape(IconCornerShape.arc,
+            IconCornerShape.arc,
+            IconCornerShape.arc,
+            IconCornerShape.arc,
+            .16f, .16f, .16f, .16f) {
+
+        override val qsbEdgeRadius = R.dimen.qsb_radius_square
+        override val windowTransitionRadius = .16f
+
+        override fun toString(): String {
+            return "square"
+        }
+    }
+
+    object RoundedSquare : IconShape(IconCornerShape.arc,
+            IconCornerShape.arc,
+            IconCornerShape.arc,
+            IconCornerShape.arc,
+            .6f, .6f, .6f, .6f) {
+
+        override val qsbEdgeRadius = R.dimen.qsb_radius_square
+        override val windowTransitionRadius = .6f
+
+        override fun toString(): String {
+            return "roundedSquare"
+        }
+    }
+
+    object Squircle : IconShape(IconCornerShape.squircle,
+            IconCornerShape.squircle,
+            IconCornerShape.squircle,
+            IconCornerShape.squircle,
+            1f, 1f, 1f, 1f) {
+
+        override val qsbEdgeRadius = R.dimen.qsb_radius_squircle
+
+        override fun toString(): String {
+            return "squircle"
+        }
+    }
+
+    object Teardrop : IconShape(IconCornerShape.arc,
+            IconCornerShape.arc,
+            IconCornerShape.arc,
+            IconCornerShape.arc,
+            1f, 1f, 1f, .3f) {
+
+        override fun toString(): String {
+            return "teardrop"
+        }
+    }
+
+    object Cylinder : IconShape(IconCornerShape.arc,
+            IconCornerShape.arc,
+            IconCornerShape.arc,
+            IconCornerShape.arc,
+            PointF(1f, .6f),
+            PointF(1f, .6f),
+            PointF(1f, .6f),
+            PointF(1f, .6f)) {
+
+        override fun toString(): String {
+            return "cylinder"
+        }
+    }
+
+    companion object {
+
+        fun fromString(value: String): IconShape? {
+            return when (value) {
+                "circle" -> Circle
+                "square" -> Square
+                "roundedSquare" -> RoundedSquare
+                "squircle" -> Squircle
+                "teardrop" -> Teardrop
+                "cylinder" -> Cylinder
+                "" -> null
+                else -> try {
+                    parseCustomShape(value)
+                } catch (ex: Exception) {
+                    null
+                }
+            }
+        }
+
+        private fun parseCustomShape(value: String): IconShape {
+            val parts = value.split("|")
+            if (parts[0] != "v1") error("unknown config format")
+            if (parts.size != 5) error("invalid arguments size")
+            return IconShape(Corner.fromString(parts[1]),
+                    Corner.fromString(parts[2]),
+                    Corner.fromString(parts[3]),
+                    Corner.fromString(parts[4]))
+        }
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/adaptive/IconShapeCornerRow.kt b/Omega/src/com/saggitt/omega/adaptive/IconShapeCornerRow.kt
new file mode 100644
index 0000000000..9260c45b06
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/adaptive/IconShapeCornerRow.kt
@@ -0,0 +1,135 @@
+/*
+ *     Copyright (C) 2019 Lawnchair Team.
+ *
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.adaptive
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.util.AttributeSet
+import android.view.View
+import android.widget.AdapterView
+import android.widget.LinearLayout
+import android.widget.SeekBar
+import android.widget.SimpleAdapter
+import com.android.launcher3.R
+import kotlinx.android.synthetic.omega.icon_shape_corner_row.view.*
+
+class IconShapeCornerRow(context: Context, attrs: AttributeSet?) :
+        LinearLayout(context, attrs), SeekBar.OnSeekBarChangeListener,
+        AdapterView.OnItemSelectedListener {
+
+    private var listener: ((IconShape.Corner) -> Unit)? = null
+    private var scale = 1f
+        set(value) {
+            if (field != value) {
+                field = value
+                updateSeekBar()
+                notifyChanged()
+            }
+        }
+    private var shape = "arc"
+        set(value) {
+            if (field != value) {
+                field = value
+                updateSpinner()
+                notifyChanged()
+            }
+        }
+
+    override fun onFinishInflate() {
+        super.onFinishInflate()
+        spinner.adapter = CornerShapeAdapter(context)
+        spinner.onItemSelectedListener = this
+        updateSeekBar()
+        updateSpinner()
+        seekbar.max = 10
+        seekbar.setOnSeekBarChangeListener(this)
+    }
+
+    fun init(titleRes: Int, corner: IconShape.Corner, listener: (IconShape.Corner) -> Unit) {
+        title.setText(titleRes)
+        this.scale = corner.scale.x
+        this.shape = corner.shape.toString()
+        this.listener = listener
+    }
+
+    @SuppressLint("SetTextI18n")
+    private fun updateSeekBar() {
+        seekbar.progress = (scale * 10).toInt()
+        txtValue.text = "${(scale * 100).toInt()}%"
+    }
+
+    private fun updateSpinner() {
+        for (i in 0 until spinner.adapter.count) {
+            val itemMap = spinner.adapter.getItem(i) as Map<*, *>
+            if (itemMap["value"] == shape) {
+                spinner.setSelection(i)
+                return
+            }
+        }
+    }
+
+    private fun notifyChanged() {
+        listener?.invoke(IconShape.Corner(IconCornerShape.fromString(shape), scale))
+    }
+
+    override fun onProgressChanged(seekBar: SeekBar?, progress: Int, fromUser: Boolean) {
+        scale = progress / 10f
+    }
+
+    override fun onStartTrackingTouch(seekBar: SeekBar?) {
+    }
+
+    override fun onStopTrackingTouch(seekBar: SeekBar?) {
+    }
+
+    override fun onItemSelected(parent: AdapterView<*>, view: View?, position: Int, id: Long) {
+        shape = (parent.adapter.getItem(position) as Map<*, *>)["value"] as String
+    }
+
+    override fun onNothingSelected(parent: AdapterView<*>?) {
+    }
+
+    class CornerShapeAdapter(context: Context) :
+            SimpleAdapter(context, getEntries(context),
+                    android.R.layout.simple_list_item_1,
+                    arrayOf("text"),
+                    intArrayOf(android.R.id.text1)) {
+
+        companion object {
+
+            private fun getEntries(context: Context): List<Map<String, String>> {
+                return listOf(
+                        mapOf(
+                                "value" to "arc",
+                                "text" to context.getString(R.string.icon_shape_corner_round)
+                        ),
+                        mapOf(
+                                "value" to "squircle",
+                                "text" to context.getString(R.string.icon_shape_corner_squircle)
+                        ),
+                        mapOf(
+                                "value" to "cut",
+                                "text" to context.getString(R.string.icon_shape_corner_cut)
+                        )
+                )
+            }
+        }
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/adaptive/IconShapeCustomizeView.kt b/Omega/src/com/saggitt/omega/adaptive/IconShapeCustomizeView.kt
new file mode 100644
index 0000000000..c6c6f2d93b
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/adaptive/IconShapeCustomizeView.kt
@@ -0,0 +1,83 @@
+/*
+ *     Copyright (C) 2019 Lawnchair Team.
+ *
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.adaptive
+
+import android.content.Context
+import android.util.AttributeSet
+import android.widget.LinearLayout
+import com.android.launcher3.R
+import kotlinx.android.synthetic.omega.icon_shape_customize_view.view.*
+
+class IconShapeCustomizeView(context: Context, attrs: AttributeSet?) :
+        LinearLayout(context, attrs) {
+
+    private val previousShape = IconShapeManager.getInstance(context).iconShape
+    private var topLeft = previousShape.topLeft
+        set(value) {
+            if (field != value) {
+                field = value
+                rebuildShape()
+            }
+        }
+    private var topRight = previousShape.topRight
+        set(value) {
+            if (field != value) {
+                field = value
+                rebuildShape()
+            }
+        }
+    private var bottomLeft = previousShape.bottomLeft
+        set(value) {
+            if (field != value) {
+                field = value
+                rebuildShape()
+            }
+        }
+    private var bottomRight = previousShape.bottomRight
+        set(value) {
+            if (field != value) {
+                field = value
+                rebuildShape()
+            }
+        }
+    var currentShape = previousShape
+        set(value) {
+            field = value
+            previewDrawable.iconShape = value
+        }
+    private val previewDrawable = IconShapeDrawable(currentShape)
+
+    override fun onFinishInflate() {
+        super.onFinishInflate()
+        shapePreview.setImageDrawable(previewDrawable)
+        (topLeftRow as IconShapeCornerRow)
+                .init(R.string.icon_shape_top_left, topLeft) { topLeft = it }
+        (topRightRow as IconShapeCornerRow)
+                .init(R.string.icon_shape_top_right, topRight) { topRight = it }
+        (bottomLeftRow as IconShapeCornerRow)
+                .init(R.string.icon_shape_bottom_left, bottomLeft) { bottomLeft = it }
+        (bottomRightRow as IconShapeCornerRow)
+                .init(R.string.icon_shape_bottom_right, bottomRight) { bottomRight = it }
+    }
+
+    private fun rebuildShape() {
+        currentShape = IconShape(topLeft, topRight, bottomLeft, bottomRight)
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/adaptive/IconShapeDrawable.kt b/Omega/src/com/saggitt/omega/adaptive/IconShapeDrawable.kt
new file mode 100644
index 0000000000..6e90e6604c
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/adaptive/IconShapeDrawable.kt
@@ -0,0 +1,73 @@
+/*
+ *     Copyright (C) 2019 Lawnchair Team.
+ *
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.adaptive
+
+import android.graphics.*
+import android.graphics.drawable.Drawable
+
+class IconShapeDrawable(private val size: Int, iconShape: IconShape) : Drawable() {
+
+    constructor(iconShape: IconShape) : this(-1, iconShape)
+
+    private val paint = Paint(Paint.ANTI_ALIAS_FLAG).apply { color = Color.BLACK }
+    private val path = Path()
+
+    var iconShape = iconShape
+        set(value) {
+            field = value
+            rebuildPath()
+        }
+
+    override fun draw(canvas: Canvas) {
+        canvas.drawPath(path, paint)
+    }
+
+    override fun setAlpha(alpha: Int) {
+        paint.alpha = alpha
+    }
+
+    override fun getOpacity(): Int {
+        return PixelFormat.TRANSLUCENT
+    }
+
+    override fun setColorFilter(colorFilter: ColorFilter?) {
+        paint.colorFilter = colorFilter
+    }
+
+    override fun onBoundsChange(bounds: Rect) {
+        super.onBoundsChange(bounds)
+        rebuildPath()
+    }
+
+    override fun getIntrinsicWidth(): Int {
+        return size
+    }
+
+    override fun getIntrinsicHeight(): Int {
+        return size
+    }
+
+    private fun rebuildPath() {
+        path.reset()
+        iconShape.addShape(path, 0f, 0f,
+                Math.min(bounds.width(), bounds.height()) / 2f)
+        invalidateSelf()
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/adaptive/IconShapeManager.kt b/Omega/src/com/saggitt/omega/adaptive/IconShapeManager.kt
new file mode 100644
index 0000000000..56a681c41d
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/adaptive/IconShapeManager.kt
@@ -0,0 +1,130 @@
+/*
+ *     Copyright (C) 2019 paphonb@xda
+ *
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.adaptive
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.graphics.Path
+import android.graphics.Rect
+import android.graphics.Region
+import android.graphics.RegionIterator
+import android.graphics.drawable.AdaptiveIconDrawable
+import android.text.TextUtils
+import androidx.annotation.Keep
+import androidx.core.graphics.PathParser
+import com.android.launcher3.AdaptiveIconCompat
+import com.android.launcher3.InvariantDeviceProfile
+import com.android.launcher3.Utilities
+import com.saggitt.omega.icons.IconShapeOverride
+import com.saggitt.omega.util.OmegaSingletonHolder
+import com.saggitt.omega.util.omegaPrefs
+
+class IconShapeManager(private val context: Context) {
+
+    private val systemIconShape = getSystemShape()
+    var iconShape by context.omegaPrefs.StringBasedPref(
+            "pref_iconShape", systemIconShape, AdaptiveIconCompat::onShapeChanged,
+            {
+                IconShape.fromString(it) ?: systemIconShape
+            }, IconShape::toString) {}
+
+    init {
+        migratePref()
+    }
+
+    @SuppressLint("RestrictedApi")
+    private fun migratePref() {
+        // Migrate from old path-based override
+        val override = IconShapeOverride.getAppliedValue(context)
+        if (!TextUtils.isEmpty(override)) {
+            try {
+                iconShape = findNearestShape(PathParser.createPathFromPathData(override))
+                Utilities.getPrefs(context).edit().remove(IconShapeOverride.KEY_PREFERENCE).apply()
+            } catch (e: RuntimeException) {
+                // Just ignore the error
+            }
+        }
+    }
+
+    private fun getSystemShape(): IconShape {
+        if (!Utilities.ATLEAST_OREO) return IconShape.Circle
+
+        val iconMask = AdaptiveIconDrawable(null, null).iconMask
+        val systemShape = findNearestShape(iconMask)
+        return object : IconShape(systemShape) {
+
+            override fun getMaskPath(): Path {
+                return Path(iconMask)
+            }
+
+            override fun toString() = ""
+
+            override fun getHashString(): String {
+                return InvariantDeviceProfile.getSystemIconShapePath(context)
+            }
+        }
+    }
+
+    private fun findNearestShape(comparePath: Path): IconShape {
+        val clip = Region(0, 0, 100, 100)
+        val systemRegion = Region().apply {
+            setPath(comparePath, clip)
+        }
+        val pathRegion = Region()
+        val path = Path()
+        val rect = Rect()
+        return listOf(
+                IconShape.Circle,
+                IconShape.Square,
+                IconShape.RoundedSquare,
+                IconShape.Squircle,
+                IconShape.Teardrop,
+                IconShape.Cylinder).minBy {
+            path.reset()
+            it.addShape(path, 0f, 0f, 50f)
+            pathRegion.setPath(path, clip)
+            pathRegion.op(systemRegion, Region.Op.XOR)
+
+            var difference = 0
+            val iter = RegionIterator(pathRegion)
+            while (iter.next(rect)) {
+                difference += rect.width() * rect.height()
+            }
+
+            difference
+        }!!
+    }
+
+    companion object : OmegaSingletonHolder<IconShapeManager>(::IconShapeManager) {
+
+        private const val KEY_LEGACY_PREFERENCE = "pref_override_icon_shape"
+
+        @JvmStatic
+        fun getWindowTransitionRadius(context: Context): Float {
+            return getInstance(context).iconShape.windowTransitionRadius
+        }
+
+        @Keep
+        @JvmStatic
+        @Suppress("unused")
+                /** Used in AdaptiveIconCompat to get the mask path **/
+        fun getAdaptiveIconMaskPath() = dangerousGetInstance()!!.iconShape.getMaskPath()
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/adaptive/IconShapePreference.kt b/Omega/src/com/saggitt/omega/adaptive/IconShapePreference.kt
new file mode 100644
index 0000000000..daa3c3af91
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/adaptive/IconShapePreference.kt
@@ -0,0 +1,177 @@
+/*
+ *     Copyright (C) 2019 Lawnchair Team.
+ *
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.adaptive
+
+import android.content.Context
+import android.graphics.PorterDuff
+import android.os.Bundle
+import android.util.AttributeSet
+import android.view.View
+import androidx.appcompat.app.AlertDialog
+import androidx.fragment.app.DialogFragment
+import androidx.preference.ListPreference
+import androidx.preference.PreferenceDialogFragmentCompat
+import com.android.launcher3.R
+import com.saggitt.omega.OmegaPreferences
+import com.saggitt.omega.preferences.ControlledPreference
+import com.saggitt.omega.util.*
+import com.saggitt.omega.views.ThemedListPreferenceDialogFragment
+
+class IconShapePreference(context: Context, attrs: AttributeSet?) :
+        ListPreference(context, attrs),
+        OmegaPreferences.OnPreferenceChangeListener,
+        ControlledPreference by ControlledPreference.Delegate(context, attrs) {
+
+    private var iconShape = IconShapeManager.getInstance(context).iconShape
+        set(value) {
+            if (field != value) {
+                field = value
+                drawable.iconShape = value
+                rebuildEntries()
+                iconShapeString = value.toString()
+                this.value = iconShapeString
+            }
+        }
+    private var iconShapeString = iconShape.toString()
+    private val drawable = IconShapeDrawable(dpToPx(48f).toInt(), iconShape).apply {
+        setColorFilter(context.getColorAttr(android.R.attr.colorControlNormal), PorterDuff.Mode.SRC_IN)
+    }
+    private var forceCustomizeMode: Boolean? = null
+    private val isCustomIcon get() = iconShapeString.startsWith("v1")
+
+    init {
+        layoutResource = R.layout.preference_preview_icon
+        icon = drawable
+        rebuildEntries()
+    }
+
+    private fun rebuildEntries() {
+        buildEntries {
+            val shapeString = iconShape.toString()
+            if (shapeString.startsWith("v1")) {
+                addEntry(R.string.custom, shapeString)
+            }
+            addEntry(R.string.icon_shape_system_default, "")
+            addEntry(R.string.icon_shape_circle, "circle")
+            addEntry(R.string.icon_shape_square, "square")
+            addEntry(R.string.icon_shape_rounded_square, "roundedSquare")
+            addEntry(R.string.icon_shape_squircle, "squircle")
+            addEntry(R.string.icon_shape_teardrop, "teardrop")
+            addEntry(R.string.icon_shape_cylinder, "cylinder")
+        }
+    }
+
+    override fun onAttached() {
+        super.onAttached()
+        context.omegaPrefs.addOnPreferenceChangeListener("pref_iconShape", this)
+    }
+
+    override fun onDetached() {
+        super.onDetached()
+        context.omegaPrefs.removeOnPreferenceChangeListener("pref_iconShape", this)
+    }
+
+    override fun onValueChanged(key: String, prefs: OmegaPreferences, force: Boolean) {
+        iconShape = IconShapeManager.getInstance(context).iconShape
+    }
+
+    override fun onClick() {
+        forceCustomizeMode = null
+        super.onClick()
+    }
+
+    private fun forceShowCustomize(showCustomize: Boolean) {
+        forceCustomizeMode = showCustomize
+        preferenceManager.showDialog(this)
+    }
+
+    fun createDialogFragment(): DialogFragment {
+        return if (forceCustomizeMode ?: isCustomIcon) {
+            CustomizeDialogFragment.newInstance(key)
+        } else {
+            ListDialogFragment.newInstance(key)
+        }
+    }
+
+    override fun getDialogLayoutResource(): Int {
+        return if (forceCustomizeMode ?: isCustomIcon) {
+            R.layout.icon_shape_customize_view
+        } else {
+            super.getDialogLayoutResource()
+        }
+    }
+
+    class ListDialogFragment : ThemedListPreferenceDialogFragment() {
+
+        override fun onPrepareDialogBuilder(builder: AlertDialog.Builder) {
+            super.onPrepareDialogBuilder(builder)
+            builder.setNeutralButton(R.string.custom) { _, _ ->
+                dismiss()
+                (preference as IconShapePreference).forceShowCustomize(true)
+            }
+        }
+
+        companion object {
+
+            fun newInstance(key: String) = ListDialogFragment().apply {
+                arguments = Bundle(1).apply {
+                    putString(ARG_KEY, key)
+                }
+            }
+        }
+    }
+
+    class CustomizeDialogFragment : PreferenceDialogFragmentCompat() {
+        private lateinit var customizeView: IconShapeCustomizeView
+
+        override fun onStart() {
+            super.onStart()
+            (dialog as AlertDialog?)?.applyAccent()
+        }
+
+        override fun onPrepareDialogBuilder(builder: AlertDialog.Builder) {
+            super.onPrepareDialogBuilder(builder)
+            builder.setNeutralButton(R.string.color_presets) { _, _ ->
+                dismiss()
+                (preference as IconShapePreference).forceShowCustomize(false)
+            }
+        }
+
+        override fun onCreateDialogView(context: Context?): View {
+            return super.onCreateDialogView(context).apply {
+                customizeView = findViewById(R.id.customizeView)
+            }
+        }
+
+        override fun onDialogClosed(positiveResult: Boolean) {
+            if (positiveResult) {
+                IconShapeManager.getInstance(requireContext()).iconShape = customizeView.currentShape
+            }
+        }
+
+        companion object {
+            fun newInstance(key: String) = CustomizeDialogFragment().apply {
+                arguments = Bundle(1).apply {
+                    putString(ARG_KEY, key)
+                }
+            }
+        }
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/allapps/AllAppsPages.java b/Omega/src/com/saggitt/omega/allapps/AllAppsPages.java
new file mode 100644
index 0000000000..96bf308f9b
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/allapps/AllAppsPages.java
@@ -0,0 +1,51 @@
+/*
+ *  Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ *
+ */
+
+package com.saggitt.omega.allapps;
+
+import android.content.Context;
+import android.os.Process;
+
+import com.android.launcher3.DeviceProfile;
+import com.android.launcher3.Launcher;
+import com.android.launcher3.util.ItemInfoMatcher;
+
+public class AllAppsPages {
+    private final ItemInfoMatcher allAppMatcher;
+    private final Context mContext;
+    private int mNumRows = 0;
+    private int mNumCols = 0;
+    private int mAppsPerPage = 0;
+    private int mPagesCount = 0;
+
+    public AllAppsPages(Context context) {
+        mContext = context;
+        allAppMatcher = ItemInfoMatcher.ofUser(Process.myUserHandle());
+        DeviceProfile grid = Launcher.getLauncher(context).getDeviceProfile();
+        mNumCols = grid.inv.numColumns;
+        mNumRows = grid.inv.numRows;
+        mAppsPerPage = mNumCols * mNumRows;
+    }
+
+    public ItemInfoMatcher getMatcher() {
+        return allAppMatcher;
+    }
+
+    public int getPageCount() {
+        return mPagesCount;
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/allapps/AllAppsSearchContainerView.java b/Omega/src/com/saggitt/omega/allapps/AllAppsSearchContainerView.java
new file mode 100644
index 0000000000..bd51c47417
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/allapps/AllAppsSearchContainerView.java
@@ -0,0 +1,105 @@
+/*
+ *     Copyright (C) 2019 Lawnchair Team.
+ *
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.allapps;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.util.AttributeSet;
+import android.view.View;
+
+import androidx.core.graphics.ColorUtils;
+
+import com.android.launcher3.Utilities;
+import com.android.launcher3.allapps.AllAppsContainerView;
+import com.saggitt.omega.OmegaPreferences;
+import com.saggitt.omega.qsb.AllAppsQsbLayout;
+
+import org.jetbrains.annotations.NotNull;
+
+public class AllAppsSearchContainerView extends AllAppsContainerView implements OmegaPreferences.OnPreferenceChangeListener {
+
+    private boolean mClearQsb;
+
+    public AllAppsSearchContainerView(Context context) {
+        this(context, null);
+    }
+
+    public AllAppsSearchContainerView(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public AllAppsSearchContainerView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    @SuppressLint("WrongConstant")
+    @Override
+    protected void dispatchDraw(Canvas canvas) {
+        View searchView = getSearchView();
+        if (mClearQsb && searchView instanceof AllAppsQsbLayout) {
+            AllAppsQsbLayout qsb = (AllAppsQsbLayout) searchView;
+            int left = (int) (qsb.getLeft() + qsb.getTranslationX());
+            int top = (int) (qsb.getTop() + qsb.getTranslationY());
+            int right = left + qsb.getWidth() + 1;
+            int bottom = top + qsb.getHeight() + 1;
+            if (Utilities.ATLEAST_P && Utilities.HIDDEN_APIS_ALLOWED) {
+                canvas.saveUnclippedLayer(left, 0, right, bottom);
+            } else {
+                int flags = Utilities.ATLEAST_P ? Canvas.ALL_SAVE_FLAG : 0x04 /* HAS_ALPHA_LAYER_SAVE_FLAG */;
+                canvas.saveLayer(left, 0, right, bottom, null, flags);
+            }
+        }
+
+        super.dispatchDraw(canvas);
+    }
+
+    @Override
+    public void setTranslationY(float translationY) {
+        super.setTranslationY(translationY);
+        ((BlurQsbLayout) getSearchView()).invalidateBlur();
+    }
+
+    @Override
+    protected void onAttachedToWindow() {
+        super.onAttachedToWindow();
+        Utilities.getOmegaPrefs(getContext()).addOnPreferenceChangeListener("pref_drawer_background_color", this);
+    }
+
+    @Override
+    protected void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+        Utilities.getOmegaPrefs(getContext()).removeOnPreferenceChangeListener("pref_drawer_background_color", this);
+    }
+
+    @Override
+    public void onValueChanged(@NotNull String key, @NotNull OmegaPreferences prefs, boolean force) {
+        if (prefs.getCustomBackground() && key.equals("pref_drawer_background_color")) {
+            int newScrimColor = ColorUtils.setAlphaComponent(Utilities.getOmegaPrefs(getContext())
+                    .getDrawerBackgroundColor(), Color.alpha(mNavBarScrimColor));
+            mClearQsb = Color.alpha(newScrimColor) != 255
+                    && prefs.getAllAppsSearch() && !prefs.getLowPerformanceMode();
+        } else {
+            mClearQsb = false;
+        }
+    }
+
+}
diff --git a/Omega/src/com/saggitt/omega/allapps/AllAppsTabs.kt b/Omega/src/com/saggitt/omega/allapps/AllAppsTabs.kt
new file mode 100644
index 0000000000..f905d26ecb
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/allapps/AllAppsTabs.kt
@@ -0,0 +1,104 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.allapps
+
+import android.content.ComponentName
+import android.content.Context
+import android.os.Process
+import com.android.launcher3.ItemInfo
+import com.android.launcher3.util.ComponentKey
+import com.android.launcher3.util.ItemInfoMatcher
+import com.saggitt.omega.groups.DrawerTabs
+import com.saggitt.omega.groups.FlowerpotTabs
+import com.saggitt.omega.util.omegaPrefs
+
+class AllAppsTabs(private val context: Context) : Iterable<AllAppsTabs.Tab> {
+
+    val tabs = ArrayList<Tab>()
+    val count get() = tabs.size
+
+    var hasWorkApps = false
+        set(value) {
+            if (value != field) {
+                field = value
+                reloadTabs()
+            }
+        }
+
+    private val addedApps = ArrayList<ComponentKey>()
+
+    init {
+        reloadTabs()
+    }
+
+    fun reloadTabs() {
+        addedApps.clear()
+        tabs.clear()
+        context.omegaPrefs.currentTabsModel.getGroups().mapNotNullTo(tabs) {
+            when {
+                hasWorkApps && it is DrawerTabs.PersonalTab ->
+                    PersonalTab(createMatcher(addedApps, personalMatcher), drawerTab = it)
+                hasWorkApps && it is DrawerTabs.WorkTab ->
+                    WorkTab(createMatcher(addedApps, workMatcher), drawerTab = it)
+                !hasWorkApps && it is DrawerTabs.AllAppsTab ->
+                    AllAppsTab(createMatcher(addedApps), drawerTab = it)
+                it is DrawerTabs.CustomTab -> {
+                    if (it.hideFromAllApps.value()) {
+                        addedApps.addAll(it.contents.value())
+                    }
+                    Tab(it.getTitle(), it.getFilter(context).matcher, drawerTab = it)
+                }
+                it is FlowerpotTabs.FlowerpotTab && !it.getMatches().isEmpty() -> {
+                    addedApps.addAll(it.getMatches())
+                    Tab(it.getTitle(), it.getFilter(context).matcher, drawerTab = it)
+                }
+                else -> null
+            }
+        }
+    }
+
+    private fun createMatcher(components: List<ComponentKey>, base: ItemInfoMatcher? = null): ItemInfoMatcher {
+        return object : ItemInfoMatcher {
+            override fun matches(info: ItemInfo, cn: ComponentName?): Boolean {
+                if (base?.matches(info, cn) == false) return false
+                return !components.contains(ComponentKey(info.targetComponent, info.user))
+            }
+        }
+    }
+
+    override fun iterator(): Iterator<Tab> {
+        return tabs.iterator()
+    }
+
+    operator fun get(index: Int) = tabs[index]
+
+    class AllAppsTab(matcher: ItemInfoMatcher?, drawerTab: DrawerTabs.Tab)
+        : Tab(drawerTab.getTitle(), matcher, drawerTab = drawerTab)
+
+    private val personalMatcher = ItemInfoMatcher.ofUser(Process.myUserHandle())!!
+    private val workMatcher = ItemInfoMatcher.not(personalMatcher)!!
+
+    inner class PersonalTab(matcher: ItemInfoMatcher?, drawerTab: DrawerTabs.Tab)
+        : Tab(drawerTab.getTitle(), matcher, drawerTab = drawerTab)
+
+    inner class WorkTab(matcher: ItemInfoMatcher?, drawerTab: DrawerTabs.Tab)
+        : Tab(drawerTab.getTitle(), matcher, true, drawerTab)
+
+    open class Tab(val name: String, val matcher: ItemInfoMatcher?,
+                   val isWork: Boolean = false, val drawerTab: DrawerTabs.Tab)
+}
diff --git a/Omega/src/com/saggitt/omega/allapps/AllAppsTabsController.kt b/Omega/src/com/saggitt/omega/allapps/AllAppsTabsController.kt
new file mode 100644
index 0000000000..f806bec033
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/allapps/AllAppsTabsController.kt
@@ -0,0 +1,91 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.allapps
+
+import android.view.View
+import android.view.ViewGroup
+import com.android.launcher3.allapps.AllAppsContainerView
+import com.android.launcher3.allapps.AllAppsPagedView
+import com.android.launcher3.allapps.AllAppsStore
+import com.saggitt.omega.util.forEachChildIndexed
+
+typealias AdapterHolders = Array<AllAppsContainerView.AdapterHolder>
+
+class AllAppsTabsController(val tabs: AllAppsTabs, private val container: AllAppsContainerView) {
+
+    val tabsCount get() = tabs.count
+    val shouldShowTabs get() = tabsCount > 1
+
+    private var holders = mutableListOf<AllAppsContainerView.AdapterHolder>()
+
+    private var horizontalPadding = 0
+    private var bottomPadding = 0
+
+    fun createHolders(): AdapterHolders {
+        while (holders.size < tabsCount) {
+            holders.add(container.createHolder(false).apply {
+                padding.bottom = bottomPadding
+                padding.left = horizontalPadding
+                padding.right = horizontalPadding
+            })
+        }
+        return holders.toTypedArray()
+    }
+
+    fun reloadTabs() {
+        tabs.reloadTabs()
+    }
+
+    fun registerIconContainers(allAppsStore: AllAppsStore) {
+        holders.forEach { allAppsStore.registerIconContainer(it.recyclerView) }
+    }
+
+    fun unregisterIconContainers(allAppsStore: AllAppsStore) {
+        holders.forEach { allAppsStore.unregisterIconContainer(it.recyclerView) }
+    }
+
+    fun setup(pagedView: AllAppsPagedView) {
+        tabs.forEachIndexed { index, tab ->
+            holders[index].setIsWork(tab.isWork)
+            holders[index].setup(pagedView.getChildAt(index), tab.matcher)
+        }
+    }
+
+    fun setup(view: View) {
+        holders.forEach { it.recyclerView = null }
+        holders[0].setup(view, null)
+    }
+
+    fun bindButtons(buttonsContainer: ViewGroup, pagedView: AllAppsPagedView) {
+        buttonsContainer.forEachChildIndexed { view, i ->
+            view.setOnClickListener { pagedView.snapToPage(i) }
+        }
+    }
+
+    fun setPadding(horizontal: Int, bottom: Int) {
+        horizontalPadding = horizontal
+        bottomPadding = bottom
+
+        holders.forEach {
+            it.padding.bottom = bottomPadding
+            it.padding.left = horizontalPadding
+            it.padding.right = horizontalPadding
+            it.applyPadding()
+        }
+    }
+}
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/allapps/AppColorComparator.java b/Omega/src/com/saggitt/omega/allapps/AppColorComparator.java
index 2f71fac8e1..1d7fd94d58 100644
--- a/Omega/src/com/saggitt/omega/allapps/AppColorComparator.java
+++ b/Omega/src/com/saggitt/omega/allapps/AppColorComparator.java
@@ -25,7 +25,7 @@
 import com.android.launcher3.allapps.AppInfoComparator;
 
 public class AppColorComparator extends AppInfoComparator {
-    int REPETITIONS = 6;
+    private static int REPETITIONS = 6;
 
     public AppColorComparator(Context context) {
         super(context);
@@ -74,10 +74,11 @@ public int compare(AppInfo a, AppInfo b) {
         return super.compare(a, b);
     }
 
-    public int remapHue(Float hue){
+    public static int remapHue(Float hue) {
         return (int) (hue / 360 * REPETITIONS);
     }
-    public int remap(Float value){
+
+    public static int remap(Float value) {
         return (int) (value * REPETITIONS);
     }
 }
diff --git a/Omega/src/com/saggitt/omega/allapps/BlurQsbLayout.kt b/Omega/src/com/saggitt/omega/allapps/BlurQsbLayout.kt
new file mode 100644
index 0000000000..da12d3f8c9
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/allapps/BlurQsbLayout.kt
@@ -0,0 +1,221 @@
+/*
+ *     Copyright (C) 2019 Lawnchair Team.
+ *
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.allapps
+
+import android.content.Context
+import android.graphics.Canvas
+import android.graphics.Paint
+import android.graphics.RectF
+import android.graphics.drawable.Drawable
+import android.util.AttributeSet
+import android.util.FloatProperty
+import android.view.View
+import android.view.animation.Interpolator
+import androidx.core.graphics.ColorUtils
+import com.android.launcher3.Launcher
+import com.android.launcher3.LauncherState.HOTSEAT_ICONS
+import com.android.launcher3.R
+import com.android.launcher3.Utilities
+import com.android.launcher3.anim.PropertySetter
+import com.saggitt.omega.OmegaPreferences
+import com.saggitt.omega.blur.BlurDrawable
+import com.saggitt.omega.blur.BlurHotseat
+import com.saggitt.omega.blur.BlurScrimView
+import com.saggitt.omega.blur.BlurWallpaperProvider
+import com.saggitt.omega.qsb.AbstractQsbLayout
+import com.saggitt.omega.qsb.AllAppsQsbLayout
+import com.saggitt.omega.util.getLauncherOrNull
+import com.saggitt.omega.util.isVisible
+import com.saggitt.omega.util.omegaPrefs
+import com.saggitt.omega.util.runOnMainThread
+
+class BlurQsbLayout @JvmOverloads constructor(
+        context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0)
+    : AllAppsQsbLayout(context, attrs, defStyleAttr), BlurWallpaperProvider.Listener,
+        OmegaPreferences.OnPreferenceChangeListener {
+
+    private val blurDrawableCallback by lazy {
+        object : Drawable.Callback {
+            override fun unscheduleDrawable(who: Drawable, what: Runnable) {
+
+            }
+
+            override fun invalidateDrawable(who: Drawable) {
+                runOnMainThread { invalidate() }
+            }
+
+            override fun scheduleDrawable(who: Drawable, what: Runnable, `when`: Long) {
+
+            }
+        }
+    }
+
+    private val blurProvider by lazy { BlurWallpaperProvider.getInstance(context) }
+    private var blurDrawable: BlurDrawable? = null
+        set(value) {
+            if (isAttachedToWindow) {
+                field?.stopListening()
+            }
+            field = value
+            if (isAttachedToWindow) {
+                field?.startListening()
+            }
+        }
+    var scrimView: BlurScrimView? = null
+
+    private val isRtl = Utilities.isRtl(resources)
+    private val bubbleGap = resources.getDimensionPixelSize(R.dimen.qsb_two_bubble_gap)
+    private val mMicWidth = resources.getDimensionPixelSize(R.dimen.qsb_mic_width)
+    private val tmpRectF = RectF()
+    private val paint = Paint(Paint.ANTI_ALIAS_FLAG)
+
+    private var hotseatBgProgress = 0f
+        set(value) {
+            if (field != value) {
+                field = value
+                invalidateBlur()
+            }
+        }
+    private val launcher = context.getLauncherOrNull()
+    private val hotseat by lazy { Launcher.getLauncher(context).hotseat as BlurHotseat }
+
+    private fun createBlurDrawable() {
+        if (launcher == null) return
+        blurDrawable = if (isVisible && BlurWallpaperProvider.isEnabled) {
+            val height = height - paddingTop - paddingBottom
+            val radius = AbstractQsbLayout.getCornerRadius(context, height / 2f)
+            val drawable = blurDrawable ?: blurProvider.createDrawable(radius, radius)
+            drawable.apply {
+                blurRadii = BlurDrawable.Radii(radius)
+                callback = blurDrawableCallback
+                setBounds(left, top, right, bottom)
+                if (isAttachedToWindow) startListening()
+            }
+        } else {
+            null
+        }
+    }
+
+    override fun onEnabledChanged() {
+        createBlurDrawable()
+    }
+
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+        context.omegaPrefs.addOnPreferenceChangeListener("pref_searchbarRadius", this)
+        blurDrawable?.startListening()
+    }
+
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+        context.omegaPrefs.removeOnPreferenceChangeListener("pref_searchbarRadius", this)
+        blurDrawable?.stopListening()
+    }
+
+    override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {
+        super.onLayout(changed, left, top, right, bottom)
+        createBlurDrawable()
+    }
+
+    override fun drawQsb(canvas: Canvas) {
+        if (scrimView?.currentBlurAlpha != 255) {
+            blurDrawable?.run {
+                val appsView = parent as View
+                val searchBox = this@BlurQsbLayout
+                val adjustmentX = left.toFloat()
+                val adjustmentY = top + translationY + appsView.top + appsView.translationY + 1
+                val left = paddingLeft + adjustmentX
+                val top = paddingTop + adjustmentY
+                val right = width - paddingRight + adjustmentX
+                val bottom = height - paddingBottom + adjustmentY
+                val isBubbleUi = (searchBox as? AbstractQsbLayout)?.useTwoBubbles() != false
+                val bubbleAdjustmentLeft = if (isBubbleUi && isRtl) mMicWidth + bubbleGap else 0
+                val bubbleAdjustmentRight = if (isBubbleUi && !isRtl) mMicWidth + bubbleGap else 0
+                tmpRectF.set(left + bubbleAdjustmentLeft, top,
+                        right - bubbleAdjustmentRight, bottom)
+                setBlurBounds(tmpRectF)
+                alpha = (searchBox.alpha * 255).toInt()
+                canvas.save()
+                canvas.translate(-adjustmentX, -adjustmentY)
+                draw(canvas)
+                paint.color = getBgColor()
+                canvas.drawRoundRect(tmpRectF, blurRadius, blurRadius, paint)
+                if (isBubbleUi) {
+                    tmpRectF.set((if (!isRtl) right - mMicWidth else left).toFloat(),
+                            top, (if (isRtl) left + mMicWidth else right).toFloat(),
+                            bottom)
+                    setBlurBounds(tmpRectF)
+                    draw(canvas)
+                    canvas.drawRoundRect(tmpRectF, blurRadius, blurRadius, paint)
+                }
+                canvas.restore()
+            }
+        }
+        super.drawQsb(canvas)
+    }
+
+    private fun getBgColor(): Int {
+        val hotseatBgColor = hotseat.bgColor
+        val hotseatBgAlpha = hotseat.bgAlpha * hotseatBgProgress
+        val hotseatBg = ColorUtils.setAlphaComponent(hotseatBgColor, (hotseatBgAlpha * 255).toInt())
+        return ColorUtils.compositeColors(scrimView?.shelfColor ?: return hotseatBg, hotseatBg)
+    }
+
+    fun setOverlayScroll(scroll: Float) {
+        blurDrawable?.viewOffsetX = scroll
+    }
+
+    override fun setTranslationY(translationY: Float) {
+        super.setTranslationY(translationY)
+        invalidateBlur()
+    }
+
+    fun invalidateBlur() {
+        if (blurDrawable != null) {
+            invalidate()
+        }
+    }
+
+    override fun onValueChanged(key: String, prefs: OmegaPreferences, force: Boolean) {
+        createBlurDrawable()
+        invalidateBlur()
+    }
+
+    override fun setContentVisibility(visibleElements: Int, setter: PropertySetter,
+                                      interpolator: Interpolator) {
+        super.setContentVisibility(visibleElements, setter, interpolator)
+        val hotseatVisible = (visibleElements and HOTSEAT_ICONS) != 0
+        setter.setFloat(this, HOTSEAT_BG_PROGRESS, if (hotseatVisible) 1f else 0f, interpolator)
+    }
+
+    companion object {
+
+        val HOTSEAT_BG_PROGRESS = object :
+                FloatProperty<BlurQsbLayout>("hotseatProgress") {
+            override fun setValue(qsb: BlurQsbLayout, v: Float) {
+                qsb.hotseatBgProgress = v
+            }
+
+            override fun get(qsb: BlurQsbLayout): Float? {
+                return qsb.hotseatBgProgress
+            }
+        }
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/allapps/CustomAppFilter.java b/Omega/src/com/saggitt/omega/allapps/CustomAppFilter.java
new file mode 100644
index 0000000000..84900fc22f
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/allapps/CustomAppFilter.java
@@ -0,0 +1,68 @@
+/*
+ *  Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ *
+ */
+
+package com.saggitt.omega.allapps;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.os.UserHandle;
+
+import com.android.launcher3.Utilities;
+import com.android.launcher3.util.ComponentKey;
+
+import java.util.HashSet;
+import java.util.Set;
+
+public class CustomAppFilter extends OmegaAppFilter {
+    private final Context mContext;
+
+    public CustomAppFilter(Context context) {
+        super(context);
+        mContext = context;
+    }
+
+    public static void setComponentNameState(Context context, ComponentKey key, boolean hidden) {
+        String comp = key.toString();
+        Set<String> hiddenApps = getHiddenApps(context);
+        while (hiddenApps.contains(comp)) {
+            hiddenApps.remove(comp);
+        }
+        if (hidden) {
+            hiddenApps.add(comp);
+        }
+        setHiddenApps(context, hiddenApps);
+    }
+
+    public static boolean isHiddenApp(Context context, ComponentKey key) {
+        return getHiddenApps(context).contains(key.toString());
+    }
+
+    @SuppressWarnings("ConstantConditions") // This can't be null anyway
+    public static Set<String> getHiddenApps(Context context) {
+        return new HashSet<>(Utilities.getOmegaPrefs(context).getHiddenAppSet());
+    }
+
+    public static void setHiddenApps(Context context, Set<String> hiddenApps) {
+        Utilities.getOmegaPrefs(context).setHiddenAppSet(hiddenApps);
+    }
+
+    @Override
+    public boolean shouldShowApp(ComponentName componentName, UserHandle user) {
+        return super.shouldShowApp(componentName, user)
+                && (user == null || !isHiddenApp(mContext, new ComponentKey(componentName, user)));
+    }
+}
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/allapps/FuzzyAppSearchAlgorithm.kt b/Omega/src/com/saggitt/omega/allapps/FuzzyAppSearchAlgorithm.kt
new file mode 100644
index 0000000000..9ba921e026
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/allapps/FuzzyAppSearchAlgorithm.kt
@@ -0,0 +1,100 @@
+/*
+ *     Copyright (C) 2019 Lawnchair Team.
+ *
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.allapps
+
+import android.content.ComponentName
+import android.content.Context
+import android.os.Handler
+import com.android.launcher3.AppFilter
+import com.android.launcher3.AppInfo
+import com.android.launcher3.LauncherAppState
+import com.android.launcher3.allapps.search.AllAppsSearchBarController
+import com.android.launcher3.allapps.search.SearchAlgorithm
+import com.android.launcher3.compat.LauncherAppsCompat
+import com.android.launcher3.compat.UserManagerCompat
+import com.saggitt.omega.search.SearchProviderController
+import com.saggitt.omega.search.webproviders.WebSearchProvider
+import com.saggitt.omega.util.omegaPrefs
+import me.xdrop.fuzzywuzzy.FuzzySearch
+import me.xdrop.fuzzywuzzy.ToStringFunction
+
+class FuzzyAppSearchAlgorithm(private val context: Context, private val apps: List<AppInfo>) :
+        SearchAlgorithm {
+
+    private var resultHandler: Handler = Handler()
+    private var baseFilter: AppFilter = OmegaAppFilter(context)
+
+    override fun doSearch(query: String, callback: AllAppsSearchBarController.Callbacks) {
+        val res = query(context, query, apps, baseFilter).map { it.toComponentKey() }
+        val suggestions = getSuggestions(query)
+        resultHandler.post {
+            callback.onSearchResult(query, ArrayList(res), suggestions)
+        }
+    }
+
+    override fun cancel(interruptActiveRequests: Boolean) {
+        if (interruptActiveRequests) {
+            resultHandler.removeCallbacksAndMessages(null)
+        }
+    }
+
+    private fun getSuggestions(query: String): List<String> {
+        val provider = SearchProviderController.getInstance(context).searchProvider
+        return (provider as? WebSearchProvider)?.getSuggestions(query) ?: emptyList()
+    }
+
+    companion object {
+        const val MIN_SCORE = 65
+
+        @JvmStatic
+        fun getApps(context: Context, defaultApps: List<AppInfo>,
+                    filter: AppFilter): List<AppInfo> {
+            if (!context.omegaPrefs.searchHiddenApps) {
+                return defaultApps
+            }
+            val iconCache = LauncherAppState.getInstance(context).iconCache
+            val lac = LauncherAppsCompat.getInstance(context)
+            return UserManagerCompat.getInstance(context).userProfiles.flatMap { user ->
+                val duplicatePreventionCache = mutableListOf<ComponentName>()
+                lac.getActivityList(null, user).filter { info ->
+                    filter.shouldShowApp(info.componentName, user) &&
+                            !duplicatePreventionCache.contains(info.componentName)
+                }.map { info ->
+                    duplicatePreventionCache.add(info.componentName)
+                    AppInfo(context, info, user).apply {
+                        iconCache.getTitleAndIcon(this, false)
+                    }
+                }
+            }
+        }
+
+        @JvmStatic
+        fun query(context: Context, query: String, defaultApps: List<AppInfo>,
+                  filter: AppFilter): List<AppInfo> {
+            return FuzzySearch.extractAll(query, getApps(context, defaultApps, filter),
+                    ToStringFunction<AppInfo> { item ->
+                        item?.title.toString()
+                    }, WinklerWeightedRatio(), MIN_SCORE)
+                    .sortedBy { it.referent.title.toString() }
+                    .sortedByDescending { it.score }
+                    .map { it.referent }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/allapps/InstallTimeComparator.java b/Omega/src/com/saggitt/omega/allapps/InstallTimeComparator.java
index 65701bb2e9..1c9fa70e80 100644
--- a/Omega/src/com/saggitt/omega/allapps/InstallTimeComparator.java
+++ b/Omega/src/com/saggitt/omega/allapps/InstallTimeComparator.java
@@ -35,13 +35,7 @@ public int compare(AppInfo app1, AppInfo app2) {
         try {
             long app1InstallTime = mPackageManager.getPackageInfo(app1.componentName.getPackageName(), 0).firstInstallTime;
             long app2InstallTime = mPackageManager.getPackageInfo(app2.componentName.getPackageName(), 0).firstInstallTime;
-            if (app1InstallTime < app2InstallTime) {
-                return 1;
-            } else if (app2InstallTime < app1InstallTime) {
-                return -1;
-            } else {
-                return 0;
-            }
+            return Long.compare(app2InstallTime, app1InstallTime);
         } catch (PackageManager.NameNotFoundException e) {
             e.printStackTrace();
             return 0;
diff --git a/Omega/src/com/saggitt/omega/allapps/NexusAppFilter.java b/Omega/src/com/saggitt/omega/allapps/NexusAppFilter.java
new file mode 100644
index 0000000000..0434e9ab2a
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/allapps/NexusAppFilter.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ */
+
+package com.saggitt.omega.allapps;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.os.UserHandle;
+
+import com.android.launcher3.AppFilter;
+
+import java.util.HashSet;
+
+public class NexusAppFilter extends AppFilter {
+    private final HashSet<ComponentName> mHideList = new HashSet<>();
+
+    public NexusAppFilter(Context context) {
+        //Voice Search
+        mHideList.add(ComponentName.unflattenFromString("com.google.android.googlequicksearchbox/.VoiceSearchActivity"));
+
+        //Wallpapers
+        mHideList.add(ComponentName.unflattenFromString("com.google.android.apps.wallpaper/.picker.CategoryPickerActivity"));
+
+        //Google Now Launcher
+        mHideList.add(ComponentName.unflattenFromString("com.google.android.launcher/.StubApp"));
+
+        //Actions Services
+        mHideList.add(ComponentName.unflattenFromString("com.google.android.as/com.google.android.apps.miphone.aiai.allapps.main.MainDummyActivity"));
+    }
+
+    @Override
+    public boolean shouldShowApp(ComponentName componentName, UserHandle user) {
+        return !mHideList.contains(componentName);
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/allapps/OmegaAppFilter.kt b/Omega/src/com/saggitt/omega/allapps/OmegaAppFilter.kt
new file mode 100644
index 0000000000..95f4e88ec3
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/allapps/OmegaAppFilter.kt
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ */
+
+package com.saggitt.omega.allapps
+
+import android.content.ComponentName
+import android.content.Context
+import android.os.UserHandle
+import com.saggitt.omega.OmegaLauncher
+
+open class OmegaAppFilter(context: Context) : NexusAppFilter(context) {
+
+    private val mHideList = HashSet<ComponentName>()
+
+    init {
+        mHideList.add(ComponentName(context, OmegaLauncher::class.java.name))
+    }
+
+    override fun shouldShowApp(componentName: ComponentName?, user: UserHandle?): Boolean {
+        return !mHideList.contains(componentName) && super.shouldShowApp(componentName, user)
+    }
+}
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/allapps/PagedAppsController.java b/Omega/src/com/saggitt/omega/allapps/PagedAppsController.java
new file mode 100644
index 0000000000..dacdf3b08f
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/allapps/PagedAppsController.java
@@ -0,0 +1,100 @@
+/*
+ *  Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ *
+ */
+
+package com.saggitt.omega.allapps;
+
+import android.view.View;
+
+import com.android.launcher3.allapps.AllAppsContainerView;
+import com.android.launcher3.allapps.AllAppsPagedView;
+import com.android.launcher3.allapps.AllAppsStore;
+
+import java.util.ArrayList;
+
+public class PagedAppsController {
+    private ArrayList<AllAppsContainerView.AdapterHolder> holders = new ArrayList<>();
+    private AllAppsContainerView mContainer;
+    private AllAppsPages mPages;
+    private int horizontalPadding = 0;
+    private int bottomPadding = 0;
+
+    public PagedAppsController(AllAppsPages pages, AllAppsContainerView container) {
+        mContainer = container;
+        mPages = pages;
+    }
+
+    public AllAppsContainerView.AdapterHolder[] createHolders() {
+        while (holders.size() < getPagesCount()) {
+            AllAppsContainerView.AdapterHolder holder = mContainer.createHolder(false);
+            holder.padding.bottom = bottomPadding;
+            holder.padding.left = horizontalPadding;
+            holder.padding.right = horizontalPadding;
+
+            holders.add(holder);
+        }
+        return holders.toArray(new AllAppsContainerView.AdapterHolder[0]);
+
+    }
+
+    public void setPadding(int leftRightPadding, int bottom) {
+        horizontalPadding = leftRightPadding;
+        bottomPadding = bottom;
+        for (AllAppsContainerView.AdapterHolder holder : holders) {
+            holder.padding.bottom = bottomPadding;
+            holder.padding.left = horizontalPadding;
+            holder.padding.right = horizontalPadding;
+            holder.applyPadding();
+        }
+    }
+
+    public void reloadPages() {
+    }
+
+    public boolean getShouldShowTabs() {
+        return false;
+    }
+
+    public void registerIconContainers(AllAppsStore mAllAppsStore) {
+        for (AllAppsContainerView.AdapterHolder holder : holders) {
+            mAllAppsStore.registerIconContainer(holder.recyclerView);
+        }
+    }
+
+    public void unregisterIconContainers(AllAppsStore mAllAppsStore) {
+        for (AllAppsContainerView.AdapterHolder holder : holders) {
+            mAllAppsStore.unregisterIconContainer(holder.recyclerView);
+        }
+    }
+
+    public void setup(View view) {
+        for (AllAppsContainerView.AdapterHolder holder : holders) {
+            holder.recyclerView = null;
+        }
+        holders.get(0).setup(view, null);
+    }
+
+    public void setup(AllAppsPagedView pagedView) {
+        for (AllAppsContainerView.AdapterHolder holder : holders) {
+            holder.setIsWork(false);
+            holder.setup(pagedView.getChildAt(holders.lastIndexOf(holder)), mPages.getMatcher());
+        }
+    }
+
+    public int getPagesCount() {
+        return mPages.getPageCount();
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/allapps/PredictionsFloatingHeader.java b/Omega/src/com/saggitt/omega/allapps/PredictionsFloatingHeader.java
deleted file mode 100644
index 6be7ecd495..0000000000
--- a/Omega/src/com/saggitt/omega/allapps/PredictionsFloatingHeader.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- *  Copyright (c) 2020 Omega Launcher
- *
- *  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.
- *
- */
-
-package com.saggitt.omega.allapps;
-
-import android.content.Context;
-import android.util.AttributeSet;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import com.android.launcher3.Insettable;
-import com.android.launcher3.R;
-import com.android.launcher3.Utilities;
-import com.android.launcher3.allapps.AllAppsContainerView;
-import com.android.launcher3.allapps.FloatingHeaderView;
-import com.android.launcher3.appprediction.ComponentKeyMapper;
-import com.android.launcher3.appprediction.PredictionRowView;
-import com.android.launcher3.appprediction.PredictionUiStateManager;
-
-import java.util.List;
-
-public class PredictionsFloatingHeader extends FloatingHeaderView implements Insettable {
-    private final PredictionUiStateManager mPredictionUiStateManager;
-    private Context mContext;
-    private boolean mShowAllAppsLabel;
-    private PredictionRowView mPredictionRowView;
-
-    public PredictionsFloatingHeader(@NonNull Context context) {
-        this(context, null);
-    }
-
-    public PredictionsFloatingHeader(@NonNull Context context, @Nullable AttributeSet attrs) {
-        super(context, attrs);
-        mContext = context;
-        mPredictionUiStateManager = PredictionUiStateManager.INSTANCE.get(context);
-    }
-
-    @Override
-    protected void onFinishInflate() {
-        super.onFinishInflate();
-        mPredictionRowView = findViewById(R.id.prediction_row);
-        updateShowAllAppsLabel();
-    }
-
-    @Override
-    public void setup(AllAppsContainerView.AdapterHolder[] mAH, boolean tabsHidden) {
-        mTabsHidden = tabsHidden;
-        updateExpectedHeight();
-        super.setup(mAH, tabsHidden);
-    }
-
-    public void updateShowAllAppsLabel() {
-        setShowAllAppsLabel(Utilities.getOmegaPrefs(mContext).getShowAllAppsLabel());
-    }
-
-    public void setShowAllAppsLabel(boolean show) {
-        if (mShowAllAppsLabel != show) {
-            mShowAllAppsLabel = show;
-        }
-    }
-
-    public boolean hasVisibleContent() {
-        return mPredictionUiStateManager.getCurrentState().isEnabled;
-    }
-
-    public void setPredictedApps(boolean enabled, List<ComponentKeyMapper> list) {
-        mPredictionUiStateManager.getCurrentState().apps = list;
-        mPredictionUiStateManager.getCurrentState().isEnabled = enabled;
-        mPredictionUiStateManager.onAppsUpdated();
-    }
-}
diff --git a/Omega/src/com/saggitt/omega/allapps/WinklerWeightedRatio.kt b/Omega/src/com/saggitt/omega/allapps/WinklerWeightedRatio.kt
new file mode 100644
index 0000000000..e3edf837dc
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/allapps/WinklerWeightedRatio.kt
@@ -0,0 +1,79 @@
+/*
+ *     Copyright (C) 2019 Lawnchair Team.
+ *
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.allapps
+
+import me.xdrop.fuzzywuzzy.ToStringFunction
+import me.xdrop.fuzzywuzzy.algorithms.WeightedRatio
+import kotlin.math.roundToInt
+
+/**
+ * Weighted ratio with higher scores for strings with common prefix like in the Jaro-Winkler algorithm
+ */
+class WinklerWeightedRatio : WeightedRatio() {
+
+    override fun apply(s1: String?, s2: String?, stringProcessor: ToStringFunction<String>): Int {
+        val first = stringProcessor.apply(s1)
+        val second = stringProcessor.apply(s2)
+
+        val ratio = super.apply(s1, s2, stringProcessor) / 100.0
+        val cl = commonPrefixLength(first, second)
+        return ((ratio + SCALING_FACTOR * cl * (1.0 - ratio)) * 100).roundToInt()
+    }
+
+    /**
+     * Calculates the number of characters from the beginning of the strings that match exactly one-to-one,
+     * up to a maximum of four (4) characters.
+     * @param first The first string.
+     * @param second The second string.
+     * @return A number between 0 and 4.
+     * @see https://github.com/rrice/java-string-similarity/blob/master/src/main/java/net/ricecode/similarity/JaroWinklerStrategy.java
+     */
+    private fun commonPrefixLength(first: String, second: String): Int {
+        val shorter: String
+        val longer: String
+
+        // Determine which string is longer.
+        if (first.length > second.length) {
+            longer = first.toLowerCase()
+            shorter = second.toLowerCase()
+        } else {
+            longer = second.toLowerCase()
+            shorter = first.toLowerCase()
+        }
+
+        var result = 0
+
+        // Iterate through the shorter string.
+        for (i in 0 until shorter.length) {
+            if (shorter[i] != longer[i]) {
+                break
+            }
+            result++
+        }
+
+        // Limit the result to 4.
+        return if (result > 4) 4 else result
+    }
+
+
+    companion object {
+        const val SCALING_FACTOR = .15
+    }
+}
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/animation/OmegaAppTransitionManagerImpl.kt b/Omega/src/com/saggitt/omega/animation/OmegaAppTransitionManagerImpl.kt
new file mode 100644
index 0000000000..904793f534
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/animation/OmegaAppTransitionManagerImpl.kt
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ */
+
+package com.saggitt.omega.animation
+
+import android.animation.AnimatorSet
+import android.animation.ObjectAnimator
+import android.content.Context
+import android.util.Pair
+import androidx.annotation.Keep
+import com.android.launcher3.LauncherAppTransitionManagerImpl
+import com.android.launcher3.LauncherState.ALL_APPS
+import com.android.launcher3.LauncherState.OVERVIEW
+import com.android.launcher3.anim.Interpolators
+import com.android.launcher3.anim.Interpolators.LINEAR
+import com.saggitt.omega.OmegaLauncher
+import com.saggitt.omega.util.InvertedMultiValueAlpha
+import com.saggitt.omega.views.OmegaBackgroundView
+
+@Keep
+class OmegaAppTransitionManagerImpl(context: Context) :
+        LauncherAppTransitionManagerImpl(context) {
+
+    private val launcher = OmegaLauncher.getLauncher(context)
+    private val background = launcher.background
+
+    override fun getLauncherContentAnimator(isAppOpening: Boolean,
+                                            trans: FloatArray?): Pair<AnimatorSet, Runnable>? {
+        val results = super.getLauncherContentAnimator(isAppOpening, trans)
+        val blurAlphas = if (isAppOpening) floatArrayOf(0f, 1f) else floatArrayOf(1f, 0f)
+        if (!launcher.isInState(ALL_APPS) && !launcher.isInState(OVERVIEW)) {
+            background.blurAlphas.getProperty(OmegaBackgroundView.ALPHA_INDEX_TRANSITIONS).value = blurAlphas[0]
+            val blurAlpha = ObjectAnimator.ofFloat(
+                    background.blurAlphas.getProperty(OmegaBackgroundView.ALPHA_INDEX_TRANSITIONS),
+                    InvertedMultiValueAlpha.VALUE, *blurAlphas)
+            blurAlpha.duration = 217
+            blurAlpha.interpolator = LINEAR
+            results.first.play(blurAlpha)
+        }
+        return results
+    }
+
+    override fun createLauncherResumeAnimation(anim: AnimatorSet) {
+        super.createLauncherResumeAnimation(anim)
+
+        background.blurAlphas.getProperty(OmegaBackgroundView.ALPHA_INDEX_TRANSITIONS).value = 1f
+        val blurAnim = ObjectAnimator.ofFloat(
+                background.blurAlphas.getProperty(OmegaBackgroundView.ALPHA_INDEX_TRANSITIONS),
+                InvertedMultiValueAlpha.VALUE, 1f, 0f)
+        blurAnim.startDelay = LAUNCHER_RESUME_START_DELAY.toLong()
+        blurAnim.duration = 333
+        blurAnim.interpolator = Interpolators.DEACCEL_1_7
+        anim.play(blurAnim)
+    }
+
+    override fun resetContentView() {
+        super.resetContentView()
+        background.blurAlphas.getProperty(OmegaBackgroundView.ALPHA_INDEX_TRANSITIONS).value = 0f
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/backup/BackupListActivity.kt b/Omega/src/com/saggitt/omega/backup/BackupListActivity.kt
new file mode 100644
index 0000000000..d335b0f9d7
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/backup/BackupListActivity.kt
@@ -0,0 +1,178 @@
+package com.saggitt.omega.backup
+
+import android.Manifest.permission.READ_EXTERNAL_STORAGE
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.os.Bundle
+import android.view.View
+import android.widget.TextView
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.app.ActivityCompat
+import androidx.core.content.ContextCompat.checkSelfPermission
+import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.android.launcher3.R
+import com.android.launcher3.Utilities
+import com.google.android.material.snackbar.Snackbar
+import com.saggitt.omega.settings.SettingsBaseActivity
+import com.saggitt.omega.settings.SettingsBottomSheet
+
+class BackupListActivity : SettingsBaseActivity(), BackupListAdapter.Callbacks {
+
+    private val permissionRequestReadExternalStorage = 0
+
+    private val recyclerView by lazy { findViewById<RecyclerView>(R.id.recyclerView) }
+    private val adapter by lazy { BackupListAdapter(this) }
+
+    private var currentPosition = 0
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_backup_list)
+
+        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+
+        adapter.callbacks = this
+        loadLocalBackups()
+        recyclerView.layoutManager = GridLayoutManager(this, 2).apply {
+            spanSizeLookup = object : GridLayoutManager.SpanSizeLookup() {
+                override fun getSpanSize(position: Int) = if (position == 0) 2 else 1
+            }
+        }
+        recyclerView.adapter = adapter
+
+        Utilities.checkRestoreSuccess(this)
+    }
+
+    private fun loadLocalBackups() {
+        if (checkSelfPermission(this, READ_EXTERNAL_STORAGE)
+                != PackageManager.PERMISSION_GRANTED) {
+            if (ActivityCompat.shouldShowRequestPermissionRationale(this,
+                            READ_EXTERNAL_STORAGE)) {
+                Snackbar.make(findViewById(android.R.id.content), R.string.read_external_storage_required,
+                        Snackbar.LENGTH_SHORT).show()
+            }
+            ActivityCompat.requestPermissions(this,
+                    arrayOf(READ_EXTERNAL_STORAGE),
+                    permissionRequestReadExternalStorage)
+        } else {
+            adapter.setData(OmegaBackup.listLocalBackups(this))
+        }
+    }
+
+    override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
+        when (requestCode) {
+            permissionRequestReadExternalStorage -> {
+                if ((grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED)) {
+                    adapter.setData(OmegaBackup.listLocalBackups(this))
+                }
+            }
+            else -> {
+            }
+        }
+    }
+
+    override fun openBackup() {
+        startActivityForResult(Intent(this, NewBackupActivity::class.java), 1)
+    }
+
+    override fun openRestore() {
+        val intent = Intent(Intent.ACTION_OPEN_DOCUMENT)
+        intent.addCategory(Intent.CATEGORY_OPENABLE)
+        intent.type = OmegaBackup.MIME_TYPE
+        intent.putExtra(Intent.EXTRA_MIME_TYPES, OmegaBackup.EXTRA_MIME_TYPES)
+        startActivityForResult(intent, 2)
+    }
+
+    override fun openRestore(position: Int) {
+        startActivity(Intent(this, RestoreBackupActivity::class.java).apply {
+            putExtra(RestoreBackupActivity.EXTRA_URI, adapter[position].uri.toString())
+        })
+    }
+
+    override fun openEdit(position: Int) {
+        currentPosition = position
+        val visibility = if (adapter[position].meta != null) View.VISIBLE else View.GONE
+
+        val bottomSheetView = layoutInflater.inflate(R.layout.backup_bottom_sheet,
+                findViewById(android.R.id.content), false)
+        bottomSheetView.findViewById<TextView>(android.R.id.title).text =
+                adapter[position].meta?.name ?: getString(R.string.backup_invalid)
+        bottomSheetView.findViewById<TextView>(android.R.id.summary).text =
+                adapter[position].meta?.localizedTimestamp ?: getString(R.string.backup_invalid)
+
+        val restoreBackup = bottomSheetView.findViewById<View>(R.id.action_restore_backup)
+        val shareBackup = bottomSheetView.findViewById<View>(R.id.action_share_backup)
+        val removeBackup = bottomSheetView.findViewById<View>(R.id.action_remove_backup_from_list)
+        val divider = bottomSheetView.findViewById<View>(R.id.divider)
+        restoreBackup.visibility = visibility
+        shareBackup.visibility = visibility
+        divider.visibility = visibility
+
+        val bottomSheet = SettingsBottomSheet.inflate(this)
+        restoreBackup.setOnClickListener {
+            bottomSheet.close(true)
+            openRestore(currentPosition)
+        }
+        shareBackup.setOnClickListener {
+            bottomSheet.close(true)
+            shareBackup(currentPosition)
+        }
+        removeBackup.setOnClickListener {
+            bottomSheet.close(true)
+            removeItem(currentPosition)
+        }
+        bottomSheet.show(bottomSheetView, true)
+    }
+
+    private fun removeItem(position: Int) {
+        adapter.removeItem(position)
+        saveChanges()
+    }
+
+    private fun shareBackup(position: Int) {
+        val shareTitle = getString(R.string.backup_share_title)
+        val shareText = getString(R.string.backup_share_text)
+        val shareIntent = Intent(Intent.ACTION_SEND)
+        shareIntent.type = OmegaBackup.MIME_TYPE
+        shareIntent.putExtra(Intent.EXTRA_STREAM, adapter[position].uri)
+        shareIntent.putExtra(Intent.EXTRA_SUBJECT, shareTitle)
+        shareIntent.putExtra(Intent.EXTRA_TEXT, shareText)
+        startActivity(Intent.createChooser(shareIntent, shareTitle))
+    }
+
+    private fun saveChanges() {
+        Utilities.getOmegaPrefs(this).blockingEdit {
+            recentBackups.replaceWith(adapter.toUriList())
+        }
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        adapter.onDestroy()
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, resultData: Intent?) {
+        if (requestCode == 1 && resultCode == AppCompatActivity.RESULT_OK) {
+            if (resultData != null) {
+                adapter.addItem(OmegaBackup(this, resultData.data!!))
+                saveChanges()
+            }
+        } else if (requestCode == 2 && resultCode == AppCompatActivity.RESULT_OK) {
+            if (resultData != null) {
+                val takeFlags = intent.flags and
+                        (Intent.FLAG_GRANT_READ_URI_PERMISSION or
+                                Intent.FLAG_GRANT_WRITE_URI_PERMISSION)
+                contentResolver.takePersistableUriPermission(resultData.data!!, takeFlags)
+                val uri = resultData.data
+                if (!Utilities.getOmegaPrefs(this).recentBackups.contains(uri!!)) {
+                    adapter.addItem(OmegaBackup(this, uri))
+                    saveChanges()
+                }
+                openRestore(0)
+            }
+        } else {
+            super.onActivityResult(requestCode, resultCode, resultData)
+        }
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/backup/BackupListAdapter.kt b/Omega/src/com/saggitt/omega/backup/BackupListAdapter.kt
new file mode 100644
index 0000000000..4a3364f52f
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/backup/BackupListAdapter.kt
@@ -0,0 +1,172 @@
+package com.saggitt.omega.backup
+
+import android.content.Context
+import android.net.Uri
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.TextView
+import android.widget.Toast
+import androidx.recyclerview.widget.RecyclerView
+import com.android.launcher3.R
+import com.android.launcher3.Utilities
+import com.saggitt.omega.util.isVisible
+
+class BackupListAdapter(val context: Context) : RecyclerView.Adapter<BackupListAdapter.Holder>() {
+
+    private val backupList = ArrayList<OmegaBackup>()
+    private val backupMetaLoaderList = ArrayList<OmegaBackup.MetaLoader>()
+
+    var callbacks: Callbacks? = null
+
+    fun setData(data: List<OmegaBackup>) {
+        backupList.clear()
+        data.forEach {
+            backupList.add(it)
+            backupMetaLoaderList.add(OmegaBackup.MetaLoader(it))
+        }
+    }
+
+    fun addItem(backup: OmegaBackup) {
+        backupList.add(0, backup)
+        backupMetaLoaderList.add(0, OmegaBackup.MetaLoader(backup))
+        notifyDataSetChanged()
+    }
+
+    fun removeItem(position: Int) {
+        if (backupList[position].delete()) {
+            backupList.removeAt(position)
+            backupMetaLoaderList.removeAt(position)
+            notifyItemRemoved(position + 1)
+        } else {
+            Toast.makeText(context, R.string.backup_delete_failed, Toast.LENGTH_SHORT).show()
+        }
+    }
+
+    fun toUriList(): List<Uri> {
+        return backupList.map { it.uri }
+    }
+
+    operator fun get(position: Int) = backupList[position]
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): Holder {
+        val view = LayoutInflater.from(parent.context).inflate(getLayoutId(viewType), parent, false)
+        return when (viewType) {
+            TYPE_MENU -> MenuHolder(view)
+            TYPE_ITEM -> ItemHolder(view)
+            else -> Holder(view)
+        }
+    }
+
+    private fun getLayoutId(viewType: Int) = when (viewType) {
+        TYPE_MENU -> R.layout.backup_menu
+        TYPE_ITEM -> R.layout.backup_item
+        else -> R.layout.backup_blank
+    }
+
+    override fun getItemCount() = if (backupList.isEmpty()) 2 else backupList.size + 1
+
+    override fun onBindViewHolder(holder: Holder, position: Int) {
+        holder.bind(position)
+    }
+
+    override fun getItemViewType(position: Int): Int {
+        return when (position) {
+            0 -> TYPE_MENU
+            else -> if (backupList.isEmpty()) TYPE_BLANK else TYPE_ITEM
+        }
+    }
+
+    fun onDestroy() {
+        backupMetaLoaderList.forEach { it.meta?.recycle() }
+    }
+
+    open class Holder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+
+        open fun bind(position: Int) {
+
+        }
+    }
+
+    inner class MenuHolder(itemView: View) : Holder(itemView), View.OnClickListener {
+
+        init {
+            itemView.findViewById<View>(R.id.action_new_backup).setOnClickListener(this)
+            itemView.findViewById<View>(R.id.action_restore_backup).setOnClickListener(this)
+            itemView.findViewById<TextView>(R.id.local_backup_title).setTextColor(Utilities.getOmegaPrefs(context).accentColor)
+        }
+
+        override fun onClick(v: View) {
+            when (v.id) {
+                R.id.action_new_backup -> callbacks?.openBackup()
+                R.id.action_restore_backup -> callbacks?.openRestore()
+            }
+        }
+    }
+
+    inner class ItemHolder(itemView: View) : Holder(itemView), View.OnClickListener, View.OnLongClickListener {
+
+        private val previewContainer = itemView.findViewById<View>(R.id.preview_container)
+        private val wallpaper = itemView.findViewById<ImageView>(R.id.wallpaper)
+        private val preview = itemView.findViewById<ImageView>(R.id.preview)
+        private val title = itemView.findViewById<TextView>(android.R.id.title)
+        private val summary = itemView.findViewById<TextView>(android.R.id.summary)
+
+        private val backupItem = itemView.findViewById<View>(R.id.backup_item)
+
+        init {
+            backupItem.setOnClickListener(this)
+            backupItem.setOnLongClickListener(this)
+        }
+
+        override fun bind(position: Int) {
+            val metaLoader = backupMetaLoaderList[position - 1]
+            if (metaLoader.loaded) {
+                previewContainer.isVisible = true
+                backupItem.isEnabled = true
+                title.text = metaLoader.meta?.name ?: context.getString(R.string.backup_invalid)
+                summary.text = metaLoader.meta?.localizedTimestamp
+                        ?: context.getString(R.string.backup_invalid)
+                metaLoader.meta?.preview?.apply {
+                    previewContainer.isVisible = true
+                    preview.setImageBitmap(first)
+                    wallpaper.setImageBitmap(second)
+                }
+            } else {
+                previewContainer.isVisible = false
+                backupItem.isEnabled = false
+                title.text = context.getString(R.string.backup_loading)
+                summary.text = context.getString(R.string.backup_loading)
+                metaLoader.callback = object : OmegaBackup.MetaLoader.Callback {
+                    override fun onMetaLoaded() {
+                        notifyItemChanged(backupMetaLoaderList.indexOf(metaLoader) + 1)
+                    }
+                }
+                metaLoader.loadMeta(true)
+            }
+        }
+
+        override fun onClick(v: View) {
+            callbacks?.openRestore(adapterPosition - 1)
+        }
+
+        override fun onLongClick(v: View?): Boolean {
+            callbacks?.openEdit(adapterPosition - 1)
+            return true
+        }
+    }
+
+    interface Callbacks {
+        fun openEdit(position: Int)
+        fun openRestore(position: Int)
+        fun openRestore()
+        fun openBackup()
+    }
+
+    companion object {
+        const val TYPE_MENU = 0
+        const val TYPE_ITEM = 1
+        const val TYPE_BLANK = 2
+    }
+}
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/backup/NewBackupActivity.kt b/Omega/src/com/saggitt/omega/backup/NewBackupActivity.kt
new file mode 100644
index 0000000000..28e3c6cb42
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/backup/NewBackupActivity.kt
@@ -0,0 +1,199 @@
+package com.saggitt.omega.backup
+
+import android.Manifest
+import android.annotation.SuppressLint
+import android.content.Context
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.net.Uri
+import android.os.AsyncTask
+import android.os.Bundle
+import android.view.View
+import android.widget.CheckBox
+import android.widget.EditText
+import android.widget.RadioButton
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.app.ActivityCompat
+import androidx.core.content.ContextCompat
+import com.android.launcher3.R
+import com.google.android.material.floatingactionbutton.FloatingActionButton
+import com.google.android.material.snackbar.Snackbar
+import com.saggitt.omega.settings.SettingsBaseActivity
+import java.io.File
+import java.text.SimpleDateFormat
+import java.util.*
+
+class NewBackupActivity : SettingsBaseActivity() {
+
+    private val permissionRequestReadExternalStorage = 0
+
+    private val backupName by lazy { findViewById<EditText>(R.id.name) }
+
+    private val backupHomescreen by lazy { findViewById<CheckBox>(R.id.content_homescreen) }
+    private val backupSettings by lazy { findViewById<CheckBox>(R.id.content_settings) }
+    private val backupWallpaper by lazy { findViewById<CheckBox>(R.id.content_wallpaper) }
+
+    private val backupLocationDevice by lazy { findViewById<RadioButton>(R.id.location_device) }
+
+    private val config by lazy { findViewById<View>(R.id.config) }
+    private val startButton by lazy { findViewById<FloatingActionButton>(R.id.fab) }
+    private val progress by lazy { findViewById<View>(R.id.progress) }
+
+    private var backupUri = Uri.parse("/")
+    private var inProgress = false
+        set(value) {
+            if (value) {
+                supportActionBar?.setDisplayShowHomeEnabled(false)
+                supportActionBar?.setDisplayHomeAsUpEnabled(false)
+            } else {
+                supportActionBar?.setDisplayHomeAsUpEnabled(true)
+            }
+            field = value
+        }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_new_backup)
+
+        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+
+        backupName.setText(getTimestamp())
+
+        startButton.setOnClickListener {
+            onStartBackup()
+        }
+    }
+
+    private fun onStartBackup() {
+        if (ContextCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE)
+                != PackageManager.PERMISSION_GRANTED) {
+            if (ActivityCompat.shouldShowRequestPermissionRationale(this,
+                            Manifest.permission.WRITE_EXTERNAL_STORAGE)) {
+                Snackbar.make(findViewById(R.id.content), R.string.read_external_storage_required,
+                        Snackbar.LENGTH_SHORT).show()
+            }
+            ActivityCompat.requestPermissions(this,
+                    arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE),
+                    permissionRequestReadExternalStorage)
+        } else {
+            val error = validateOptions()
+            if (error == 0) {
+                val fileName = "${backupName.text}.${OmegaBackup.EXTENSION}"
+                if (backupLocationDevice.isChecked) {
+                    backupUri = Uri.fromFile(File(OmegaBackup.getFolder(), fileName))
+                    startBackup()
+                } else {
+                    val intent = Intent(Intent.ACTION_CREATE_DOCUMENT)
+                    intent.addCategory(Intent.CATEGORY_OPENABLE)
+                    intent.type = OmegaBackup.MIME_TYPE
+                    intent.putExtra(Intent.EXTRA_TITLE, fileName)
+                    startActivityForResult(intent, 1)
+                }
+            } else {
+                Snackbar.make(findViewById(R.id.content), error, Snackbar.LENGTH_SHORT).show()
+            }
+        }
+    }
+
+    private fun startBackup() {
+        CreateBackupTask(this).execute()
+    }
+
+    private fun validateOptions(): Int {
+        return if (backupName.text == null || backupName.text.toString() == "") {
+            R.string.backup_error_blank_name
+        } else if (!backupHomescreen.isChecked && !backupSettings.isChecked && !backupWallpaper.isChecked) {
+            R.string.backup_error_blank_contents
+        } else {
+            0
+        }
+    }
+
+    fun getTimestamp(): String {
+        val simpleDateFormat = SimpleDateFormat("dd-MM-yyyy hh:mm:ss", Locale.US)
+        return simpleDateFormat.format(Date())
+    }
+
+    override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
+        when (requestCode) {
+            permissionRequestReadExternalStorage -> {
+                // If request is cancelled, the result arrays are empty.
+                if ((grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED)) {
+                    onStartBackup()
+                } else {
+                    Snackbar.make(findViewById(R.id.content), R.string.read_external_storage_required,
+                            Snackbar.LENGTH_SHORT).show()
+                }
+            }
+            else -> {
+
+            }
+        }
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, resultData: Intent?) {
+        if (requestCode == 1 && resultCode == AppCompatActivity.RESULT_OK) {
+            if (resultData != null) {
+                val takeFlags = intent.flags and
+                        (Intent.FLAG_GRANT_READ_URI_PERMISSION or
+                                Intent.FLAG_GRANT_WRITE_URI_PERMISSION)
+                contentResolver.takePersistableUriPermission(resultData.data!!, takeFlags)
+                backupUri = resultData.data
+                startBackup()
+            }
+        } else {
+            super.onActivityResult(requestCode, resultCode, resultData)
+        }
+    }
+
+    override fun onBackPressed() {
+        if (!inProgress) super.onBackPressed()
+    }
+
+    @SuppressLint("StaticFieldLeak")
+    private inner class CreateBackupTask(val context: Context) : AsyncTask<Void, Void, Boolean>() {
+
+        override fun onPreExecute() {
+            super.onPreExecute()
+
+            config.visibility = View.GONE
+            startButton.visibility = View.GONE
+
+            progress.visibility = View.VISIBLE
+
+            inProgress = true
+        }
+
+        override fun doInBackground(vararg params: Void?): Boolean {
+            var contents = 0
+            if (backupHomescreen.isChecked) {
+                contents = contents or OmegaBackup.INCLUDE_HOMESCREEN
+            }
+            if (backupSettings.isChecked) {
+                contents = contents or OmegaBackup.INCLUDE_SETTINGS
+            }
+            if (backupWallpaper.isChecked) {
+                contents = contents or OmegaBackup.INCLUDE_WALLPAPER
+            }
+            return OmegaBackup.create(
+                    context = context,
+                    name = backupName.text.toString(),
+                    location = backupUri,
+                    contents = contents
+            )
+        }
+
+        override fun onPostExecute(result: Boolean) {
+            super.onPostExecute(result)
+
+            if (result) {
+                setResult(AppCompatActivity.RESULT_OK, Intent().setData(backupUri))
+                finish()
+            } else {
+                inProgress = false
+                Snackbar.make(findViewById(R.id.content), R.string.backup_failed, Snackbar.LENGTH_SHORT).show()
+            }
+        }
+
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/backup/OmegaBackup.kt b/Omega/src/com/saggitt/omega/backup/OmegaBackup.kt
new file mode 100644
index 0000000000..c8d4bc6dbe
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/backup/OmegaBackup.kt
@@ -0,0 +1,363 @@
+package com.saggitt.omega.backup
+
+import android.annotation.SuppressLint
+import android.app.WallpaperManager
+import android.content.Context
+import android.content.ContextWrapper
+import android.graphics.Bitmap
+import android.graphics.BitmapFactory
+import android.net.Uri
+import android.os.AsyncTask
+import android.os.Environment
+import android.util.Log
+import androidx.core.content.FileProvider
+import com.android.launcher3.BuildConfig
+import com.android.launcher3.LauncherFiles
+import com.android.launcher3.Utilities
+import org.json.JSONArray
+import java.io.*
+import java.nio.charset.StandardCharsets
+import java.text.SimpleDateFormat
+import java.util.*
+import java.util.zip.ZipEntry
+import java.util.zip.ZipInputStream
+import java.util.zip.ZipOutputStream
+
+class OmegaBackup(val context: Context, val uri: Uri) {
+
+    val mContext: Context = context
+    val meta by lazy { readMeta() }
+
+    private fun readMeta(): Meta? {
+        try {
+            val pfd = mContext.contentResolver.openFileDescriptor(uri, "r")
+            val inStream = FileInputStream(pfd?.fileDescriptor)
+            val zipIs = ZipInputStream(inStream)
+            var entry: ZipEntry?
+            var meta: Meta? = null
+            try {
+                while (true) {
+                    entry = zipIs.nextEntry
+                    if (entry == null) break
+                    if (entry.name != Meta.FILE_NAME) continue
+                    meta = Meta.fromString(String(zipIs.readBytes(), StandardCharsets.UTF_8))
+                    break
+                }
+            } catch (t: Throwable) {
+                Log.e(TAG, "Unable to read meta for $uri", t)
+            } finally {
+                zipIs.close()
+                inStream.close()
+                pfd?.close()
+                return meta
+            }
+        } catch (t: Throwable) {
+            Log.e(TAG, "Unable to read meta for $uri", t)
+            return null
+        }
+    }
+
+    private fun readPreview(): Pair<Bitmap?, Bitmap?>? {
+        var entry: ZipEntry?
+        var screenshot: Bitmap? = null
+        var wallpaper: Bitmap? = null
+        readZip { zipIs ->
+            while (true) {
+                entry = zipIs.nextEntry
+                if (entry == null) break
+                if (entry!!.name == "screenshot.png") {
+                    screenshot = BitmapFactory.decodeStream(zipIs)
+                } else if (entry!!.name == WALLPAPER_FILE_NAME) {
+                    wallpaper = BitmapFactory.decodeStream(zipIs)
+                }
+            }
+        }
+        if (screenshot == wallpaper) return null // both are null
+        return Pair(Utilities.getScaledDownBitmap(screenshot, 1000, false),
+                Utilities.getScaledDownBitmap(wallpaper, 1000, false))
+    }
+
+    private inline fun readZip(body: (ZipInputStream) -> Unit) {
+        try {
+            val pfd = mContext.contentResolver.openFileDescriptor(uri, "r")
+            val inStream = FileInputStream(pfd?.fileDescriptor)
+            val zipIs = ZipInputStream(inStream)
+            try {
+                body(zipIs)
+            } catch (t: Throwable) {
+                Log.e(TAG, "Unable to read zip for $uri", t)
+            } finally {
+                zipIs.close()
+                inStream.close()
+                pfd?.close()
+            }
+        } catch (t: Throwable) {
+            Log.e(TAG, "Unable to read zip for $uri", t)
+        }
+    }
+
+    fun restore(contents: Int): Boolean {
+        try {
+            val contextWrapper = ContextWrapper(mContext)
+            val dbFile = contextWrapper.getDatabasePath(LauncherFiles.LAUNCHER_DB)
+            val dbFile2 = contextWrapper.getDatabasePath(LauncherFiles.LAUNCHER_DB2)
+            val dir = contextWrapper.cacheDir.parent
+            val settingsFile = File(dir, "shared_prefs/" + LauncherFiles.SHARED_PREFERENCES_KEY + ".xml")
+
+            val pfd = mContext.contentResolver.openFileDescriptor(uri, "r")
+            val inStream = FileInputStream(pfd?.fileDescriptor)
+            val zipIs = ZipInputStream(inStream)
+            val data = ByteArray(BUFFER)
+            var entry: ZipEntry?
+            var success = false
+            try {
+                while (true) {
+                    entry = zipIs.nextEntry
+                    if (entry == null) break
+                    Log.d(TAG, "Found entry ${entry.name}")
+                    val file = if (entry.name == dbFile.name) {
+                        if (contents and INCLUDE_HOMESCREEN == 0) continue
+                        dbFile
+                    } else if (entry.name == dbFile2.name) {
+                        if (contents and INCLUDE_HOMESCREEN == 0) continue
+                        dbFile2
+                    } else if (entry.name == settingsFile.name) {
+                        if (contents and INCLUDE_SETTINGS == 0) continue
+                        settingsFile
+                    } else if (entry.name == WALLPAPER_FILE_NAME) {
+                        if (contents and INCLUDE_WALLPAPER == 0) continue
+                        val wallpaperManager = WallpaperManager.getInstance(mContext)
+                        wallpaperManager.setBitmap(BitmapFactory.decodeStream(zipIs))
+                        continue
+                    } else {
+                        continue
+                    }
+                    val out = FileOutputStream(file)
+                    Log.d(TAG, "Restoring ${entry.name} to ${file.absolutePath}")
+                    var count: Int
+                    while (true) {
+                        count = zipIs.read(data, 0, BUFFER)
+                        if (count == -1) break
+                        out.write(data, 0, count)
+                    }
+                    out.close()
+                }
+                success = true
+            } catch (t: Throwable) {
+                Log.e(TAG, "Failed to restore $uri", t)
+            } finally {
+                zipIs.close()
+                inStream.close()
+                pfd?.close()
+                return success
+            }
+        } catch (t: Throwable) {
+            Log.e(TAG, "Failed to restore $uri", t)
+            return false
+        }
+    }
+
+    fun delete(): Boolean {
+        return mContext.contentResolver.delete(uri, null, null) != 0
+    }
+
+    class MetaLoader(val backup: OmegaBackup) {
+        var callback: Callback? = null
+        var meta: Meta? = null
+        var withPreview = false
+        var loaded = false
+        private var loading = false
+
+        fun loadMeta(withPreview: Boolean = false) {
+            if (loading) return
+            if (!loaded) {
+                loading = true
+                this.withPreview = withPreview
+                LoadMetaTask().execute()
+            } else {
+                callback?.onMetaLoaded()
+            }
+        }
+
+        @SuppressLint("StaticFieldLeak")
+        inner class LoadMetaTask : AsyncTask<Void, Void, Meta?>() {
+
+            override fun doInBackground(vararg params: Void?): Meta? {
+                backup.meta
+                if (withPreview) {
+                    backup.meta?.preview = backup.readPreview()
+                }
+                return backup.meta
+            }
+
+            override fun onPostExecute(result: Meta?) {
+                meta = result
+                loaded = true
+                callback?.onMetaLoaded()
+            }
+        }
+
+        interface Callback {
+
+            fun onMetaLoaded()
+        }
+    }
+
+    data class Meta(val name: String, val contents: Int, val timestamp: String) {
+
+        val localizedTimestamp = SimpleDateFormat.getDateTimeInstance().format(timestampFormat.parse(timestamp))
+        var preview: Pair<Bitmap?, Bitmap?>? = null
+        override fun toString(): String {
+            val arr = JSONArray()
+            arr.put(VERSION)
+            arr.put(name)
+            arr.put(contents)
+            arr.put(timestamp)
+            return arr.toString()
+        }
+
+        fun recycle() {
+            preview?.first?.recycle()
+            preview?.second?.recycle()
+        }
+
+        companion object {
+
+            const val VERSION = 1
+
+            const val FILE_NAME = "lcbkp"
+
+            @Suppress("unused")
+            private const val VERSION_INDEX = 0
+            private const val NAME_INDEX = 1
+            private const val CONTENTS_INDEX = 2
+            private const val TIMESTAMP_INDEX = 3
+
+            fun fromString(string: String): Meta {
+                val arr = JSONArray(string)
+                return Meta(
+                        name = arr.getString(NAME_INDEX),
+                        contents = arr.getInt(CONTENTS_INDEX),
+                        timestamp = arr.getString(TIMESTAMP_INDEX)
+                )
+            }
+        }
+    }
+
+    companion object {
+        const val TAG = "OmegaBackup"
+
+        const val INCLUDE_HOMESCREEN = 1 shl 0
+        const val INCLUDE_SETTINGS = 1 shl 1
+        const val INCLUDE_WALLPAPER = 1 shl 2
+
+        const val BUFFER = 2018
+
+        const val EXTENSION = "zbk"
+        const val MIME_TYPE = "application/vnd.omega.backup"
+        val EXTRA_MIME_TYPES = arrayOf(MIME_TYPE, "application/x-zip", "application/octet-stream")
+
+        const val WALLPAPER_FILE_NAME = "wallpaper.png"
+        val timestampFormat = SimpleDateFormat("dd-MM-yyyy HH:mm:ss", Locale.US)
+
+        fun getFolder(): File {
+            val folder = File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOCUMENTS), "Omega/backup")
+            Log.d(TAG, "path: $folder")
+            if (!folder.exists()) {
+                folder.mkdirs()
+            }
+            return folder
+        }
+
+        fun listLocalBackups(context: Context): List<OmegaBackup> {
+            return getFolder().listFiles { file -> file.extension == EXTENSION }
+                    ?.sortedByDescending { it.lastModified() }
+                    ?.map { FileProvider.getUriForFile(context, "${BuildConfig.APPLICATION_ID}.provider", it) }
+                    ?.map { OmegaBackup(context, it) }
+                    ?: Collections.emptyList()
+        }
+
+        private fun prepareConfig(context: Context) {
+            Utilities.getOmegaPrefs(context).blockingEdit {
+                restoreSuccess = true
+                developerOptionsEnabled = false
+            }
+        }
+
+        private fun cleanupConfig(context: Context, devOptionsEnabled: Boolean) {
+            Utilities.getOmegaPrefs(context).blockingEdit {
+                restoreSuccess = false
+                developerOptionsEnabled = devOptionsEnabled
+            }
+        }
+
+        fun create(context: Context, name: String, location: Uri, contents: Int): Boolean {
+            val contextWrapper = ContextWrapper(context)
+            val files: MutableList<File> = ArrayList()
+            if (contents or INCLUDE_HOMESCREEN != 0) {
+                files.add(contextWrapper.getDatabasePath(LauncherFiles.LAUNCHER_DB))
+                files.add(contextWrapper.getDatabasePath(LauncherFiles.LAUNCHER_DB2))
+            }
+            if (contents or INCLUDE_SETTINGS != 0) {
+                val dir = contextWrapper.cacheDir.parent
+                files.add(File(dir, "shared_prefs/" + LauncherFiles.SHARED_PREFERENCES_KEY + ".xml"))
+            }
+
+            val devOptionsEnabled = Utilities.getOmegaPrefs(context)
+                    .developerOptionsEnabled
+            prepareConfig(context)
+            val pfd = context.contentResolver.openFileDescriptor(location, "w")
+            val outStream = FileOutputStream(pfd?.fileDescriptor)
+            val out = ZipOutputStream(BufferedOutputStream(outStream))
+            val data = ByteArray(BUFFER)
+            var success = false
+            try {
+                val metaEntry = ZipEntry(Meta.FILE_NAME)
+                out.putNextEntry(metaEntry)
+                out.write(getMeta(name, contents).toString().toByteArray())
+                if (contents or INCLUDE_WALLPAPER != 0) {
+                    val wallpaperManager = WallpaperManager.getInstance(context)
+                    val wallpaperDrawable = wallpaperManager.drawable
+                    val wallpaperBitmap = Utilities.drawableToBitmap(wallpaperDrawable)
+                    if (wallpaperBitmap != null) {
+                        val wallpaperEntry = ZipEntry(WALLPAPER_FILE_NAME)
+                        out.putNextEntry(wallpaperEntry)
+                        wallpaperBitmap.compress(Bitmap.CompressFormat.PNG, 100, out)
+                    }
+                }
+                files.forEach { file ->
+                    val input = BufferedInputStream(FileInputStream(file), BUFFER)
+                    val entry = ZipEntry(file.name)
+                    out.putNextEntry(entry)
+                    var count: Int
+                    while (true) {
+                        count = input.read(data, 0, BUFFER)
+                        if (count == -1) break
+                        out.write(data, 0, count)
+                    }
+                    input.close()
+                }
+                success = true
+            } catch (t: Throwable) {
+                Log.e(TAG, "Failed to create backup", t)
+            } finally {
+                out.close()
+                outStream.close()
+                pfd?.close()
+                cleanupConfig(context, devOptionsEnabled)
+                return success
+            }
+        }
+
+        private fun getMeta(name: String, contents: Int) = Meta(
+                name = name,
+                contents = contents,
+                timestamp = getTimestamp()
+        )
+
+        private fun getTimestamp(): String {
+            val simpleDateFormat = SimpleDateFormat("dd-MM-yyyy hh:mm:ss", Locale.US)
+            return simpleDateFormat.format(Date())
+        }
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/backup/RestoreBackupActivity.kt b/Omega/src/com/saggitt/omega/backup/RestoreBackupActivity.kt
new file mode 100644
index 0000000000..beb11ce02e
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/backup/RestoreBackupActivity.kt
@@ -0,0 +1,219 @@
+package com.saggitt.omega.backup
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.os.AsyncTask
+import android.os.Bundle
+import android.os.Handler
+import android.view.View
+import android.widget.CheckBox
+import android.widget.EditText
+import android.widget.ImageView
+import android.widget.TextView
+import com.android.launcher3.R
+import com.android.launcher3.Utilities
+import com.google.android.material.floatingactionbutton.FloatingActionButton
+import com.google.android.material.snackbar.Snackbar
+import com.saggitt.omega.settings.SettingsBaseActivity
+
+class RestoreBackupActivity : SettingsBaseActivity(), OmegaBackup.MetaLoader.Callback {
+
+    private val backupName by lazy { findViewById<EditText>(R.id.name) }
+    private val backupTimestamp by lazy { findViewById<EditText>(R.id.timestamp) }
+
+    private val backupHomescreen by lazy { findViewById<CheckBox>(R.id.content_homescreen) }
+    private val backupSettings by lazy { findViewById<CheckBox>(R.id.content_settings) }
+    private val backupWallpaper by lazy { findViewById<CheckBox>(R.id.content_wallpaper) }
+
+    private val backup by lazy {
+        if (intent.hasExtra(EXTRA_URI))
+            OmegaBackup(this, Uri.parse(intent.getStringExtra(EXTRA_URI)))
+        else
+            OmegaBackup(this, intent.data!!)
+    }
+    private val backupMetaLoader by lazy { OmegaBackup.MetaLoader(backup) }
+
+    private val config by lazy { findViewById<View>(R.id.config) }
+    private val startButton by lazy { findViewById<FloatingActionButton>(R.id.fab) }
+    private val progress by lazy { findViewById<View>(R.id.progress) }
+    private val progressBar by lazy { findViewById<View>(R.id.progressBar) }
+    private val progressText by lazy { findViewById<TextView>(R.id.progress_text) }
+    private val successIcon by lazy { findViewById<ImageView>(R.id.success_icon) }
+
+    private var fromExternal = false
+
+    private var inProgress = false
+        set(value) {
+            if (value) {
+                supportActionBar?.setDisplayShowHomeEnabled(false)
+                supportActionBar?.setDisplayHomeAsUpEnabled(false)
+            } else {
+                supportActionBar?.setDisplayHomeAsUpEnabled(true)
+            }
+            field = value
+        }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_restore_backup)
+
+        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+
+        when {
+            intent.hasExtra(EXTRA_URI) -> {
+            }
+            intent.data != null -> {
+                fromExternal = true
+            }
+            intent.hasExtra(EXTRA_SUCCESS) -> {
+                inProgress = true
+                showMessage(R.drawable.ic_check, R.string.restore_success)
+                Utilities.getOmegaPrefs(this).blockingEdit { restoreSuccess = false }
+                Handler().postDelayed({ finish() }, 2000)
+                return
+            }
+            else -> {
+                finish()
+                return
+            }
+        }
+
+        startButton.setOnClickListener {
+            startRestore()
+        }
+
+        loadMeta()
+    }
+
+    fun loadMeta() {
+        backupMetaLoader.callback = this
+        backupMetaLoader.loadMeta()
+
+        config.visibility = View.GONE
+        startButton.visibility = View.GONE
+        progress.visibility = View.VISIBLE
+        progressText.visibility = View.GONE
+    }
+
+    override fun onMetaLoaded() {
+        config.visibility = View.VISIBLE
+        startButton.visibility = View.VISIBLE
+        progress.visibility = View.GONE
+        backupMetaLoader.callback = null
+        if (backup.meta != null) {
+            backupName.setText(backup.meta?.name)
+            backupTimestamp.setText(backup.meta?.timestamp)
+            val contents = backup.meta!!.contents
+            val includeHomescreen = contents and OmegaBackup.INCLUDE_HOMESCREEN != 0
+            backupHomescreen.isEnabled = includeHomescreen
+            backupHomescreen.isChecked = includeHomescreen
+            val includeSettings = contents and OmegaBackup.INCLUDE_SETTINGS != 0
+            backupSettings.isEnabled = includeSettings
+            backupSettings.isChecked = includeSettings
+            val includeWallpaper = contents and OmegaBackup.INCLUDE_WALLPAPER != 0
+            backupWallpaper.isEnabled = includeWallpaper
+            backupWallpaper.isChecked = includeWallpaper
+        } else {
+            showMessage(R.drawable.ic_close, R.string.restore_read_meta_fail)
+        }
+    }
+
+    private fun validateOptions(): Int {
+        return if (backupName.text == null || backupName.text.toString() == "") {
+            R.string.backup_error_blank_name
+        } else if (!backupHomescreen.isChecked && !backupSettings.isChecked && !backupWallpaper.isChecked) {
+            R.string.backup_error_blank_contents
+        } else {
+            0
+        }
+    }
+
+    private fun startRestore() {
+        val error = validateOptions()
+        if (error == 0) {
+            RestoreBackupTask(this).execute()
+        } else {
+            Snackbar.make(findViewById(R.id.content), error, Snackbar.LENGTH_SHORT).show()
+        }
+    }
+
+    override fun onBackPressed() {
+        if (!inProgress) super.onBackPressed()
+    }
+
+    @SuppressLint("StaticFieldLeak")
+    private inner class RestoreBackupTask(val context: Context) : AsyncTask<Void, Void, Int>() {
+
+        override fun onPreExecute() {
+            super.onPreExecute()
+
+            config.visibility = View.GONE
+            startButton.visibility = View.GONE
+
+            progress.visibility = View.VISIBLE
+            progressText.visibility = View.VISIBLE
+
+            inProgress = true
+        }
+
+        override fun doInBackground(vararg params: Void?): Int {
+            var contents = 0
+            if (backupHomescreen.isChecked) {
+                contents = contents or OmegaBackup.INCLUDE_HOMESCREEN
+            }
+            if (backupSettings.isChecked) {
+                contents = contents or OmegaBackup.INCLUDE_SETTINGS
+            }
+            if (backupWallpaper.isChecked) {
+                contents = contents or OmegaBackup.INCLUDE_WALLPAPER
+            }
+            return if (backup.restore(contents)) contents else -1
+        }
+
+        override fun onPostExecute(result: Int) {
+            super.onPostExecute(result)
+
+            if (result > -1) {
+                progressText.text = getString(R.string.backup_restarting)
+
+                if (result and OmegaBackup.INCLUDE_SETTINGS == 0) {
+                    Utilities.getOmegaPrefs(this@RestoreBackupActivity).blockingEdit {
+                        restoreSuccess = true
+                    }
+                }
+
+                Handler().postDelayed({
+                    if (fromExternal) {
+                        val intent = Intent(this@RestoreBackupActivity,
+                                RestoreBackupActivity::class.java).putExtra(EXTRA_SUCCESS, true)
+                        startActivity(intent)
+                    }
+                    Utilities.killLauncher()
+                }, 500)
+            } else {
+                inProgress = false
+
+                showMessage(R.drawable.ic_close, R.string.restore_failed)
+            }
+        }
+
+    }
+
+    private fun showMessage(icon: Int, text: Int) {
+        config.visibility = View.GONE
+        startButton.visibility = View.GONE
+        progress.visibility = View.VISIBLE
+        progressBar.visibility = View.GONE
+        progressText.visibility = View.VISIBLE
+        successIcon.visibility = View.VISIBLE
+        successIcon.setImageDrawable(getDrawable(icon))
+        progressText.setText(text)
+    }
+
+    companion object {
+        const val EXTRA_URI = "uri"
+        const val EXTRA_SUCCESS = "success"
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/blur/BlurDrawable.kt b/Omega/src/com/saggitt/omega/blur/BlurDrawable.kt
index 103a1c04cf..3c3d43bbb7 100644
--- a/Omega/src/com/saggitt/omega/blur/BlurDrawable.kt
+++ b/Omega/src/com/saggitt/omega/blur/BlurDrawable.kt
@@ -20,13 +20,20 @@
 package com.saggitt.omega.blur
 
 import android.graphics.Canvas
+import android.graphics.RectF
 import android.graphics.drawable.Drawable
 
 abstract class BlurDrawable : Drawable(), BlurWallpaperProvider.Listener {
 
     abstract var blurRadii: Radii
+    open val blurRadius: Float get() = blurRadii.average
     abstract var viewOffsetX: Float
 
+    open var blurScaleX = 0f
+    open var blurScaleY = 0f
+    open var blurPivotX = 0f
+    open var blurPivotY = 0f
+
     override fun draw(canvas: Canvas) {
         draw(canvas, false)
     }
@@ -34,6 +41,9 @@ abstract class BlurDrawable : Drawable(), BlurWallpaperProvider.Listener {
     abstract fun draw(canvas: Canvas, noRadius: Boolean = false)
 
     abstract fun setBlurBounds(left: Float, top: Float, right: Float, bottom: Float)
+    open fun setBlurBounds(bounds: RectF) {
+        setBlurBounds(bounds.left, bounds.top, bounds.right, bounds.bottom)
+    }
 
     abstract fun startListening()
     abstract fun stopListening()
@@ -44,6 +54,8 @@ abstract class BlurDrawable : Drawable(), BlurWallpaperProvider.Listener {
             val bottomLeft: Float = 0f,
             val bottomRight: Float = 0f) {
 
+        val average = (topLeft + topRight + bottomLeft + bottomRight) / 4
+
         constructor(radius: Float) : this(radius, radius, radius, radius)
         constructor(topRadius: Float, bottomRadius: Float)
                 : this(topRadius, topRadius, bottomRadius, bottomRadius)
diff --git a/Omega/src/com/saggitt/omega/blur/BlurHotseat.kt b/Omega/src/com/saggitt/omega/blur/BlurHotseat.kt
new file mode 100644
index 0000000000..c1213ca52e
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/blur/BlurHotseat.kt
@@ -0,0 +1,243 @@
+/*
+ *     Copyright (C) 2019 Lawnchair Team.
+ *
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.blur
+
+import android.content.Context
+import android.graphics.Bitmap
+import android.graphics.Canvas
+import android.graphics.Paint
+import android.graphics.drawable.Drawable
+import android.util.AttributeSet
+import com.android.launcher3.Launcher
+import com.android.launcher3.R
+import com.android.launcher3.graphics.NinePatchDrawHelper
+import com.android.launcher3.icons.GraphicsUtils.setColorAlphaBound
+import com.android.launcher3.icons.ShadowGenerator
+import com.android.launcher3.util.Themes
+import com.saggitt.omega.OmegaPreferences
+import com.saggitt.omega.util.dpToPx
+import com.saggitt.omega.util.isVisible
+import com.saggitt.omega.util.omegaPrefs
+import com.saggitt.omega.util.runOnMainThread
+import kotlin.math.max
+import kotlin.math.roundToInt
+
+class BlurHotseat @JvmOverloads constructor(
+        context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
+) : CustomHotseat(context, attrs, defStyleAttr),
+        OmegaPreferences.OnPreferenceChangeListener,
+        BlurWallpaperProvider.Listener {
+
+    private val launcher = Launcher.getLauncher(context)
+    private val prefs = context.omegaPrefs
+    private val prefsToWatch = arrayOf("pref_dockBackground", "pref_dockRadius", "pref_dockShadow",
+            "pref_hotseatCustomOpacity")
+
+    private val paint = Paint(Paint.ANTI_ALIAS_FLAG)
+    private val shadowBlur = resources.getDimension(R.dimen.all_apps_scrim_blur)
+    private var viewAlpha = 1f
+        set(value) {
+            field = value
+            setBgColor()
+        }
+
+    private var bgEnabled = prefs.dockBackground
+    private var radius = prefs.dockRadius
+    private var shadow = prefs.dockShadow
+    private val shadowHelper = NinePatchDrawHelper()
+    private var shadowBitmap = generateShadowBitmap()
+
+    private var noAlphaBgColor = context.omegaPrefs.dockBackgroundColor
+        set(value) {
+            field = value
+            setBgColor()
+        }
+    var bgAlpha = 0f
+        private set(value) {
+            field = value
+            setBgColor()
+        }
+    var bgColor = 0
+        private set
+
+    private val blurDrawableCallback by lazy {
+        object : Drawable.Callback {
+            override fun unscheduleDrawable(who: Drawable, what: Runnable) {
+
+            }
+
+            override fun invalidateDrawable(who: Drawable) {
+                runOnMainThread { invalidate() }
+            }
+
+            override fun scheduleDrawable(who: Drawable, what: Runnable, `when`: Long) {
+
+            }
+        }
+    }
+
+    private val blurProvider by lazy { BlurWallpaperProvider.getInstance(context) }
+    private var blurDrawable: BlurDrawable? = null
+        set(value) {
+            if (isAttachedToWindow) {
+                field?.stopListening()
+            }
+            field = value
+            if (isAttachedToWindow) {
+                field?.startListening()
+            }
+        }
+
+    init {
+        setWillNotDraw(!bgEnabled || launcher.useVerticalBarLayout())
+    }
+
+    private fun createBlurDrawable() {
+        blurDrawable = if (isVisible && BlurWallpaperProvider.isEnabled) {
+            val drawable = blurDrawable ?: blurProvider.createDrawable(radius, radius)
+            drawable.apply {
+                blurRadii = BlurDrawable.Radii(radius)
+                callback = blurDrawableCallback
+                setBounds(left, top, right, bottom)
+                if (isAttachedToWindow) startListening()
+            }
+        } else {
+            null
+        }
+    }
+
+    private fun drawBackground(canvas: Canvas) {
+        val adjustmentX = left.toFloat() + translationX
+        val adjustmentY = top.toFloat() + translationY
+        val left = 0f + adjustmentX
+        val top = -radius + adjustmentY
+        val right = width.toFloat() + adjustmentX
+        val bottom = height * 2f + adjustmentY
+        canvas.save()
+        canvas.translate(-adjustmentX, -adjustmentY)
+        blurDrawable?.run {
+            blurScaleX = 1 / scaleX
+            blurScaleY = 1 / scaleY
+            blurPivotX = pivotX
+            blurPivotY = pivotY
+            alpha = (viewAlpha * 255).toInt()
+            setBlurBounds(left, top, right, bottom)
+            draw(canvas)
+        }
+        canvas.drawRoundRect(left, top, right, bottom, radius, radius, paint)
+        if (shadow) {
+            shadowHelper.paint.alpha = (viewAlpha * 255).toInt()
+            shadowHelper.drawVerticallyStretched(
+                    shadowBitmap, canvas,
+                    left - shadowBlur,
+                    top - shadowBlur,
+                    right + shadowBlur,
+                    bottom)
+        }
+        canvas.restore()
+    }
+
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+        prefs.addOnPreferenceChangeListener(this, *prefsToWatch)
+        blurProvider.addListener(this)
+        blurDrawable?.startListening()
+    }
+
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+        prefs.removeOnPreferenceChangeListener(this, *prefsToWatch)
+        blurProvider.removeListener(this)
+        blurDrawable?.stopListening()
+    }
+
+    override fun onValueChanged(key: String, prefs: OmegaPreferences, force: Boolean) {
+        reloadPrefs()
+    }
+
+    override fun onLayout(changed: Boolean, l: Int, t: Int, r: Int, b: Int) {
+        super.onLayout(changed, l, t, r, b)
+        setWillNotDraw(!bgEnabled || launcher.useVerticalBarLayout())
+    }
+
+    private fun reloadPrefs() {
+        bgEnabled = prefs.dockBackground
+        radius = dpToPx(prefs.dockRadius)
+        shadow = prefs.dockShadow
+        bgAlpha = (prefs.dockOpacity.takeIf { it >= 0 }
+                ?: Themes.getAttrInteger(context, R.attr.allAppsInterimScrimAlpha)).toFloat() / 255f
+        shadowBitmap = generateShadowBitmap()
+        setWillNotDraw(!bgEnabled || launcher.useVerticalBarLayout())
+        createBlurDrawable()
+        invalidate()
+    }
+
+    override fun draw(canvas: Canvas) {
+        if (bgEnabled) {
+            drawBackground(canvas)
+        }
+        super.draw(canvas)
+    }
+
+    private fun setBgColor() {
+        bgColor = setColorAlphaBound(noAlphaBgColor, (bgAlpha * viewAlpha * 255).toInt())
+        paint.color = bgColor
+        invalidate()
+    }
+
+    override fun setAlpha(alpha: Float) {
+        this.viewAlpha = max(0f, alpha)
+        shortcutsAndWidgets.alpha = alpha
+    }
+
+    override fun getAlpha(): Float {
+        return shortcutsAndWidgets.alpha
+    }
+
+    override fun setTranslationX(translationX: Float) {
+        super.setTranslationX(translationX)
+        invalidateBlur()
+    }
+
+    private fun generateShadowBitmap(): Bitmap {
+        val tmp = radius + shadowBlur
+        val builder = ShadowGenerator.Builder(0)
+        builder.radius = radius
+        builder.shadowBlur = shadowBlur
+        val round = 2 * tmp.roundToInt() + 20
+        val bitmap = Bitmap.createBitmap(round, round / 2, Bitmap.Config.ARGB_8888)
+        val f = 2f * tmp + 20f - shadowBlur
+        builder.bounds.set(shadowBlur, shadowBlur, f, f)
+        builder.drawShadow(Canvas(bitmap))
+        return bitmap
+    }
+
+    private fun invalidateBlur() {
+        if (blurDrawable != null) {
+            invalidate()
+        }
+    }
+
+    override fun onEnabledChanged() {
+        super.onEnabledChanged()
+        createBlurDrawable()
+        invalidate()
+    }
+}
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/blur/BlurScrimView.kt b/Omega/src/com/saggitt/omega/blur/BlurScrimView.kt
new file mode 100644
index 0000000000..fa42b6ad06
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/blur/BlurScrimView.kt
@@ -0,0 +1,329 @@
+/*
+ * Copyright (C) 2018 paphonb@xda
+ *
+ * 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.
+ */
+
+package com.saggitt.omega.blur
+
+import android.content.Context
+import android.graphics.*
+import android.graphics.drawable.Drawable
+import android.util.AttributeSet
+import androidx.core.graphics.ColorUtils
+import com.android.launcher3.BuildConfig
+import com.android.launcher3.LauncherState
+import com.android.launcher3.LauncherState.BACKGROUND_APP
+import com.android.launcher3.R
+import com.android.launcher3.Utilities
+import com.android.launcher3.anim.Interpolators.ACCEL_2
+import com.android.launcher3.anim.Interpolators.LINEAR
+import com.android.launcher3.util.Themes
+import com.android.quickstep.SysUINavigationMode
+import com.android.quickstep.views.ShelfScrimView
+import com.saggitt.omega.OmegaPreferences
+import com.saggitt.omega.util.dpToPx
+import com.saggitt.omega.util.omegaPrefs
+import com.saggitt.omega.util.runOnMainThread
+
+class BlurScrimView(context: Context, attrs: AttributeSet) : ShelfScrimView(context, attrs),
+        OmegaPreferences.OnPreferenceChangeListener,
+        BlurWallpaperProvider.Listener {
+
+    private val key_radius = "pref_dockRadius"
+    private val key_opacity = "pref_allAppsOpacitySB"
+    private val key_dock_opacity = "pref_hotseatCustomOpacity"
+    private val key_dock_arrow = "pref_hotseatShowArrow"
+    private val key_search_radius = "pref_searchbarRadius"
+    private val key_debug_state = "pref_debugDisplayState"
+    private val key_drawer_background = "pref_drawer_background_color"
+    private val key_dock_background = "pref_dock_background_color"
+
+    private val prefsToWatch =
+            arrayOf(key_radius, key_opacity, key_dock_opacity, key_dock_arrow, key_search_radius,
+                    key_debug_state, key_drawer_background, key_dock_background)
+
+    private val blurDrawableCallback by lazy {
+        object : Drawable.Callback {
+            override fun unscheduleDrawable(who: Drawable, what: Runnable) {
+
+            }
+
+            override fun invalidateDrawable(who: Drawable) {
+                runOnMainThread { invalidate() }
+            }
+
+            override fun scheduleDrawable(who: Drawable, what: Runnable, `when`: Long) {
+
+            }
+        }
+    }
+
+    private val provider by lazy { BlurWallpaperProvider.getInstance(context) }
+    private val useFlatColor get() = mLauncher.deviceProfile.isVerticalBarLayout
+    private var blurDrawable: BlurDrawable? = null
+
+    private val insets = Rect()
+
+    private val colorRanges = ArrayList<ColorRange>()
+
+    private var allAppsBackground = context.omegaPrefs.drawerBackgroundColor
+    private var dockBackground = context.omegaPrefs.dockBackgroundColor
+    private val defaultAllAppsBackground = Themes.getAttrColor(context, R.attr.allAppsNavBarScrimColor)
+
+    private val reInitUiRunnable = this::reInitUi
+    private var fullBlurProgress = 0f
+
+    private var shouldDrawDebug = false
+    private val debugTextPaint = Paint().apply {
+        textSize = DEBUG_TEXT_SIZE
+        color = Color.RED
+        typeface = Typeface.DEFAULT_BOLD
+    }
+
+    private val defaultEndAlpha = Color.alpha(mEndScrim)
+
+    val currentBlurAlpha get() = blurDrawable?.alpha
+
+    private fun createBlurDrawable(): BlurDrawable? {
+        blurDrawable?.let { if (isAttachedToWindow) it.stopListening() }
+        return if (BlurWallpaperProvider.isEnabled) {
+            provider.createDrawable(mRadius, 0f).apply {
+                callback = blurDrawableCallback
+                setBounds(left, top, right, bottom)
+                if (isAttachedToWindow) startListening()
+            }
+        } else {
+            null
+        }
+    }
+
+    override fun reInitUi() {
+        blurDrawable = createBlurDrawable()
+        blurDrawable?.alpha = 0
+        rebuildColors()
+        super.reInitUi()
+    }
+
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+
+        prefs.addOnPreferenceChangeListener(this, *prefsToWatch)
+        BlurWallpaperProvider.getInstance(context).addListener(this)
+        blurDrawable?.startListening()
+    }
+
+    override fun onValueChanged(key: String, prefs: OmegaPreferences, force: Boolean) {
+        when (key) {
+            key_radius -> {
+                mRadius = dpToPx(prefs.dockRadius)
+                blurDrawable?.also {
+                    it.blurRadii = BlurDrawable.Radii(mRadius, 0f)
+                }
+            }
+            key_opacity -> {
+                mEndAlpha = prefs.allAppsOpacity.takeIf { it >= 0 } ?: defaultEndAlpha
+                calculateEndScrim()
+                mEndFlatColorAlpha = Color.alpha(mEndFlatColor)
+                postReInitUi()
+            }
+            key_dock_opacity -> {
+                postReInitUi()
+            }
+            key_dock_arrow -> {
+                updateDragHandleVisibility()
+            }
+            key_dock_background -> {
+                dockBackground = prefs.dockBackgroundColor
+                postReInitUi()
+            }
+            key_drawer_background -> {
+                if (prefs.customBackground) {
+                    allAppsBackground = prefs.drawerBackgroundColor
+                } else {
+                    allAppsBackground = defaultAllAppsBackground
+                }
+                calculateEndScrim()
+                postReInitUi()
+            }
+        }
+    }
+
+    private fun calculateEndScrim() {
+        mEndScrim = ColorUtils.setAlphaComponent(allAppsBackground, mEndAlpha)
+        mEndFlatColor = ColorUtils.compositeColors(mEndScrim, ColorUtils.setAlphaComponent(
+                mScrimColor, mMaxScrimAlpha))
+    }
+
+    private fun rebuildColors() {
+        val recentsProgress = LauncherState.OVERVIEW.getScrimProgress(mLauncher)
+
+        val hasRecents = Utilities.isRecentsEnabled() && recentsProgress < 1f
+
+        val fullShelfColor = ColorUtils.setAlphaComponent(allAppsBackground, mEndAlpha)
+        val recentsShelfColor = ColorUtils.setAlphaComponent(allAppsBackground, super.getMidAlpha())
+        val nullShelfColor = ColorUtils.setAlphaComponent(allAppsBackground, 0)
+
+        val colors = ArrayList<Pair<Float, Int>>()
+        colors.add(Pair(Float.NEGATIVE_INFINITY, fullShelfColor))
+        colors.add(Pair(0.5f, fullShelfColor))
+        fullBlurProgress = 0.5f
+        if (hasRecents) {
+            colors.add(Pair(recentsProgress, recentsShelfColor))
+            fullBlurProgress = recentsProgress
+        } else if (hasRecents) {
+            colors.add(Pair(recentsProgress, recentsShelfColor))
+            fullBlurProgress = recentsProgress
+        }
+        colors.add(Pair(1f, nullShelfColor))
+        colors.add(Pair(Float.POSITIVE_INFINITY, nullShelfColor))
+
+        colorRanges.clear()
+        for (i in (1 until colors.size)) {
+            val color1 = colors[i - 1]
+            val color2 = colors[i]
+            colorRanges.add(ColorRange(color1.first, color2.first, color1.second, color2.second))
+        }
+    }
+
+    override fun getMidAlpha(): Int {
+        return prefs.dockOpacity.takeIf { it >= 0 } ?: super.getMidAlpha()
+    }
+
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+
+        prefs.removeOnPreferenceChangeListener(this, *prefsToWatch)
+        BlurWallpaperProvider.getInstance(context).removeListener(this)
+        blurDrawable?.stopListening()
+    }
+
+    override fun onDraw(canvas: Canvas) {
+        super.onDraw(canvas)
+
+        if (shouldDrawDebug) {
+            drawDebug(canvas)
+        }
+    }
+
+    override fun setInsets(insets: Rect) {
+        super.setInsets(insets)
+        this.insets.set(insets)
+        postReInitUi()
+    }
+
+    override fun onDrawFlatColor(canvas: Canvas) {
+        blurDrawable?.run {
+            setBounds(0, 0, width, height)
+            draw(canvas, true)
+        }
+    }
+
+    override fun onDrawRoundRect(canvas: Canvas, left: Float, top: Float, right: Float, bottom: Float, rx: Float, ry: Float, paint: Paint) {
+        blurDrawable?.run {
+            setBlurBounds(left, top, right, bottom)
+            draw(canvas)
+        }
+        super.onDrawRoundRect(canvas, left, top, right, bottom, rx, ry, paint)
+    }
+
+    override fun updateColors() {
+        super.updateColors()
+        val alpha = when {
+            useFlatColor -> ((1 - mProgress) * 255).toInt()
+            mProgress >= fullBlurProgress -> Math.round(255 * ACCEL_2.getInterpolation(
+                    Math.max(0f, 1 - mProgress) / (1 - fullBlurProgress)))
+            else -> 255
+        }
+        blurDrawable?.alpha = alpha
+
+        mDragHandleOffset = Math.max(0f, mDragHandleBounds.top + mDragHandleSize - mShelfTop)
+
+        if (!useFlatColor) {
+            if (mProgress >= 1 && mSysUINavigationMode == SysUINavigationMode.Mode.NO_BUTTON
+                    && mLauncher.stateManager.state == BACKGROUND_APP) {
+                mShelfColor = ColorUtils.setAlphaComponent(allAppsBackground, mMidAlpha)
+            } else {
+                mShelfColor = getColorForProgress(mProgress)
+            }
+        }
+    }
+
+    private fun getColorForProgress(progress: Float): Int {
+        val interpolatedProgress: Float = when {
+            progress >= 1 -> progress
+            progress >= mMidProgress -> Utilities.mapToRange(
+                    progress, mMidProgress, 1f, mMidProgress, 1f,
+                    mBeforeMidProgressColorInterpolator)
+            else -> Utilities.mapToRange(
+                    progress, 0f, mMidProgress, 0f, mMidProgress,
+                    mAfterMidProgressColorInterpolator)
+        }
+        colorRanges.forEach {
+            if (interpolatedProgress in it) {
+                return it.getColor(interpolatedProgress)
+            }
+        }
+        return 0
+    }
+
+    override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {
+        super.onLayout(changed, left, top, right, bottom)
+        if (useFlatColor) {
+            blurDrawable?.setBounds(left, top, right, bottom)
+        }
+    }
+
+    override fun onEnabledChanged() {
+        postReInitUi()
+    }
+
+    private fun drawDebug(canvas: Canvas) {
+        listOf(
+                "version: ${BuildConfig.VERSION_NAME} (${BuildConfig.VERSION_CODE})",
+                "state: ${mLauncher.stateManager.state::class.java.simpleName}",
+                "toState: ${mLauncher.stateManager.toState::class.java.simpleName}"
+        ).forEachIndexed { index, line ->
+            canvas.drawText(line, 50f, 200f + (DEBUG_LINE_HEIGHT * index), debugTextPaint)
+        }
+    }
+
+    private fun postReInitUi() {
+        handler?.removeCallbacks(reInitUiRunnable)
+        handler?.post(reInitUiRunnable)
+    }
+
+    fun setOverlayScroll(scroll: Float) {
+        blurDrawable?.viewOffsetX = scroll
+    }
+
+    companion object {
+        private const val DEBUG_TEXT_SIZE = 30f
+        private const val DEBUG_LINE_HEIGHT = DEBUG_TEXT_SIZE + 3f
+    }
+
+    class ColorRange(private val start: Float, private val end: Float,
+                     private val startColor: Int, private val endColor: Int) {
+
+        private val range = start..end
+
+        fun getColor(progress: Float): Int {
+            if (start == Float.NEGATIVE_INFINITY) return endColor
+            if (end == Float.POSITIVE_INFINITY) return startColor
+            val amount = Utilities.mapToRange(progress, start, end, 0f, 1f, LINEAR)
+            return ColorUtils.blendARGB(startColor, endColor, amount)
+        }
+
+        operator fun contains(value: Float) = value in range
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/blur/CustomHotseat.kt b/Omega/src/com/saggitt/omega/blur/CustomHotseat.kt
new file mode 100644
index 0000000000..926c8fd584
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/blur/CustomHotseat.kt
@@ -0,0 +1,45 @@
+/*
+ *     Copyright (C) 2019 Lawnchair Team.
+ *
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.blur
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.View
+import com.android.launcher3.Hotseat
+import com.saggitt.omega.util.omegaPrefs
+
+open class CustomHotseat @JvmOverloads constructor(
+        context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0) : Hotseat(context, attrs, defStyleAttr) {
+
+    private val hotseatDisabled = context.omegaPrefs.dockHide
+
+    init {
+        if (hotseatDisabled) {
+            super.setVisibility(View.GONE)
+        }
+    }
+
+    override fun setVisibility(visibility: Int) {
+        if (!hotseatDisabled) {
+            super.setVisibility(visibility)
+        }
+    }
+}
+
diff --git a/Omega/src/com/saggitt/omega/dash/DashActivity.java b/Omega/src/com/saggitt/omega/dash/DashActivity.java
deleted file mode 100644
index 59d5d99056..0000000000
--- a/Omega/src/com/saggitt/omega/dash/DashActivity.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- *  Copyright (c) 2020 Omega Launcher
- *
- *  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.
- *
- */
-
-package com.saggitt.omega.dash;
-
-import android.os.Bundle;
-
-import androidx.appcompat.app.AppCompatActivity;
-
-import com.android.launcher3.R;
-
-import java.util.ArrayList;
-
-public class DashActivity extends AppCompatActivity {
-    private DashItemAdapter adapter;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        setContentView(R.layout.activity_dash);
-        DashItems items = new DashItems(getApplicationContext());
-
-        ArrayList<DashModel> itemTitles = items.getItemList();
-
-        // usage sample
-        final DashListView circularListView = (DashListView) findViewById(R.id.my_circular_list);
-        adapter = new DashItemAdapter(getLayoutInflater(), itemTitles, circularListView.getContext());
-        circularListView.setAdapter(adapter);
-        circularListView.setRadius(150);
-    }
-}
diff --git a/Omega/src/com/saggitt/omega/dash/DashBottomSheet.kt b/Omega/src/com/saggitt/omega/dash/DashBottomSheet.kt
new file mode 100644
index 0000000000..a09c269cd1
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/dash/DashBottomSheet.kt
@@ -0,0 +1,53 @@
+/*
+ *  Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ *
+ */
+
+package com.saggitt.omega.dash
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.View
+import android.widget.RelativeLayout
+import com.android.launcher3.Launcher
+import com.android.launcher3.R
+import com.saggitt.omega.views.CenterFloatingView
+
+/*
+* Esta clase despliega la vista circular desde la parte inferior de la pantalla.
+*/
+class DashBottomSheet(context: Context) : RelativeLayout(context) {
+    private var adapter: DashItemAdapter? = null
+    private var mInflater: LayoutInflater? = null
+
+    init {
+        View.inflate(context, R.layout.dash_view, this)
+        val items = DashItems(context)
+        val itemTitles = items.getItemList()
+        val circularListView = findViewById<View>(R.id.my_circular_list) as DashListView
+        mInflater = context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater
+        adapter = DashItemAdapter(mInflater, itemTitles, context)
+        circularListView.setAdapter(adapter)
+        circularListView.setRadius(150f)
+    }
+
+    companion object {
+        fun show(launcher: Launcher, animate: Boolean) {
+            val sheet = CenterFloatingView.inflate(launcher)
+            val view = DashBottomSheet(launcher)
+            sheet.show(view, animate)
+        }
+    }
+}
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/dash/DashEditAdapter.kt b/Omega/src/com/saggitt/omega/dash/DashEditAdapter.kt
index 1d9b610f7e..ec3277affb 100644
--- a/Omega/src/com/saggitt/omega/dash/DashEditAdapter.kt
+++ b/Omega/src/com/saggitt/omega/dash/DashEditAdapter.kt
@@ -20,7 +20,6 @@ package com.saggitt.omega.dash
 import android.annotation.SuppressLint
 import android.content.Context
 import android.content.res.ColorStateList
-import android.os.Handler
 import android.view.LayoutInflater
 import android.view.MotionEvent
 import android.view.View
@@ -31,15 +30,15 @@ import androidx.appcompat.widget.SwitchCompat
 import androidx.core.widget.CompoundButtonCompat
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.RecyclerView
-import com.android.launcher3.Launcher
 import com.android.launcher3.R
 import com.android.launcher3.Utilities
+import com.android.launcher3.util.Executors.MAIN_EXECUTOR
 import com.saggitt.omega.util.isVisible
 
 class DashEditAdapter(context: Context) : RecyclerView.Adapter<DashEditAdapter.Holder>() {
     private val prefs = Utilities.getOmegaPrefs(context)
     private val allItems = ArrayList<CustomDashItem>()
-    private val handler = Handler()
+    private val handler = MAIN_EXECUTOR.handler
 
     private var dividerIndex = 0
     private val adapterItems = ArrayList<Item>()
@@ -211,7 +210,6 @@ class DashEditAdapter(context: Context) : RecyclerView.Adapter<DashEditAdapter.H
         @SuppressLint("PrivateResource")
         override fun bind(item: Item) {
             super.bind(item)
-            val context = Launcher.mContext
             val states = arrayOf(intArrayOf(-android.R.attr.state_enabled), intArrayOf(android.R.attr.state_checked), intArrayOf())
             val colors = intArrayOf(androidx.preference.R.color.switch_thumb_normal_material_light, //Normal
                     prefs.accentColor, //checked
@@ -227,7 +225,7 @@ class DashEditAdapter(context: Context) : RecyclerView.Adapter<DashEditAdapter.H
 
             switchEnable.setOnCheckedChangeListener { buttonView, isChecked ->
                 buttonView.setText(if (isChecked) R.string.on else R.string.off)
-                prefs.setDashEnable(isChecked)
+                prefs.dashEnable = isChecked
             }
         }
     }
diff --git a/Omega/src/com/saggitt/omega/dash/DashFragment.kt b/Omega/src/com/saggitt/omega/dash/DashFragment.kt
index 7fe9656dd9..e6baaef68b 100644
--- a/Omega/src/com/saggitt/omega/dash/DashFragment.kt
+++ b/Omega/src/com/saggitt/omega/dash/DashFragment.kt
@@ -36,8 +36,8 @@ class DashFragment : RecyclerViewFragment() {
         }
     }
 
-    override fun onPause() {
+    /*override fun onPause() {
         super.onPause()
-        //Utilities.getZimPrefs(context).dashItems = adapter.getDashItems()
-    }
+        Utilities.getOmegaPrefs(context).dashItems = adapter.getDashItems()
+    }*/
 }
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/dash/DashItemAdapter.java b/Omega/src/com/saggitt/omega/dash/DashItemAdapter.java
index f0aa1f3236..00f892dcc2 100644
--- a/Omega/src/com/saggitt/omega/dash/DashItemAdapter.java
+++ b/Omega/src/com/saggitt/omega/dash/DashItemAdapter.java
@@ -18,35 +18,41 @@
 package com.saggitt.omega.dash;
 
 import android.content.Context;
+import android.content.res.ColorStateList;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.ImageView;
 
+import com.android.launcher3.AbstractFloatingView;
+import com.android.launcher3.Launcher;
 import com.android.launcher3.R;
+import com.android.launcher3.util.Themes;
 
 import java.util.ArrayList;
 
 public class DashItemAdapter {
-    private ArrayList<DashModel> mItems;
-    private LayoutInflater mInflater;
-    private ArrayList<View> mItemViews;
+    private final ArrayList<View> mItemViews;
     private DashItemChangeListener circularItemChangeListener;
-    private Context mContext;
+    private final Context mContext;
 
     public DashItemAdapter(LayoutInflater inflater, ArrayList<DashModel> items, Context context) {
-        this.mItemViews = new ArrayList<>();
-        this.mItems = items;
-        this.mInflater = inflater;
-        for (DashModel dashItem : mItems) {
-            View view = mInflater.inflate(R.layout.dash_item, null);
-            ImageView itemView = (ImageView) view.findViewById(R.id.bt_item);
+        mContext = context;
+        mItemViews = new ArrayList<>();
+        for (DashModel dashItem : items) {
+            View view = inflater.inflate(R.layout.dash_item, null);
+            ImageView itemView = view.findViewById(R.id.bt_item);
+            ColorStateList backgroundColor = ColorStateList.valueOf(Themes.getAttrColor(mContext, R.attr.dashIconBackground));
+            itemView.setBackgroundTintList(backgroundColor);
             itemView.setImageDrawable(dashItem.getIcon());
+            ColorStateList iconColor = ColorStateList.valueOf(Themes.getAttrColor(mContext, R.attr.dashIconTint));
+            itemView.setImageTintList(iconColor);
+
             itemView.setOnClickListener((parent) -> {
-                dashItem.RunAction(dashItem.getAction(), parent.getContext());
+                dashItem.RunAction(dashItem.getAction(), mContext);
+                AbstractFloatingView.closeAllOpenViews(Launcher.getLauncher(mContext));
             });
             mItemViews.add(view);
         }
-        mContext = context;
     }
 
     public int getCount() {
@@ -74,7 +80,7 @@ public void addItem(View view) {
     }
 
     public void setOnItemChangeListener(DashItemChangeListener listener) {
-        this.circularItemChangeListener = listener;
+        circularItemChangeListener = listener;
     }
 
     public void notifyItemChange() {
diff --git a/Omega/src/com/saggitt/omega/dash/DashItems.java b/Omega/src/com/saggitt/omega/dash/DashItems.java
index 8c7432b742..d86570c563 100644
--- a/Omega/src/com/saggitt/omega/dash/DashItems.java
+++ b/Omega/src/com/saggitt/omega/dash/DashItems.java
@@ -34,7 +34,6 @@
 import java.util.ArrayList;
 
 public class DashItems {
-
     ArrayList<DashModel> itemList = new ArrayList<>();
     private Context mContext;
 
@@ -69,7 +68,7 @@ private void LoadItems() {
 
     private Drawable getDrawable(String iconName) {
         int icon = mContext.getResources().getIdentifier(iconName, "drawable", mContext.getPackageName());
-        return mContext.getResources().getDrawable(icon);
+        return mContext.getResources().getDrawable(icon, null);
 
     }
 
diff --git a/Omega/src/com/saggitt/omega/dash/DashListView.java b/Omega/src/com/saggitt/omega/dash/DashListView.java
index 9e43fc7e4e..8a7ed7f487 100644
--- a/Omega/src/com/saggitt/omega/dash/DashListView.java
+++ b/Omega/src/com/saggitt/omega/dash/DashListView.java
@@ -41,7 +41,6 @@ public class DashListView extends RelativeLayout implements DashItemAdapter.Dash
     private double intervalAngle = Math.PI / 4;
     private double pre_IntervalAngle = Math.PI / 4;
     private DashItemAdapter dashAdapter;
-    private Context mContext;
 
     public DashListView(Context context) {
         this(context, null, 0);
@@ -53,13 +52,12 @@ public DashListView(Context context, AttributeSet attrs) {
 
     public DashListView(Context context, AttributeSet attrs, int defStyleAttrs) {
         super(context, attrs, defStyleAttrs);
-        mContext = context;
         init();
     }
 
     private void init() {
         post(() -> {
-            Log.e("CircularListView", "get layout width and height");
+            Log.d("CircularListView", "get layout width and height");
             layoutWidth = getWidth();
             layoutHeight = getHeight();
             layoutCenter_x = layoutWidth / 2;
diff --git a/Omega/src/com/saggitt/omega/dash/DashModel.java b/Omega/src/com/saggitt/omega/dash/DashModel.java
index 1974860284..be6dd76333 100644
--- a/Omega/src/com/saggitt/omega/dash/DashModel.java
+++ b/Omega/src/com/saggitt/omega/dash/DashModel.java
@@ -18,11 +18,13 @@
 package com.saggitt.omega.dash;
 
 import android.app.NotificationManager;
+import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.drawable.Drawable;
 import android.media.AudioManager;
 import android.provider.Settings;
+import android.widget.Toast;
 
 import com.android.launcher3.Launcher;
 import com.android.launcher3.R;
@@ -42,9 +44,6 @@ public class DashModel implements Serializable {
     private boolean isEnabled;
     private Drawable icon;
 
-    public DashModel() {
-    }
-
     public int getId() {
         return id;
     }
@@ -94,6 +93,7 @@ public void setIcon(Drawable icon) {
     }
 
     public void RunAction(String action, Context context) {
+
         switch (action) {
             case "MobileNetworkSettings":
                 context.startActivity(new Intent(Settings.ACTION_DATA_ROAMING_SETTINGS));
@@ -109,16 +109,22 @@ public void RunAction(String action, Context context) {
                 break;
 
             case "SetWallpaper":
-                context.startActivity(Intent.createChooser(new Intent(Intent.ACTION_SET_WALLPAPER), context.getString(R.string.wallpaper_pick)));
+                try {
+                    context.startActivity(
+                            Intent.createChooser(new Intent(Intent.ACTION_SET_WALLPAPER),
+                                    context.getString(R.string.wallpaper_pick)));
+                } catch (ActivityNotFoundException e) {
+                    Toast.makeText(context, R.string.activity_not_found, Toast.LENGTH_SHORT).show();
+                }
                 break;
 
             case "DeviceSettings":
                 context.startActivity(new Intent(android.provider.Settings.ACTION_SETTINGS));
                 break;
+
             case "LauncherSettings":
-                Launcher launcher = Launcher.getLauncher(context);
-                launcher.startActivity(new Intent(Intent.ACTION_APPLICATION_PREFERENCES)
-                        .setPackage(launcher.getPackageName())
+                context.startActivity(new Intent(Intent.ACTION_APPLICATION_PREFERENCES)
+                        .setPackage(context.getPackageName())
                         .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
                 break;
 
@@ -127,6 +133,7 @@ public void RunAction(String action, Context context) {
                     Launcher.getLauncher(context).getStateManager().goToState(ALL_APPS);
                 }
                 break;
+
             case "VolumeDialog":
                 try {
                     AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
diff --git a/Omega/src/com/saggitt/omega/dragndrop/CustomWidgetDragListener.java b/Omega/src/com/saggitt/omega/dragndrop/CustomWidgetDragListener.java
new file mode 100644
index 0000000000..340f201211
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/dragndrop/CustomWidgetDragListener.java
@@ -0,0 +1,80 @@
+/*
+ * 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.
+ */
+
+package com.saggitt.omega.dragndrop;
+
+import android.graphics.Rect;
+import android.os.CancellationSignal;
+import android.view.View;
+
+import com.android.launcher3.DragSource;
+import com.android.launcher3.ItemInfo;
+import com.android.launcher3.Launcher;
+import com.android.launcher3.LauncherAppWidgetProviderInfo;
+import com.android.launcher3.PendingAddItemInfo;
+import com.android.launcher3.dragndrop.BaseItemDragListener;
+import com.android.launcher3.uioverrides.UiFactory;
+import com.android.launcher3.userevent.nano.LauncherLogProto;
+import com.android.launcher3.widget.PendingAddWidgetInfo;
+import com.android.launcher3.widget.PendingItemDragHelper;
+
+/**
+ * {@link DragSource} for handling drop from a different window. This object is initialized
+ * in the source window and is passed on to the Launcher activity as an Intent extra.
+ */
+public class CustomWidgetDragListener extends BaseItemDragListener {
+
+    private final LauncherAppWidgetProviderInfo mProvider;
+    private final CancellationSignal mCancelSignal;
+
+    public CustomWidgetDragListener(LauncherAppWidgetProviderInfo provider, Rect previewRect,
+                                    int previewBitmapWidth, int previewViewWidth) {
+        super(previewRect, previewBitmapWidth, previewViewWidth);
+        mProvider = provider;
+        mCancelSignal = new CancellationSignal();
+    }
+
+    @Override
+    public boolean init(Launcher launcher, boolean alreadyOnHome) {
+        super.init(launcher, alreadyOnHome);
+        if (!alreadyOnHome) {
+            UiFactory.useFadeOutAnimationForLauncherStart(launcher, mCancelSignal);
+        }
+        return false;
+    }
+
+    @Override
+    protected PendingItemDragHelper createDragHelper() {
+        final PendingAddItemInfo item;
+        item = new PendingAddWidgetInfo(mProvider);
+        View view = new View(mLauncher);
+        view.setTag(item);
+
+        return new PendingItemDragHelper(view);
+    }
+
+    @Override
+    public void fillInLogContainerData(View v, ItemInfo info, LauncherLogProto.Target target,
+                                       LauncherLogProto.Target targetParent) {
+        targetParent.containerType = LauncherLogProto.ContainerType.PINITEM;
+    }
+
+    @Override
+    protected void postCleanup() {
+        super.postCleanup();
+        mCancelSignal.cancel();
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/flowerpot/Flowerpot.kt b/Omega/src/com/saggitt/omega/flowerpot/Flowerpot.kt
new file mode 100644
index 0000000000..9d79a10121
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/flowerpot/Flowerpot.kt
@@ -0,0 +1,153 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.flowerpot
+
+import android.content.Context
+import com.saggitt.omega.flowerpot.parser.FlowerpotReader
+import com.saggitt.omega.flowerpot.rules.Rule
+import com.saggitt.omega.util.SingletonHolder
+import com.saggitt.omega.util.ensureOnMainThread
+import com.saggitt.omega.util.toTitleCase
+import com.saggitt.omega.util.useApplicationContext
+import java.io.InputStream
+
+/**
+ * A ruleset for an app category
+ */
+class Flowerpot(private val context: Context, val name: String, private val loader: Flowerpot.() -> Unit) {
+
+    val displayName by lazy {
+        val id = context.resources.getIdentifier("category_${name.toLowerCase()}", "string", context.packageName)
+        if (id != 0)
+            context.getString(id)
+        else
+            beautifyName(name)
+    }
+    private var loaded = false
+    val rules: MutableSet<Rule> = mutableSetOf()
+    val size get() = rules.size
+    lateinit var apps: FlowerpotApps
+
+    fun ensureLoaded() {
+        if (!loaded) {
+            load()
+            loaded = true
+        }
+    }
+
+    private fun load() {
+        loader(this)
+        apps = FlowerpotApps(context, this)
+    }
+
+    /**
+     * Load all data from
+     */
+    private fun loadFromInputStream(inputStream: InputStream) {
+        rules.addAll(FlowerpotReader(inputStream).readRules())
+    }
+
+    companion object {
+        /**
+         * Load a flowerpot from an assets file
+         */
+        fun fromAssets(context: Context, path: String, name: String): Flowerpot {
+            return Flowerpot(context, name) {
+                loadFromInputStream(context.assets.open(path))
+            }
+        }
+
+        /**
+         * The current Flowerpot format version
+         */
+        const val VERSION_CURRENT = Version.AZALEA
+
+        /**
+         * List of all currently supported versions
+         */
+        val SUPPORTED_VERSIONS = arrayOf(
+                VERSION_CURRENT
+        )
+
+        /**
+         * Path relative to assets/ to the directory containing the shipped flowerpot files
+         */
+        const val ASSETS_PATH = "flowerpot"
+
+        private fun beautifyName(name: String): String {
+            return name.replace('_', ' ').toLowerCase().toTitleCase()
+        }
+
+    }
+
+    object Version {
+        /**
+         * Azalea - A beautiful pink flower, known in China as "thinking of home bush" (sixiang shu).
+         *
+         * Changes:
+         *  - The very first version of the format
+         */
+        const val AZALEA = 1
+    }
+
+    /**
+     * Class used to interact with Pots as a whole, load hem
+     */
+    class Manager private constructor(private val context: Context) {
+
+        private val pots = mutableMapOf<String, Flowerpot>()
+
+        init {
+            loadAssets()
+        }
+
+        /**
+         * Load flowerpot files located in assets/
+         */
+        private fun loadAssets() {
+            context.assets.list(ASSETS_PATH)?.forEach {
+                pots.getOrPut(it) {
+                    fromAssets(context, "$ASSETS_PATH/$it", it)
+                }
+            }
+        }
+
+        /**
+         * Get a pot by its name, returns null if no pot with this name has been loaded
+         *
+         * @param name (code) name of the flowerpot, usually the filename of a flowerpot file
+         * @param forceLoad Whether or not the pot should be loaded if it hasn't already been
+         * @return the pot or null if none exists with this name
+         */
+        fun getPot(name: String, forceLoad: Boolean = true) = pots[name]?.apply {
+            if (forceLoad) {
+                ensureLoaded()
+            }
+        }
+
+        fun getAllPots() = pots.values
+
+        companion object : SingletonHolder<Manager, Context>(ensureOnMainThread(useApplicationContext(::Manager))) {
+
+            @JvmStatic
+            override fun getInstance(arg: Context): Manager {
+                return super.getInstance(arg)
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/flowerpot/FlowerpotApps.kt b/Omega/src/com/saggitt/omega/flowerpot/FlowerpotApps.kt
new file mode 100644
index 0000000000..8f101c0587
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/flowerpot/FlowerpotApps.kt
@@ -0,0 +1,122 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.flowerpot
+
+import android.content.Context
+import android.content.Intent
+import android.content.pm.ShortcutInfo
+import android.os.UserHandle
+import com.android.launcher3.compat.LauncherAppsCompat
+import com.android.launcher3.compat.UserManagerCompat
+import com.android.launcher3.util.ComponentKey
+import com.android.launcher3.util.PackageUserKey
+import com.saggitt.omega.flowerpot.rules.CodeRule
+import com.saggitt.omega.flowerpot.rules.Rule
+
+class FlowerpotApps(private val context: Context, private val pot: Flowerpot) : LauncherAppsCompat.OnAppsChangedCallbackCompat {
+
+    private val launcherApps = LauncherAppsCompat.getInstance(context)
+    private val intentMatches = mutableSetOf<String>()
+    val matches = mutableSetOf<ComponentKey>()
+    val packageMatches = mutableSetOf<PackageUserKey>()
+
+    init {
+        filterApps()
+        launcherApps.addOnAppsChangedCallback(this)
+    }
+
+    private fun filterApps() {
+        queryIntentMatches()
+        matches.clear()
+        packageMatches.clear()
+        UserManagerCompat.getInstance(context).userProfiles.forEach {
+            addFromPackage(null, it)
+        }
+    }
+
+    private fun addFromPackage(packageName: String?, user: UserHandle) {
+        launcherApps.getActivityList(packageName, user).forEach {
+            if (intentMatches.contains(it.componentName.packageName)
+                    || pot.rules.contains(Rule.Package(it.componentName.packageName))) {
+                matches.add(ComponentKey(it.componentName, it.user))
+                packageMatches.add(PackageUserKey(it.componentName.packageName, it.user))
+            } else {
+                for (rule in pot.rules.filterIsInstance<Rule.CodeRule>()) {
+                    if (CodeRule.get(rule.rule, *rule.args).matches(it.applicationInfo)) {
+                        matches.add(ComponentKey(it.componentName, it.user))
+                        packageMatches.add(PackageUserKey(it.componentName.packageName, it.user))
+                        break
+                    }
+                }
+            }
+        }
+    }
+
+    private fun queryIntentMatches() {
+        intentMatches.clear()
+        for (rule in pot.rules.filterIsInstance<Rule.IntentCategory>()) {
+            context.packageManager.queryIntentActivities(Intent(Intent.ACTION_MAIN).addCategory(rule.category), 0).forEach {
+                intentMatches.add(it.activityInfo.packageName)
+            }
+        }
+        for (rule in pot.rules.filterIsInstance<Rule.IntentAction>()) {
+            context.packageManager.queryIntentActivities(Intent(rule.action), 0).forEach {
+                intentMatches.add(it.activityInfo.packageName)
+            }
+        }
+    }
+
+    override fun onPackageAdded(packageName: String, user: UserHandle) {
+        queryIntentMatches()
+        addFromPackage(packageName, user)
+    }
+
+    override fun onPackageChanged(packageName: String, user: UserHandle) {
+        onPackageAdded(packageName, user)
+    }
+
+    override fun onPackageRemoved(packageName: String, user: UserHandle) {
+        matches.removeAll {
+            it.componentName.packageName == packageName && it.user == user
+        }
+        packageMatches.removeAll {
+            it.mPackageName == packageName && it.mUser == user
+        }
+    }
+
+    override fun onPackagesAvailable(packageNames: Array<out String>, user: UserHandle, replacing: Boolean) {
+        packageNames.forEach { onPackageAdded(it, user) }
+    }
+
+    override fun onPackagesUnavailable(packageNames: Array<out String>, user: UserHandle, replacing: Boolean) {
+        packageNames.forEach { onPackageRemoved(it, user) }
+    }
+
+    override fun onPackagesSuspended(packageNames: Array<out String>, user: UserHandle) {
+        packageNames.forEach { onPackageRemoved(it, user) }
+    }
+
+    override fun onPackagesUnsuspended(packageNames: Array<out String>, user: UserHandle) {
+        packageNames.forEach { onPackageAdded(it, user) }
+    }
+
+    override fun onShortcutsChanged(packageName: String?, shortcuts: MutableList<ShortcutInfo>?, user: UserHandle?) {
+
+    }
+}
+
diff --git a/Omega/src/com/saggitt/omega/flowerpot/FlowerpotFormatException.kt b/Omega/src/com/saggitt/omega/flowerpot/FlowerpotFormatException.kt
new file mode 100644
index 0000000000..ef3792e822
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/flowerpot/FlowerpotFormatException.kt
@@ -0,0 +1,19 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.saggitt.omega.flowerpot
+
+class FlowerpotFormatException(message: String?) : RuntimeException(message)
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/flowerpot/parser/FlowerpotReader.kt b/Omega/src/com/saggitt/omega/flowerpot/parser/FlowerpotReader.kt
new file mode 100644
index 0000000000..a710e2fcd5
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/flowerpot/parser/FlowerpotReader.kt
@@ -0,0 +1,37 @@
+package com.saggitt.omega.flowerpot.parser
+
+import com.saggitt.omega.flowerpot.Flowerpot
+import com.saggitt.omega.flowerpot.FlowerpotFormatException
+import com.saggitt.omega.flowerpot.rules.Rule
+import com.saggitt.omega.util.listWhileNotNull
+import java.io.BufferedReader
+import java.io.InputStream
+import java.io.InputStreamReader
+
+class FlowerpotReader(inputStream: InputStream) : BufferedReader(InputStreamReader(inputStream)) {
+    private var version: Int? = null
+
+    /**
+     * Read the next rule from the stream
+     * @return the parsed rule or null if the end of the file has been reached
+     */
+    fun readRule(): Rule? {
+        val line = readLine() ?: return null
+        val filter = LineParser.parse(line, version)
+        if (filter is Rule.Version) {
+            if (version != null) {
+                throw FlowerpotFormatException("Version declaration can only appear once")
+            }
+            if (!Flowerpot.SUPPORTED_VERSIONS.contains(filter.version)) {
+                throw FlowerpotFormatException("Unsupported version ${filter.version} (supported are ${Flowerpot.SUPPORTED_VERSIONS.joinToString()})")
+            }
+            version = filter.version
+        }
+        return filter
+    }
+
+    /**
+     * Read all rules contained in the file with None and Version rules already filtered out
+     */
+    fun readRules(): List<Rule> = listWhileNotNull { readRule() }.filterNot { it is Rule.None || it is Rule.Version }
+}
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/flowerpot/parser/LineParser.kt b/Omega/src/com/saggitt/omega/flowerpot/parser/LineParser.kt
new file mode 100644
index 0000000000..4793cfc48b
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/flowerpot/parser/LineParser.kt
@@ -0,0 +1,59 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.flowerpot.parser
+
+import com.saggitt.omega.flowerpot.FlowerpotFormatException
+import com.saggitt.omega.flowerpot.rules.Rule
+
+object LineParser {
+    fun parse(line: String, version: Int?): Rule? {
+        if (line.isBlank()) {
+            // ignore blank lines
+            return Rule.NONE
+        }
+        return when (line[0]) {
+            // Comment
+            '#' -> Rule.NONE
+            // Version declaration
+            '$' -> Rule.Version(line.rest.toInt())
+            // Intent action
+            ':' -> Rule.IntentAction(line.rest)
+            // Intent category
+            ';' -> Rule.IntentCategory(line.rest)
+            // Code rule
+            '&' -> {
+                val parts = line.rest.split("|")
+                val ruleName = parts[0]
+                val args = if (parts.size > 1) parts.subList(1, parts.size) else emptyList()
+                Rule.CodeRule(ruleName, args.toTypedArray())
+            }
+            // Package
+            else -> if (!line[0].isLetter()) {
+                throw FlowerpotFormatException("Unknown rule identifier '${line[0]}' for version $version")
+            } else {
+                Rule.Package(line)
+            }
+        }.apply {
+            if (version == null && !(this is Rule.None || this is Rule.Version)) {
+                throw FlowerpotFormatException("Version has to be specified before any other rules")
+            }
+        }
+    }
+
+    private inline val String.rest get() = this.substring(1)
+}
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/flowerpot/rules/CodeRule.kt b/Omega/src/com/saggitt/omega/flowerpot/rules/CodeRule.kt
new file mode 100644
index 0000000000..07e01c31e7
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/flowerpot/rules/CodeRule.kt
@@ -0,0 +1,64 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.saggitt.omega.flowerpot.rules
+
+import android.content.pm.ApplicationInfo
+import com.android.launcher3.Utilities
+import com.saggitt.omega.util.hasFlag
+
+sealed class CodeRule(vararg val args: String) {
+    abstract fun matches(info: ApplicationInfo): Boolean
+
+    class IsGame(vararg args: String) : CodeRule(*args) {
+        override fun matches(info: ApplicationInfo) = info.flags hasFlag ApplicationInfo.FLAG_IS_GAME
+    }
+
+    class Category(vararg args: String) : CodeRule(*args) {
+        val category: Int
+
+        init {
+            if (args.size != 1) {
+                throw IllegalArgumentException("Expected exactly one argument")
+            }
+            category = when (args[0]) {
+                "undefined" -> ApplicationInfo.CATEGORY_UNDEFINED
+                "game" -> ApplicationInfo.CATEGORY_GAME
+                "audio" -> ApplicationInfo.CATEGORY_AUDIO
+                "video" -> ApplicationInfo.CATEGORY_VIDEO
+                "image" -> ApplicationInfo.CATEGORY_IMAGE
+                "social" -> ApplicationInfo.CATEGORY_SOCIAL
+                "news" -> ApplicationInfo.CATEGORY_NEWS
+                "maps" -> ApplicationInfo.CATEGORY_MAPS
+                "productivity" -> ApplicationInfo.CATEGORY_PRODUCTIVITY
+                else -> throw IllegalArgumentException("Expected a known category, got '${args[0]}' instead")
+            }
+        }
+
+        override fun matches(info: ApplicationInfo) = Utilities.ATLEAST_OREO && info.category == category
+    }
+
+    companion object {
+        private val cache = mutableMapOf<Pair<String, Array<out String>>, CodeRule>()
+        fun get(name: String, vararg args: String) = cache.getOrPut(Pair(name, args)) {
+            when (name) {
+                "isGame" -> IsGame(*args)
+                "category" -> Category(*args)
+                else -> throw IllegalArgumentException("Unknown Code Rule '$name'")
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/flowerpot/rules/Rule.kt b/Omega/src/com/saggitt/omega/flowerpot/rules/Rule.kt
new file mode 100644
index 0000000000..bd712aa189
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/flowerpot/rules/Rule.kt
@@ -0,0 +1,31 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.flowerpot.rules
+
+sealed class Rule {
+    class None : Rule()
+    data class Version(val version: Int) : Rule()
+    data class Package(val filter: String) : Rule()
+    data class IntentAction(val action: String) : Rule()
+    data class IntentCategory(val category: String) : Rule()
+    data class CodeRule(val rule: String, val args: Array<String>) : Rule()
+
+    companion object {
+        val NONE = None()
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/folder/FirstItemProvider.kt b/Omega/src/com/saggitt/omega/folder/FirstItemProvider.kt
new file mode 100644
index 0000000000..0b668ea240
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/folder/FirstItemProvider.kt
@@ -0,0 +1,42 @@
+/*
+ *  Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ *
+ */
+
+package com.saggitt.omega.folder
+
+import com.android.launcher3.FolderInfo
+import com.android.launcher3.WorkspaceItemInfo
+
+class FirstItemProvider(private val info: FolderInfo) : FolderInfo.FolderListener {
+
+    var firstItem: WorkspaceItemInfo? = findFirstItem()
+        private set
+
+    init {
+        info.addListener(this)
+    }
+
+    private fun findFirstItem() = info.contents.minBy { it.rank }
+
+    override fun onItemsChanged(animate: Boolean) {
+        firstItem = findFirstItem()
+    }
+
+    override fun onAdd(item: WorkspaceItemInfo?, rank: Int) = Unit
+    override fun onRemove(item: WorkspaceItemInfo?) = Unit
+    override fun onTitleChanged(title: CharSequence?) = Unit
+    override fun prepareAutoUpdate() = Unit
+}
diff --git a/Omega/src/com/saggitt/omega/gestures/Gesture.kt b/Omega/src/com/saggitt/omega/gestures/Gesture.kt
new file mode 100644
index 0000000000..e7acf3d940
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/gestures/Gesture.kt
@@ -0,0 +1,32 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.saggitt.omega.gestures
+
+import android.view.MotionEvent
+
+abstract class Gesture(val controller: GestureController) {
+
+    abstract val isEnabled: Boolean
+
+    open fun onTouchEvent(ev: MotionEvent): Boolean {
+        return false
+    }
+
+    open fun onEvent(): Boolean {
+        return false
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/gestures/GestureController.kt b/Omega/src/com/saggitt/omega/gestures/GestureController.kt
new file mode 100644
index 0000000000..a7ed3597bd
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/gestures/GestureController.kt
@@ -0,0 +1,159 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.gestures
+
+import android.content.Context
+import android.graphics.PointF
+import android.text.TextUtils
+import android.util.Log
+import android.view.GestureDetector
+import android.view.MotionEvent
+import com.android.launcher3.util.TouchController
+import com.saggitt.omega.OmegaLauncher
+import com.saggitt.omega.gestures.gestures.*
+import com.saggitt.omega.gestures.handlers.*
+import com.saggitt.omega.util.omegaPrefs
+import org.json.JSONException
+import org.json.JSONObject
+
+class GestureController(val launcher: OmegaLauncher) : TouchController {
+
+    private val prefs = launcher.omegaPrefs
+    val blankGestureHandler = BlankGestureHandler(launcher, null)
+    private val doubleTapGesture by lazy { DoubleTapGesture(this) }
+    private val pressHomeGesture by lazy { PressHomeGesture(this) }
+    private val pressBackGesture by lazy { PressBackGesture(this) }
+    private val longPressGesture by lazy { LongPressGesture(this) }
+
+    val hasBackGesture
+        get() = pressBackGesture.handler !is BlankGestureHandler
+    val verticalSwipeGesture by lazy { VerticalSwipeGesture(this) }
+    val navSwipeUpGesture by lazy { NavSwipeUpGesture(this) }
+
+    var touchDownPoint = PointF()
+
+    private var swipeUpOverride: Pair<GestureHandler, Long>? = null
+
+    override fun onControllerInterceptTouchEvent(ev: MotionEvent): Boolean {
+        return false
+    }
+
+    override fun onControllerTouchEvent(ev: MotionEvent): Boolean {
+        return false
+    }
+
+    fun attachDoubleTapListener(gestureDetector: GestureDetector) {
+        gestureDetector.setOnDoubleTapListener(doubleTapGesture.createDoubleTapListener())
+    }
+
+    fun onLongPress() {
+        longPressGesture.isEnabled && longPressGesture.onEvent()
+    }
+
+    fun onPressHome() {
+        pressHomeGesture.isEnabled && pressHomeGesture.onEvent()
+    }
+
+    fun onPressBack() {
+        pressBackGesture.isEnabled && pressBackGesture.onEvent()
+    }
+
+    fun setSwipeUpOverride(handler: GestureHandler, downTime: Long) {
+        if (swipeUpOverride?.second != downTime) {
+            swipeUpOverride = Pair(handler, downTime)
+        }
+    }
+
+    fun getSwipeUpOverride(downTime: Long): GestureHandler? {
+        swipeUpOverride?.let {
+            if (it.second == downTime) {
+                return it.first
+            } else {
+                swipeUpOverride = null
+            }
+        }
+        return null
+    }
+
+    fun createHandlerPref(key: String, defaultValue: GestureHandler = blankGestureHandler) = prefs.StringBasedPref(
+            key, defaultValue, prefs.doNothing, ::createGestureHandler, GestureHandler::toString, GestureHandler::onDestroy)
+
+    private fun createGestureHandler(jsonString: String) = createGestureHandler(launcher, jsonString, blankGestureHandler)
+
+    companion object {
+
+        private const val TAG = "GestureController"
+        private val LEGACY_SLEEP_HANDLERS = listOf(
+                "com.saggitt.omega.gestures.handlers.SleepGestureHandlerDeviceAdmin",
+                "com.saggitt.omega.gestures.handlers.SleepGestureHandlerAccessibility")
+
+        fun createGestureHandler(context: Context, jsonString: String, fallback: GestureHandler): GestureHandler {
+            if (!TextUtils.isEmpty(jsonString)) {
+                val config: JSONObject? = try {
+                    JSONObject(jsonString)
+                } catch (e: JSONException) {
+                    null
+                }
+                var className = config?.getString("class") ?: jsonString
+                if (className in LEGACY_SLEEP_HANDLERS) {
+                    className = SleepGestureHandler::class.java.name
+                }
+                val configValue = if (config?.has("config") == true) config.getJSONObject("config") else null
+                try {
+                    val handler = Class.forName(className).getConstructor(Context::class.java, JSONObject::class.java)
+                            .newInstance(context, configValue) as GestureHandler
+                    if (handler.isAvailable) return handler
+                } catch (t: Throwable) {
+                    Log.e(TAG, "can't create gesture handler", t)
+                }
+            }
+            return fallback
+        }
+
+        fun getClassName(jsonString: String): String {
+            val config: JSONObject? = try {
+                JSONObject(jsonString)
+            } catch (e: JSONException) {
+                null
+            }
+            val className = config?.getString("class") ?: jsonString
+            return if (className in LEGACY_SLEEP_HANDLERS) {
+                SleepGestureHandler::class.java.name
+            } else {
+                className
+            }
+        }
+
+        fun getGestureHandlers(context: Context, isSwipeUp: Boolean, hasBlank: Boolean) = mutableListOf(
+                SleepGestureHandler(context, null),
+                SleepGestureHandlerTimeout(context, null),
+                OpenDashGestureHandler(context, null),
+                OpenDrawerGestureHandler(context, null),
+                NotificationsOpenGestureHandler(context, null),
+                OpenOverviewGestureHandler(context, null),
+                StartGlobalSearchGestureHandler(context, null),
+                StartAppSearchGestureHandler(context, null),
+                StartAppGestureHandler(context, null),
+                OpenSettingsGestureHandler(context, null)
+        ).apply {
+            if (hasBlank) {
+                add(0, BlankGestureHandler(context, null))
+            }
+        }.filter { it.isAvailableForSwipeUp(isSwipeUp) }
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/gestures/GestureHandler.kt b/Omega/src/com/saggitt/omega/gestures/GestureHandler.kt
new file mode 100644
index 0000000000..a335f5dbf7
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/gestures/GestureHandler.kt
@@ -0,0 +1,74 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.gestures
+
+import android.content.Context
+import android.content.Intent
+import android.graphics.drawable.Drawable
+import android.view.View
+import com.android.launcher3.R
+import org.json.JSONObject
+
+abstract class GestureHandler(val context: Context, val config: JSONObject?) {
+
+    abstract val displayName: String
+    open val requiresForeground: Boolean = false
+    open val hasConfig = false
+    open val configIntent: Intent? = null
+    open val isAvailable: Boolean = true
+    open val icon: Drawable? = null
+    open val iconResource: Intent.ShortcutIconResource
+            by lazy { Intent.ShortcutIconResource.fromContext(context, R.mipmap.ic_launcher) }
+
+    abstract fun onGestureTrigger(controller: GestureController, view: View? = null)
+
+    protected open fun saveConfig(config: JSONObject) {
+    }
+
+    open fun onConfigResult(data: Intent?) {
+    }
+
+    open fun onDestroy() {
+    }
+
+    open fun isAvailableForSwipeUp(isSwipeUp: Boolean) = isAvailable
+
+    override fun toString(): String {
+        return JSONObject().apply {
+            put("class", this@GestureHandler::class.java.name)
+            if (hasConfig) {
+                val config = JSONObject()
+                saveConfig(config)
+                put("config", config)
+            }
+        }.toString()
+    }
+}
+
+class BlankGestureHandler(context: Context, config: JSONObject?) : GestureHandler(context, config) {
+    override val displayName: String = context.getString(R.string.action_none)
+    override fun onGestureTrigger(controller: GestureController, view: View?) {
+    }
+}
+
+class RunnableGestureHandler(context: Context, private val onTrigger: Runnable) : GestureHandler(context, null) {
+    override val displayName: String = context.getString(R.string.action_none)
+    override fun onGestureTrigger(controller: GestureController, view: View?) {
+        onTrigger.run()
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/gestures/OmegaShortcutActivity.kt b/Omega/src/com/saggitt/omega/gestures/OmegaShortcutActivity.kt
new file mode 100644
index 0000000000..36a6227a2c
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/gestures/OmegaShortcutActivity.kt
@@ -0,0 +1,109 @@
+/*
+ *  Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ *
+ */
+
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.saggitt.omega.gestures
+
+import android.app.Activity
+import android.content.Intent
+import android.os.Build
+import android.os.Bundle
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.android.launcher3.R
+import com.android.launcher3.icons.LauncherIcons
+import com.saggitt.omega.gestures.ui.HandlerListAdapter
+import com.saggitt.omega.gestures.ui.RunHandlerActivity
+import com.saggitt.omega.settings.SettingsBaseActivity
+
+class OmegaShortcutActivity : SettingsBaseActivity() {
+    private var selectedHandler: GestureHandler? = null
+    private val launcherIcons by lazy { LauncherIcons.obtain(this) }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        if (intent.action != Intent.ACTION_CREATE_SHORTCUT) {
+            finish()
+        }
+        setContentView(R.layout.preference_insettable_recyclerview)
+        supportActionBar?.setDisplayShowHomeEnabled(true)
+        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+        val recyclerView = findViewById<RecyclerView>(R.id.list)
+        recyclerView.adapter = HandlerListAdapter(this, false, "", ::onSelectHandler, false)
+        recyclerView.layoutManager = LinearLayoutManager(this)
+    }
+
+    private fun onSelectHandler(handler: GestureHandler) {
+        selectedHandler = handler
+        if (handler.configIntent != null) {
+            startActivityForResult(handler.configIntent, REQUEST_CODE)
+        } else {
+            saveChanges()
+        }
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        if (requestCode == REQUEST_CODE && resultCode == Activity.RESULT_OK) {
+            selectedHandler?.onConfigResult(data)
+            saveChanges()
+        }
+        super.onActivityResult(requestCode, resultCode, data)
+    }
+
+    private fun saveChanges() {
+        val shortcutIntent = Intent(this, RunHandlerActivity::class.java).apply {
+            action = START_ACTION
+            `package` = packageName
+            putExtra(EXTRA_HANDLER, selectedHandler.toString())
+        }
+
+        val icon = if (selectedHandler?.icon != null)
+            launcherIcons.createScaledBitmapWithoutShadow(selectedHandler?.icon, Build.VERSION.SDK_INT)
+        else null
+        val intent = Intent().apply {
+            putExtra(Intent.EXTRA_SHORTCUT_INTENT, shortcutIntent)
+            putExtra(Intent.EXTRA_SHORTCUT_NAME, selectedHandler?.displayName)
+            if (icon != null)
+                putExtra(Intent.EXTRA_SHORTCUT_ICON, icon)
+            else
+                putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE, selectedHandler?.iconResource)
+        }
+        setResult(Activity.RESULT_OK, intent)
+        finish()
+    }
+
+    companion object {
+        const val START_ACTION = "com.saggitt.omega.START_ACTION"
+        const val EXTRA_HANDLER = "com.saggitt.omega.EXTRA_HANDLER"
+        const val REQUEST_CODE = 1337
+    }
+}
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/gestures/VerticalSwipeGestureController.kt b/Omega/src/com/saggitt/omega/gestures/VerticalSwipeGestureController.kt
new file mode 100644
index 0000000000..504c93b989
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/gestures/VerticalSwipeGestureController.kt
@@ -0,0 +1,276 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.saggitt.omega.gestures
+
+import android.annotation.SuppressLint
+import android.view.MotionEvent
+import com.android.launcher3.AbstractFloatingView
+import com.android.launcher3.Launcher
+import com.android.launcher3.LauncherState
+import com.android.launcher3.touch.SingleAxisSwipeDetector
+import com.android.launcher3.util.TouchController
+import com.saggitt.omega.OmegaLauncher
+import com.saggitt.omega.gestures.handlers.VerticalSwipeGestureHandler
+import java.lang.Math.abs
+import java.lang.reflect.InvocationTargetException
+
+class VerticalSwipeGestureController(private val launcher: Launcher) : TouchController, SingleAxisSwipeDetector.Listener {
+
+    enum class GestureState {
+        Locked,
+        Free,
+        NotificationOpened,
+        NotificationClosed,
+        Triggered
+    }
+
+    private val triggerVelocity = 2.25f
+    private val notificationsCloseVelocity = 0.35f
+
+    private val controller by lazy { OmegaLauncher.getLauncher(launcher).gestureController }
+    private val gesture by lazy { controller.verticalSwipeGesture }
+    private val detector by lazy { SingleAxisSwipeDetector(launcher, this, SingleAxisSwipeDetector.VERTICAL) }
+    private var noIntercept = false
+
+    private var swipeUpOverride: GestureHandler? = null
+    private val hasSwipeUpOverride get() = swipeUpOverride != null
+    private var state = GestureState.Free
+    private var downTime = 0L
+    private var downSent = false
+    private var pointerCount = 0
+
+    private var overrideDragging = false
+
+    private var currentMillis = 0L
+    private var currentVelocity = 0f
+    private var currentDisplacement = 0f
+
+    override fun onControllerInterceptTouchEvent(ev: MotionEvent): Boolean {
+        downTime = ev.downTime
+        val isDown = ev.actionMasked == MotionEvent.ACTION_DOWN
+        val overrideAppeared = !hasSwipeUpOverride && controller.getSwipeUpOverride(ev.downTime) != null
+        if (isDown || overrideAppeared) {
+            swipeUpOverride = if (isDown) {
+                downSent = false
+                null
+            } else {
+                controller.getSwipeUpOverride(ev.downTime)
+            }
+            noIntercept = !canInterceptTouch() && !hasSwipeUpOverride
+            if (noIntercept) {
+                return false
+            }
+            detector.setDetectableScrollConditions(getSwipeDirection(ev), false)
+        }
+        if (noIntercept) {
+            return false
+        }
+        val action = ev.action
+        if (!isDown && !downSent) {
+            ev.action = MotionEvent.ACTION_DOWN
+        }
+        downSent = true
+        onControllerTouchEvent(ev)
+        ev.action = action
+        return detector.isDraggingOrSettling
+    }
+
+    override fun onControllerTouchEvent(ev: MotionEvent): Boolean {
+        pointerCount = ev.pointerCount
+        return detector.onTouchEvent(ev)
+    }
+
+    private fun canInterceptTouch(): Boolean {
+        return AbstractFloatingView.getTopOpenView(launcher) == null &&
+                launcher.isInState(LauncherState.NORMAL)
+    }
+
+    private fun isOverHotseat(ev: MotionEvent): Boolean {
+        val dp = launcher.deviceProfile
+        val hotseatHeight = dp.hotseatBarSizePx + dp.insets.bottom
+        return ev.y >= launcher.dragLayer.height - hotseatHeight
+    }
+
+    private fun getSwipeDirection(ev: MotionEvent): Int {
+        return when {
+            controller.getSwipeUpOverride(ev.downTime) != null -> {
+                if (canInterceptTouch())
+                    SingleAxisSwipeDetector.DIRECTION_BOTH
+                else
+                    SingleAxisSwipeDetector.DIRECTION_POSITIVE
+            }
+            gesture.customSwipeUp && !isOverHotseat(ev) -> SingleAxisSwipeDetector.DIRECTION_BOTH
+            gesture.customDockSwipeUp && isOverHotseat(ev) -> SingleAxisSwipeDetector.DIRECTION_BOTH
+            else -> SingleAxisSwipeDetector.DIRECTION_NEGATIVE
+        }
+    }
+
+    override fun onDragStart(start: Boolean) {
+        state = GestureState.Free
+        (swipeUpOverride as? VerticalSwipeGestureHandler)?.onDragStart(start)
+        overrideDragging = true
+    }
+
+    override fun onDrag(displacement: Float): Boolean {
+        return true
+    }
+
+    override fun onDrag(displacement: Float, ev: MotionEvent): Boolean {
+        val velocity = computeVelocity(displacement - currentDisplacement, ev.eventTime)
+        currentDisplacement = displacement
+        if (state != GestureState.Locked) {
+            val wasFree = state == GestureState.Free
+            if (overrideDragging) {
+                (swipeUpOverride as? VerticalSwipeGestureHandler)?.onDrag(displacement, velocity)
+            }
+            if (gesture.customSwipeDown) {
+                if (velocity > triggerVelocity && state == GestureState.Free) {
+                    state = GestureState.Triggered
+                    gesture.onSwipeDown()
+                }
+            } else {
+                if (velocity > triggerVelocity &&
+                        (state == GestureState.Free || state == GestureState.NotificationClosed)) {
+                    state = if (openNotificationsOrQuickSettings()) GestureState.NotificationOpened else GestureState.Locked
+                } else if (velocity < -notificationsCloseVelocity && state == GestureState.NotificationOpened) {
+                    state = if (closeNotifications()) GestureState.NotificationClosed else GestureState.Locked
+                }
+            }
+
+            if (wasFree && state == GestureState.NotificationOpened) {
+                sendOnDragEnd(velocity, false)
+            } else if (velocity < -triggerVelocity && state == GestureState.Free) {
+                controller.getSwipeUpOverride(downTime)?.let {
+                    state = GestureState.Triggered
+                    it.onGestureTrigger(controller)
+                } ?: if (gesture.customSwipeUp) {
+                    state = GestureState.Triggered
+                    gesture.onSwipeUp()
+                } else if (gesture.customDockSwipeUp) {
+                    state = GestureState.Triggered
+                    gesture.onDockSwipeUp()
+                }
+            }
+        }
+        return true
+    }
+
+    private fun computeVelocity(delta: Float, millis: Long): Float {
+        val previousMillis = currentMillis
+        currentMillis = millis
+
+        val deltaTimeMillis = (currentMillis - previousMillis).toFloat()
+        val velocity = if (deltaTimeMillis > 0) delta / deltaTimeMillis else 0f
+        currentVelocity = if (abs(currentVelocity) < 0.001f) {
+            velocity
+        } else {
+            val alpha = computeDampeningFactor(deltaTimeMillis)
+            interpolate(currentVelocity, velocity, alpha)
+        }
+        return currentVelocity
+    }
+
+    /**
+     * Returns a time-dependent dampening factor using delta time.
+     */
+    private fun computeDampeningFactor(deltaTime: Float): Float {
+        return deltaTime / (SCROLL_VELOCITY_DAMPENING_RC + deltaTime)
+    }
+
+    /**
+     * Returns the linear interpolation between two values
+     */
+    private fun interpolate(from: Float, to: Float, alpha: Float): Float {
+        return (1.0f - alpha) * from + alpha * to
+    }
+
+    override fun onDragEnd(velocity: Float) {
+        launcher.workspace.postDelayed(detector::finishedScrolling, 200)
+        sendOnDragEnd(velocity, true)
+    }
+
+    private fun sendOnDragEnd(velocity: Float, fling: Boolean) {
+        if (overrideDragging) {
+            (swipeUpOverride as? VerticalSwipeGestureHandler)?.onDragEnd(velocity, fling)
+            overrideDragging = false
+        }
+    }
+
+    private fun openNotificationsOrQuickSettings(): Boolean {
+        return if (pointerCount > 1) openQuickSettings() else openNotifications()
+    }
+
+    @SuppressLint("WrongConstant", "PrivateApi")
+    private fun openNotifications(): Boolean {
+        return try {
+            Class.forName("android.app.StatusBarManager")
+                    .getMethod("expandNotificationsPanel")
+                    .invoke(launcher.getSystemService("statusbar"))
+            true
+        } catch (ex: ClassNotFoundException) {
+            false
+        } catch (ex: NoSuchMethodException) {
+            false
+        } catch (ex: IllegalAccessException) {
+            false
+        } catch (ex: InvocationTargetException) {
+            false
+        }
+    }
+
+    @SuppressLint("WrongConstant", "PrivateApi")
+    private fun openQuickSettings(): Boolean {
+        return try {
+            Class.forName("android.app.StatusBarManager")
+                    .getMethod("expandSettingsPanel")
+                    .invoke(launcher.getSystemService("statusbar"))
+            true
+        } catch (ex: ClassNotFoundException) {
+            false
+        } catch (ex: NoSuchMethodException) {
+            false
+        } catch (ex: IllegalAccessException) {
+            false
+        } catch (ex: InvocationTargetException) {
+            false
+        }
+    }
+
+    @SuppressLint("WrongConstant", "PrivateApi")
+    private fun closeNotifications(): Boolean {
+        return try {
+            Class.forName("android.app.StatusBarManager")
+                    .getMethod("collapsePanels")
+                    .invoke(launcher.getSystemService("statusbar"))
+            true
+        } catch (ex: ClassNotFoundException) {
+            false
+        } catch (ex: NoSuchMethodException) {
+            false
+        } catch (ex: IllegalAccessException) {
+            false
+        } catch (ex: InvocationTargetException) {
+            false
+        }
+
+    }
+
+    companion object {
+
+        private const val SCROLL_VELOCITY_DAMPENING_RC = 1000f / (2f * Math.PI.toFloat() * 10f)
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/gestures/gestures/DoubleTapGesture.kt b/Omega/src/com/saggitt/omega/gestures/gestures/DoubleTapGesture.kt
new file mode 100644
index 0000000000..287a7fac0d
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/gestures/gestures/DoubleTapGesture.kt
@@ -0,0 +1,67 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.gestures.gestures
+
+import android.view.GestureDetector
+import android.view.MotionEvent
+import com.android.launcher3.Utilities
+import com.android.launcher3.Utilities.squaredHypot
+import com.saggitt.omega.gestures.Gesture
+import com.saggitt.omega.gestures.GestureController
+
+class DoubleTapGesture(controller: GestureController) : Gesture(controller) {
+
+    private val handler by controller.createHandlerPref("pref_gesture_double_tap")
+    override val isEnabled = true
+
+    private val squaredTouchSlop = Utilities.squaredTouchSlop(controller.launcher)
+
+    fun createDoubleTapListener(): DoubleTapGestureListener {
+        return DoubleTapGestureListener()
+    }
+
+    inner class DoubleTapGestureListener : GestureDetector.OnDoubleTapListener {
+
+        private var downX = 0f
+        private var downY = 0f
+
+        override fun onSingleTapConfirmed(e: MotionEvent): Boolean {
+            return false
+        }
+
+        override fun onDoubleTap(e: MotionEvent): Boolean {
+            return false
+        }
+
+        override fun onDoubleTapEvent(e: MotionEvent): Boolean {
+            when (e.actionMasked) {
+                MotionEvent.ACTION_DOWN -> {
+                    downX = e.x
+                    downY = e.y
+                }
+                MotionEvent.ACTION_UP -> {
+                    if (squaredHypot(e.x - downX, e.y - downY) < squaredTouchSlop) {
+                        handler.onGestureTrigger(controller)
+                        return true
+                    }
+                }
+            }
+            return false
+        }
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/gestures/gestures/GestureTouchConsumer.kt b/Omega/src/com/saggitt/omega/gestures/gestures/GestureTouchConsumer.kt
new file mode 100644
index 0000000000..b571fcd6a0
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/gestures/gestures/GestureTouchConsumer.kt
@@ -0,0 +1,224 @@
+/*
+ *     Copyright (C) 2019 Lawnchair Team.
+ *
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.gestures.gestures
+
+import android.content.Context
+import android.graphics.PointF
+import android.graphics.RectF
+import android.os.SystemClock
+import android.view.GestureDetector
+import android.view.HapticFeedbackConstants
+import android.view.MotionEvent
+import android.view.MotionEvent.*
+import android.view.ViewConfiguration
+import com.android.launcher3.R
+import com.android.launcher3.Utilities.squaredHypot
+import com.android.quickstep.ActivityControlHelper
+import com.android.quickstep.inputconsumers.DelegateInputConsumer
+import com.android.quickstep.inputconsumers.InputConsumer
+import com.android.systemui.shared.system.InputMonitorCompat
+import com.android.systemui.shared.system.WindowManagerWrapper
+import com.android.systemui.shared.system.WindowManagerWrapper.NAV_BAR_POS_LEFT
+import com.android.systemui.shared.system.WindowManagerWrapper.NAV_BAR_POS_RIGHT
+import com.saggitt.omega.OmegaLauncher
+import com.saggitt.omega.gestures.BlankGestureHandler
+import com.saggitt.omega.gestures.Gesture
+import com.saggitt.omega.gestures.GestureController
+import com.saggitt.omega.gestures.GestureHandler
+import kotlin.math.atan2
+import kotlin.math.hypot
+
+class GestureTouchConsumer(
+        private val context: Context,
+        private val leftRegion: RectF,
+        private val rightRegion: RectF,
+        private val activityControlHelper: ActivityControlHelper<*>,
+        delegate: InputConsumer, inputMonitor: InputMonitorCompat)
+    : DelegateInputConsumer(delegate, inputMonitor) {
+
+    private val launcher get() = activityControlHelper.createdActivity as? OmegaLauncher
+    private val controller get() = launcher?.gestureController
+    private var gestureHandler: GestureHandler? = null
+
+    private val gestureDetector = GestureDetector(context, object :
+            GestureDetector.SimpleOnGestureListener() {
+        override fun onFling(e1: MotionEvent, e2: MotionEvent, velocityX: Float,
+                             velocityY: Float): Boolean {
+            return this@GestureTouchConsumer.onFling(velocityX, velocityY)
+        }
+    })
+
+    private val downPos = PointF()
+    private val lastPos = PointF()
+    private val startDragPos = PointF()
+
+    private var activePointerId = -1
+    private var passedSlop = false
+    private var triggeredGesture = false
+    private var timeFraction = 0f
+    private var dragTime = 0L
+    private var distance = 0f
+    private val distThreshold = context.resources.getDimension(R.dimen.gestures_assistant_drag_threshold)
+
+    private val squaredSlop = ViewConfiguration.get(context).scaledTouchSlop.let { it * it }
+
+    override fun getType() = InputConsumer.TYPE_CUSTOM_GESTURES or mDelegate.type
+
+    override fun onMotionEvent(ev: MotionEvent) {
+        gestureDetector.onTouchEvent(ev)
+
+        when (ev.actionMasked) {
+            ACTION_DOWN -> {
+                activePointerId = ev.getPointerId(0)
+                downPos.set(ev.x, ev.y)
+                lastPos.set(downPos)
+                timeFraction = 0f
+                if (leftRegion.contains(downPos.x, downPos.y)) {
+                    gestureHandler = controller?.navSwipeUpGesture?.leftHandler
+                } else if (rightRegion.contains(downPos.x, downPos.y)) {
+                    gestureHandler = controller?.navSwipeUpGesture?.rightHandler
+                }
+                if (gestureHandler == null) {
+                    mState = STATE_DELEGATE_ACTIVE
+                }
+            }
+            ACTION_POINTER_DOWN, ACTION_POINTER_UP -> {
+                if (ev.actionMasked == ACTION_POINTER_DOWN && mState != STATE_ACTIVE) {
+                    mState = STATE_DELEGATE_ACTIVE
+                } else {
+                    val ptrIdx = ev.actionIndex
+                    val ptrId = ev.getPointerId(ptrIdx)
+                    if (ptrId == activePointerId) {
+                        val newPointerIdx = if (ptrIdx == 0) 1 else 0
+                        downPos.set(
+                                ev.getX(newPointerIdx) - (lastPos.x - downPos.x),
+                                ev.getY(newPointerIdx) - (lastPos.y - downPos.y))
+                        lastPos.set(ev.getX(newPointerIdx), ev.getY(newPointerIdx))
+                        activePointerId = ev.getPointerId(newPointerIdx)
+                    }
+                }
+            }
+            ACTION_MOVE -> {
+                if (!mDelegate.allowInterceptByParent()) {
+                    mState = STATE_DELEGATE_ACTIVE
+                } else if (mState != STATE_DELEGATE_ACTIVE) {
+                    val pointerIndex = ev.findPointerIndex(activePointerId)
+                    if (pointerIndex != -1) {
+                        lastPos.set(ev.getX(pointerIndex), ev.getY(pointerIndex))
+                        if (!passedSlop) {
+                            if (squaredHypot(lastPos.x - downPos.x, lastPos.y - downPos.y) > squaredSlop) {
+                                passedSlop = true
+                                startDragPos.set(lastPos)
+                                dragTime = SystemClock.uptimeMillis()
+
+                                if (isValidGestureAngle(getDeltaX(), getDeltaY())) {
+                                    setActive(ev)
+                                } else {
+                                    mState = STATE_DELEGATE_ACTIVE
+                                }
+                            }
+                        } else {
+                            distance = hypot(
+                                    (lastPos.x - startDragPos.x).toDouble(),
+                                    (lastPos.y - startDragPos.y).toDouble()).toFloat()
+                            if (distance >= distThreshold && !triggeredGesture) {
+                                triggerGesture()
+                            }
+                        }
+                    }
+                }
+            }
+            ACTION_UP, ACTION_CANCEL -> {
+                passedSlop = false
+                mState = STATE_INACTIVE
+            }
+        }
+
+        if (mState != STATE_ACTIVE) {
+            mDelegate.onMotionEvent(ev)
+        }
+    }
+
+    private fun triggerGesture() {
+        triggeredGesture = true
+        val handler = gestureHandler ?: return
+        if (!handler.requiresForeground) {
+            launcher?.rootView?.performHapticFeedback(
+                    HapticFeedbackConstants.VIRTUAL_KEY,
+                    HapticFeedbackConstants.FLAG_IGNORE_VIEW_SETTING)
+            handler.onGestureTrigger(controller!!)
+        }
+    }
+
+    private fun onFling(velocityX: Float, velocityY: Float): Boolean {
+        val navBarPosition = WindowManagerWrapper.getInstance().getNavBarPosition(0)
+        val vx = when (navBarPosition) {
+            NAV_BAR_POS_LEFT -> velocityY
+            NAV_BAR_POS_RIGHT -> -velocityY
+            else -> velocityX
+        }
+        val vy = when (navBarPosition) {
+            NAV_BAR_POS_LEFT -> velocityX
+            NAV_BAR_POS_RIGHT -> -velocityX
+            else -> velocityY
+        }
+        if (!triggeredGesture && mState != STATE_DELEGATE_ACTIVE && isValidGestureAngle(vx, -vy)) {
+            triggerGesture()
+        }
+        return true
+    }
+
+    private fun getDeltaX(): Float {
+        return when (WindowManagerWrapper.getInstance().getNavBarPosition(0)) {
+            NAV_BAR_POS_LEFT -> downPos.y - lastPos.y
+            NAV_BAR_POS_RIGHT -> lastPos.y - downPos.y
+            else -> downPos.x - lastPos.x
+        }
+    }
+
+    private fun getDeltaY(): Float {
+        return when (WindowManagerWrapper.getInstance().getNavBarPosition(0)) {
+            NAV_BAR_POS_LEFT -> downPos.x - lastPos.x
+            NAV_BAR_POS_RIGHT -> lastPos.x - downPos.x
+            else -> downPos.y - lastPos.y
+        }
+    }
+
+    private fun isValidGestureAngle(deltaX: Float, deltaY: Float): Boolean {
+        var angle = Math.toDegrees(atan2(deltaY.toDouble(), deltaX.toDouble())).toFloat()
+
+        // normalize so that angle is measured clockwise from horizontal in the bottom right corner
+        // and counterclockwise from horizontal in the bottom left corner
+        angle = if (angle > 90) 180 - angle else angle
+        return angle in 45f..90f
+    }
+}
+
+class NavSwipeUpGesture(controller: GestureController) : Gesture(controller) {
+
+    override val isEnabled = true
+
+    private val blankHandler = controller.blankGestureHandler
+    private val leftHandlerPref by controller.createHandlerPref("pref_gesture_nav_swipe_up_left", blankHandler)
+    private val rightHandlerPref by controller.createHandlerPref("pref_gesture_nav_swipe_up_right", blankHandler)
+
+    val leftHandler get() = leftHandlerPref.takeUnless { it is BlankGestureHandler }
+    val rightHandler get() = rightHandlerPref.takeUnless { it is BlankGestureHandler }
+}
diff --git a/Omega/src/com/saggitt/omega/gestures/gestures/LongPressGesture.kt b/Omega/src/com/saggitt/omega/gestures/gestures/LongPressGesture.kt
new file mode 100644
index 0000000000..3432b2857a
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/gestures/gestures/LongPressGesture.kt
@@ -0,0 +1,34 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.gestures.gestures
+
+import com.saggitt.omega.gestures.Gesture
+import com.saggitt.omega.gestures.GestureController
+import com.saggitt.omega.gestures.handlers.OpenOverviewGestureHandler
+
+class LongPressGesture(controller: GestureController) : Gesture(controller) {
+
+    private val handler by controller.createHandlerPref("pref_gesture_long_press",
+            OpenOverviewGestureHandler(controller.launcher, null))
+    override val isEnabled = true
+
+    override fun onEvent(): Boolean {
+        handler.onGestureTrigger(controller)
+        return true
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/gestures/gestures/PressBackGesture.kt b/Omega/src/com/saggitt/omega/gestures/gestures/PressBackGesture.kt
new file mode 100644
index 0000000000..50ad842d97
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/gestures/gestures/PressBackGesture.kt
@@ -0,0 +1,33 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.gestures.gestures
+
+import com.saggitt.omega.gestures.Gesture
+import com.saggitt.omega.gestures.GestureController
+
+class PressBackGesture(controller: GestureController) : Gesture(controller) {
+
+    val handler by controller.createHandlerPref("pref_gesture_press_back")
+    override val isEnabled = true
+
+
+    override fun onEvent(): Boolean {
+        handler.onGestureTrigger(controller)
+        return true
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/gestures/gestures/PressHomeGesture.kt b/Omega/src/com/saggitt/omega/gestures/gestures/PressHomeGesture.kt
new file mode 100644
index 0000000000..032566e3d5
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/gestures/gestures/PressHomeGesture.kt
@@ -0,0 +1,33 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.gestures.gestures
+
+import com.saggitt.omega.gestures.Gesture
+import com.saggitt.omega.gestures.GestureController
+
+class PressHomeGesture(controller: GestureController) : Gesture(controller) {
+
+    private val handler by controller.createHandlerPref("pref_gesture_press_home")
+    override val isEnabled = true
+
+
+    override fun onEvent(): Boolean {
+        handler.onGestureTrigger(controller)
+        return true
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/gestures/gestures/VerticalSwipeGesture.kt b/Omega/src/com/saggitt/omega/gestures/gestures/VerticalSwipeGesture.kt
new file mode 100644
index 0000000000..e358b43aec
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/gestures/gestures/VerticalSwipeGesture.kt
@@ -0,0 +1,69 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.gestures.gestures
+
+import com.android.launcher3.LauncherState
+import com.android.launcher3.LauncherState.ALL_APPS
+import com.saggitt.omega.gestures.Gesture
+import com.saggitt.omega.gestures.GestureController
+import com.saggitt.omega.gestures.handlers.*
+
+class VerticalSwipeGesture(controller: GestureController) : Gesture(controller) {
+
+    override val isEnabled = true
+
+    private val swipeUpHandler by controller.createHandlerPref("pref_gesture_swipe_up",
+            OpenDrawerGestureHandler(controller.launcher, null))
+    private val dockSwipeUpHandler by controller.createHandlerPref("pref_gesture_dock_swipe_up",
+            OpenDrawerGestureHandler(controller.launcher, null))
+    private val swipeDownHandler by controller.createHandlerPref("pref_gesture_swipe_down",
+            NotificationsOpenGestureHandler(controller.launcher, null))
+
+    val customSwipeUp get() = swipeUpHandler !is VerticalSwipeGestureHandler
+    val customDockSwipeUp get() = dockSwipeUpHandler !is VerticalSwipeGestureHandler
+    val customSwipeDown get() = swipeDownHandler !is NotificationsOpenGestureHandler
+
+    val swipeUpAppsSearch get() = swipeUpHandler is StartAppSearchGestureHandler
+    val dockSwipeUpAppsSearch get() = dockSwipeUpHandler is StartAppSearchGestureHandler
+
+    fun onSwipeUp() {
+        swipeUpHandler.onGestureTrigger(controller)
+    }
+
+    fun onDockSwipeUp() {
+        dockSwipeUpHandler.onGestureTrigger(controller)
+    }
+
+    fun onSwipeDown() {
+        swipeDownHandler.onGestureTrigger(controller)
+    }
+
+    fun onSwipeUpAllAppsComplete(fromDock: Boolean) {
+        if (if (fromDock) dockSwipeUpAppsSearch else swipeUpAppsSearch) {
+            controller.launcher.appsView.searchUiManager.startSearch()
+        }
+    }
+
+    fun getTargetState(fromDock: Boolean): LauncherState {
+        return if (fromDock) {
+            (dockSwipeUpHandler as? StateChangeGestureHandler)?.getTargetState() ?: ALL_APPS
+        } else {
+            (swipeUpHandler as? StateChangeGestureHandler)?.getTargetState() ?: ALL_APPS
+        }
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/gestures/handlers/LauncherGestureHandlers.kt b/Omega/src/com/saggitt/omega/gestures/handlers/LauncherGestureHandlers.kt
new file mode 100644
index 0000000000..620edc4f68
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/gestures/handlers/LauncherGestureHandlers.kt
@@ -0,0 +1,272 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.gestures.handlers
+
+import android.app.Activity
+import android.content.Context
+import android.content.Intent
+import android.graphics.drawable.Drawable
+import android.os.UserHandle
+import android.util.Log
+import android.view.View
+import android.widget.Toast
+import androidx.annotation.Keep
+import com.android.launcher3.LauncherState
+import com.android.launcher3.R
+import com.android.launcher3.Utilities
+import com.android.launcher3.compat.LauncherAppsCompat
+import com.android.launcher3.compat.UserManagerCompat
+import com.android.launcher3.shortcuts.DeepShortcutManager
+import com.android.launcher3.util.ComponentKey
+import com.android.launcher3.views.OptionsPopupView
+import com.saggitt.omega.dash.DashBottomSheet
+import com.saggitt.omega.gestures.GestureController
+import com.saggitt.omega.gestures.GestureHandler
+import com.saggitt.omega.gestures.ui.SelectAppActivity
+import com.saggitt.omega.search.SearchProviderController
+import com.saggitt.omega.util.getIcon
+import com.saggitt.omega.util.omegaPrefs
+import org.json.JSONObject
+
+@Keep
+open class OpenDrawerGestureHandler(context: Context, config: JSONObject?) : GestureHandler(context, config),
+        VerticalSwipeGestureHandler, StateChangeGestureHandler {
+
+    override val displayName: String = context.getString(R.string.action_open_drawer)
+    override val iconResource: Intent.ShortcutIconResource by lazy { Intent.ShortcutIconResource.fromContext(context, R.mipmap.ic_allapps_adaptive) }
+    override val requiresForeground = true
+
+    override fun onGestureTrigger(controller: GestureController, view: View?) {
+        controller.launcher.stateManager.goToState(LauncherState.ALL_APPS, true, getOnCompleteRunnable(controller))
+    }
+
+    open fun getOnCompleteRunnable(controller: GestureController): Runnable? = null
+
+    override fun getTargetState(): LauncherState {
+        return LauncherState.ALL_APPS
+    }
+}
+
+@Keep
+class StartGlobalSearchGestureHandler(context: Context, config: JSONObject?) : GestureHandler(context, config) {
+
+    private val searchProvider get() = SearchProviderController.getInstance(context).searchProvider
+    override val displayName: String = context.getString(R.string.action_global_search)
+    override val icon: Drawable by lazy { searchProvider.getIcon() }
+    override val requiresForeground = true
+
+    override fun onGestureTrigger(controller: GestureController, view: View?) {
+        searchProvider.startSearch {
+            try {
+                if (context !is Activity) {
+                    it.flags = it.flags or Intent.FLAG_ACTIVITY_NEW_TASK
+                }
+                context.startActivity(it)
+            } catch (e: Exception) {
+                Log.e(this::class.java.name, "Failed to start global search", e)
+            }
+        }
+    }
+}
+
+@Keep
+class StartAppSearchGestureHandler(context: Context, config: JSONObject?) : OpenDrawerGestureHandler(context, config) {
+
+    override val displayName: String = context.getString(R.string.action_app_search)
+    override val iconResource: Intent.ShortcutIconResource by lazy { Intent.ShortcutIconResource.fromContext(context, R.drawable.ic_search_shadow) }
+
+    override fun getOnCompleteRunnable(controller: GestureController): Runnable? {
+        return Runnable { controller.launcher.appsView.searchUiManager.startSearch() }
+    }
+}
+
+
+@Keep
+class StartAppGestureHandler(context: Context, config: JSONObject?) : GestureHandler(context, config) {
+
+    override val hasConfig = true
+    override val configIntent = Intent(context, SelectAppActivity::class.java)
+    override val displayName
+        get() = if (target != null)
+            String.format(displayNameWithTarget, appName) else displayNameWithoutTarget
+    override val icon: Drawable
+        get() = when {
+            intent != null -> try {
+                context.packageManager.getActivityIcon(intent!!)
+            } catch (e: Exception) {
+                context.getIcon()
+            }
+            target != null -> try {
+                context.packageManager.getApplicationIcon(target?.componentName!!.packageName)
+            } catch (e: Exception) {
+                context.getIcon()
+            }
+            else -> context.getIcon()
+        }
+
+    private val displayNameWithoutTarget: String = context.getString(R.string.action_open_app)
+    private val displayNameWithTarget: String = context.getString(R.string.action_open_app_with_target)
+
+    var type: String? = null
+    var appName: String? = null
+    var target: ComponentKey? = null
+    var intent: Intent? = null
+    var user: UserHandle? = null
+    var packageName: String? = null
+    var id: String? = null
+
+    init {
+        if (config?.has("appName") == true) {
+            appName = config.getString("appName")
+            type = if (config.has("type")) config.getString("type") else "app"
+            if (type == "app") {
+                Log.d("GestureController", "Class " + target.toString())
+                target = Utilities.makeComponentKey(context, config.getString("target"))
+            } else {
+                intent = Intent.parseUri(config.getString("intent"), 0)
+                user = UserManagerCompat.getInstance(context).getUserForSerialNumber(config.getLong("user"))
+                packageName = config.getString("packageName")
+                id = config.getString("id")
+            }
+        }
+    }
+
+    override fun saveConfig(config: JSONObject) {
+        super.saveConfig(config)
+        config.put("appName", appName)
+        config.put("type", type)
+        when (type) {
+            "app" -> {
+                config.put("target", target.toString())
+            }
+            "shortcut" -> {
+                config.put("intent", intent!!.toUri(0))
+                config.put("user", UserManagerCompat.getInstance(context).getSerialNumberForUser(user))
+                config.put("packageName", packageName)
+                config.put("id", id)
+            }
+        }
+    }
+
+    override fun onConfigResult(data: Intent?) {
+        super.onConfigResult(data)
+        if (data != null) {
+            appName = data.getStringExtra("appName")
+            type = data.getStringExtra("type")
+            when (type) {
+                "app" -> {
+                    target = Utilities.makeComponentKey(context, data.getStringExtra("target"))
+                }
+                "shortcut" -> {
+                    intent = Intent.parseUri(data.getStringExtra("intent"), 0)
+                    user = data.getParcelableExtra("user")
+                    packageName = data.getStringExtra("packageName")
+                    id = data.getStringExtra("id")
+                }
+            }
+        }
+    }
+
+    override fun onGestureTrigger(controller: GestureController, view: View?) {
+        Log.d("Open App", "Opening app")
+
+        if (view == null) {
+            val down = controller.touchDownPoint
+            controller.launcher.prepareDummyView(down.x.toInt(), down.y.toInt()) {
+                onGestureTrigger(controller, controller.launcher.dummyView)
+            }
+            return
+        }
+        val opts = view.let { controller.launcher.getActivityLaunchOptionsAsBundle(it) }
+        when (type) {
+            "app" -> {
+                try {
+                    LauncherAppsCompat.getInstance(context)
+                            .startActivityForProfile(target!!.componentName, target!!.user, null, opts)
+                } catch (e: NullPointerException) {
+                    // App is probably not installed anymore, show a Toast
+                    Toast.makeText(context, R.string.failed, Toast.LENGTH_LONG).show()
+                } catch (e: SecurityException) {
+                    // App is probably not installed anymore, show a Toast
+                    Toast.makeText(context, R.string.failed, Toast.LENGTH_LONG).show()
+                }
+            }
+            "shortcut" -> {
+                DeepShortcutManager.getInstance(context)
+                        .startShortcut(packageName, id, null, opts, user)
+            }
+        }
+    }
+}
+
+@Keep
+class OpenSettingsGestureHandler(context: Context, config: JSONObject?) :
+        GestureHandler(context, config) {
+
+    override val displayName = context.getString(R.string.action_open_settings)
+    override val iconResource: Intent.ShortcutIconResource by lazy {
+        Intent.ShortcutIconResource.fromContext(context, R.drawable.ic_setting)
+    }
+
+    override fun onGestureTrigger(controller: GestureController, view: View?) {
+        controller.launcher.startActivity(Intent(Intent.ACTION_APPLICATION_PREFERENCES).apply {
+            `package` = controller.launcher.packageName
+        })
+    }
+}
+
+@Keep
+class OpenDashGestureHandler(context: Context, config: JSONObject?) :
+        GestureHandler(context, config) {
+
+    override val displayName = context.getString(R.string.action_open_dash)
+    override fun onGestureTrigger(controller: GestureController, view: View?) {
+        DashBottomSheet.show(controller.launcher, true)
+    }
+}
+
+@Keep
+class OpenOverviewGestureHandler(context: Context, config: JSONObject?) : GestureHandler(context, config) {
+
+    override val displayName: String = context.getString(R.string.action_open_overview)
+    override val iconResource: Intent.ShortcutIconResource by lazy { Intent.ShortcutIconResource.fromContext(context, R.drawable.ic_setting) }
+    override val requiresForeground = true
+
+    override fun onGestureTrigger(controller: GestureController, view: View?) {
+        if (context.omegaPrefs.usePopupMenuView) {
+            OptionsPopupView.showDefaultOptions(controller.launcher,
+                    controller.touchDownPoint.x, controller.touchDownPoint.y)
+        } else {
+            controller.launcher.stateManager.goToState(LauncherState.OPTIONS)
+        }
+    }
+}
+
+interface VerticalSwipeGestureHandler {
+
+    fun onDragStart(start: Boolean) {}
+
+    fun onDrag(displacement: Float, velocity: Float) {}
+
+    fun onDragEnd(velocity: Float, fling: Boolean) {}
+}
+
+interface StateChangeGestureHandler {
+
+    fun getTargetState(): LauncherState
+}
diff --git a/Omega/src/com/saggitt/omega/gestures/handlers/NotificationsOpenGestureHandler.kt b/Omega/src/com/saggitt/omega/gestures/handlers/NotificationsOpenGestureHandler.kt
new file mode 100644
index 0000000000..2d3f5c6aaf
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/gestures/handlers/NotificationsOpenGestureHandler.kt
@@ -0,0 +1,67 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.gestures.handlers
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.view.View
+import androidx.annotation.Keep
+import com.android.launcher3.R
+import com.saggitt.omega.gestures.GestureController
+import com.saggitt.omega.gestures.GestureHandler
+import org.json.JSONObject
+import java.lang.reflect.InvocationTargetException
+
+@Keep
+class NotificationsOpenGestureHandler(context: Context, config: JSONObject?) : GestureHandler(context, config) {
+
+    override val displayName = context.getString(R.string.action_open_notifications)
+
+    @SuppressLint("PrivateApi", "WrongConstant")
+    override fun onGestureTrigger(controller: GestureController, view: View?) {
+        try {
+            Class.forName("android.app.StatusBarManager")
+                    .getMethod("expandNotificationsPanel")
+                    .invoke(controller.launcher.getSystemService("statusbar"))
+        } catch (ex: ClassNotFoundException) {
+        } catch (ex: NoSuchMethodException) {
+        } catch (ex: IllegalAccessException) {
+        } catch (ex: InvocationTargetException) {
+        }
+    }
+}
+
+@Keep
+class NotificationsCloseGestureHandler(context: Context, config: JSONObject?) : GestureHandler(context, config) {
+
+    override val displayName = context.getString(R.string.action_close_notifications)
+
+    @SuppressLint("PrivateApi", "WrongConstant")
+    override fun onGestureTrigger(controller: GestureController, view: View?) {
+        try {
+            Class.forName("android.app.StatusBarManager")
+                    .getMethod("collapsePanels")
+                    .invoke(controller.launcher.getSystemService("statusbar"))
+        } catch (ex: ClassNotFoundException) {
+        } catch (ex: NoSuchMethodException) {
+        } catch (ex: IllegalAccessException) {
+        } catch (ex: InvocationTargetException) {
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/gestures/handlers/SleepGestureHandler.kt b/Omega/src/com/saggitt/omega/gestures/handlers/SleepGestureHandler.kt
new file mode 100644
index 0000000000..4bf8944a67
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/gestures/handlers/SleepGestureHandler.kt
@@ -0,0 +1,110 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.gestures.handlers
+
+import android.accessibilityservice.AccessibilityService
+import android.annotation.TargetApi
+import android.app.admin.DeviceAdminReceiver
+import android.app.admin.DevicePolicyManager
+import android.content.ComponentName
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.os.Build
+import android.provider.Settings
+import android.view.View
+import androidx.annotation.Keep
+import com.android.launcher3.R
+import com.android.launcher3.Utilities
+import com.saggitt.omega.gestures.GestureController
+import com.saggitt.omega.gestures.GestureHandler
+import com.saggitt.omega.omegaApp
+import org.json.JSONObject
+
+@Keep
+class SleepGestureHandler(context: Context, config: JSONObject?) : GestureHandler(context, config) {
+    override val displayName: String = context.getString(R.string.action_sleep)
+
+    override fun onGestureTrigger(controller: GestureController, view: View?) {
+        method!!.sleep(controller)
+    }
+
+    // Preferred methods should appear earlier in the list
+    private val method: SleepMethod? by lazy {
+        listOf(
+                SleepMethodPieAccessibility(context),
+                SleepMethodDeviceAdmin(context)
+        ).firstOrNull { it.supported }
+    }
+
+    override val isAvailable = true // At least the device admin method is always going to work
+
+    abstract class SleepMethod(protected val context: Context) {
+        abstract val supported: Boolean
+        abstract fun sleep(controller: GestureController)
+    }
+}
+
+class SleepMethodPieAccessibility(context: Context) : SleepGestureHandler.SleepMethod(context) {
+    override val supported = Utilities.ATLEAST_P
+
+    @TargetApi(Build.VERSION_CODES.P)
+    override fun sleep(controller: GestureController) {
+        context.omegaApp.performGlobalAction(AccessibilityService.GLOBAL_ACTION_LOCK_SCREEN)
+    }
+}
+
+class SleepMethodDeviceAdmin(context: Context) : SleepGestureHandler.SleepMethod(context) {
+    override val supported = true
+
+    override fun sleep(controller: GestureController) {
+        val devicePolicyManager = context.getSystemService(Context.DEVICE_POLICY_SERVICE) as DevicePolicyManager
+        if (devicePolicyManager.isAdminActive(ComponentName(context, SleepDeviceAdmin::class.java))) {
+            devicePolicyManager.lockNow()
+        } else {
+            val intent = Intent(DevicePolicyManager.ACTION_ADD_DEVICE_ADMIN)
+            intent.putExtra(DevicePolicyManager.EXTRA_DEVICE_ADMIN, ComponentName(context, SleepMethodDeviceAdmin.SleepDeviceAdmin::class.java))
+            intent.putExtra(DevicePolicyManager.EXTRA_ADD_EXPLANATION, context.getString(R.string.dt2s_admin_hint))
+            context.startActivity(intent)
+        }
+    }
+
+    class SleepDeviceAdmin : DeviceAdminReceiver() {
+
+        override fun onDisableRequested(context: Context, intent: Intent): CharSequence {
+            return context.getString(R.string.dt2s_admin_warning)
+        }
+    }
+}
+
+@Keep
+class SleepGestureHandlerTimeout(context: Context, config: JSONObject?) : GestureHandler(context, config) {
+
+    override val displayName: String = context.getString(R.string.action_sleep_timeout)
+
+    override fun onGestureTrigger(controller: GestureController, view: View?) {
+        val launcher = controller.launcher
+        if (Settings.System.canWrite(launcher)) {
+            launcher.startActivity(Intent(launcher, SleepTimeoutActivity::class.java))
+        } else {
+            val intent = Intent(Settings.ACTION_MANAGE_WRITE_SETTINGS)
+            intent.data = Uri.parse("package:${launcher.packageName}")
+            launcher.startActivity(intent)
+        }
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/gestures/handlers/SleepTimeoutActivity.kt b/Omega/src/com/saggitt/omega/gestures/handlers/SleepTimeoutActivity.kt
new file mode 100644
index 0000000000..bf32a6a97e
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/gestures/handlers/SleepTimeoutActivity.kt
@@ -0,0 +1,73 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.gestures.handlers
+
+import android.app.Activity
+import android.os.Bundle
+import android.provider.Settings
+import android.util.Log
+import android.view.View
+
+class SleepTimeoutActivity : Activity() {
+
+    private val timeout by lazy { Settings.System.getInt(contentResolver, Settings.System.SCREEN_OFF_TIMEOUT, 60000) }
+    private val stayOnWhilePluggedIn by lazy { Settings.System.getInt(contentResolver, Settings.Global.STAY_ON_WHILE_PLUGGED_IN, 0) }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        // Load original values
+        timeout
+        stayOnWhilePluggedIn
+
+        window.decorView.systemUiVisibility = window.decorView.systemUiVisibility or View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
+
+        putSettings(0, 0)
+    }
+
+    override fun onWindowFocusChanged(hasFocus: Boolean) {
+        super.onWindowFocusChanged(hasFocus)
+
+        if (!hasFocus) {
+            finish()
+        }
+    }
+
+    override fun onPause() {
+        super.onPause()
+
+        finish()
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+
+        putSettings(timeout, stayOnWhilePluggedIn)
+    }
+
+    override fun onBackPressed() {
+
+    }
+
+    private fun putSettings(timeout: Int, stayOnWhilePluggedIn: Int) {
+        if (!Settings.System.canWrite(this)) return
+        Settings.System.putInt(contentResolver, Settings.System.SCREEN_OFF_TIMEOUT, timeout)
+        Settings.System.putInt(contentResolver, Settings.Global.STAY_ON_WHILE_PLUGGED_IN, stayOnWhilePluggedIn)
+        Log.d("SleepTimeoutActivity", "Screen timeout settings set to $timeout $stayOnWhilePluggedIn")
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/gestures/handlers/ViewSwipeUpGestureHandler.kt b/Omega/src/com/saggitt/omega/gestures/handlers/ViewSwipeUpGestureHandler.kt
new file mode 100644
index 0000000000..f94363cd2c
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/gestures/handlers/ViewSwipeUpGestureHandler.kt
@@ -0,0 +1,49 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.gestures.handlers
+
+import android.view.View
+import android.view.animation.DecelerateInterpolator
+import com.android.launcher3.R
+import com.android.launcher3.touch.OverScroll
+import com.saggitt.omega.gestures.GestureController
+import com.saggitt.omega.gestures.GestureHandler
+
+class ViewSwipeUpGestureHandler(private val view: View, private val handler: GestureHandler)
+    : GestureHandler(view.context, null), VerticalSwipeGestureHandler {
+
+    private val negativeMax by lazy { view.resources.getDimensionPixelSize(R.dimen.swipe_up_negative_max) }
+    private val positiveMax by lazy { view.resources.getDimensionPixelSize(R.dimen.swipe_up_positive_max) }
+
+    override fun onGestureTrigger(controller: GestureController, view: View?) {
+        controller.launcher.prepareDummyView(this.view) {
+            handler.onGestureTrigger(controller, controller.launcher.dummyView)
+        }
+    }
+
+    override fun onDrag(displacement: Float, velocity: Float) {
+        view.translationY = OverScroll.dampedScroll(displacement, if (displacement < 0)
+            negativeMax else positiveMax).toFloat()
+    }
+
+    override fun onDragEnd(velocity: Float, fling: Boolean) {
+        view.animate().translationY(0f).setDuration(100).setInterpolator(DecelerateInterpolator()).start()
+    }
+
+    override val displayName = ""
+}
diff --git a/Omega/src/com/saggitt/omega/gestures/ui/GestureHandlerInitListener.kt b/Omega/src/com/saggitt/omega/gestures/ui/GestureHandlerInitListener.kt
new file mode 100644
index 0000000000..c5555f92bf
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/gestures/ui/GestureHandlerInitListener.kt
@@ -0,0 +1,33 @@
+/*
+ *     Copyright (C) 2019 Lawnchair Team.
+ *
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.gestures.ui
+
+import com.android.launcher3.Launcher
+import com.android.launcher3.states.InternalStateHandler
+import com.saggitt.omega.OmegaLauncher
+import com.saggitt.omega.gestures.GestureHandler
+
+class GestureHandlerInitListener(private val handler: GestureHandler) : InternalStateHandler() {
+
+    override fun init(launcher: Launcher, alreadyOnHome: Boolean): Boolean {
+        handler.onGestureTrigger((launcher as OmegaLauncher).gestureController)
+        return true
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/gestures/ui/GesturePreference.kt b/Omega/src/com/saggitt/omega/gestures/ui/GesturePreference.kt
new file mode 100644
index 0000000000..20353864e1
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/gestures/ui/GesturePreference.kt
@@ -0,0 +1,82 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.gestures.ui
+
+import android.content.Context
+import android.content.SharedPreferences
+import android.content.res.TypedArray
+import android.util.AttributeSet
+import androidx.preference.DialogPreference
+import com.android.launcher3.R
+import com.saggitt.omega.gestures.BlankGestureHandler
+import com.saggitt.omega.gestures.GestureController
+import com.saggitt.omega.gestures.gestures.NavSwipeUpGesture
+
+class GesturePreference(context: Context, attrs: AttributeSet?) : DialogPreference(context, attrs), SharedPreferences.OnSharedPreferenceChangeListener {
+
+    var value = ""
+    var defaultValue = ""
+
+    private val blankGestureHandler = BlankGestureHandler(context, null)
+    private val handler get() = GestureController.createGestureHandler(context, value, blankGestureHandler)
+    internal var isSwipeUp = false
+
+    init {
+        val ta = context.obtainStyledAttributes(attrs, R.styleable.GesturePreference)
+        val className = ta.getString(R.styleable.GesturePreference_gestureClass) ?: ""
+        when (className) {
+            NavSwipeUpGesture::class.java.name -> isSwipeUp = true
+        }
+
+        ta.recycle()
+    }
+
+    override fun onAttached() {
+        super.onAttached()
+        preferenceManager.sharedPreferences.registerOnSharedPreferenceChangeListener(this)
+    }
+
+    override fun onDetached() {
+        super.onDetached()
+        preferenceManager.sharedPreferences.unregisterOnSharedPreferenceChangeListener(this)
+    }
+
+    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String) {
+        if (key == this.key) {
+            value = getPersistedString(defaultValue)
+            notifyChanged()
+        }
+    }
+
+    override fun getSummary() = handler.displayName
+
+    override fun onSetInitialValue(restorePersistedValue: Boolean, defaultValue: Any?) {
+        value = if (restorePersistedValue) {
+            getPersistedString(defaultValue as String?) ?: ""
+        } else {
+            defaultValue as String? ?: ""
+        }
+    }
+
+    override fun onGetDefaultValue(a: TypedArray, index: Int): String? {
+        defaultValue = a.getString(index)!!
+        return defaultValue
+    }
+
+    override fun getDialogLayoutResource() = R.layout.dialog_preference_recyclerview
+}
diff --git a/Omega/src/com/saggitt/omega/gestures/ui/HandlerListAdapter.kt b/Omega/src/com/saggitt/omega/gestures/ui/HandlerListAdapter.kt
new file mode 100644
index 0000000000..f2b9b7e4cd
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/gestures/ui/HandlerListAdapter.kt
@@ -0,0 +1,59 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.gestures.ui
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.CheckedTextView
+import androidx.recyclerview.widget.RecyclerView
+import com.android.launcher3.R
+import com.saggitt.omega.gestures.GestureController
+import com.saggitt.omega.gestures.GestureHandler
+import com.saggitt.omega.util.applyAccent
+
+class HandlerListAdapter(private val context: Context, isSwipeUp: Boolean,
+                         private val currentClass: String,
+                         private val onSelectHandler: (handler: GestureHandler) -> Unit, showBlank: Boolean = true) : RecyclerView.Adapter<HandlerListAdapter.Holder>() {
+
+    val handlers = GestureController.getGestureHandlers(context, isSwipeUp, showBlank)
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): Holder {
+        return Holder(LayoutInflater.from(context).inflate(R.layout.gesture_item, parent, false))
+    }
+
+    override fun getItemCount() = handlers.size
+
+    override fun onBindViewHolder(holder: Holder, position: Int) {
+        holder.text.text = handlers[position].displayName
+        holder.text.isChecked = handlers[position]::class.java.name == currentClass
+    }
+
+    inner class Holder(itemView: View) : RecyclerView.ViewHolder(itemView), View.OnClickListener {
+
+        val text = itemView.findViewById<CheckedTextView>(android.R.id.text1)!!.apply {
+            setOnClickListener(this@Holder)
+            applyAccent()
+        }
+
+        override fun onClick(v: View) {
+            onSelectHandler(handlers[adapterPosition])
+        }
+    }
+}
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/gestures/ui/LauncherGesturePreference.kt b/Omega/src/com/saggitt/omega/gestures/ui/LauncherGesturePreference.kt
new file mode 100644
index 0000000000..b17b1402e9
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/gestures/ui/LauncherGesturePreference.kt
@@ -0,0 +1,65 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.gestures.ui
+
+import android.app.AlertDialog
+import android.content.Context
+import android.util.AttributeSet
+import com.saggitt.omega.gestures.BlankGestureHandler
+import com.saggitt.omega.gestures.GestureController
+import com.saggitt.omega.gestures.GestureHandler
+import com.saggitt.omega.preferences.RecyclerViewPreference
+
+class LauncherGesturePreference(context: Context, attrs: AttributeSet?) : RecyclerViewPreference(context, attrs) {
+
+    var value: String? = null
+        set(value) {
+            field = value
+            notifyChanged()
+        }
+    var defaultValue = BlankGestureHandler::class.java.name
+    lateinit var onSelectHandler: (GestureHandler) -> Unit
+    private val mContext = context
+    private val blankGestureHandler = BlankGestureHandler(mContext, null)
+    private val handler get() = GestureController.createGestureHandler(mContext, value.toString(), blankGestureHandler)
+
+    override fun getSummary() = handler.displayName
+
+    override fun onSetInitialValue(restorePersistedValue: Boolean, defaultValue: Any?) {
+        value = if (restorePersistedValue) {
+            getPersistedString(defaultValue as String?) ?: ""
+        } else {
+            defaultValue as String? ?: ""
+        }
+    }
+
+    override fun onPrepareDialogBuilder(builder: AlertDialog.Builder) {
+        super.onPrepareDialogBuilder(builder)
+
+        builder.setPositiveButton(null, null)
+    }
+
+    override fun onBindRecyclerView(recyclerView: androidx.recyclerview.widget.RecyclerView) {
+        recyclerView.adapter = HandlerListAdapter(themedContext, false, getClassName(), onSelectHandler)
+        recyclerView.layoutManager = androidx.recyclerview.widget.LinearLayoutManager(themedContext)
+    }
+
+    fun getClassName(): String {
+        return GestureController.getClassName(value ?: defaultValue)
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/gestures/ui/RunHandlerActivity.kt b/Omega/src/com/saggitt/omega/gestures/ui/RunHandlerActivity.kt
new file mode 100644
index 0000000000..ac46b405d5
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/gestures/ui/RunHandlerActivity.kt
@@ -0,0 +1,67 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.gestures.ui
+
+import android.app.Activity
+import android.content.Intent
+import android.os.Bundle
+import android.widget.Toast
+import com.android.launcher3.LauncherAppState
+import com.android.launcher3.R
+import com.saggitt.omega.OmegaLauncher
+import com.saggitt.omega.gestures.BlankGestureHandler
+import com.saggitt.omega.gestures.GestureController
+import com.saggitt.omega.gestures.GestureHandler
+import com.saggitt.omega.gestures.OmegaShortcutActivity
+
+class RunHandlerActivity : Activity() {
+    private val fallback by lazy { BlankGestureHandler(this, null) }
+    private val launcher
+        get() = (LauncherAppState.getInstance(this).launcher as? OmegaLauncher)
+    private val controller
+        get() = launcher?.gestureController
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        if (intent.action == OmegaShortcutActivity.START_ACTION) {
+            val handlerString = intent.getStringExtra(OmegaShortcutActivity.EXTRA_HANDLER)
+            if (handlerString != null) {
+                val handler = GestureController.createGestureHandler(this.applicationContext, handlerString, fallback)
+                if (handler.requiresForeground) {
+                    val listener = GestureHandlerInitListener(handler)
+                    val homeIntent = listener.addToIntent(
+                            Intent(Intent.ACTION_MAIN)
+                                    .addCategory(Intent.CATEGORY_HOME)
+                                    .setPackage(packageName)
+                                    .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK))
+
+                    startActivity(homeIntent)
+                } else {
+                    triggerGesture(handler)
+                }
+            }
+        }
+        finish()
+    }
+
+    private fun triggerGesture(handler: GestureHandler) = if (controller != null) {
+        handler.onGestureTrigger(controller!!)
+    } else {
+        Toast.makeText(this.applicationContext, R.string.failed, Toast.LENGTH_LONG).show()
+    }
+}
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/gestures/ui/SelectAppActivity.kt b/Omega/src/com/saggitt/omega/gestures/ui/SelectAppActivity.kt
new file mode 100644
index 0000000000..af04f19b84
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/gestures/ui/SelectAppActivity.kt
@@ -0,0 +1,73 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.gestures.ui
+
+import android.app.Activity
+import android.content.Intent
+import android.os.Bundle
+import android.view.MenuItem
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.android.launcher3.R
+import com.android.launcher3.shortcuts.ShortcutKey
+import com.saggitt.omega.preferences.AppsAdapterWithShortcuts
+import com.saggitt.omega.settings.SettingsBaseActivity
+
+class SelectAppActivity : SettingsBaseActivity(), AppsAdapterWithShortcuts.Callback {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.preference_insettable_recyclerview)
+
+        supportActionBar?.setDisplayShowHomeEnabled(true)
+        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+
+        val recyclerView = findViewById<RecyclerView>(R.id.list)
+        recyclerView.adapter = AppsAdapterWithShortcuts(this, this)
+        recyclerView.layoutManager = LinearLayoutManager(this)
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        if (item.itemId == android.R.id.home) {
+            finish()
+            return true
+        }
+        return super.onOptionsItemSelected(item)
+    }
+
+    override fun onAppSelected(app: AppsAdapterWithShortcuts.AppItem) {
+        setResult(Activity.RESULT_OK, Intent().apply {
+            putExtra("type", "app")
+            putExtra("appName", app.info.label)
+            putExtra("target", app.key.toString())
+        })
+        finish()
+    }
+
+    override fun onShortcutSelected(shortcut: AppsAdapterWithShortcuts.ShortcutItem) {
+        setResult(Activity.RESULT_OK, Intent().apply {
+            putExtra("type", "shortcut")
+            putExtra("appName", shortcut.label)
+            putExtra("intent", ShortcutKey.makeIntent(shortcut.info).toUri(0))
+            putExtra("user", shortcut.info.userHandle)
+            putExtra("packageName", shortcut.info.`package`)
+            putExtra("id", shortcut.info.id)
+        })
+        finish()
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/gestures/ui/SelectGestureHandlerFragment.kt b/Omega/src/com/saggitt/omega/gestures/ui/SelectGestureHandlerFragment.kt
new file mode 100644
index 0000000000..7ccb673794
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/gestures/ui/SelectGestureHandlerFragment.kt
@@ -0,0 +1,101 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.gestures.ui
+
+import android.app.Activity
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import android.view.View
+import androidx.appcompat.app.AlertDialog
+import androidx.preference.PreferenceDialogFragmentCompat
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.android.launcher3.R
+import com.android.launcher3.Utilities
+import com.saggitt.omega.gestures.GestureController
+import com.saggitt.omega.gestures.GestureHandler
+import com.saggitt.omega.util.applyAccent
+
+class SelectGestureHandlerFragment : PreferenceDialogFragmentCompat() {
+
+    private val requestCode = "config".hashCode() and 65535
+
+    private val key by lazy { requireArguments().getString("key") }
+    private val value by lazy { requireArguments().getString("value") }
+    private val isSwipeUp by lazy { requireArguments().getBoolean("isSwipeUp") }
+    private val currentClass by lazy { GestureController.getClassName(value!!) }
+
+    private var selectedHandler: GestureHandler? = null
+
+    override fun onBindDialogView(view: View) {
+        super.onBindDialogView(view)
+
+        val recyclerView = view.findViewById<RecyclerView>(R.id.list)
+        recyclerView.adapter = HandlerListAdapter(activity as Context, isSwipeUp, currentClass, ::onSelectHandler)
+        recyclerView.layoutManager = LinearLayoutManager(activity)
+    }
+
+    fun onSelectHandler(handler: GestureHandler) {
+        selectedHandler = handler
+        if (handler.configIntent != null) {
+            startActivityForResult(handler.configIntent, requestCode)
+        } else {
+            saveChanges()
+        }
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        if (requestCode == this.requestCode && resultCode == Activity.RESULT_OK) {
+            selectedHandler?.onConfigResult(data)
+            saveChanges()
+        }
+        super.onActivityResult(requestCode, resultCode, data)
+    }
+
+    private fun saveChanges() {
+        Utilities.getOmegaPrefs(activity).sharedPrefs.edit().putString(key, selectedHandler.toString()).apply()
+        dismiss()
+    }
+
+    override fun onPrepareDialogBuilder(builder: AlertDialog.Builder) {
+        super.onPrepareDialogBuilder(builder)
+
+        builder.setPositiveButton(null, null)
+    }
+
+    override fun onStart() {
+        super.onStart()
+        (dialog as AlertDialog).applyAccent()
+    }
+
+    override fun onDialogClosed(positiveResult: Boolean) {
+
+    }
+
+    companion object {
+
+        fun newInstance(preference: GesturePreference) = SelectGestureHandlerFragment().apply {
+            arguments = Bundle(2).apply {
+                putString("key", preference.key)
+                putString("value", preference.value)
+                putBoolean("isSwipeUp", preference.isSwipeUp)
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/graphics/DoubleShadowTextView.java b/Omega/src/com/saggitt/omega/graphics/DoubleShadowTextView.java
new file mode 100644
index 0000000000..19caccdf53
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/graphics/DoubleShadowTextView.java
@@ -0,0 +1,48 @@
+package com.saggitt.omega.graphics;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.graphics.Canvas;
+import android.util.AttributeSet;
+import android.widget.TextView;
+
+import com.android.launcher3.views.DoubleShadowBubbleTextView;
+
+@SuppressLint("AppCompatCustomView")
+public class DoubleShadowTextView extends TextView {
+    private final DoubleShadowBubbleTextView.ShadowInfo mShadowInfo;
+
+    public DoubleShadowTextView(Context context) {
+        super(context, null);
+        mShadowInfo = new DoubleShadowBubbleTextView.ShadowInfo(context, null, 0);
+        setShadowLayer(Math.max(mShadowInfo.keyShadowBlur + mShadowInfo.keyShadowOffset,
+                mShadowInfo.ambientShadowBlur), 0f, 0f,
+                mShadowInfo.keyShadowColor);
+    }
+
+    public DoubleShadowTextView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        mShadowInfo = new DoubleShadowBubbleTextView.ShadowInfo(context, attrs, 0);
+        setShadowLayer(Math.max(mShadowInfo.keyShadowBlur + mShadowInfo.keyShadowOffset,
+                mShadowInfo.ambientShadowBlur), 0f, 0f,
+                mShadowInfo.keyShadowColor);
+    }
+
+    public DoubleShadowTextView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        mShadowInfo = new DoubleShadowBubbleTextView.ShadowInfo(context, attrs, defStyleAttr);
+        setShadowLayer(Math.max(mShadowInfo.keyShadowBlur
+                + mShadowInfo.keyShadowOffset, mShadowInfo.ambientShadowBlur), 0f, 0f, mShadowInfo.keyShadowColor);
+    }
+
+    protected void onDraw(Canvas canvas) {
+        if (mShadowInfo.skipDoubleShadow(this)) {
+            super.onDraw(canvas);
+            return;
+        }
+        getPaint().setShadowLayer(mShadowInfo.ambientShadowBlur, 0.0f, 0.0f, mShadowInfo.ambientShadowColor);
+        super.onDraw(canvas);
+        getPaint().setShadowLayer(mShadowInfo.keyShadowBlur, 0.0f, mShadowInfo.keyShadowOffset, mShadowInfo.keyShadowColor);
+        super.onDraw(canvas);
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/graphics/IcuDateTextView.java b/Omega/src/com/saggitt/omega/graphics/IcuDateTextView.java
new file mode 100644
index 0000000000..cba9cc144a
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/graphics/IcuDateTextView.java
@@ -0,0 +1,87 @@
+package com.saggitt.omega.graphics;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.icu.text.DateFormat;
+import android.icu.text.DisplayContext;
+import android.util.AttributeSet;
+
+import com.android.launcher3.R;
+import com.android.launcher3.Utilities;
+import com.saggitt.omega.OmegaPreferences;
+
+import java.util.Locale;
+
+public class IcuDateTextView extends DoubleShadowTextView {
+    private DateFormat mDateFormat;
+    private final BroadcastReceiver mTimeChangeReceiver;
+    private boolean mIsVisible = false;
+
+    public IcuDateTextView(final Context context) {
+        this(context, null);
+    }
+
+    public IcuDateTextView(final Context context, final AttributeSet set) {
+        super(context, set, 0);
+        mTimeChangeReceiver = new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                reloadDateFormat(!Intent.ACTION_TIME_TICK.equals(intent.getAction()));
+            }
+        };
+    }
+
+    public void reloadDateFormat(boolean forcedChange) {
+        mDateFormat = getDateFormat(getContext(), forcedChange, mDateFormat, getId() == R.id.time_above);
+        String format = mDateFormat.format(System.currentTimeMillis());
+        setText(format);
+        setContentDescription(format);
+    }
+
+    public static DateFormat getDateFormat(Context context, boolean forcedChange, DateFormat oldFormat, boolean isTimeAbove) {
+        if (oldFormat == null || forcedChange) {
+            (oldFormat = DateFormat.getInstanceForSkeleton(context
+                    .getString(R.string.icu_abbrev_wday_month_day_no_year), Locale.getDefault()))
+                    .setContext(DisplayContext.CAPITALIZATION_FOR_STANDALONE);
+        }
+        OmegaPreferences prefs = Utilities.getOmegaPrefs(context);
+        boolean showTime = prefs.getSmartspaceTime();
+        boolean timeAbove = prefs.getSmartspaceTimeAbove();
+        boolean show24h = prefs.getSmartspaceTime24H();
+        boolean showDate = prefs.getSmartspaceDate();
+        if ((showTime && !timeAbove) || isTimeAbove) {
+            String format = context.getString(show24h ? R.string.icu_abbrev_time : R.string.icu_abbrev_time_12h);
+            if (showDate && !isTimeAbove)
+                format += context.getString(R.string.icu_abbrev_date);
+            (oldFormat = DateFormat.getInstanceForSkeleton(format, Locale.getDefault()))
+                    .setContext(DisplayContext.CAPITALIZATION_FOR_STANDALONE);
+        }
+        return oldFormat;
+    }
+
+    private void registerReceiver() {
+        IntentFilter intentFilter = new IntentFilter();
+        intentFilter.addAction(Intent.ACTION_TIME_TICK);
+        intentFilter.addAction(Intent.ACTION_TIME_CHANGED);
+        intentFilter.addAction(Intent.ACTION_TIMEZONE_CHANGED);
+        getContext().registerReceiver(mTimeChangeReceiver, intentFilter);
+    }
+
+    private void unregisterReceiver() {
+        getContext().unregisterReceiver(mTimeChangeReceiver);
+    }
+
+    public void onVisibilityAggregated(boolean isVisible) {
+        super.onVisibilityAggregated(isVisible);
+        if (!mIsVisible && isVisible) {
+            mIsVisible = true;
+            registerReceiver();
+            reloadDateFormat(true);
+        } else if (mIsVisible && !isVisible) {
+            unregisterReceiver();
+            mIsVisible = false;
+        }
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/groups/AppGroups.kt b/Omega/src/com/saggitt/omega/groups/AppGroups.kt
new file mode 100644
index 0000000000..20000f1a8e
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/groups/AppGroups.kt
@@ -0,0 +1,551 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.groups
+
+import android.content.Context
+import android.text.Editable
+import android.text.TextWatcher
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.Switch
+import android.widget.TextView
+import com.android.launcher3.R
+import com.android.launcher3.Utilities
+import com.android.launcher3.util.ComponentKey
+import com.saggitt.omega.OmegaPreferencesChangeCallback
+import com.saggitt.omega.preferences.SelectableAppsActivity
+import com.saggitt.omega.util.*
+import org.json.JSONArray
+import org.json.JSONException
+import org.json.JSONObject
+
+typealias GroupCreator<T> = (Context) -> T?
+
+abstract class AppGroups<T : AppGroups.Group>(private val manager: AppGroupsManager,
+                                              private val type: AppGroupsManager.CategorizationType) {
+
+    private val prefs = manager.prefs
+    val context = prefs.context
+
+    private var groupsDataJson by prefs.StringPref(type.prefsKey, "{}", prefs.withChangeCallback {
+        onGroupsChanged(it)
+    })
+    private val groups = ArrayList<T>()
+
+    var isEnabled = manager.categorizationEnabled && manager.categorizationType == type
+        private set
+
+    private val defaultGroups by lazy { getDefaultCreators().mapNotNull { it(context) } }
+
+    init {
+        loadGroups()
+    }
+
+    private fun loadGroupsArray(): JSONArray {
+        try {
+            val obj = JSONObject(groupsDataJson)
+            val version = if (obj.has(KEY_VERSION)) obj.getInt(KEY_VERSION) else 0
+            if (version > currentVersion) return JSONArray()
+            return obj.getJSONArray(KEY_GROUPS)
+        } catch (ignored: JSONException) {
+        }
+
+        try {
+            return JSONArray(groupsDataJson)
+        } catch (ignored: JSONException) {
+        }
+
+        return JSONArray()
+    }
+
+    private fun loadGroups() {
+        groups.clear()
+        val arr = loadGroupsArray()
+        val used = mutableSetOf<GroupCreator<T>>()
+        (0 until arr.length())
+                .map { arr.getJSONObject(it) }
+                .mapNotNullTo(groups) { group ->
+                    val type = if (group.has(KEY_TYPE)) group.getInt(KEY_TYPE) else TYPE_UNDEFINED
+                    val creator = getGroupCreator(type)
+                    used.add(creator)
+                    creator(context)?.apply { loadCustomizations(context, group.asMap()) }
+                }
+        getDefaultCreators().asReversed().forEach { creator ->
+            if (creator !in used) {
+                creator(context)?.let { groups.add(0, it) }
+            }
+        }
+    }
+
+    fun checkIsEnabled(changeCallback: OmegaPreferencesChangeCallback) {
+        val enabled = manager.categorizationEnabled && manager.categorizationType == type
+        if (isEnabled != enabled) {
+            isEnabled = enabled
+            onGroupsChanged(changeCallback)
+        }
+    }
+
+    abstract fun getDefaultCreators(): List<GroupCreator<T>>
+
+    abstract fun getGroupCreator(type: Int): GroupCreator<T>
+
+    @Suppress("UNUSED_PARAMETER")
+    protected fun createNull(context: Context) = null
+
+    abstract fun onGroupsChanged(changeCallback: OmegaPreferencesChangeCallback)
+
+    fun getGroups(): List<T> {
+        if (!isEnabled) {
+            return defaultGroups
+        }
+        return groups
+    }
+
+    fun setGroups(groups: List<T>) {
+        this.groups.clear()
+        this.groups.addAll(groups)
+
+        val used = mutableSetOf<GroupCreator<T>>()
+        groups.forEach {
+            val creator = getGroupCreator(it.type)
+            used.add(creator)
+        }
+        getDefaultCreators().asReversed().forEach { creator ->
+            if (creator !in used) {
+                creator(context)?.let { this.groups.add(0, it) }
+            }
+        }
+    }
+
+    fun saveToJson() {
+        val arr = JSONArray()
+        groups.forEach { group ->
+            arr.put(JSONObject(group.saveCustomizationsInternal(context)))
+        }
+
+        val obj = JSONObject()
+        obj.put(KEY_VERSION, currentVersion)
+        obj.put(KEY_GROUPS, arr)
+        groupsDataJson = obj.toString()
+    }
+
+    companion object {
+
+        const val currentVersion = 1
+
+        const val KEY_VERSION = "version"
+        const val KEY_GROUPS = "tabs"
+
+        const val KEY_ID = "id"
+        const val KEY_TYPE = "type"
+        const val KEY_COLOR = "color"
+        const val KEY_TITLE = "title"
+        const val KEY_HIDE_FROM_ALL_APPS = "hideFromAllApps"
+
+        const val TYPE_UNDEFINED = -1
+    }
+
+    open class Group(val type: Int, context: Context, titleRes: Int) {
+
+        private val defaultTitle: String = context.getString(titleRes)
+
+        val customizations = CustomizationMap()
+        val title = CustomTitle(KEY_TITLE, defaultTitle)
+
+        init {
+            addCustomization(title)
+        }
+
+        fun getTitle(): String {
+            return title.value ?: defaultTitle
+        }
+
+        open fun getSummary(context: Context): String? {
+            return null
+        }
+
+        fun addCustomization(customization: Customization<*, *>) {
+            customizations.add(customization)
+        }
+
+        open fun loadCustomizations(context: Context, obj: Map<String, Any>) {
+            customizations.entries.forEach { it.loadFromJsonInternal(context, obj[it.key]) }
+        }
+
+        fun saveCustomizationsInternal(context: Context): Map<String, Any> {
+            val obj = HashMap<String, Any>()
+            saveCustomizations(context, obj)
+            return obj
+        }
+
+        open fun saveCustomizations(context: Context, obj: MutableMap<String, Any>) {
+            obj[KEY_TYPE] = type
+            customizations.entries.forEach { entry ->
+                entry.saveToJson(context)?.let { obj[entry.key] = it }
+            }
+        }
+
+        fun cloneCustomizations(): CustomizationMap {
+            return CustomizationMap(customizations)
+        }
+
+        abstract class Customization<T : Any, S : Any>(val key: String, protected val default: T) {
+
+            var value: T? = null
+
+            fun value() = value ?: default
+
+            @Suppress("UNCHECKED_CAST")
+            fun loadFromJsonInternal(context: Context, obj: Any?) {
+                loadFromJson(context, obj as S?)
+            }
+
+            abstract fun loadFromJson(context: Context, obj: S?)
+
+            abstract fun saveToJson(context: Context): S?
+
+            abstract fun clone(): Customization<T, S>
+
+            open fun applyFrom(other: Customization<*, *>) {
+                value = other.value as? T
+            }
+
+            open fun createRow(context: Context, parent: ViewGroup, accent: Int): View? {
+                return null
+            }
+        }
+
+        open class StringCustomization(key: String, default: String) :
+                Customization<String, String>(key, default) {
+
+            override fun loadFromJson(context: Context, obj: String?) {
+                value = obj
+            }
+
+            override fun saveToJson(context: Context): String? {
+                return value
+            }
+
+            override fun clone(): Customization<String, String> {
+                return StringCustomization(key, default).also { it.value = value }
+            }
+        }
+
+        class CustomTitle(key: String, default: String) : StringCustomization(key, default) {
+
+            override fun createRow(context: Context, parent: ViewGroup, accent: Int): View? {
+                val view = LayoutInflater.from(context).inflate(R.layout.drawer_tab_custom_title_row, parent, false)
+                view.findViewById<TextView>(R.id.name_label).setTextColor(accent)
+
+                val tabName = view.findViewById<TextView>(R.id.name)
+                tabName.text = value
+                tabName.hint = default
+                tabName.addTextChangedListener(object : TextWatcher {
+                    override fun afterTextChanged(s: Editable?) {
+                        value = s?.toString()?.trim()?.asNonEmpty()
+                    }
+
+                    override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
+
+                    }
+
+                    override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
+
+                    }
+
+                })
+                return view
+            }
+
+            override fun saveToJson(context: Context): String? {
+                return value?.asNonEmpty()
+            }
+
+            override fun clone(): Customization<String, String> {
+                return CustomTitle(key, default).also { it.value = value }
+            }
+        }
+
+        open class BooleanCustomization(key: String, default: Boolean) :
+                Customization<Boolean, Boolean>(key, default) {
+
+            override fun loadFromJson(context: Context, obj: Boolean?) {
+                value = obj
+            }
+
+            override fun saveToJson(context: Context): Boolean? {
+                return value
+            }
+
+            override fun clone(): Customization<Boolean, Boolean> {
+                return BooleanCustomization(key, default).also { it.value = value }
+            }
+        }
+
+        open class LongCustomization(key: String, default: Long) : Customization<Long, Long>(key, default) {
+            override fun loadFromJson(context: Context, obj: Long?) {
+                value = obj
+            }
+
+            override fun saveToJson(context: Context): Long? {
+                return value
+            }
+
+            override fun clone(): Customization<Long, Long> {
+                return LongCustomization(key, default).also { it.value = value }
+            }
+
+        }
+
+        class SwitchRow(private val icon: Int, private val label: Int, key: String, default: Boolean) :
+                BooleanCustomization(key, default) {
+
+            override fun createRow(context: Context, parent: ViewGroup, accent: Int): View? {
+                val view = LayoutInflater.from(context).inflate(R.layout.drawer_tab_switch_row, parent, false)
+
+                view.findViewById<ImageView>(R.id.icon).apply {
+                    setImageResource(icon)
+                    tintDrawable(accent)
+                }
+
+                view.findViewById<TextView>(R.id.title).setText(label)
+
+                val switch = view.findViewById<Switch>(R.id.switch_widget)
+                switch.isChecked = value()
+                switch.applyColor(accent)
+
+                view.setOnClickListener {
+                    value = !value()
+                    switch.isChecked = value()
+                }
+
+                return view
+            }
+
+            override fun clone(): Customization<Boolean, Boolean> {
+                return SwitchRow(icon, label, key, default).also { it.value = value }
+            }
+        }
+
+        /*open class ColorCustomization(key: String, default: Int) :
+                Customization<Int, String>(key, default) {
+
+            override fun loadFromJson(context: Context, obj: String?) {
+                value = obj?.let { AppGroupsUtils.getInstance(context).createColorResolver(it) }
+            }
+
+            override fun saveToJson(context: Context): String? {
+                return if (value is LawnchairAccentResolver) null else value.toString()
+            }
+
+            override fun clone(): Customization<ColorEngine.ColorResolver, String> {
+                return ColorCustomization(key, default).also { it.value = value }
+            }
+        }
+
+        class ColorRow(key: String, default: Int) :
+                ColorCustomization(key, default) {
+
+            override fun createRow(context: Context, parent: ViewGroup, accent: Int): View? {
+                val view = LayoutInflater.from(context).inflate(R.layout.drawer_tab_color_row, parent, false)
+                val resources = context.resources
+
+                updateColor(view)
+
+                view.setOnClickListener {
+                    val dialog = AlertDialog.Builder(context).create()
+                    val current = value()
+                    val resolvers = resources.getStringArray(R.array.resolver_tabs)
+                    with(dialog) {
+                        val tabbedPickerView = TabbedPickerView(this.context, "tabs", current.resolveColor(),
+                                ColorMode.RGB, resolvers, current.isCustom, {
+                            value = it
+                            updateColor(view)
+                        }, dialog::dismiss)
+                        setView(tabbedPickerView)
+                        setOnShowListener {
+                            val width: Int; val height: Int
+                            if (orientation(this.context) == Configuration.ORIENTATION_LANDSCAPE) {
+                                height = WindowManager.LayoutParams.WRAP_CONTENT
+                                width = 80 percentOf screenDimensions(this.context).widthPixels
+                            } else {
+                                height = WindowManager.LayoutParams.WRAP_CONTENT
+                                width = resources.getDimensionPixelSize(R.dimen.chroma_dialog_width)
+                            }
+                            window!!.setLayout(width, height)
+
+                            // for some reason it won't respect the windowBackground attribute in the theme
+                            window!!.setBackgroundDrawable(this.context.getDrawable(R.drawable.dialog_material_background))
+                        }
+                    }
+                    dialog.show()
+                }
+
+                return view
+            }
+
+            private fun updateColor(view: View) {
+                view.findViewById<ImageView>(R.id.color_ring_icon).tintDrawable(value().resolveColor())
+            }
+
+            override fun clone(): Customization<ColorEngine.ColorResolver, String> {
+                return ColorRow(key, default).also { it.value = value }
+            }
+        }*/
+
+        abstract class SetCustomization<T : Any, S : Any>(key: String, default: MutableSet<T>) :
+                Customization<MutableSet<T>, JSONArray>(key, default) {
+
+            @Suppress("UNCHECKED_CAST")
+            override fun loadFromJson(context: Context, obj: JSONArray?) {
+                if (obj == null) {
+                    value = null
+                } else {
+                    val set = HashSet<T>()
+                    for (i in (0 until obj.length())) {
+                        set.add(unflatten(context, obj.get(i) as S))
+                    }
+                    value = set
+                }
+            }
+
+            override fun saveToJson(context: Context): JSONArray? {
+                val list = value ?: return null
+                val array = JSONArray()
+                list.forEach { array.put(flatten(it)) }
+                return array
+            }
+
+            abstract fun unflatten(context: Context, value: S): T
+
+            abstract fun flatten(value: T): S
+        }
+
+        open class ComponentsCustomization(key: String, default: MutableSet<ComponentKey>) :
+                SetCustomization<ComponentKey, String>(key, default) {
+
+            override fun loadFromJson(context: Context, obj: JSONArray?) {
+                super.loadFromJson(context, obj)
+                if (value == null) {
+                    value = HashSet(default)
+                }
+            }
+
+            override fun unflatten(context: Context, value: String): ComponentKey {
+                return Utilities.makeComponentKey(context, value)
+            }
+
+            override fun flatten(value: ComponentKey): String {
+                return value.toString()
+            }
+
+            override fun clone(): Customization<MutableSet<ComponentKey>, JSONArray> {
+                return ComponentsCustomization(key, default).also { newInstance ->
+                    value?.let { newInstance.value = HashSet(it) }
+                }
+            }
+        }
+
+        class AppsRow(key: String, default: MutableSet<ComponentKey>) :
+                ComponentsCustomization(key, default) {
+
+            override fun createRow(context: Context, parent: ViewGroup, accent: Int): View? {
+                val view = LayoutInflater.from(context).inflate(R.layout.drawer_tab_apps_row, parent, false)
+
+                view.findViewById<ImageView>(R.id.manage_apps_icon).tintDrawable(accent)
+                updateCount(view)
+
+                view.setOnClickListener {
+                    SelectableAppsActivity.start(context, value(), { newSelections ->
+                        if (newSelections != null) {
+                            value = HashSet(newSelections)
+                            updateCount(view)
+                        }
+                    })
+                }
+
+                return view
+            }
+
+            private fun updateCount(view: View) {
+                val count = value().size
+                view.findViewById<TextView>(R.id.apps_count).text =
+                        view.resources.getQuantityString(R.plurals.tab_apps_count, count, count)
+            }
+
+            override fun clone(): Customization<MutableSet<ComponentKey>, JSONArray> {
+                return AppsRow(key, default).also { newInstance ->
+                    value?.let { newInstance.value = HashSet(it) }
+                }
+            }
+        }
+
+        class CustomizationMap(old: CustomizationMap? = null) {
+
+            private val map = HashMap<String, Customization<*, *>>()
+            private val order = HashMap<String, Int>()
+
+            init {
+                old?.map?.mapValuesTo(map) { it.value.clone() }
+                old?.order?.entries?.forEach { order[it.key] = it.value }
+            }
+
+            fun add(customization: Customization<*, *>) {
+                map[customization.key] = customization
+            }
+
+            fun get(customization: Customization<*, *>): Customization<*, *>? {
+                return map[customization.key]
+            }
+
+            fun setOrder(vararg keys: String) {
+                keys.forEachIndexed { index, s -> order[s] = index }
+            }
+
+            fun applyFrom(config: CustomizationMap) {
+                map.values.forEach { entry ->
+                    val other = config.map[entry.key] ?: return@forEach
+                    entry.applyFrom(other)
+                }
+            }
+
+            val entries get() = map.values
+
+            val sortedEntries
+                get() =
+                    if (order.isEmpty()) entries
+                    else entries.sortedBy { order[it.key] }
+
+            override fun equals(other: Any?): Boolean {
+                if (other !is CustomizationMap) return false
+                return map == other.map
+            }
+
+            override fun hashCode(): Int {
+                return map.hashCode()
+            }
+        }
+    }
+}
+
+class AppGroupsUtils(context: Context) {
+    companion object : SingletonHolder<AppGroupsUtils, Context>(
+            ensureOnMainThread(useApplicationContext(::AppGroupsUtils)))
+}
diff --git a/Omega/src/com/saggitt/omega/groups/AppGroupsManager.kt b/Omega/src/com/saggitt/omega/groups/AppGroupsManager.kt
new file mode 100644
index 0000000000..d6433cc7fc
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/groups/AppGroupsManager.kt
@@ -0,0 +1,60 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.groups
+
+import com.saggitt.omega.OmegaPreferences
+
+class AppGroupsManager(val prefs: OmegaPreferences) {
+
+    var categorizationEnabled by prefs.BooleanPref("pref_appsCategorizationEnabled", false, ::onPrefsChanged)
+    var categorizationType by prefs.EnumPref("pref_appsCategorizationType", CategorizationType.Tabs, ::onPrefsChanged)
+
+    val drawerTabs by lazy { CustomTabs(this) }
+    val flowerpotTabs by lazy { FlowerpotTabs(this) }
+    val drawerFolders by lazy { DrawerFolders(this) }
+
+    private fun onPrefsChanged() {
+        prefs.getOnChangeCallback()?.let {
+            drawerTabs.checkIsEnabled(it)
+            flowerpotTabs.checkIsEnabled(it)
+            drawerFolders.checkIsEnabled(it)
+        }
+    }
+
+    fun getEnabledType(): CategorizationType? {
+        return CategorizationType.values().firstOrNull { getModel(it).isEnabled }
+    }
+
+    fun getEnabledModel(): AppGroups<*>? {
+        return CategorizationType.values().map { getModel(it) }.firstOrNull { it.isEnabled }
+    }
+
+    private fun getModel(type: CategorizationType): AppGroups<*> {
+        return when (type) {
+            CategorizationType.Flowerpot -> flowerpotTabs
+            CategorizationType.Tabs -> drawerTabs
+            CategorizationType.Folders -> drawerFolders
+        }
+    }
+
+    enum class CategorizationType(val prefsKey: String) {
+        Tabs("pref_drawerTabs"),
+        Folders("pref_drawerFolders"),
+        Flowerpot("pref_drawerFlowerpot")
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/groups/CustomTabs.kt b/Omega/src/com/saggitt/omega/groups/CustomTabs.kt
new file mode 100644
index 0000000000..15439d7f91
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/groups/CustomTabs.kt
@@ -0,0 +1,20 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.groups
+
+class CustomTabs(manager: AppGroupsManager) : DrawerTabs(manager, AppGroupsManager.CategorizationType.Tabs)
diff --git a/Omega/src/com/saggitt/omega/groups/DrawerFolderInfo.kt b/Omega/src/com/saggitt/omega/groups/DrawerFolderInfo.kt
new file mode 100644
index 0000000000..7c7edb3a74
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/groups/DrawerFolderInfo.kt
@@ -0,0 +1,54 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.groups
+
+import com.android.launcher3.FolderInfo
+import com.android.launcher3.Launcher
+import com.android.launcher3.allapps.AllAppsStore
+import com.saggitt.omega.preferences.DrawerTabEditBottomSheet
+import com.saggitt.omega.util.omegaPrefs
+
+class DrawerFolderInfo(private val drawerFolder: DrawerFolders.Folder) : FolderInfo() {
+
+    private var changed = false
+    lateinit var appsStore: AllAppsStore
+
+    override fun setTitle(title: CharSequence?) {
+        super.setTitle(title)
+        changed = true
+        drawerFolder.title.value = title?.toString()
+    }
+
+    override fun onIconChanged() {
+        super.onIconChanged()
+        drawerFolder.context.omegaPrefs.withChangeCallback {
+            it.reloadDrawer()
+        }
+    }
+
+    fun onCloseComplete() {
+        if (changed) {
+            changed = false
+            drawerFolder.context.omegaPrefs.appGroupsManager.drawerFolders.saveToJson()
+        }
+    }
+
+    fun showEdit(launcher: Launcher) {
+        DrawerTabEditBottomSheet.editFolder(launcher, drawerFolder)
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/groups/DrawerFolderItem.kt b/Omega/src/com/saggitt/omega/groups/DrawerFolderItem.kt
new file mode 100644
index 0000000000..1324a7f350
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/groups/DrawerFolderItem.kt
@@ -0,0 +1,37 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.groups
+
+import android.view.ViewGroup
+import com.android.launcher3.Launcher
+import com.android.launcher3.R
+import com.android.launcher3.folder.FolderIcon
+
+class DrawerFolderItem(private val info: DrawerFolderInfo, private val index: Int) {
+
+    private var icon: FolderIcon? = null
+
+    fun getFolderIcon(launcher: Launcher, container: ViewGroup): FolderIcon {
+        if (icon == null) {
+            icon = FolderIcon.fromXml(R.layout.all_apps_folder_icon, launcher, container, info)
+        }
+        return icon!!.apply {
+            (parent as? ViewGroup)?.removeView(this)
+        }
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/groups/DrawerFolders.kt b/Omega/src/com/saggitt/omega/groups/DrawerFolders.kt
new file mode 100644
index 0000000000..1bf8557f57
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/groups/DrawerFolders.kt
@@ -0,0 +1,132 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.groups
+
+import android.content.Context
+import com.android.launcher3.AppInfo
+import com.android.launcher3.R
+import com.android.launcher3.allapps.AlphabeticalAppsList
+import com.android.launcher3.util.ComponentKey
+import com.saggitt.omega.OmegaPreferencesChangeCallback
+import com.saggitt.omega.util.random
+
+class DrawerFolders(private val manager: AppGroupsManager) : AppGroups<DrawerFolders.Folder>(manager, AppGroupsManager.CategorizationType.Folders) {
+
+    override fun getDefaultCreators(): List<GroupCreator<Folder>> {
+        return emptyList()
+    }
+
+    override fun getGroupCreator(type: Int): GroupCreator<Folder> {
+        return when (type) {
+            TYPE_CUSTOM -> ::createCustomFolder
+            else -> ::createNull
+        }
+    }
+
+    private fun createCustomFolder(context: Context) = CustomFolder(context)
+
+    override fun onGroupsChanged(changeCallback: OmegaPreferencesChangeCallback) {
+        // TODO: reload after icon cache is ready to ensure high res folder previews
+        changeCallback.reloadDrawer()
+    }
+
+    fun getFolderInfos(apps: AlphabeticalAppsList) = getFolderInfos(buildAppsMap(apps)::get)
+
+    private fun buildAppsMap(apps: AlphabeticalAppsList): Map<ComponentKey, AppInfo> {
+        return apps.apps.associateBy { it.toComponentKey() }
+    }
+
+    private fun getFolderInfos(getAppInfo: (ComponentKey) -> AppInfo?): List<DrawerFolderInfo> = getGroups()
+            .asSequence()
+            .filter { !it.isEmpty }
+            .map { it.toFolderInfo(getAppInfo) }
+            .toList()
+
+    private fun getHiddenItems() = getGroups()
+            .asSequence()
+            .filterIsInstance<CustomFolder>()
+            .filter { it.hideFromAllApps.value() }
+            .mapNotNull { it.contents.value }
+            .flatMapTo(mutableSetOf()) { it.asSequence() }
+
+    fun getHiddenComponents(): MutableSet<ComponentKey> {
+        val hiddenComponents: ArrayList<ComponentKey> = ArrayList()
+        val components = getHiddenItems()
+
+        components.forEach {
+            val comp = ComponentKey(it.componentName, it.user)
+            hiddenComponents.add(comp)
+        }
+
+        return hiddenComponents.toMutableSet()
+    }
+
+    abstract class Folder(val context: Context, type: Int, titleRes: Int) : Group(type, context, titleRes) {
+        // Ensure icon customization sticks across group changes
+        val id = LongCustomization(KEY_ID, Long.random + 9999L)
+        open val isEmpty = true
+
+        init {
+            // DO NOT actually change this ever
+            addCustomization(id)
+        }
+
+        open fun toFolderInfo(getAppInfo: (ComponentKey) -> AppInfo?) = DrawerFolderInfo(this).apply {
+            setTitle(this@Folder.getTitle())
+            id = this@Folder.id.value().toInt()
+            contents = ArrayList()
+        }
+    }
+
+    class CustomFolder(context: Context) : Folder(context, TYPE_CUSTOM, R.string.default_folder_name) {
+
+        val hideFromAllApps = SwitchRow(R.drawable.tab_hide_from_main, R.string.tab_hide_from_main,
+                KEY_HIDE_FROM_ALL_APPS, true)
+        val contents = AppsRow(KEY_ITEMS, mutableSetOf())
+        override val isEmpty get() = contents.value.isNullOrEmpty()
+
+        val comparator = ShortcutInfoComparator(context)
+
+        init {
+            addCustomization(hideFromAllApps)
+            addCustomization(contents)
+
+            customizations.setOrder(KEY_TITLE, KEY_HIDE_FROM_ALL_APPS, KEY_ITEMS)
+        }
+
+        override fun getSummary(context: Context): String? {
+            val size = getFilter(context).size
+            return context.resources.getQuantityString(R.plurals.tab_apps_count, size, size)
+        }
+
+        fun getFilter(context: Context): Filter<*> = CustomFilter(context, contents.value())
+
+        override fun toFolderInfo(getAppInfo: (ComponentKey) -> AppInfo?) = super.toFolderInfo(getAppInfo).apply {
+            this@CustomFolder.contents.value?.mapNotNullTo(contents) { key ->
+                getAppInfo(ComponentKey(key.componentName, key.user))?.makeWorkspaceItem()
+            }?.sortWith(comparator)
+        }
+    }
+
+    companion object {
+
+        const val TYPE_CUSTOM = 0
+
+        const val KEY_ITEMS = "items"
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/groups/DrawerFoldersAdapter.kt b/Omega/src/com/saggitt/omega/groups/DrawerFoldersAdapter.kt
new file mode 100644
index 0000000000..1d53132e67
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/groups/DrawerFoldersAdapter.kt
@@ -0,0 +1,43 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.groups
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import com.android.launcher3.R
+import com.saggitt.omega.groups.ui.AppGroupsAdapter
+
+class DrawerFoldersAdapter(context: Context) : AppGroupsAdapter<DrawerFoldersAdapter.FolderHolder, DrawerFolders.Folder>(context) {
+
+    override val groupsModel = manager.drawerFolders
+    override val headerText = R.string.drawer_folders
+
+    override fun createGroup(callback: (folder: DrawerFolders.Folder, Boolean) -> Unit) {
+        callback(DrawerFolders.CustomFolder(context), true)
+    }
+
+    override fun createGroupHolder(parent: ViewGroup): FolderHolder {
+        return FolderHolder(LayoutInflater.from(parent.context).inflate(R.layout.tab_item, parent, false))
+    }
+
+    override fun filterGroups() = groupsModel.getGroups()
+
+    inner class FolderHolder(itemView: View) : GroupHolder(itemView)
+}
diff --git a/Omega/src/com/saggitt/omega/groups/DrawerTabs.kt b/Omega/src/com/saggitt/omega/groups/DrawerTabs.kt
new file mode 100644
index 0000000000..6ccb001dfe
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/groups/DrawerTabs.kt
@@ -0,0 +1,208 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.groups
+
+import android.content.Context
+import android.os.Process
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.TextView
+import com.android.launcher3.R
+import com.android.launcher3.Utilities
+import com.android.launcher3.util.ComponentKey
+import com.saggitt.omega.OmegaPreferencesChangeCallback
+import com.saggitt.omega.groups.FlowerpotTabs.FlowerpotTab
+import com.saggitt.omega.preferences.SelectableAppsActivity
+import com.saggitt.omega.util.omegaPrefs
+import com.saggitt.omega.util.tintDrawable
+
+abstract class DrawerTabs(manager: AppGroupsManager, type: AppGroupsManager.CategorizationType)
+    : AppGroups<DrawerTabs.Tab>(manager, type) {
+
+    override fun getDefaultCreators(): List<GroupCreator<Tab>> {
+        return listOf(::createAllAppsTab, ::createPersonalTab, ::createWorkTab)
+    }
+
+    override fun getGroupCreator(type: Int): GroupCreator<Tab> {
+        return when (type) {
+            TYPE_CUSTOM, TYPE_UNDEFINED -> ::createCustomTab
+            TYPE_PERSONAL -> ::createPersonalTab
+            TYPE_WORK -> ::createWorkTab
+            TYPE_ALL_APPS -> ::createAllAppsTab
+            FlowerpotTabs.TYPE_FLOWERPOT -> ::FlowerpotTab
+            else -> ::createNull
+        }
+    }
+
+    private fun createPersonalTab(context: Context) = PersonalTab(context)
+
+    private fun createWorkTab(context: Context) = WorkTab(context)
+
+    private fun createAllAppsTab(context: Context) = AllAppsTab(context)
+
+    private fun createCustomTab(context: Context) = CustomTab(context)
+
+    override fun onGroupsChanged(changeCallback: OmegaPreferencesChangeCallback) {
+        changeCallback.launcher.appsView.reloadTabs()
+    }
+
+    abstract class Tab(context: Context, type: Int, titleRes: Int) : Group(type, context, titleRes) {
+
+         /*val colorResolver = ColorRow(KEY_COLOR, AppGroupsUtils.getInstance(context).defaultColorResolver)
+
+        init {
+            addCustomization(colorResolver)
+        }*/
+    }
+
+    class CustomTab(context: Context) : Tab(context, TYPE_CUSTOM, R.string.default_tab_name) {
+
+        val hideFromAllApps = SwitchRow(R.drawable.tab_hide_from_main, R.string.tab_hide_from_main,
+                KEY_HIDE_FROM_ALL_APPS, true)
+        val contents = AppsRow(KEY_ITEMS, mutableSetOf())
+
+        init {
+            addCustomization(hideFromAllApps)
+            addCustomization(contents)
+
+            customizations.setOrder(KEY_TITLE, KEY_HIDE_FROM_ALL_APPS, KEY_COLOR, KEY_ITEMS)
+        }
+
+        override fun getSummary(context: Context): String? {
+            val size = getFilter(context).size
+            return context.resources.getQuantityString(R.plurals.tab_apps_count, size, size)
+        }
+
+        fun getFilter(context: Context): Filter<*> = CustomFilter(context, contents.value()) // IconPackFilter(context)
+    }
+
+    open class PredefinedTab(context: Context, type: Int, titleRes: Int,
+                             private val filterIsWork: Boolean?) : Tab(context, type, titleRes) {
+
+        init {
+            addCustomization(HiddenAppsRow(filterIsWork))
+            customizations.setOrder(KEY_TITLE, KEY_COLOR, KEY_HIDDEN)
+        }
+
+        override fun getSummary(context: Context): String? {
+            val hidden = context.omegaPrefs.hiddenAppSet
+                    .map { Utilities.makeComponentKey(context, it) }
+                    .filter(getWorkFilter(filterIsWork))
+            val size = hidden.size
+            if (size == 0) {
+                return null
+            }
+            return context.resources.getQuantityString(R.plurals.hidden_apps_count, size, size)
+        }
+    }
+
+    class AllAppsTab(context: Context) : PredefinedTab(context, TYPE_ALL_APPS, R.string.apps_label, null)
+
+    class PersonalTab(context: Context) : PredefinedTab(context, TYPE_PERSONAL, R.string.all_apps_personal_tab, false)
+
+    class WorkTab(context: Context) : PredefinedTab(context, TYPE_WORK, R.string.all_apps_work_tab, true)
+
+    class HiddenAppsRow(private val filterIsWork: Boolean? = null) :
+            Group.Customization<Collection<ComponentKey>, Boolean>(KEY_HIDDEN, emptySet()) {
+
+        private val predicate get() = getWorkFilter(filterIsWork)
+
+        override fun createRow(context: Context, parent: ViewGroup, accent: Int): View? {
+            val view = LayoutInflater.from(context).inflate(R.layout.drawer_tab_hidden_apps_row, parent, false)
+
+            view.findViewById<ImageView>(R.id.manage_apps_icon).tintDrawable(accent)
+            updateCount(view)
+
+            view.setOnClickListener {
+                SelectableAppsActivity.start(context, filteredValue(context), { newSelections ->
+                    if (newSelections != null) {
+                        value = HashSet(newSelections)
+                        updateCount(view)
+                    }
+                }, filterIsWork)
+            }
+
+            return view
+        }
+
+        override fun loadFromJson(context: Context, obj: Boolean?) {
+
+        }
+
+        override fun saveToJson(context: Context): Boolean? {
+            val value = value ?: return null
+            setHiddenApps(context, value)
+            this.value = null
+            return null
+        }
+
+        private fun updateCount(view: View) {
+            val count = (value ?: filteredValue(view.context)).size
+            view.findViewById<TextView>(R.id.apps_count).text =
+                    view.resources.getQuantityString(R.plurals.hidden_apps_count, count, count)
+        }
+
+        private fun filteredValue(context: Context): Collection<ComponentKey> {
+            return context.omegaPrefs.hiddenAppSet
+                    .map { Utilities.makeComponentKey(context, it) }
+                    .filter(predicate)
+        }
+
+        private fun setHiddenApps(context: Context, hidden: Collection<ComponentKey>) {
+            val prefs = context.omegaPrefs
+            val hiddenSet = ArrayList(prefs.hiddenAppSet
+                    .map { Utilities.makeComponentKey(context, it) }
+                    .filter { !predicate(it) })
+            hiddenSet.addAll(hidden)
+            prefs.hiddenAppSet = hiddenSet.map(ComponentKey::toString).toSet()
+        }
+
+        override fun clone(): Group.Customization<Collection<ComponentKey>, Boolean> {
+            return HiddenAppsRow(filterIsWork).also { it.value = value }
+        }
+    }
+
+    companion object {
+
+        const val TYPE_PERSONAL = 0
+        const val TYPE_WORK = 1
+        const val TYPE_CUSTOM = 2
+        const val TYPE_ALL_APPS = 3
+
+        const val KEY_ITEMS = "items"
+        const val KEY_HIDDEN = "hidden"
+
+        private val noFilter = { _: ComponentKey -> true }
+        private val personalFilter = { key: ComponentKey ->
+            key.user == null || key.user == Process.myUserHandle()
+        }
+        private val workFilter = { key: ComponentKey ->
+            key.user != null && key.user != Process.myUserHandle()
+        }
+
+        fun getWorkFilter(isWork: Boolean?): (ComponentKey) -> Boolean {
+            return when (isWork) {
+                null -> noFilter
+                false -> personalFilter
+                true -> workFilter
+            }
+        }
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/groups/DrawerTabsAdapter.kt b/Omega/src/com/saggitt/omega/groups/DrawerTabsAdapter.kt
new file mode 100644
index 0000000000..ab977a7ad5
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/groups/DrawerTabsAdapter.kt
@@ -0,0 +1,71 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.groups
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import com.android.launcher3.R
+import com.android.launcher3.compat.UserManagerCompat
+import com.saggitt.omega.groups.ui.AppGroupsAdapter
+import com.saggitt.omega.preferences.DrawerTabTypeSelectionBottomSheet
+import com.saggitt.omega.util.isVisible
+import com.saggitt.omega.util.omegaPrefs
+
+open class DrawerTabsAdapter(context: Context) : AppGroupsAdapter<DrawerTabsAdapter.TabHolder, DrawerTabs.Tab>(context) {
+
+    override val groupsModel: DrawerTabs = manager.drawerTabs
+    override val headerText = R.string.drawer_tabs
+
+    private val hasWorkApps = context.omegaPrefs.separateWorkApps
+            && UserManagerCompat.getInstance(context).userProfiles.size > 1
+
+    override fun createGroup(callback: (DrawerTabs.Tab, Boolean) -> Unit) {
+        DrawerTabTypeSelectionBottomSheet.show(context, mapOf(
+                FlowerpotTabs.TYPE_FLOWERPOT to arrayOf(R.string.tab_type_smart, R.string.pref_appcategorization_flowerpot_summary, R.drawable.ic_category),
+                DrawerTabs.TYPE_CUSTOM to arrayOf(R.string.tab_type_custom, R.string.tab_type_custom_desc, R.drawable.ic_list)
+        )) {
+            when (it) {
+                DrawerTabs.TYPE_CUSTOM -> callback(DrawerTabs.CustomTab(context), false)
+                FlowerpotTabs.TYPE_FLOWERPOT -> callback(FlowerpotTabs.FlowerpotTab(context), false)
+            }
+        }
+    }
+
+    override fun createGroupHolder(parent: ViewGroup): TabHolder {
+        return TabHolder(LayoutInflater.from(parent.context).inflate(R.layout.tab_item, parent, false))
+    }
+
+    override fun filterGroups(): Collection<DrawerTabs.Tab> {
+        return if (hasWorkApps) {
+            groupsModel.getGroups().filter { it !is DrawerTabs.AllAppsTab }
+        } else {
+            groupsModel.getGroups().filter { it !is DrawerTabs.PersonalTab && it !is DrawerTabs.WorkTab }
+        }
+    }
+
+    open inner class TabHolder(itemView: View) : GroupHolder(itemView) {
+
+        override fun bind(info: AppGroups.Group) {
+            super.bind(info)
+
+            delete.isVisible = info.type in arrayOf(DrawerTabs.TYPE_CUSTOM, FlowerpotTabs.TYPE_FLOWERPOT)
+        }
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/groups/Filters.kt b/Omega/src/com/saggitt/omega/groups/Filters.kt
new file mode 100644
index 0000000000..6862a27d65
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/groups/Filters.kt
@@ -0,0 +1,50 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.groups
+
+import android.content.Context
+import com.android.launcher3.util.ComponentKey
+import com.android.launcher3.util.ItemInfoMatcher
+
+abstract class Filter<T>(val context: Context) {
+
+    abstract val matches: Set<T>?
+
+    open val size get() = matches?.size ?: 0
+
+    abstract val matcher: ItemInfoMatcher
+}
+
+class CustomFilter(context: Context, override val matches: Set<ComponentKey>) : Filter<ComponentKey>(context) {
+
+    override val matcher
+        get() = ItemInfoMatcher { info, cn -> matches.contains(ComponentKey(info.targetComponent, info.user)) }
+}
+
+/*
+class IconPackFilter(context: Context) : Filter<String>(context) {
+
+    override val matches = IconPackManager.getInstance(context).getPackProviders().map { it.name }.toHashSet()
+
+    override val matcher
+        get() = object : ItemInfoMatcher{
+            override fun matches(info: ItemInfo, cn: ComponentName?): Boolean {
+                return matches.contains(info.targetComponent?.packageName)
+            }
+        }
+}*/
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/groups/FlowerpotTabs.kt b/Omega/src/com/saggitt/omega/groups/FlowerpotTabs.kt
new file mode 100644
index 0000000000..0b31cd00e2
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/groups/FlowerpotTabs.kt
@@ -0,0 +1,157 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.groups
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.appcompat.app.AlertDialog
+import com.android.launcher3.R
+import com.android.launcher3.util.ComponentKey
+import com.saggitt.omega.flowerpot.Flowerpot
+import com.saggitt.omega.theme.ThemeOverride
+import com.saggitt.omega.theme.ThemedContextProvider
+import com.saggitt.omega.util.applyAccent
+
+class FlowerpotTabs(manager: AppGroupsManager) : DrawerTabs(manager, AppGroupsManager.CategorizationType.Flowerpot) {
+
+    private val flowerpotManager = Flowerpot.Manager.getInstance(context)
+
+    init {
+        val pots = flowerpotManager.getAllPots().toMutableSet()
+        val existingGroups = getGroups().filter { group ->
+            if (group !is FlowerpotTab) {
+                true
+            } else {
+                val pot = pots.firstOrNull { pot -> pot.name == group.potName.value }
+                pot?.let { pots.remove(it) }
+                pot != null
+            }
+        }.toMutableList()
+        existingGroups.addAll(pots.map {
+            FlowerpotTab(context).apply {
+                title.value = it.displayName
+                potName.value = it.name
+            }
+        })
+        setGroups(existingGroups)
+        saveToJson()
+    }
+
+    override fun getGroupCreator(type: Int): GroupCreator<Tab> {
+        return when (type) {
+            TYPE_FLOWERPOT -> ::FlowerpotTab
+            else -> super.getGroupCreator(type)
+        }
+    }
+
+    class FlowerpotTab(private val context: Context) : Tab(context, TYPE_FLOWERPOT, R.string.default_tab_name) {
+        // todo: make updating the title dynamically less hacky (aka make it actually work)
+        val potName: FlowerpotCustomization = FlowerpotCustomization(KEY_FLOWERPOT, DEFAULT, context, customizations.entries.first { it is CustomTitle } as CustomTitle)
+
+        private val pot
+            get() = Flowerpot.Manager.getInstance(context).getPot(potName.value ?: DEFAULT, true)!!
+
+        init {
+            addCustomization(potName)
+
+            customizations.setOrder(KEY_TITLE, KEY_FLOWERPOT, KEY_COLOR)
+        }
+
+        override fun getSummary(context: Context): String? {
+            val size = getFilter(context).size
+            return context.resources.getQuantityString(R.plurals.tab_apps_count, size, size)
+        }
+
+        fun getMatches(): Set<ComponentKey> {
+            pot.ensureLoaded()
+            return pot.apps.matches
+        }
+
+        fun getFilter(context: Context): Filter<*> {
+            return CustomFilter(context, getMatches())
+        }
+
+        companion object {
+            const val DEFAULT = "PERSONALIZATION"
+            const val KEY_FLOWERPOT = "potName"
+        }
+    }
+
+    class FlowerpotCustomization(key: String, default: String, private val context: Context, private val title: Group.CustomTitle) : Group.StringCustomization(key, default) {
+        private val flowerpotManager = Flowerpot.Manager.getInstance(context)
+        private val displayName
+            get() = flowerpotManager.getPot(value ?: default)?.displayName
+
+        override fun createRow(context: Context, parent: ViewGroup, accent: Int): View? {
+            val view = LayoutInflater.from(context).inflate(R.layout.drawer_tab_flowerpot_row, parent, false)
+            updateSummary(view)
+
+            view.setOnClickListener {
+                // make a copy to ensure indexes don't change while the dialog is opened
+                val pots = flowerpotManager.getAllPots().toList()
+                val currentIndex = pots.indexOfFirst { it.name == value ?: default }
+                val themedContext = ThemedContextProvider(context, null, ThemeOverride.Settings()).get()
+                AlertDialog.Builder(themedContext, ThemeOverride.AlertDialog().getTheme(context))
+                        .setTitle(R.string.pref_appcategorization_flowerpot_title)
+                        .setSingleChoiceItems(pots.map { it.displayName }.toTypedArray(), currentIndex) { dialog, which ->
+                            if (currentIndex != which) {
+                                var updateTitle = false
+                                // Update the group title if it exactly matched the previous category name
+                                if (title.value == displayName) {
+                                    updateTitle = true
+                                }
+                                value = pots[which].name
+                                if (updateTitle) {
+                                    title.value = displayName
+                                }
+                                updateSummary(view)
+                            }
+                            dialog.dismiss()
+                        }
+                        .setNegativeButton(android.R.string.cancel, null)
+                        .create()
+                        .apply {
+                            applyAccent()
+                            show()
+                        }
+            }
+
+            return view
+        }
+
+        override fun saveToJson(context: Context): String? {
+            return value ?: default
+        }
+
+        private fun updateSummary(view: View) {
+            view.findViewById<TextView>(R.id.current_category).text = displayName
+        }
+
+        override fun clone(): AppGroups.Group.Customization<String, String> {
+            return FlowerpotCustomization(key, default, context, title).also { it.value = value }
+        }
+    }
+
+    companion object {
+
+        const val TYPE_FLOWERPOT = 4
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/groups/FlowerpotTabsAdapter.kt b/Omega/src/com/saggitt/omega/groups/FlowerpotTabsAdapter.kt
new file mode 100644
index 0000000000..27b23561c6
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/groups/FlowerpotTabsAdapter.kt
@@ -0,0 +1,29 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.groups
+
+import android.content.Context
+
+class FlowerpotTabsAdapter(context: Context) : DrawerTabsAdapter(context) {
+
+    override val groupsModel = manager.flowerpotTabs
+
+    override fun createAddItem(): Item? {
+        return null
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/groups/ShortcutInfoComparator.kt b/Omega/src/com/saggitt/omega/groups/ShortcutInfoComparator.kt
new file mode 100644
index 0000000000..4b25bf2c21
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/groups/ShortcutInfoComparator.kt
@@ -0,0 +1,47 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.groups
+
+import android.content.Context
+import android.os.Process
+import com.android.launcher3.WorkspaceItemInfo
+import com.android.launcher3.compat.UserManagerCompat
+import com.android.launcher3.util.LabelComparator
+
+class ShortcutInfoComparator(context: Context) : Comparator<WorkspaceItemInfo> {
+
+    private val userManager = UserManagerCompat.getInstance(context)
+    private val myUser = Process.myUserHandle()
+    private val labelComparator = LabelComparator()
+
+    override fun compare(a: WorkspaceItemInfo, b: WorkspaceItemInfo): Int {
+        // Order by the title in the current locale
+        val result = labelComparator.compare(a.title.toString(), b.title.toString())
+        if (result != 0) {
+            return result
+        }
+
+        return if (myUser == a.user) {
+            -1
+        } else {
+            val aUserSerial = userManager.getSerialNumberForUser(a.user)
+            val bUserSerial = userManager.getSerialNumberForUser(b.user)
+            aUserSerial.compareTo(bUserSerial)
+        }
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/groups/ui/AppCategorizationFragment.kt b/Omega/src/com/saggitt/omega/groups/ui/AppCategorizationFragment.kt
new file mode 100644
index 0000000000..c01ef6e877
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/groups/ui/AppCategorizationFragment.kt
@@ -0,0 +1,140 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.groups.ui
+
+import android.content.Context
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.Switch
+import android.widget.TextView
+import androidx.annotation.Keep
+import androidx.fragment.app.Fragment
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.android.launcher3.R
+import com.saggitt.omega.OmegaPreferences
+import com.saggitt.omega.groups.AppGroupsManager
+import com.saggitt.omega.groups.DrawerFoldersAdapter
+import com.saggitt.omega.groups.DrawerTabsAdapter
+import com.saggitt.omega.groups.FlowerpotTabsAdapter
+import com.saggitt.omega.util.*
+import kotlinx.android.synthetic.omega.fragment_app_categorization.*
+
+@Keep
+class AppCategorizationFragment : Fragment(), OmegaPreferences.OnPreferenceChangeListener {
+
+    private val ourContext by lazy { activity as Context }
+    private val prefs by lazy { ourContext.omegaPrefs }
+    private val manager by lazy { prefs.appGroupsManager }
+
+    private val accent by lazy { ourContext.getColorAccent() }
+    private lateinit var recyclerView: RecyclerView
+    private var groupAdapter: AppGroupsAdapter<*, *>? = null
+        set(value) {
+            if (field != value) {
+                field?.itemTouchHelper?.attachToRecyclerView(null)
+                field?.saveChanges()
+                field = value
+
+                recyclerView.adapter = value?.also {
+                    it.loadAppGroups()
+                    it.itemTouchHelper.attachToRecyclerView(recyclerView)
+                }
+            }
+        }
+    private val drawerTabsAdapter by lazy { DrawerTabsAdapter(ourContext) }
+    private val flowerpotTabsAdapter by lazy { FlowerpotTabsAdapter(ourContext) }
+    private val drawerFoldersAdapter by lazy { DrawerFoldersAdapter(ourContext) }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_app_categorization, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        recyclerView = view.findViewById(R.id.recyclerView)
+        recyclerView.layoutManager = LinearLayoutManager(ourContext)
+        setupEnableToggle(enableToggle)
+        setupStyleSection()
+    }
+
+    override fun onResume() {
+        super.onResume()
+
+        groupAdapter?.loadAppGroups()
+        prefs.addOnPreferenceChangeListener("pref_appsCategorizationType", this)
+    }
+
+    override fun onPause() {
+        super.onPause()
+
+        groupAdapter?.saveChanges()
+        prefs.removeOnPreferenceChangeListener("pref_appsCategorizationType", this)
+    }
+
+    override fun onValueChanged(key: String, prefs: OmegaPreferences, force: Boolean) {
+        updateGroupAdapter()
+    }
+
+    private fun updateGroupAdapter() {
+        groupAdapter = when (manager.getEnabledType()) {
+            AppGroupsManager.CategorizationType.Tabs -> drawerTabsAdapter
+            AppGroupsManager.CategorizationType.Flowerpot -> flowerpotTabsAdapter
+            AppGroupsManager.CategorizationType.Folders -> drawerFoldersAdapter
+            else -> null
+        }
+    }
+
+    private fun setupEnableToggle(enableToggle: View) {
+        enableToggle.findViewById<ImageView>(android.R.id.icon).tintDrawable(accent)
+
+        val switch = enableToggle.findViewById<Switch>(R.id.switchWidget)
+        switch.applyColor(accent)
+        val syncSwitch = {
+            switch.isChecked = manager.categorizationEnabled
+            updateGroupAdapter()
+        }
+
+        enableToggle.setOnClickListener {
+            manager.categorizationEnabled = !manager.categorizationEnabled
+            syncSwitch()
+        }
+
+        syncSwitch()
+    }
+
+    private fun setupStyleSection() {
+        val title = styleHeader.findViewById<TextView>(android.R.id.title)
+        title.setText(R.string.pref_appcategorization_style_text)
+        title.setTextColor(ourContext.createDisabledColor(accent))
+
+        (folderTypeItem as AppCategorizationTypeItem)
+                .setup(AppGroupsManager.CategorizationType.Folders,
+                        R.string.pref_appcategorization_folders_title,
+                        R.string.pref_appcategorization_folders_summary)
+
+        (tabTypeItem as AppCategorizationTypeItem)
+                .setup(AppGroupsManager.CategorizationType.Tabs,
+                        R.string.pref_appcategorization_tabs_title,
+                        R.string.pref_appcategorization_tabs_summary)
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/groups/ui/AppCategorizationTypeItem.kt b/Omega/src/com/saggitt/omega/groups/ui/AppCategorizationTypeItem.kt
new file mode 100644
index 0000000000..fbee658b3a
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/groups/ui/AppCategorizationTypeItem.kt
@@ -0,0 +1,97 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.groups.ui
+
+import android.content.Context
+import android.content.res.ColorStateList
+import android.graphics.drawable.RippleDrawable
+import android.util.AttributeSet
+import android.view.View
+import android.widget.LinearLayout
+import androidx.core.graphics.ColorUtils
+import com.saggitt.omega.OmegaPreferences
+import com.saggitt.omega.groups.AppGroupsManager
+import com.saggitt.omega.util.*
+import kotlinx.android.synthetic.omega.app_categorization_type_item.view.*
+
+class AppCategorizationTypeItem(context: Context, attrs: AttributeSet?) : LinearLayout(context, attrs),
+        View.OnClickListener, OmegaPreferences.OnPreferenceChangeListener {
+
+    private val prefs = context.omegaPrefs
+    private val manager = prefs.appGroupsManager
+    private lateinit var type: AppGroupsManager.CategorizationType
+
+    init {
+        setOnClickListener(this)
+
+        val tintSelected = context.getColorAccent()
+        val tintNormal = ColorUtils.setAlphaComponent(context.getColorAttr(android.R.attr.colorControlHighlight), 255)
+        val tintList = ColorStateList(arrayOf(
+                intArrayOf(android.R.attr.state_selected),
+                intArrayOf()),
+                intArrayOf(
+                        tintSelected,
+                        tintNormal))
+        background.setTintList(tintList)
+
+        val rippleTintList = ColorStateList(arrayOf(
+                intArrayOf(android.R.attr.state_selected),
+                intArrayOf()),
+                intArrayOf(
+                        ColorUtils.setAlphaComponent(tintSelected, 31),
+                        ColorUtils.setAlphaComponent(tintNormal, 31)))
+        (background as RippleDrawable).setColor(rippleTintList)
+    }
+
+    override fun onFinishInflate() {
+        super.onFinishInflate()
+
+        checkMark.tintDrawable(context.getColorAccent())
+    }
+
+    fun setup(type: AppGroupsManager.CategorizationType, titleRes: Int, summaryRes: Int) {
+        this.type = type
+        title.setText(titleRes)
+        summary.setText(summaryRes)
+    }
+
+    override fun onClick(v: View) {
+        manager.categorizationType = type
+    }
+
+    override fun setSelected(selected: Boolean) {
+        super.setSelected(selected)
+        checkMark.isVisible = selected
+    }
+
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+
+        prefs.addOnPreferenceChangeListener("pref_appsCategorizationType", this)
+    }
+
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+
+        prefs.removeOnPreferenceChangeListener("pref_appsCategorizationType", this)
+    }
+
+    override fun onValueChanged(key: String, prefs: OmegaPreferences, force: Boolean) {
+        isSelected = type == manager.categorizationType
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/groups/ui/AppGroupsAdapter.kt b/Omega/src/com/saggitt/omega/groups/ui/AppGroupsAdapter.kt
new file mode 100644
index 0000000000..5875e9eede
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/groups/ui/AppGroupsAdapter.kt
@@ -0,0 +1,256 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.groups.ui
+
+import android.content.Context
+import android.text.TextUtils
+import android.util.LayoutDirection
+import android.view.LayoutInflater
+import android.view.MotionEvent
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.recyclerview.widget.ItemTouchHelper
+import androidx.recyclerview.widget.RecyclerView
+import com.android.launcher3.R
+import com.saggitt.omega.groups.AppGroups
+import com.saggitt.omega.preferences.DrawerTabEditBottomSheet
+import com.saggitt.omega.util.*
+
+abstract class AppGroupsAdapter<VH : AppGroupsAdapter<VH, T>.GroupHolder, T : AppGroups.Group>(val context: Context)
+    : RecyclerView.Adapter<AppGroupsAdapter.Holder>() {
+
+    private var saved = true
+
+    protected val manager = context.omegaPrefs.appGroupsManager
+    protected val items = ArrayList<Item>()
+    protected val accent = context.getColorAccent()
+    protected abstract val groupsModel: AppGroups<T>
+    protected abstract val headerText: Int
+
+    val itemTouchHelper = ItemTouchHelper(TouchHelperCallback())
+
+    private var headerItemCount = 0
+
+    override fun getItemCount() = items.size
+
+    override fun getItemViewType(position: Int): Int {
+        val item = items[position]
+        return when (item) {
+            is HeaderItem -> TYPE_HEADER
+            is AddItem -> TYPE_ADD
+            is GroupItem -> TYPE_GROUP
+            else -> throw IllegalStateException("Unknown item class $item")
+        }
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): Holder {
+        return when (viewType) {
+            TYPE_HEADER -> HeaderHolder(LayoutInflater.from(parent.context).inflate(R.layout.app_groups_adapter_header, parent, false))
+            TYPE_ADD -> AddHolder(LayoutInflater.from(parent.context).inflate(R.layout.app_groups_adapter_add, parent, false))
+            TYPE_GROUP -> createGroupHolder(parent)
+            else -> throw IllegalStateException("Unknown view type $viewType")
+        }
+    }
+
+    abstract fun createGroupHolder(parent: ViewGroup): VH
+
+    override fun onBindViewHolder(holder: Holder, position: Int) {
+        when (holder) {
+            is AppGroupsAdapter<*, *>.GroupHolder -> holder.bind((items[position] as GroupItem).group)
+        }
+    }
+
+    abstract fun filterGroups(): Collection<T>
+
+    open fun loadAppGroups() {
+        items.clear()
+        headerItemCount = 0
+        createHeaderItem()?.let {
+            items.add(it)
+            headerItemCount++
+        }
+        createAddItem()?.let {
+            items.add(it)
+            headerItemCount++
+        }
+        items.addAll(filterGroups().map { GroupItem(it) })
+        notifyDataSetChanged()
+    }
+
+    open fun createHeaderItem(): Item? {
+        return HeaderItem()
+    }
+
+    open fun createAddItem(): Item? {
+        return AddItem()
+    }
+
+    open fun addGroup(group: T) {
+        items.add(GroupItem(group))
+        notifyItemInserted(items.size - 1)
+        saved = false
+    }
+
+    open fun saveChanges() {
+        if (saved) return
+        groupsModel.setGroups(items.mapNotNull { (it as? GroupItem)?.group })
+        groupsModel.saveToJson()
+        saved = true
+    }
+
+    protected open fun move(from: Int, to: Int): Boolean {
+        if (to < headerItemCount) return false
+        if (to == from) return true
+        items.add(to, items.removeAt(from))
+        notifyItemMoved(from, to)
+        saved = false
+        return true
+    }
+
+    fun showAddDialog() {
+        createGroup { group, animate ->
+            DrawerTabEditBottomSheet.newGroup(context, group, animate) {
+                group.customizations.applyFrom(it)
+                addGroup(group)
+                saveChanges()
+            }
+        }
+    }
+
+    fun showEditDialog(group: T) {
+        DrawerTabEditBottomSheet.edit(context, group) {
+            saved = false
+            saveChanges()
+            loadAppGroups()
+        }
+    }
+
+    abstract fun createGroup(callback: (group: T, animate: Boolean) -> Unit)
+
+    open class Holder(itemView: View) : RecyclerView.ViewHolder(itemView)
+
+    inner class HeaderHolder(itemView: View) : Holder(itemView) {
+
+        init {
+            val context = itemView.context
+            val title = itemView.findViewById<View>(R.id.categoryHeader).findViewById<TextView>(android.R.id.title)
+            title.setText(headerText)
+            title.setTextColor(context.createDisabledColor(accent))
+
+            val tipIcon = itemView.findViewById<View>(R.id.tipRow).findViewById<ImageView>(android.R.id.icon)
+            tipIcon.tintDrawable(accent)
+        }
+    }
+
+    inner class AddHolder(itemView: View) : Holder(itemView), View.OnClickListener {
+
+        init {
+            val title = itemView.findViewById<TextView>(android.R.id.title)
+            title.setTextColor(accent)
+
+            val icon = itemView.findViewById<ImageView>(android.R.id.icon)
+            icon.tintDrawable(accent)
+
+            itemView.setOnClickListener(this)
+        }
+
+        override fun onClick(v: View) {
+            showAddDialog()
+        }
+    }
+
+    open inner class GroupHolder(itemView: View) : Holder(itemView) {
+
+        protected val title: TextView = itemView.findViewById(R.id.title)
+        protected val summary: TextView = itemView.findViewById(R.id.summary)
+        protected val delete: ImageView = itemView.findViewById(R.id.delete)
+        private var deleted = false
+
+        init {
+            itemView.findViewById<View>(R.id.drag_handle).setOnTouchListener { _, event ->
+                if (event.actionMasked == MotionEvent.ACTION_DOWN) {
+                    itemTouchHelper.startDrag(this)
+                }
+                false
+            }
+            itemView.setOnClickListener { startEdit() }
+            delete.setOnClickListener { delete() }
+            delete.tintDrawable(accent)
+        }
+
+        open fun bind(info: AppGroups.Group) {
+            title.text = info.getTitle()
+            summary.text = formatSummary(info.getSummary(context))
+            summary.isVisible = !TextUtils.isEmpty(summary.text)
+            deleted = false
+        }
+
+        protected open fun formatSummary(summary: String?): String? {
+            if (summary.isNullOrEmpty()) return null
+            return if (itemView.layoutDirection == LayoutDirection.LTR) {
+                "— $summary"
+            } else {
+                "$summary —"
+            }
+        }
+
+        private fun startEdit() {
+            if (deleted) return
+            val group = (items[adapterPosition] as GroupItem).group
+            showEditDialog(group)
+        }
+
+        private fun delete() {
+            if (deleted) return
+            deleted = true
+            items.removeAt(adapterPosition)
+            notifyItemRemoved(adapterPosition)
+            saved = false
+        }
+    }
+
+    open inner class Item
+    inner class HeaderItem : Item()
+    inner class AddItem : Item()
+    inner class GroupItem(val group: T) : Item()
+
+    inner class TouchHelperCallback : ItemTouchHelper.Callback() {
+
+        override fun getMovementFlags(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder): Int {
+            if (viewHolder !is AppGroupsAdapter<*, *>.GroupHolder) return 0
+            return makeMovementFlags(ItemTouchHelper.UP or ItemTouchHelper.DOWN, 0)
+        }
+
+        override fun onMove(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder, target: RecyclerView.ViewHolder): Boolean {
+            return move(viewHolder.adapterPosition, target.adapterPosition)
+        }
+
+        override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) {
+
+        }
+    }
+
+    companion object {
+
+        const val TYPE_HEADER = 0
+        const val TYPE_ADD = 1
+        const val TYPE_GROUP = 2
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/iconpack/ApplyIconPackActivity.kt b/Omega/src/com/saggitt/omega/iconpack/ApplyIconPackActivity.kt
new file mode 100644
index 0000000000..0a1166b467
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/iconpack/ApplyIconPackActivity.kt
@@ -0,0 +1,44 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.iconpack
+
+import android.app.Activity
+import android.os.Bundle
+import android.widget.Toast
+import com.android.launcher3.R
+import com.android.launcher3.Utilities
+import com.saggitt.omega.theme.ThemeOverride
+
+class ApplyIconPackActivity : Activity() {
+    private val prefs by lazy { Utilities.getOmegaPrefs(this) }
+    private val themeSet: ThemeOverride.ThemeSet get() = ThemeOverride.SettingsTransparent()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        ThemeOverride(themeSet, this).applyTheme(this)
+
+        val packageName = intent.getStringExtra("packageName")
+        prefs.iconPacks.remove(packageName!!)
+        prefs.iconPacks.add(0, packageName)
+        val packName = IconPackManager.getInstance(this).packList.currentPack().displayName
+        val message = String.format(getString(R.string.icon_pack_applied_toast), packName)
+        Toast.makeText(this, message, Toast.LENGTH_LONG).show()
+        finish()
+        Utilities.goToHome(this)
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/iconpack/CustomIconUtils.java b/Omega/src/com/saggitt/omega/iconpack/CustomIconUtils.java
new file mode 100644
index 0000000000..9f9db5e312
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/iconpack/CustomIconUtils.java
@@ -0,0 +1,67 @@
+/*
+ *  Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ *
+ */
+
+package com.saggitt.omega.iconpack;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.content.pm.ShortcutInfo;
+import android.os.UserHandle;
+
+import com.android.launcher3.LauncherModel;
+import com.android.launcher3.shortcuts.DeepShortcutManager;
+
+import java.util.HashMap;
+import java.util.List;
+
+public class CustomIconUtils {
+    public final static String[] ICON_INTENTS = new String[]{
+            "com.novalauncher.THEME",
+            "org.adw.launcher.THEMES",
+            "org.adw.launcher.icons.ACTION_PICK_ICON",
+            "com.anddoes.launcher.THEME",
+            "com.teslacoilsw.launcher.THEME",
+            "com.fede.launcher.THEME_ICONPACK",
+            "com.gau.go.launcherex.theme",
+            "com.dlto.atom.launcher.THEME",
+            "net.oneplus.launcher.icons.ACTION_PICK_ICON"
+    };
+
+    public static HashMap<String, CharSequence> getPackProviders(Context context) {
+        PackageManager pm = context.getPackageManager();
+        HashMap<String, CharSequence> packs = new HashMap<>();
+        for (String intent : ICON_INTENTS) {
+            for (ResolveInfo info : pm.queryIntentActivities(new Intent(intent), PackageManager.GET_META_DATA)) {
+                packs.put(info.activityInfo.packageName, info.loadLabel(pm));
+            }
+        }
+        return packs;
+    }
+
+    public static void reloadIcon(DeepShortcutManager shortcutManager, LauncherModel model, UserHandle user, String pkg) {
+        model.onPackageChanged(pkg, user);
+        if (shortcutManager.wasLastCallSuccess()) {
+            List<ShortcutInfo> shortcuts = shortcutManager.queryForPinnedShortcuts(pkg, user);
+            if (!shortcuts.isEmpty()) {
+                model.updatePinnedShortcuts(pkg, shortcuts, user);
+            }
+        }
+    }
+}
+
diff --git a/Omega/src/com/saggitt/omega/iconpack/DefaultPack.kt b/Omega/src/com/saggitt/omega/iconpack/DefaultPack.kt
new file mode 100644
index 0000000000..6cb89f2909
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/iconpack/DefaultPack.kt
@@ -0,0 +1,303 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.iconpack
+
+
+import android.content.ComponentName
+import android.content.Context
+import android.content.pm.LauncherActivityInfo
+import android.content.pm.PackageManager
+import android.content.pm.ShortcutInfo
+import android.content.res.Resources
+import android.graphics.Bitmap
+import android.graphics.drawable.Drawable
+import android.os.Build
+import android.text.TextUtils
+import com.android.launcher3.*
+import com.android.launcher3.compat.LauncherAppsCompat
+import com.android.launcher3.compat.UserManagerCompat
+import com.android.launcher3.shortcuts.DeepShortcutManager
+import com.android.launcher3.shortcuts.ShortcutInfoCompat
+import com.android.launcher3.util.ComponentKey
+import com.saggitt.omega.adaptive.AdaptiveIconGenerator
+import com.saggitt.omega.icons.CustomDrawableFactory
+import com.saggitt.omega.icons.CustomIconProvider
+import com.saggitt.omega.icons.calendar.DynamicCalendar.GOOGLE_CALENDAR
+import com.saggitt.omega.icons.clock.DynamicClock
+import com.saggitt.omega.util.ApkAssets
+import com.saggitt.omega.util.getLauncherActivityInfo
+import com.saggitt.omega.util.omegaPrefs
+import com.saggitt.omega.util.overrideSdk
+import org.xmlpull.v1.XmlPullParser
+import org.xmlpull.v1.XmlPullParserException
+import java.io.IOException
+
+class DefaultPack(context: Context) : IconPack(context, "") {
+
+    private val prefs = context.omegaPrefs
+    private val dynamicClockDrawer by lazy { DynamicClock(context) }
+    private val appMap = HashMap<ComponentKey, Entry>().apply {
+        val launcherApps = LauncherAppsCompat.getInstance(context)
+        UserManagerCompat.getInstance(context).userProfiles.forEach { user ->
+            launcherApps.getActivityList(null, user).forEach {
+                put(ComponentKey(it.componentName, user), Entry(it))
+            }
+        }
+    }
+    override val entries get() = appMap.values.toList()
+
+    init {
+        executeLoadPack()
+    }
+
+    override val packInfo = IconPackList.DefaultPackInfo(context)
+
+    override fun onDateChanged() {
+        val model = LauncherAppState.getInstance(context).model
+        UserManagerCompat.getInstance(context).userProfiles.forEach { user ->
+            model.onPackageChanged(GOOGLE_CALENDAR, user)
+            val shortcuts = DeepShortcutManager
+                    .getInstance(context).queryForPinnedShortcuts(GOOGLE_CALENDAR, user)
+            if (!shortcuts.isEmpty()) {
+                model.updatePinnedShortcuts(GOOGLE_CALENDAR, shortcuts, user)
+            }
+        }
+    }
+
+    override fun loadPack() {
+
+    }
+
+    override fun getEntryForComponent(key: ComponentKey) = appMap[key]
+
+    override fun getIcon(entry: IconPackManager.CustomIconEntry, iconDpi: Int): Drawable? {
+        return getIcon(Utilities.makeComponentKey(context, entry.icon), iconDpi)
+    }
+
+    fun getIcon(key: ComponentKey, iconDpi: Int): Drawable? {
+        ensureInitialLoadComplete()
+
+        val info = key.getLauncherActivityInfo(context) ?: return null
+        val component = key.componentName
+        var originalIcon = info.getIcon(iconDpi).apply { mutate() }
+        getLegacyIcon(component, iconDpi, prefs.forceShapeless)?.let {
+            originalIcon = it.apply { mutate() }
+        }
+        var roundIcon: Drawable? = null
+        if (!prefs.forceShapeless) {
+            getRoundIcon(component, iconDpi)?.let {
+                roundIcon = it.apply { mutate() }
+            }
+        }
+        val gen = AdaptiveIconGenerator(context, originalIcon, roundIcon)
+        return gen.result
+    }
+
+    override fun getIcon(launcherActivityInfo: LauncherActivityInfo,
+                         iconDpi: Int, flattenDrawable: Boolean,
+                         customIconEntry: IconPackManager.CustomIconEntry?,
+                         iconProvider: CustomIconProvider?): Drawable {
+        ensureInitialLoadComplete()
+
+        val key: ComponentKey
+        val info: LauncherActivityInfo
+        if (customIconEntry != null && !TextUtils.isEmpty(customIconEntry.icon)) {
+            key = Utilities.makeComponentKey(context, customIconEntry.icon)
+            info = key.getLauncherActivityInfo(context) ?: launcherActivityInfo
+        } else {
+            key = ComponentKey(launcherActivityInfo.componentName, launcherActivityInfo.user)
+            info = launcherActivityInfo
+        }
+        val component = key.componentName
+        val packageName = component.packageName
+        var originalIcon = info.getIcon(iconDpi).apply { mutate() }
+        getLegacyIcon(component, iconDpi, prefs.forceShapeless)?.let {
+            originalIcon = it.apply { mutate() }
+        }
+        if (iconProvider == null || (GOOGLE_CALENDAR != packageName && DynamicClock.DESK_CLOCK != component)) {
+            var roundIcon: Drawable? = null
+            if (!prefs.forceShapeless) {
+                getRoundIcon(component, iconDpi)?.let {
+                    roundIcon = it.apply { mutate() }
+                }
+            }
+            val gen = AdaptiveIconGenerator(context, originalIcon, roundIcon)
+            return gen.result
+        }
+
+        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            iconProvider.getDynamicIcon(info, iconDpi, flattenDrawable)
+        } else {
+            return originalIcon
+        }
+    }
+
+    override fun getIcon(shortcutInfo: ShortcutInfo, iconDpi: Int): Drawable? {
+        ensureInitialLoadComplete()
+
+        val drawable = DeepShortcutManager.getInstance(context).getShortcutIconDrawable(shortcutInfo, iconDpi)
+        val gen = AdaptiveIconGenerator(context, drawable, null)
+        return gen.result
+    }
+
+    override fun getIcon(shortcutInfo: ShortcutInfoCompat, iconDpi: Int): Drawable? {
+        ensureInitialLoadComplete()
+
+        val drawable = DeepShortcutManager.getInstance(context).getShortcutIconDrawable(shortcutInfo, iconDpi)
+        val gen = AdaptiveIconGenerator(context, drawable, null)
+        return gen.result
+    }
+
+    override fun newIcon(icon: Bitmap, itemInfo: ItemInfoWithIcon,
+                         customIconEntry: IconPackManager.CustomIconEntry?,
+                         drawableFactory: CustomDrawableFactory): FastBitmapDrawable {
+        ensureInitialLoadComplete()
+
+        if (Utilities.ATLEAST_OREO && itemInfo.itemType == LauncherSettings.Favorites.ITEM_TYPE_APPLICATION) {
+            val component = if (customIconEntry?.icon != null) {
+                Utilities.makeComponentKey(context, customIconEntry.icon).componentName
+            } else {
+                itemInfo.targetComponent
+            }
+            if (DynamicClock.DESK_CLOCK == component) {
+                return dynamicClockDrawer.drawIcon(icon)
+            }
+        }
+
+        return FastBitmapDrawable(icon)
+    }
+
+    override fun supportsMasking(): Boolean = false
+
+    private fun getRoundIcon(component: ComponentName, iconDpi: Int): Drawable? {
+        var appIcon: String? = null
+        val elementTags = HashMap<String, String>()
+
+        try {
+            val resourcesForApplication = context.packageManager.getResourcesForApplication(component.packageName)
+            val assets = resourcesForApplication.assets
+
+            val parseXml = assets.openXmlResourceParser("AndroidManifest.xml")
+            while (parseXml.next() != XmlPullParser.END_DOCUMENT) {
+                if (parseXml.eventType == XmlPullParser.START_TAG) {
+                    val name = parseXml.name
+                    for (i in 0 until parseXml.attributeCount) {
+                        elementTags[parseXml.getAttributeName(i)] = parseXml.getAttributeValue(i)
+                    }
+                    if (elementTags.containsKey("roundIcon")) {
+                        if (name == "application") {
+                            appIcon = elementTags["roundIcon"]
+                        } else if ((name == "activity" || name == "activity-alias") &&
+                                elementTags.containsKey("name") &&
+                                elementTags["name"] == component.className) {
+                            appIcon = elementTags["roundIcon"]
+                            break
+                        }
+                    }
+                    elementTags.clear()
+                }
+            }
+            parseXml.close()
+
+            if (appIcon != null) {
+                val resId = Utilities.parseResourceIdentifier(resourcesForApplication, appIcon, component.packageName)
+                return resourcesForApplication.getDrawableForDensity(resId, iconDpi)
+            }
+        } catch (ex: PackageManager.NameNotFoundException) {
+            ex.printStackTrace()
+        } catch (ex: Resources.NotFoundException) {
+            ex.printStackTrace()
+        } catch (ex: IOException) {
+            ex.printStackTrace()
+        } catch (ex: XmlPullParserException) {
+            ex.printStackTrace()
+        }
+
+        return null
+    }
+
+    private fun getLegacyIcon(component: ComponentName, iconDpi: Int, loadShapeless: Boolean): Drawable? {
+        var appIcon: String? = null
+        val elementTags = HashMap<String, String>()
+
+        try {
+            val resourcesForApplication = context.packageManager.getResourcesForApplication(component.packageName)
+            val info = context.packageManager.getApplicationInfo(component.packageName, PackageManager.GET_SHARED_LIBRARY_FILES or PackageManager.GET_META_DATA)
+
+            val parseXml = try {
+                // For apps which are installed as Split APKs the asset instance we can get via PM won't hold the right Manifest for us.
+                ApkAssets(info.publicSourceDir).openXml("AndroidManifest.xml")
+            } catch (ex: Exception) {
+                val assets = resourcesForApplication.assets
+                assets.openXmlResourceParser("AndroidManifest.xml")
+            }
+
+            while (parseXml.next() != XmlPullParser.END_DOCUMENT) {
+                if (parseXml.eventType == XmlPullParser.START_TAG) {
+                    val name = parseXml.name
+                    for (i in 0 until parseXml.attributeCount) {
+                        elementTags[parseXml.getAttributeName(i)] = parseXml.getAttributeValue(i)
+                    }
+                    if (elementTags.containsKey("icon")) {
+                        if (name == "application") {
+                            appIcon = elementTags["icon"]
+                        } else if ((name == "activity" || name == "activity-alias") &&
+                                elementTags.containsKey("name") &&
+                                elementTags["name"] == component.className) {
+                            appIcon = elementTags["icon"]
+                            break
+                        }
+                    }
+                    elementTags.clear()
+                }
+            }
+            parseXml.close()
+
+            if (appIcon != null) {
+                val resId = Utilities.parseResourceIdentifier(resourcesForApplication, appIcon, component.packageName)
+                if (loadShapeless) {
+                    return resourcesForApplication.overrideSdk(Build.VERSION_CODES.M) { getDrawable(resId) }
+                }
+                return resourcesForApplication.getDrawableForDensity(resId, iconDpi)
+            }
+        } catch (ex: PackageManager.NameNotFoundException) {
+            ex.printStackTrace()
+        } catch (ex: Resources.NotFoundException) {
+            ex.printStackTrace()
+        } catch (ex: IOException) {
+            ex.printStackTrace()
+        } catch (ex: XmlPullParserException) {
+            ex.printStackTrace()
+        }
+
+        return null
+    }
+
+    class Entry(private val app: LauncherActivityInfo) : IconPack.Entry() {
+
+        override val displayName by lazy { app.label.toString() }
+        override val identifierName = ComponentKey(app.componentName, app.user).toString()
+        override val isAvailable = true
+
+        override fun drawableForDensity(density: Int): Drawable {
+            return AdaptiveIconCompat.wrap(app.getIcon(density)!!)
+        }
+
+        override fun toCustomEntry() = IconPackManager.CustomIconEntry("", ComponentKey(app.componentName, app.user).toString())
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/iconpack/DynamicDrawable.kt b/Omega/src/com/saggitt/omega/iconpack/DynamicDrawable.kt
new file mode 100644
index 0000000000..b8db1549d1
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/iconpack/DynamicDrawable.kt
@@ -0,0 +1,223 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.iconpack
+
+import android.content.Context
+import android.content.pm.PackageManager
+import android.content.res.Resources
+import android.graphics.drawable.Drawable
+import android.graphics.drawable.LayerDrawable
+import android.graphics.drawable.RotateDrawable
+import android.util.Log
+import android.util.Xml
+import com.android.launcher3.FastBitmapDrawable
+import com.android.launcher3.ItemInfoWithIcon
+import com.saggitt.omega.icons.CustomDrawableFactory
+import com.saggitt.omega.icons.clock.CustomClock
+import com.saggitt.omega.util.get
+import org.xmlpull.v1.XmlPullParser
+import org.xmlpull.v1.XmlPullParserException
+import org.xmlpull.v1.XmlPullParserFactory
+import java.io.IOException
+
+class DynamicDrawable {
+    companion object {
+        const val TAG = "DynamicDrawable"
+
+        fun getIcon(context: Context, drawable: Drawable, metadata: Metadata, iconDpi: Int): Drawable {
+            metadata.load(context, iconDpi)
+            return when (metadata.type) {
+                Type.CLOCK -> CustomClock.getClock(context, metadata.clockMetadata!!.drawable,
+                        metadata.clockMetadata!!.metadata)
+                else -> drawable
+            }
+        }
+
+        fun drawIcon(context: Context, icon: ItemInfoWithIcon, metadata: Metadata, drawableFactory: CustomDrawableFactory, iconDpi: Int): FastBitmapDrawable? {
+            metadata.load(context, iconDpi)
+            return when (metadata.type) {
+                Type.CLOCK -> drawableFactory.customClockDrawer.drawIcon(icon, metadata.clockMetadata!!.drawable, metadata.clockMetadata!!.metadata)
+                else -> null
+            }
+        }
+
+        private fun getXml(context: Context, name: String, packageName: String): XmlPullParser? {
+            val res: Resources
+            try {
+                res = context.packageManager.getResourcesForApplication(packageName)
+                val resourceId = res.getIdentifier(name, "raw", packageName)
+                if (0 != resourceId) {
+                    val factory = XmlPullParserFactory.newInstance()
+                    val parser = factory.newPullParser()
+                    parser.setInput(res.openRawResource(resourceId), Xml.Encoding.UTF_8.toString())
+                    return parser
+                }
+            } catch (e: PackageManager.NameNotFoundException) {
+            } catch (e: IOException) {
+            } catch (e: XmlPullParserException) {
+            }
+            return null
+        }
+
+        fun getDrawable(context: Context, packageName: String, name: String, density: Int): Drawable? {
+            return try {
+                val res = context.packageManager.getResourcesForApplication(packageName)
+                val id = res.getIdentifier(name, "drawable", packageName)
+                if (id != 0) res.getDrawableForDensity(id, density) else null
+            } catch (e: Resources.NotFoundException) {
+                Log.e(TAG, "Can't get drawable ($name) from $packageName", e)
+                null
+            }
+        }
+    }
+
+    class Metadata(val xml: String, val packageName: String) {
+        internal var type: Type? = null
+        internal var items: List<Item>? = null
+        internal var clockMetadata: ClockMetadata? = null
+        internal var loaded: Boolean = false
+
+        internal fun load(context: Context, iconDpi: Int) {
+            if (!loaded) {
+                val mutableItems: MutableList<Item> = ArrayList()
+                val parser = getXml(context, xml, packageName)
+                while (parser != null && parser.next() != XmlPullParser.END_DOCUMENT) {
+                    if (parser.eventType == XmlPullParser.START_TAG) {
+                        if (parser.name == "item") {
+                            val item = Item(
+                                    parser["type"]!!,
+                                    parser["key"]!!)
+                            item.parseItem(parser)
+                            mutableItems.add(item)
+                        }
+                    }
+                }
+                items = mutableItems.toList()
+                type = when {
+                    items!!.count { it.key == "day" } > 0 -> Type.CALENDAR
+                    items!!.count { it.key == "temp" } > 0 -> Type.WEATHER
+                    items!!.count { it.key == "hour_hand" } > 0 -> Type.CLOCK
+                    else -> null
+                }
+                when (type) {
+                    Type.CLOCK -> {
+                        loadClock(context, iconDpi)
+                    }
+                    else -> {
+                    }
+                }
+                loaded = true
+            }
+        }
+
+        private fun loadClock(context: Context, iconDpi: Int) {
+            Log.d(TAG, "loadClock")
+            val drawables: MutableList<Drawable> = ArrayList()
+            val relevantItems = listOf("background", "hour_hand", "minute_hand", "second_hand")
+            val hourTo = 5000f
+            val minTo = 60000f
+            val secTo = 6000f
+            for (relevantItem in relevantItems) {
+                val item = items!!.findLast { it.key == relevantItem }
+                if (item != null) {
+                    if (item.drawables.size > 1) {
+                        Log.e(TAG, "Unexpected number of drawables ${item.drawables.size}! " +
+                                "Assuming first and continuing.")
+                    } else if (item.drawables.isEmpty()) {
+                        throw RuntimeException("Item '${item.key}' has no drawables!")
+                    }
+                    var d = getDrawable(context, packageName, item.drawables.first().res, iconDpi)
+                    if (d != null) {
+                        if (relevantItem != "background") {
+                            val d2 = RotateDrawable()
+                            with(d2) {
+                                drawable = d
+                                fromDegrees = 0f
+                                toDegrees = if (relevantItem == "hour_hand") hourTo else if (relevantItem == "minute_hand") minTo else secTo
+                            }
+                            d = d2
+                        }
+                        drawables.add(d.mutate())
+                    }
+                }
+            }
+            val layerDrawable = LayerDrawable(drawables.toTypedArray())
+            clockMetadata = ClockMetadata(
+                    layerDrawable,
+                    CustomClock.Metadata(
+                            1,
+                            2,
+                            3,
+                            0,
+                            0,
+                            0
+                    )
+            )
+        }
+    }
+
+    internal class Item(val type: String, val key: String) {
+        val drawables: MutableList<DrawableItem> = ArrayList()
+        var textAttributes: TextAttributes? = null
+
+        fun parseItem(parser: XmlPullParser) {
+            when (type) {
+                "drawable" -> {
+                    while (!(parser.next() == XmlPullParser.END_TAG && parser.name == "item")) {
+                        if (parser.eventType == XmlPullParser.START_TAG && parser.name == "drawable") {
+                            drawables.add(DrawableItem(
+                                    parser["value"]!!,
+                                    parser["res"]!!
+                            ))
+                        }
+                    }
+                }
+                "text" -> {
+                    textAttributes = TextAttributes(
+                            parser["alignX"],
+                            parser["alignY"],
+                            parser["offsetX"],
+                            parser["offsetY"],
+                            parser["textSize"],
+                            parser["font"],
+                            parser["color"],
+                            parser["shadowLayerX"],
+                            parser["shadowLayerY"],
+                            parser["shadowLayerRadius"]?.toInt(),
+                            parser["shadowLayerColor"],
+                            parser["shadowLayerAlpha"],
+                            parser["enabled"]?.toBoolean() ?: true
+                    )
+                }
+            }
+        }
+    }
+
+    internal class DrawableItem(val value: String, val res: String)
+    internal class TextAttributes(val alignX: String?, val alignY: String?, val offsetX: String?,
+                                  val offsetY: String?, val textSize: String?, val font: String?,
+                                  val color: String?, val shadowLayerX: String?, val shadowLayerY: String?,
+                                  val shadowLayerRadius: Int?, val shadowLayerColor: String?,
+                                  val shadowLayerAlpha: String?, val enabled: Boolean = true)
+
+    internal class ClockMetadata(val drawable: Drawable, val metadata: CustomClock.Metadata)
+
+    internal enum class Type {
+        CALENDAR, CLOCK, WEATHER
+    }
+}
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/iconpack/EditIconActivity.kt b/Omega/src/com/saggitt/omega/iconpack/EditIconActivity.kt
new file mode 100644
index 0000000000..35922a559b
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/iconpack/EditIconActivity.kt
@@ -0,0 +1,405 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.iconpack
+
+import android.app.Activity
+import android.app.AlertDialog
+import android.content.ComponentName
+import android.content.Context
+import android.content.Intent
+import android.graphics.drawable.BitmapDrawable
+import android.net.Uri
+import android.os.Build
+import android.os.Bundle
+import android.os.Process
+import android.text.TextUtils
+import android.util.DisplayMetrics
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.CheckBox
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.android.launcher3.R
+import com.android.launcher3.Utilities
+import com.android.launcher3.icons.LauncherIcons
+import com.android.launcher3.util.ComponentKey
+import com.android.launcher3.util.Executors.MAIN_EXECUTOR
+import com.saggitt.omega.OmegaLauncher
+import com.saggitt.omega.settings.SettingsBaseActivity
+import com.saggitt.omega.util.applyAccent
+import com.saggitt.omega.util.isVisible
+import com.saggitt.omega.util.omegaPrefs
+import java.lang.ref.WeakReference
+
+class EditIconActivity : SettingsBaseActivity() {
+
+    private val originalIcon by lazy { findViewById<ImageView>(R.id.originalIcon) }
+    private val divider by lazy { findViewById<View>(R.id.divider) }
+    private val iconRecyclerView by lazy { findViewById<RecyclerView>(R.id.iconRecyclerView) }
+    private val iconPackRecyclerView by lazy { findViewById<RecyclerView>(R.id.iconPackRecyclerView) }
+    private val iconPackManager by lazy { IconPackManager.getInstance(this) }
+    private val component by lazy {
+        if (intent.hasExtra(EXTRA_COMPONENT)) {
+            ComponentKey(intent.getParcelableExtra<ComponentName>(EXTRA_COMPONENT), intent.getParcelableExtra(EXTRA_USER))
+        } else null
+    }
+    private val isFolder by lazy { intent.getBooleanExtra(EXTRA_FOLDER, false) }
+    private val iconPacks by lazy {
+        listOf(IconPackInfo(iconPackManager.defaultPackProvider)) + iconPackManager.getPackProviders()
+                .map { IconPackInfo(it) }.sortedBy { it.title }
+    }
+    private val iconAdapter by lazy { IconAdapter() }
+    private val icons = arrayListOf<AdapterItem>(LoadingItem())
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_edit_icon)
+
+        title = intent.getStringExtra(EXTRA_TITLE)
+
+        MAIN_EXECUTOR.execute {
+            val packs = iconPacks.map { it.getIconPack() }
+            runOnUiThread(::bindViews)
+            if (isFolder) {
+                packs.forEach {
+                    it.ensureInitialLoadComplete()
+                    it.getAllIcons({ list ->
+                        // Max 3 icons per pack
+                        list.mapNotNull { it as? IconPack.Entry }.take(3).forEach { entry ->
+                            runOnUiThread {
+                                val item = IconItem(entry, it is DefaultPack, it.displayName)
+                                val index = icons.size - 1
+                                if (index >= 0) {
+                                    icons.add(index, item)
+                                    iconAdapter.notifyItemInserted(index)
+                                }
+                            }
+                        }
+                    }, {
+                        false
+                    }, {
+                        // Filter for folder icons
+                        it.contains("folder", true)
+                    })
+                }
+                runOnUiThread {
+                    icons.removeAt(icons.size - 1)
+                    iconAdapter.notifyItemRemoved(icons.size)
+                }
+            } else if (component != null) {
+
+                packs.forEach {
+                    it.ensureInitialLoadComplete()
+
+                    val entry = it.getEntryForComponent(component!!)
+                            ?: it.getMaskEntryForComponent(component!!)
+                    if (entry != null) {
+                        runOnUiThread {
+                            val item = IconItem(entry, it is DefaultPack, it.displayName)
+                            val index = icons.size - 1
+                            if (index >= 0) {
+                                icons.add(index, item)
+                                iconAdapter.notifyItemInserted(index)
+                            }
+                        }
+                    }
+                }
+                runOnUiThread {
+                    icons.removeAt(icons.size - 1)
+                    iconAdapter.notifyItemRemoved(icons.size)
+                }
+            }
+        }
+    }
+
+    private fun bindViews() {
+        originalIcon.setImageDrawable(OmegaLauncher.currentEditIcon)
+        originalIcon.setOnClickListener { onSelectIcon(null) }
+
+        iconPackRecyclerView.adapter = IconPackAdapter()
+        iconPackRecyclerView.layoutManager = LinearLayoutManager(this)
+
+        if (component != null) {
+            iconRecyclerView.adapter = iconAdapter
+            iconRecyclerView.layoutManager = LinearLayoutManager(this, LinearLayoutManager.HORIZONTAL, false)
+        } else {
+            divider.visibility = View.GONE
+            iconRecyclerView.visibility = View.GONE
+        }
+    }
+
+    fun onSelectIcon(entry: IconPack.Entry?) {
+        val customEntry = entry?.toCustomEntry()
+        val entryString = if (isFolder) customEntry?.toString() else customEntry?.toPackString()
+        setResult(Activity.RESULT_OK, Intent().putExtra(EXTRA_ENTRY, entryString))
+        finish()
+    }
+
+    fun onSelectIconPack(provider: IconPackManager.PackProvider) {
+        startActivityForResult(IconPickerActivity.newIntent(this, provider), CODE_PICK_ICON)
+    }
+
+    fun onSelectExternal() {
+        val intent = Intent(Intent.ACTION_OPEN_DOCUMENT).apply {
+            addCategory(Intent.CATEGORY_OPENABLE)
+            type = "image/*"
+        }
+
+        startActivityForResult(intent, PICKER_REQUEST_CODE)
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        if (resultCode == Activity.RESULT_OK) {
+            when (requestCode) {
+                CODE_PICK_ICON -> {
+                    val entryString = data?.getStringExtra(EXTRA_ENTRY) ?: return
+                    setResult(Activity.RESULT_OK, Intent().putExtra(EXTRA_ENTRY, entryString))
+                    finish()
+                }
+                PICKER_REQUEST_CODE -> {
+                    data?.data?.also { uri ->
+                        onSelectUri(uri)
+                    }
+                }
+            }
+        }
+
+        super.onActivityResult(requestCode, resultCode, data)
+    }
+
+    private fun onSelectUri(uri: Uri) {
+        val entry = UriIconPack.UriEntry(this, uri, false)
+        if (!entry.isAvailable) return
+
+        val dialogContent = layoutInflater.inflate(R.layout.import_icon_preview, null).apply {
+            findViewById<ImageView>(android.R.id.icon).setImageDrawable(entry.drawable)
+        }
+        val checkBox = dialogContent.findViewById<CheckBox>(android.R.id.checkbox)
+        if (!Utilities.ATLEAST_OREO) {
+            checkBox.isVisible = false
+        }
+        AlertDialog.Builder(this)
+                .setTitle(R.string.import_icon)
+                .setView(dialogContent)
+                .setPositiveButton(android.R.string.ok) { _, _ ->
+                    entry.adaptive = checkBox.isChecked
+                    contentResolver.takePersistableUriPermission(uri, Intent.FLAG_GRANT_READ_URI_PERMISSION)
+                    setResult(Activity.RESULT_OK, Intent().putExtra(EXTRA_ENTRY, entry.toCustomEntry().toString()))
+                    finish()
+                }
+                .show().applyAccent()
+    }
+
+    inner class IconAdapter : RecyclerView.Adapter<IconAdapter.Holder>() {
+
+        override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): Holder {
+            return when (viewType) {
+                0 -> Holder(LayoutInflater.from(parent.context).inflate(R.layout.icon_suggestion_item, parent, false))
+                else -> LoadingHolder(LayoutInflater.from(parent.context).inflate(R.layout.icon_loading, parent, false))
+            }
+        }
+
+        override fun getItemViewType(position: Int): Int {
+            return when (icons[position]) {
+                is IconItem -> 0
+                else -> 1
+            }
+        }
+
+        override fun getItemCount() = icons.size
+
+        override fun onBindViewHolder(holder: Holder, position: Int) {
+            holder.bind(icons[position])
+        }
+
+        open inner class Holder(itemView: View) : RecyclerView.ViewHolder(itemView), View.OnClickListener {
+
+            init {
+                itemView.setOnClickListener(this)
+            }
+
+            open fun bind(item: AdapterItem) {
+                if (item !is IconItem) return
+                try {
+                    itemView.visibility = View.VISIBLE
+                    (itemView as ImageView).setImageDrawable(item.iconDrawable)
+                } catch (e: Exception) {
+                    itemView.visibility = View.GONE
+                }
+            }
+
+            override fun onClick(v: View) {
+                onSelectIcon((icons[adapterPosition] as IconItem).entry)
+            }
+        }
+
+        inner class LoadingHolder(itemView: View) : Holder(itemView) {
+
+            init {
+                itemView.setOnClickListener(null)
+            }
+
+            override fun bind(item: AdapterItem) {
+
+            }
+        }
+    }
+
+    inner class IconPackAdapter : RecyclerView.Adapter<IconPackAdapter.Holder>() {
+
+        override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): Holder {
+            return Holder(LayoutInflater.from(parent.context).inflate(R.layout.icon_pack_item, parent, false))
+        }
+
+        override fun getItemCount() = iconPacks.size + 1
+
+        override fun onBindViewHolder(holder: Holder, position: Int) {
+            if (position == iconPacks.size) {
+                holder.bindExternal()
+            } else {
+                holder.bind(iconPacks[position])
+            }
+        }
+
+        inner class Holder(itemView: View) : RecyclerView.ViewHolder(itemView), View.OnClickListener {
+
+            private val icon = itemView.findViewById<ImageView>(android.R.id.icon)
+            private val title = itemView.findViewById<TextView>(android.R.id.title)
+            private val packageName = itemView.findViewById<TextView>(android.R.id.text1)
+
+            init {
+                itemView.setOnClickListener(this)
+            }
+
+            fun bind(info: IconPackInfo) {
+                icon.setImageDrawable(info.icon)
+                title.text = info.title
+                packageName.isVisible = omegaPrefs.showDebugInfo && !TextUtils.isEmpty(info.packageName)
+                if (packageName.isVisible) {
+                    packageName.text = info.packageName
+                }
+            }
+
+            fun bindExternal() {
+                val context = itemView.context
+                icon.setImageDrawable(IconPackManager.getInstance(context).defaultPack.displayIcon)
+                title.text = context.getString(R.string.open_image_picker)
+                packageName.isVisible = false
+            }
+
+            override fun onClick(v: View) {
+                if (adapterPosition == iconPacks.size) {
+                    onSelectExternal()
+                } else {
+                    onSelectIconPack(iconPacks[adapterPosition].provider)
+                }
+            }
+        }
+    }
+
+    inner class IconPackInfo(val provider: IconPackManager.PackProvider) {
+
+        val info = IconPackList.PackInfo.forPackage(this@EditIconActivity, provider.name)
+
+        val icon = info.displayIcon
+        val title = info.displayName
+        val packageName = info.packageName
+
+        var packRef: WeakReference<IconPack>? = null
+
+        fun getIconPack(): IconPack {
+            if (packRef?.get() == null) {
+                packRef = WeakReference(iconPackManager.getIconPack(provider, true, false))
+            }
+            return packRef!!.get()!!
+        }
+    }
+
+    abstract class AdapterItem : Comparable<AdapterItem>
+
+    inner class IconItem(val entry: IconPack.Entry, val isDefault: Boolean, val title: String) : AdapterItem() {
+
+        private val normalizedIconBitmap by lazy {
+            LauncherIcons.obtain(this@EditIconActivity).createBadgedIconBitmap(
+                    entry.drawableForDensity(getIconDensity()), component?.user
+                    ?: Process.myUserHandle(), Build.VERSION.SDK_INT)
+        }
+        val iconDrawable by lazy { BitmapDrawable(resources, normalizedIconBitmap.icon) }
+
+        override fun compareTo(other: AdapterItem): Int {
+            if (other is IconItem) {
+                if (isDefault) return -1
+                if (other.isDefault) return 1
+                return title.compareTo(other.title)
+            }
+            return -1
+        }
+
+        private fun getIconDensity(requiredSize: Int = resources.getDimensionPixelSize(R.dimen.icon_preview_size)): Int {
+            // Densities typically defined by an app.
+            val densityBuckets =
+                    intArrayOf(DisplayMetrics.DENSITY_LOW, DisplayMetrics.DENSITY_MEDIUM,
+                            DisplayMetrics.DENSITY_TV, DisplayMetrics.DENSITY_HIGH,
+                            DisplayMetrics.DENSITY_XHIGH, DisplayMetrics.DENSITY_XXHIGH,
+                            DisplayMetrics.DENSITY_XXXHIGH)
+
+            var density = DisplayMetrics.DENSITY_XXXHIGH
+            for (i in densityBuckets.indices.reversed()) {
+                val expectedSize = 48 * densityBuckets[i] / DisplayMetrics.DENSITY_DEFAULT
+                if (expectedSize >= requiredSize) {
+                    density = densityBuckets[i]
+                }
+            }
+
+            return density
+        }
+    }
+
+    class LoadingItem : AdapterItem() {
+
+        override fun compareTo(other: AdapterItem): Int {
+            return 1
+        }
+    }
+
+    companion object {
+
+        const val CODE_PICK_ICON = 0
+        const val EXTRA_ENTRY = "entry"
+        const val EXTRA_TITLE = "title"
+        const val EXTRA_COMPONENT = "component"
+        const val EXTRA_USER = "user"
+        const val EXTRA_FOLDER = "is_folder"
+
+        const val PICKER_REQUEST_CODE = 999
+
+        fun newIntent(context: Context, title: String, isFolder: Boolean, componentKey: ComponentKey? = null): Intent {
+            return Intent(context, EditIconActivity::class.java).apply {
+                putExtra(EXTRA_TITLE, title)
+                componentKey?.run {
+                    putExtra(EXTRA_COMPONENT, componentName)
+                    putExtra(EXTRA_USER, user)
+                    putExtra(EXTRA_FOLDER, isFolder)
+                }
+            }
+        }
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/iconpack/IconMask.kt b/Omega/src/com/saggitt/omega/iconpack/IconMask.kt
new file mode 100644
index 0000000000..e943e97fba
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/iconpack/IconMask.kt
@@ -0,0 +1,124 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.iconpack
+
+import android.content.Context
+import android.graphics.*
+import android.graphics.drawable.Drawable
+import androidx.core.graphics.drawable.toBitmap
+import com.android.launcher3.AdaptiveIconCompat
+import com.android.launcher3.FastBitmapDrawable
+import com.android.launcher3.LauncherAppState
+import com.android.launcher3.Utilities
+import com.android.launcher3.icons.FixedScaleDrawable
+
+class IconMask {
+    val hasMask by lazy { validBacks.isNotEmpty() || validMasks.isNotEmpty() || validUpons.isNotEmpty() }
+    var onlyMaskLegacy: Boolean = false
+    var iconScale = 1f
+    val matrix = Matrix()
+    val paint = Paint()
+
+    val iconBackEntries = ArrayList<IconPackImpl.Entry>()
+    val iconMaskEntries = ArrayList<IconPackImpl.Entry>()
+    val iconUponEntries = ArrayList<IconPackImpl.Entry>()
+
+    private val validBacks by lazy { iconBackEntries.filter { it.isAvailable } }
+    private val validMasks by lazy { iconMaskEntries.filter { it.isAvailable } }
+    private val validUpons by lazy { iconUponEntries.filter { it.isAvailable } }
+
+    fun getIcon(context: Context, baseIcon: Drawable, key: Any?): Drawable {
+        val iconBack = getFromList(validBacks, key)
+        val iconMask = getFromList(validMasks, key)
+        val iconUpon = getFromList(validUpons, key)
+        val scale = getScale(iconBack)
+
+        var adaptiveBackground: Drawable? = null
+        // Some random magic to get an acceptable resolution
+        var size = (LauncherAppState.getIDP(context).iconBitmapSize * (3 - scale)).toInt()
+        if (Utilities.ATLEAST_OREO && iconBack?.drawableId != 0 && iconBack?.drawable is AdaptiveIconCompat) {
+            size += (size * AdaptiveIconCompat.getExtraInsetFraction()).toInt()
+        }
+        val bitmap = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888)
+        val canvas = Canvas(bitmap)
+
+        // Draw the app icon
+        var bb = baseIcon.toBitmap()
+        if (!bb.isMutable) bb = bb.copy(bb.config, true)
+        matrix.setScale((size * scale) / bb.width, (size * scale) / bb.height)
+        matrix.postTranslate((size / 2) * (1 - scale), (size / 2) * (1 - scale))
+        canvas.drawBitmap(bb, matrix, paint)
+        matrix.reset()
+
+        // Mask the app icon
+        if (iconMask != null && iconMask.drawableId != 0) {
+            iconMask.drawable.toBitmap().let {
+                paint.xfermode = PorterDuffXfermode(PorterDuff.Mode.DST_OUT)
+                matrix.setScale(size.toFloat() / it.width, size.toFloat() / it.height)
+                canvas.drawBitmap(it, matrix, paint)
+                matrix.reset()
+            }
+            paint.reset()
+        }
+
+        // Draw iconBack
+        if (iconBack != null && iconBack.drawableId != 0) {
+            val drawable = iconBack.drawable
+            if (Utilities.ATLEAST_OREO && drawable is AdaptiveIconCompat) {
+                adaptiveBackground = drawable.background
+            } else {
+                drawable.toBitmap().let {
+                    paint.xfermode = PorterDuffXfermode(PorterDuff.Mode.DST_OVER)
+                    matrix.setScale(size.toFloat() / it.width, size.toFloat() / it.height)
+                    canvas.drawBitmap(it, matrix, paint)
+                    matrix.reset()
+                }
+                paint.reset()
+            }
+        }
+
+        // Draw iconUpon
+        if (iconUpon != null && iconUpon.drawableId != 0) {
+            iconUpon.drawable.toBitmap().let {
+                matrix.setScale(size.toFloat() / it.width, size.toFloat() / it.height)
+                canvas.drawBitmap(it, matrix, paint)
+                matrix.reset()
+            }
+        }
+        if (adaptiveBackground != null) {
+            if (onlyMaskLegacy && baseIcon is AdaptiveIconCompat) {
+                return baseIcon
+            }
+            return AdaptiveIconCompat(adaptiveBackground, FastBitmapDrawable(bitmap))
+        }
+        return FastBitmapDrawable(bitmap)
+    }
+
+    private fun getScale(iconBack: IconPackImpl.Entry?): Float {
+        return if (Utilities.ATLEAST_OREO && iconBack?.drawable is AdaptiveIconCompat) {
+            iconScale - (1f - FixedScaleDrawable.LEGACY_ICON_SCALE)
+        } else {
+            iconScale
+        }
+    }
+
+    private fun <T> getFromList(list: List<T>, key: Any?): T? {
+        if (list.isEmpty()) return null
+        return list[Math.abs(key.hashCode()) % list.size]
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/iconpack/IconPack.kt b/Omega/src/com/saggitt/omega/iconpack/IconPack.kt
new file mode 100644
index 0000000000..3f4881b12b
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/iconpack/IconPack.kt
@@ -0,0 +1,143 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.iconpack
+
+import android.content.Context
+import android.content.pm.LauncherActivityInfo
+import android.content.pm.ShortcutInfo
+import android.graphics.Bitmap
+import android.graphics.drawable.Drawable
+import com.android.launcher3.FastBitmapDrawable
+import com.android.launcher3.ItemInfoWithIcon
+import com.android.launcher3.compat.AlphabeticIndexCompat
+import com.android.launcher3.shortcuts.ShortcutInfoCompat
+import com.android.launcher3.util.ComponentKey
+import com.android.launcher3.util.Executors.MAIN_EXECUTOR
+import com.saggitt.omega.icons.CustomDrawableFactory
+import com.saggitt.omega.icons.CustomIconProvider
+import java.util.concurrent.Semaphore
+
+abstract class IconPack(val context: Context, val packPackageName: String) {
+    private var waiter: Semaphore? = Semaphore(0)
+    private val indexCompat by lazy { AlphabeticIndexCompat(context) }
+    private val loadCompleteListeners = ArrayList<(IconPack) -> Unit>()
+
+    fun executeLoadPack() {
+        MAIN_EXECUTOR.execute {
+            loadPack()
+            waiter?.release()
+            loadCompleteListeners.forEach { it.invoke(this) }
+            loadCompleteListeners.clear()
+        }
+    }
+
+    fun addOnLoadCompleteListener(listener: (IconPack) -> Unit) {
+        if (waiter != null) loadCompleteListeners.add(listener)
+        else listener.invoke(this)
+    }
+
+    @Synchronized
+    fun ensureInitialLoadComplete() {
+        waiter?.run {
+            acquireUninterruptibly()
+            release()
+            waiter = null
+        }
+    }
+
+    val displayIcon get() = packInfo.displayIcon
+    val displayName get() = packInfo.displayName
+
+    abstract val packInfo: IconPackList.PackInfo
+
+    abstract fun onDateChanged()
+
+    abstract fun loadPack()
+
+    abstract fun getEntryForComponent(key: ComponentKey): Entry?
+
+    open fun getMaskEntryForComponent(key: ComponentKey): Entry? = null
+
+    open fun getIcon(entry: IconPackManager.CustomIconEntry, iconDpi: Int): Drawable? {
+        return null
+    }
+
+    abstract fun getIcon(launcherActivityInfo: LauncherActivityInfo,
+                         iconDpi: Int, flattenDrawable: Boolean,
+                         customIconEntry: IconPackManager.CustomIconEntry?,
+                         iconProvider: CustomIconProvider?): Drawable?
+
+    abstract fun getIcon(shortcutInfo: ShortcutInfo, iconDpi: Int): Drawable?
+
+    abstract fun getIcon(shortcutInfo: ShortcutInfoCompat, iconDpi: Int): Drawable?
+
+    abstract fun newIcon(icon: Bitmap, itemInfo: ItemInfoWithIcon,
+                         customIconEntry: IconPackManager.CustomIconEntry?,
+                         drawableFactory: CustomDrawableFactory): FastBitmapDrawable?
+
+    open fun getAllIcons(callback: (List<PackEntry>) -> Unit, cancel: () -> Boolean, filter: (item: String) -> Boolean = { _ -> true }) {
+        ensureInitialLoadComplete()
+        callback(categorize(filterDuplicates(entries)).filter { if (it is Entry) filter(it.identifierName) else true })
+    }
+
+    abstract fun supportsMasking(): Boolean
+
+    private fun filterDuplicates(entries: List<Entry>): List<Entry> {
+        var previous = ""
+        val filtered = ArrayList<Entry>()
+        entries.sortedBy { it.identifierName }.forEach {
+            if (it.identifierName != previous) {
+                previous = it.identifierName
+                filtered.add(it)
+            }
+        }
+        return filtered
+    }
+
+    private fun categorize(entries: List<Entry>): List<PackEntry> {
+        val packEntries = ArrayList<PackEntry>()
+        var previousSection = ""
+        entries.sortedBy { it.displayName.toLowerCase() }.forEach {
+            val currentSection = indexCompat.computeSectionName(it.displayName)
+            if (currentSection != previousSection) {
+                previousSection = currentSection
+                packEntries.add(CategoryTitle(currentSection))
+            }
+            packEntries.add(it)
+        }
+        return packEntries
+    }
+
+    abstract val entries: List<Entry>
+
+    open class PackEntry
+
+    class CategoryTitle(val title: String) : PackEntry()
+
+    abstract class Entry : PackEntry() {
+
+        abstract val displayName: String
+        abstract val identifierName: String
+        val drawable get() = drawableForDensity(0)
+        abstract val isAvailable: Boolean
+
+        abstract fun drawableForDensity(density: Int): Drawable
+
+        abstract fun toCustomEntry(): IconPackManager.CustomIconEntry
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/iconpack/IconPackAdapter.kt b/Omega/src/com/saggitt/omega/iconpack/IconPackAdapter.kt
new file mode 100644
index 0000000000..05c2295a32
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/iconpack/IconPackAdapter.kt
@@ -0,0 +1,297 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.iconpack
+
+import android.content.Context
+import android.content.Intent
+import android.view.LayoutInflater
+import android.view.MotionEvent
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.recyclerview.widget.ItemTouchHelper
+import androidx.recyclerview.widget.RecyclerView
+import com.android.launcher3.R
+import com.android.launcher3.Utilities
+import com.android.launcher3.util.Executors.MAIN_EXECUTOR
+import com.saggitt.omega.util.isVisible
+
+class IconPackAdapter(context: Context) : RecyclerView.Adapter<IconPackAdapter.Holder>() {
+
+    private val manager = IconPackManager.getInstance(context)
+    private val allPacks = ArrayList<IconPackItem>()
+    private val handler = MAIN_EXECUTOR.handler
+
+    private var dividerIndex = 0
+
+    private val adapterItems = ArrayList<Item>()
+    private val currentSpecs = ArrayList<String>()
+    private val otherItems = ArrayList<IconPackItem>()
+    private val divider = DividerItem(IconPackList.DefaultPackInfo(context))
+    private var isDragging = false
+
+    var itemTouchHelper: ItemTouchHelper? = null
+
+    init {
+        allPacks.addAll(manager.packList.getAvailablePacks().map { IconPackItem(it) })
+        currentSpecs.addAll(manager.packList.appliedPacks.map { it.packPackageName })
+
+        fillItems()
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): Holder {
+        return when (viewType) {
+            TYPE_HEADER -> createHolder(parent, R.layout.icon_pack_text_item, ::HeaderHolder)
+            TYPE_PACK -> createHolder(parent, R.layout.icon_pack_dialog_item, ::IconPackHolder)
+            TYPE_DIVIDER -> createHolder(parent, R.layout.icon_pack_divider_item, ::DividerHolder)
+            TYPE_DOWNLOAD -> createHolder(parent, R.layout.icon_pack_dialog_item, ::DownloadHolder)
+            else -> throw IllegalArgumentException("type must be either TYPE_TEXT, " +
+                    "TYPE_PACK, TYPE_DIVIDER or TYPE_DOWNLOAD")
+        }
+    }
+
+    override fun getItemCount() = adapterItems.count()
+
+    override fun onBindViewHolder(holder: Holder, position: Int) {
+        holder.bind(adapterItems[position])
+    }
+
+    override fun getItemViewType(position: Int): Int {
+        return adapterItems[position].type
+    }
+
+    fun saveSpecs(): ArrayList<String> {
+        val newSpecs = ArrayList<String>()
+        val iterator = adapterItems.iterator()
+
+        while (iterator.hasNext()) {
+            val item = iterator.next()
+            if (item is IconPackItem) newSpecs.add(item.info.packageName)
+            if (item is DividerItem) break
+        }
+        return newSpecs
+    }
+
+    private fun fillItems() {
+        otherItems.clear()
+        otherItems.addAll(allPacks)
+
+        adapterItems.clear()
+        adapterItems.add(HeaderItem())
+        currentSpecs.forEach {
+            val item = getAndRemoveOther(it)
+            if (item != null) {
+                adapterItems.add(item)
+            }
+        }
+        dividerIndex = adapterItems.count()
+        adapterItems.add(divider)
+        adapterItems.addAll(otherItems)
+        adapterItems.add(DownloadItem())
+    }
+
+    private fun getAndRemoveOther(s: String): IconPackItem? {
+        val iterator = otherItems.iterator()
+        while (iterator.hasNext()) {
+            val item = iterator.next()
+            if (item.info.packageName == s) {
+                iterator.remove()
+                return item
+            }
+        }
+        return null
+    }
+
+    private fun move(from: Int, to: Int): Boolean {
+        if (to == from) return true
+        move(from, to, adapterItems)
+        dividerIndex = adapterItems.indexOf(divider)
+        return true
+    }
+
+    private fun <T> move(from: Int, to: Int, list: MutableList<T>) {
+        list.add(to, list.removeAt(from))
+        notifyItemMoved(from, to)
+    }
+
+    private inline fun createHolder(parent: ViewGroup, resource: Int, creator: (View) -> Holder): Holder {
+        return creator(LayoutInflater.from(parent.context).inflate(resource, parent, false))
+    }
+
+    abstract class Item {
+
+        abstract val isStatic: Boolean
+        abstract val type: Int
+    }
+
+    class HeaderItem : Item() {
+
+        override val isStatic = true
+        override val type = TYPE_HEADER
+    }
+
+    open class IconPackItem(val info: IconPackList.PackInfo) : Item() {
+
+        override val isStatic = false
+        override val type = TYPE_PACK
+    }
+
+    class DividerItem(info: IconPackList.PackInfo) : IconPackItem(info) {
+
+        override val isStatic = true
+        override val type = TYPE_DIVIDER
+    }
+
+    class DownloadItem : Item() {
+
+        override val isStatic = true
+        override val type = TYPE_DOWNLOAD
+    }
+
+    abstract class Holder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+        open fun bind(item: Item) {
+
+        }
+    }
+
+    class HeaderHolder(itemView: View) : Holder(itemView) {
+        init {
+            itemView.findViewById<TextView>(android.R.id.text1).setText(R.string.enabled_icon_packs)
+        }
+    }
+
+    open inner class IconPackHolder(itemView: View) : Holder(itemView), View.OnClickListener, View.OnTouchListener {
+
+        val icon: ImageView = itemView.findViewById(android.R.id.icon)
+        val title: TextView = itemView.findViewById(android.R.id.title)
+        val summary: TextView = itemView.findViewById(android.R.id.summary)
+        private val dragHandle: View = itemView.findViewById(R.id.drag_handle)
+        private val packItem
+            get() = adapterItems[adapterPosition] as? IconPackItem
+                    ?: throw IllegalArgumentException("item must be IconPackItem")
+
+        init {
+            itemView.setOnClickListener(this)
+            dragHandle.setOnTouchListener(this)
+        }
+
+        override fun bind(item: Item) {
+            val packItem = item as? IconPackItem
+                    ?: throw IllegalArgumentException("item must be IconPackItem")
+            icon.setImageDrawable(packItem.info.displayIcon)
+            title.text = packItem.info.displayName
+            itemView.isClickable = !packItem.isStatic
+            dragHandle.isVisible = !packItem.isStatic
+        }
+
+        override fun onClick(v: View) {
+            val item = packItem
+            if (adapterPosition > dividerIndex) {
+                adapterItems.removeAt(adapterPosition)
+                adapterItems.add(1, item)
+                notifyItemMoved(adapterPosition, 1)
+                dividerIndex++
+            } else {
+                adapterItems.removeAt(adapterPosition)
+                adapterItems.add(dividerIndex, item)
+                notifyItemMoved(adapterPosition, dividerIndex)
+                dividerIndex--
+            }
+            notifyItemChanged(dividerIndex)
+        }
+
+        override fun onTouch(v: View, event: MotionEvent): Boolean {
+            if (v == dragHandle && event.actionMasked == MotionEvent.ACTION_DOWN) {
+                itemTouchHelper?.startDrag(this)
+            }
+            return false
+        }
+    }
+
+    inner class DividerHolder(itemView: View) : IconPackHolder(itemView) {
+
+        val text: TextView = itemView.findViewById(android.R.id.text1)
+
+        override fun bind(item: Item) {
+            super.bind(item)
+            if (isDragging) {
+                text.setText(R.string.drag_to_disable_packs)
+            } else {
+                text.setText(R.string.drag_to_enable_packs)
+            }
+            text.isVisible = isDragging || dividerIndex != adapterItems.size - 2
+        }
+    }
+
+    inner class DownloadHolder(itemView: View) : IconPackHolder(itemView) {
+
+        init {
+            val context = itemView.context
+            icon.setImageDrawable(context.getDrawable(R.drawable.ic_add)?.apply {
+                setTint(Utilities.getOmegaPrefs(context).accentColor)
+            })
+            title.setText(R.string.get_more_icon_packs)
+        }
+
+        override fun bind(item: Item) {
+
+        }
+
+        override fun onClick(v: View) {
+            val intent = Intent.parseUri(v.context.getString(R.string.market_search_intent), 0)
+            intent.data = intent.data!!.buildUpon().appendQueryParameter("q", v.context.getString(R.string.playstore_query_icon_pack)).build()
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+            v.context.startActivity(intent)
+        }
+    }
+
+    inner class TouchHelperCallback : ItemTouchHelper.Callback() {
+
+        override fun onSelectedChanged(viewHolder: RecyclerView.ViewHolder?, actionState: Int) {
+            super.onSelectedChanged(viewHolder, actionState)
+            isDragging = actionState == ItemTouchHelper.ACTION_STATE_DRAG
+            handler.post { notifyItemChanged(dividerIndex) }
+        }
+
+        override fun canDropOver(recyclerView: RecyclerView, current: RecyclerView.ViewHolder, target: RecyclerView.ViewHolder): Boolean {
+            return target.adapterPosition in 1..dividerIndex
+        }
+
+        override fun getMovementFlags(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder): Int {
+            val item = adapterItems[viewHolder.adapterPosition]
+            val dragFlags = if (item.isStatic) 0 else ItemTouchHelper.UP or ItemTouchHelper.DOWN
+            return makeMovementFlags(dragFlags, 0)
+        }
+
+        override fun onMove(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder, target: RecyclerView.ViewHolder): Boolean {
+            return move(viewHolder.adapterPosition, target.adapterPosition)
+        }
+
+        override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) {
+
+        }
+    }
+
+    companion object {
+        const val TYPE_HEADER = 0
+        const val TYPE_PACK = 1
+        const val TYPE_DIVIDER = 2
+        const val TYPE_DOWNLOAD = 3
+    }
+}
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/iconpack/IconPackFragment.kt b/Omega/src/com/saggitt/omega/iconpack/IconPackFragment.kt
new file mode 100644
index 0000000000..0408507c76
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/iconpack/IconPackFragment.kt
@@ -0,0 +1,45 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.iconpack
+
+import androidx.recyclerview.widget.DefaultItemAnimator
+import androidx.recyclerview.widget.ItemTouchHelper
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.saggitt.omega.OmegaPreferences
+import com.saggitt.omega.views.RecyclerViewFragment
+
+class IconPackFragment : RecyclerViewFragment() {
+
+    private val adapter by lazy { IconPackAdapter(requireContext()) }
+
+    override fun onRecyclerViewCreated(recyclerView: RecyclerView) {
+        recyclerView.layoutManager = LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
+        recyclerView.adapter = adapter
+        (recyclerView.itemAnimator as? DefaultItemAnimator)?.supportsChangeAnimations = false
+        adapter.itemTouchHelper = ItemTouchHelper(adapter.TouchHelperCallback()).apply {
+            attachToRecyclerView(recyclerView)
+        }
+    }
+
+    override fun onPause() {
+        super.onPause()
+
+        OmegaPreferences.getInstance(requireContext()).iconPacks.setAll(adapter.saveSpecs())
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/iconpack/IconPackImpl.kt b/Omega/src/com/saggitt/omega/iconpack/IconPackImpl.kt
new file mode 100644
index 0000000000..97dcfe0b27
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/iconpack/IconPackImpl.kt
@@ -0,0 +1,484 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.iconpack
+
+import android.content.ComponentName
+import android.content.Context
+import android.content.Intent
+import android.content.pm.LauncherActivityInfo
+import android.content.pm.PackageManager
+import android.content.pm.ShortcutInfo
+import android.content.res.Resources
+import android.content.res.XmlResourceParser
+import android.graphics.Bitmap
+import android.graphics.drawable.Drawable
+import android.os.Build
+import android.text.TextUtils
+import android.util.Xml
+import android.widget.Toast
+import androidx.annotation.RequiresApi
+import com.android.launcher3.*
+import com.android.launcher3.compat.LauncherAppsCompat
+import com.android.launcher3.compat.UserManagerCompat
+import com.android.launcher3.shortcuts.DeepShortcutManager
+import com.android.launcher3.shortcuts.ShortcutInfoCompat
+import com.android.launcher3.util.ComponentKey
+import com.saggitt.omega.adaptive.AdaptiveIconGenerator
+import com.saggitt.omega.icons.CustomDrawableFactory
+import com.saggitt.omega.icons.CustomIconProvider
+import com.saggitt.omega.icons.clock.CustomClock
+import com.saggitt.omega.util.get
+import com.saggitt.omega.util.toTitleCase
+import org.xmlpull.v1.XmlPullParser
+import org.xmlpull.v1.XmlPullParserException
+import org.xmlpull.v1.XmlPullParserFactory
+import java.io.IOException
+import java.util.*
+import kotlin.collections.ArrayList
+
+class IconPackImpl(context: Context, packPackageName: String) : IconPack(context, packPackageName) {
+
+    private val packComponents: MutableMap<ComponentName, Entry> = HashMap()
+    private val packCalendars: MutableMap<ComponentName, String> = HashMap()
+    private val packClocks: MutableMap<Int, CustomClock.Metadata> = HashMap()
+    private val packDynamicDrawables: MutableMap<Int, DynamicDrawable.Metadata> = HashMap()
+    private var packMask: IconMask = IconMask()
+    private val defaultPack = DefaultPack(context)
+    private val packResources = context.packageManager.getResourcesForApplication(packPackageName)
+    private val prefs by lazy { Utilities.getOmegaPrefs(context) }
+    override val entries get() = packComponents.values.toList()
+
+    init {
+        executeLoadPack()
+    }
+
+    override val packInfo = IconPackList.PackInfoImpl(context, packPackageName)
+
+    override fun onDateChanged() {
+        val apps = LauncherAppsCompat.getInstance(context)
+        val model = LauncherAppState.getInstance(context).model
+        val shortcutManager = DeepShortcutManager.getInstance(context)
+        for (user in UserManagerCompat.getInstance(context).userProfiles) {
+            packCalendars.keys.forEach {
+                val pkg = it.packageName
+                if (!apps.getActivityList(pkg, user).isEmpty()) {
+                    CustomIconUtils.reloadIcon(shortcutManager, model, user, pkg)
+                }
+            }
+        }
+    }
+
+    override fun loadPack() {
+        try {
+            val res = packResources
+            val compStart = "ComponentInfo{"
+            val compStartlength = compStart.length
+            val compEnd = "}"
+            val compEndLength = compEnd.length
+
+            val parseXml = getXml("appfilter") ?: throw IllegalStateException("parser is null")
+            while (parseXml.next() != XmlPullParser.END_DOCUMENT) {
+                if (parseXml.eventType == XmlPullParser.START_TAG) {
+                    val name = parseXml.name
+                    val isCalendar = name == "calendar"
+                    when {
+                        isCalendar || name == "item" -> {
+                            var componentName: String? = parseXml[null, "component"]
+                            val drawableName = parseXml[if (isCalendar) "prefix" else "drawable"]
+                            if (componentName != null && drawableName != null) {
+                                if (componentName.startsWith(compStart) && componentName.endsWith(compEnd)) {
+                                    componentName = componentName.substring(compStartlength, componentName.length - compEndLength)
+                                }
+                                val parsed = ComponentName.unflattenFromString(componentName)
+                                if (parsed != null) {
+                                    if (isCalendar) {
+                                        packCalendars[parsed] = drawableName
+                                    } else {
+                                        packComponents[parsed] = Entry(drawableName)
+                                    }
+                                }
+                            }
+                        }
+                        name == "dynamic-clock" -> {
+                            val drawableName = parseXml["drawable"]
+                            if (drawableName != null) {
+                                val drawableId = getDrawableId(drawableName)
+                                if (parseXml is XmlResourceParser && drawableId != 0) {
+                                    packClocks[drawableId] = CustomClock.Metadata(
+                                            parseXml.getAttributeIntValue(null, "hourLayerIndex", -1),
+                                            parseXml.getAttributeIntValue(null, "minuteLayerIndex", -1),
+                                            parseXml.getAttributeIntValue(null, "secondLayerIndex", -1),
+                                            parseXml.getAttributeIntValue(null, "defaultHour", 0),
+                                            parseXml.getAttributeIntValue(null, "defaultMinute", 0),
+                                            parseXml.getAttributeIntValue(null, "defaultSecond", 0))
+                                }
+                            }
+                        }
+                        name == "scale" -> {
+                            val scale = parseXml["factor"]!!.toFloat()
+                            if (scale > 0x7f070000) {
+                                packMask.iconScale = packResources.getDimension(scale.toInt())
+                            } else {
+                                packMask.iconScale = scale
+                            }
+                        }
+                        name == "iconback" -> {
+                            // TODO: handle packs with multiple masks
+                            addImgsTo(parseXml, packMask.iconBackEntries)
+                        }
+                        name == "iconmask" -> {
+                            addImgsTo(parseXml, packMask.iconMaskEntries)
+                        }
+                        name == "iconupon" -> {
+                            addImgsTo(parseXml, packMask.iconUponEntries)
+                        }
+                        name == "config" -> {
+                            val onlyMaskLegacy = parseXml["onlyMaskLegacy"]
+                            if (!TextUtils.isEmpty(onlyMaskLegacy)) {
+                                packMask.onlyMaskLegacy = onlyMaskLegacy!!.toBoolean()
+                            }
+                        }
+                    }
+                }
+            }
+            // TODO: only run this on icon packs with oneplus intent filter to reduce overhead for others
+            val parseDrawableXml = getXml("drawable")
+            if (parseDrawableXml != null) {
+                while (parseDrawableXml.next() != XmlPullParser.END_DOCUMENT) {
+                    if (parseDrawableXml.eventType == XmlPullParser.START_TAG) {
+                        val name = parseDrawableXml.name
+                        if (name == "item") {
+                            val dynamicDrawable = parseDrawableXml["dynamic_drawable"]
+                            if (dynamicDrawable != null) {
+                                val drawableId = res.getIdentifier(dynamicDrawable, "drawable",
+                                        packPackageName)
+                                if (drawableId != 0) {
+                                    packDynamicDrawables[drawableId] = DynamicDrawable.Metadata(
+                                            parseDrawableXml["xml"]!!,
+                                            packPackageName)
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            return
+        } catch (e: PackageManager.NameNotFoundException) {
+            e.printStackTrace()
+        } catch (e: XmlPullParserException) {
+            e.printStackTrace()
+        } catch (e: IOException) {
+            e.printStackTrace()
+        } catch (e: IllegalStateException) {
+            e.printStackTrace()
+        }
+        Toast.makeText(context, "Failed to parse AppFilter", Toast.LENGTH_SHORT).show()
+    }
+
+    private fun addImgsTo(parseXml: XmlPullParser, collection: MutableCollection<Entry>) {
+        for (i in (0 until parseXml.attributeCount)) {
+            if (parseXml.getAttributeName(i).startsWith("img")) {
+                val drawableName = parseXml.getAttributeValue(i)
+                if (!TextUtils.isEmpty(drawableName)) {
+                    collection.add(Entry(drawableName))
+                }
+            }
+        }
+    }
+
+    override fun getEntryForComponent(key: ComponentKey): Entry? {
+        val entry = packComponents[key.componentName]
+        if (entry?.isAvailable != true) return null
+        return entry
+    }
+
+    override fun getMaskEntryForComponent(key: ComponentKey): IconPack.Entry? {
+        if (!supportsMasking()) return null
+        return MaskEntry(key)
+    }
+
+    override fun getIcon(entry: IconPackManager.CustomIconEntry, iconDpi: Int): Drawable? {
+        val drawableId = getDrawableId(entry.icon ?: return null)
+        if (drawableId != 0) {
+            try {
+                var drawable = packResources.getDrawable(drawableId)
+                if (Utilities.ATLEAST_OREO && packClocks.containsKey(drawableId)) {
+                    drawable = CustomClock.getClock(context, drawable, packClocks[drawableId])
+                } else if (packDynamicDrawables.containsKey(drawableId)) {
+                    drawable = DynamicDrawable.getIcon(context, drawable, packDynamicDrawables[drawableId]!!, iconDpi)
+                }
+                if (prefs.adaptifyIconPacks) {
+                    val gen = AdaptiveIconGenerator(context, drawable.mutate(), null)
+                    return gen.result
+                }
+                return drawable.mutate()
+            } catch (ex: Resources.NotFoundException) {
+            }
+        }
+        return null
+    }
+
+    override fun getIcon(launcherActivityInfo: LauncherActivityInfo, iconDpi: Int,
+                         flattenDrawable: Boolean,
+                         customIconEntry: IconPackManager.CustomIconEntry?,
+                         iconProvider: CustomIconProvider?): Drawable? {
+        ensureInitialLoadComplete()
+
+        val component = launcherActivityInfo.componentName
+        val drawableId = when {
+            customIconEntry?.icon != null -> getDrawableId(customIconEntry.icon)
+            packCalendars.containsKey(component) -> getDrawableId(packCalendars[component] + Calendar.getInstance().get(Calendar.DAY_OF_MONTH))
+            packComponents.containsKey(component) -> packComponents[component]!!.drawableId
+            else -> 0
+        }
+
+        if (drawableId != 0) {
+            try {
+                var drawable = AdaptiveIconCompat.wrap(
+                        packResources.getDrawableForDensity(drawableId, iconDpi)
+                                ?: packResources.getDrawable(drawableId))
+                if (Utilities.ATLEAST_OREO && packClocks.containsKey(drawableId)) {
+                    drawable = CustomClock.getClock(context, drawable, packClocks[drawableId])
+                } else if (packDynamicDrawables.containsKey(drawableId)) {
+                    drawable = DynamicDrawable.getIcon(context, drawable, packDynamicDrawables[drawableId]!!, iconDpi)
+                }
+                if (prefs.adaptifyIconPacks) {
+                    val gen = AdaptiveIconGenerator(context, drawable.mutate(), null)
+                    return gen.result
+                }
+                return drawable.mutate()
+            } catch (ex: Resources.NotFoundException) {
+            }
+        }
+
+        val isCustomPack = customIconEntry?.packPackageName == packPackageName && customIconEntry.icon == null
+        if ((prefs.iconPackMasking || isCustomPack) && packMask.hasMask) {
+            val baseIcon = defaultPack.getIcon(launcherActivityInfo, iconDpi, flattenDrawable,
+                    customIconEntry, iconProvider)
+            val icon = packMask.getIcon(context, baseIcon, launcherActivityInfo.componentName)
+            if (prefs.adaptifyIconPacks) {
+                val gen = AdaptiveIconGenerator(context, icon, null)
+                return gen.result
+            }
+            return icon
+        }
+
+        return null
+    }
+
+    @RequiresApi(Build.VERSION_CODES.O)
+    override fun getIcon(shortcutInfo: ShortcutInfo, iconDpi: Int): Drawable? {
+        ensureInitialLoadComplete()
+
+        if (prefs.iconPackMasking && packMask.hasMask) {
+            val baseIcon = defaultPack.getIcon(shortcutInfo, iconDpi)
+            if (baseIcon != null) {
+                val icon = packMask.getIcon(context, baseIcon, shortcutInfo.activity)
+                if (prefs.adaptifyIconPacks) {
+                    val gen = AdaptiveIconGenerator(context, icon, null)
+                    return gen.result
+                }
+                return icon
+            }
+        }
+
+        return null
+    }
+
+    @RequiresApi(Build.VERSION_CODES.O)
+    override fun getIcon(shortcutInfo: ShortcutInfoCompat, iconDpi: Int): Drawable? {
+        ensureInitialLoadComplete()
+
+        if (prefs.iconPackMasking && packMask.hasMask) {
+            val baseIcon = defaultPack.getIcon(shortcutInfo, iconDpi)
+            if (baseIcon != null) {
+                val icon = packMask.getIcon(context, baseIcon, shortcutInfo.activity)
+                if (prefs.adaptifyIconPacks) {
+                    val gen = AdaptiveIconGenerator(context, icon, null)
+                    return gen.result
+                }
+                return icon
+            }
+        }
+
+        return null
+    }
+
+    override fun newIcon(icon: Bitmap, itemInfo: ItemInfoWithIcon,
+                         customIconEntry: IconPackManager.CustomIconEntry?,
+                         drawableFactory: CustomDrawableFactory): FastBitmapDrawable? {
+        ensureInitialLoadComplete()
+
+        if (Utilities.ATLEAST_OREO && itemInfo.itemType == LauncherSettings.Favorites.ITEM_TYPE_APPLICATION) {
+            val component = itemInfo.targetComponent
+            val drawableId = when {
+                customIconEntry?.icon != null -> getDrawableId(customIconEntry.icon)
+                packComponents.containsKey(component) -> packComponents[component]!!.drawableId
+                else -> 0
+            }
+            if (packClocks.containsKey(drawableId)) {
+                val drawable = AdaptiveIconCompat.wrap(packResources.getDrawable(drawableId))
+                return drawableFactory.customClockDrawer.drawIcon(itemInfo, drawable, packClocks[drawableId])
+            } else if (packDynamicDrawables.containsKey(drawableId)) {
+                val iconDpi = LauncherAppState.getIDP(context).fillResIconDpi
+                val icn = DynamicDrawable.drawIcon(context, itemInfo, packDynamicDrawables[drawableId]!!,
+                        drawableFactory, iconDpi)
+                if (icn != null) return icn
+            }
+            if (drawableId != 0) {
+                return FastBitmapDrawable(icon)
+            }
+        }
+        return null
+    }
+
+    override fun getAllIcons(callback: (List<PackEntry>) -> Unit, cancel: () -> Boolean, filter: (item: String) -> Boolean) {
+        var lastSend = System.currentTimeMillis() - 900
+        var tmpList = ArrayList<PackEntry>()
+        val sendResults = { force: Boolean ->
+            val current = System.currentTimeMillis()
+            if (force || current - lastSend >= 1000) {
+                callback(tmpList)
+                tmpList = ArrayList()
+                lastSend = current
+            }
+        }
+        var found = false
+        var entry: Entry
+        try {
+            val parser = getXml("drawable")
+            while (parser != null && parser.next() != XmlPullParser.END_DOCUMENT) {
+                if (cancel()) return
+                if (parser.eventType != XmlPullParser.START_TAG) continue
+                if ("category" == parser.name) {
+                    tmpList.add(CategoryTitle(parser["title"]!!))
+                    sendResults(false)
+                } else if ("item" == parser.name) {
+                    val drawableName = parser["drawable"]!!
+                    if (filter(drawableName)) {
+                        val resId = getDrawableId(drawableName)
+                        if (resId != 0) {
+                            entry = Entry(drawableName, resId)
+                            tmpList.add(entry)
+                            sendResults(false)
+                            found = true
+                        }
+                    }
+                }
+            }
+            sendResults(true)
+            if (found) {
+                return
+            }
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
+        super.getAllIcons(callback, cancel, filter)
+    }
+
+    override fun supportsMasking(): Boolean = packMask.hasMask
+
+    private fun getXml(name: String): XmlPullParser? {
+        val res: Resources
+        try {
+            res = context.packageManager.getResourcesForApplication(packPackageName)
+            val resourceId = res.getIdentifier(name, "xml", packPackageName)
+            return if (0 != resourceId) {
+                context.packageManager.getXml(packPackageName, resourceId, null)
+            } else {
+                val factory = XmlPullParserFactory.newInstance()
+                val parser = factory.newPullParser()
+                parser.setInput(res.assets.open("$name.xml"), Xml.Encoding.UTF_8.toString())
+                parser
+            }
+        } catch (e: PackageManager.NameNotFoundException) {
+        } catch (e: IOException) {
+        } catch (e: XmlPullParserException) {
+        }
+        return null
+    }
+
+    fun getDrawable(name: String, density: Int): Drawable? {
+        val id = getDrawableId(name)
+        return try {
+            if (id != 0) packResources.getDrawableForDensity(id, density) else null
+        } catch (ex: Resources.NotFoundException) {
+            null
+        }
+    }
+
+    private val idCache = mutableMapOf<String, Int>()
+    private fun getDrawableId(name: String) = packResources.getIdentifier(name, "drawable", packPackageName)// idCache.getOrPut(name) {    }
+
+    fun createEntry(icon: Intent.ShortcutIconResource): Entry {
+        val id = packResources.getIdentifier(icon.resourceName, null, null)
+        val simpleName = packResources.getResourceEntryName(id)
+        return Entry(simpleName, id)
+    }
+
+    inner class Entry(private val drawableName: String, val id: Int? = null) : IconPack.Entry() {
+
+        override val displayName by lazy { drawableName.replace(Regex("""_+"""), " ").trim().toTitleCase() }
+        override val identifierName = drawableName
+        override val isAvailable by lazy { drawableId != 0 && checkResourceExists() }
+
+        val debugName get() = "$drawableName in $packPackageName"
+        val drawableId: Int by lazy { id ?: getDrawableId(drawableName) }
+
+        override fun drawableForDensity(density: Int): Drawable {
+            if (!isAvailable) {
+                throw IllegalStateException("Trying to access an unavailable entry $debugName")
+            }
+            try {
+                return AdaptiveIconCompat.wrap(packResources.getDrawableForDensity(drawableId, density)!!)
+            } catch (e: Resources.NotFoundException) {
+                throw Exception("Failed to get drawable $drawableId ($debugName)", e)
+            }
+        }
+
+        override fun toCustomEntry() = IconPackManager.CustomIconEntry(packPackageName, drawableName)
+
+        private fun checkResourceExists(): Boolean {
+            return try {
+                packResources.getResourceName(drawableId)
+                true
+            } catch (e: Resources.NotFoundException) {
+                false
+            }
+        }
+    }
+
+    inner class MaskEntry(private val key: ComponentKey) : IconPack.Entry() {
+        override val identifierName = key.toString()
+        override val displayName = identifierName
+        override val isAvailable = true
+
+        override fun drawableForDensity(density: Int): Drawable {
+            val baseIcon = defaultPack.getIcon(key, density)!!
+            val icon = packMask.getIcon(context, baseIcon, key.componentName)
+            if (prefs.adaptifyIconPacks) {
+                val gen = AdaptiveIconGenerator(context, icon, null)
+                return gen.result
+            }
+            return icon
+        }
+
+        override fun toCustomEntry() = IconPackManager.CustomIconEntry(packPackageName, key.toString(), "mask")
+    }
+
+}
diff --git a/Omega/src/com/saggitt/omega/iconpack/IconPackList.kt b/Omega/src/com/saggitt/omega/iconpack/IconPackList.kt
new file mode 100644
index 0000000000..2f6fc6b087
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/iconpack/IconPackList.kt
@@ -0,0 +1,233 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.iconpack
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.graphics.drawable.Drawable
+import android.text.TextUtils
+import com.android.launcher3.R
+import com.android.launcher3.Utilities
+import com.android.launcher3.util.Executors
+import com.android.launcher3.util.LooperExecutor
+import com.saggitt.omega.util.ActionIntentFilter
+
+class IconPackList(private val context: Context, private val manager: IconPackManager) {
+
+    private val prefs = Utilities.getOmegaPrefs(context)
+
+    private val loadedPacks = HashMap<String, LoadedPack>()
+    val appliedPacks = ArrayList<IconPack>()
+
+    private val default by lazy { DefaultLoadedPack() }
+
+    init {
+        reloadPacks()
+    }
+
+    private fun onPackListUpdated(packs: List<String>) {
+        LooperExecutor(Executors.ICON_PACK_EXECUTOR.looper).execute {
+            loadedPacks.values.forEach {
+                if (!packs.contains(it.packageName)) {
+                    it.unregister()
+                }
+            }
+
+            appliedPacks.clear()
+
+            val newPacks = HashMap<String, LoadedPack>()
+            packs.forEach { pack ->
+                val loadedPack = loadedPacks.getOrPut(pack) {
+                    loadPack(pack).apply {
+                        iconPack.ensureInitialLoadComplete()
+                        register()
+                    }
+                }
+                newPacks[pack] = loadedPack
+                appliedPacks.add(loadedPack.iconPack)
+            }
+
+            loadedPacks.clear()
+            loadedPacks.putAll(newPacks)
+
+            manager.onPacksUpdated()
+        }
+    }
+
+    private fun loadPack(packageName: String) = if (!TextUtils.isEmpty(packageName))
+        LoadedPackImpl(packageName) else default
+
+    fun getPack(packageName: String, keep: Boolean): IconPack {
+        if (keep) {
+            return loadedPacks.getOrPut(packageName) {
+                loadPack(packageName).apply { register() }
+            }.iconPack
+        }
+        loadedPacks[packageName]?.let { return it.iconPack }
+        return IconPackImpl(context, packageName)
+    }
+
+    fun onDateChanged() {
+        loadedPacks.values.forEach { it.iconPack.onDateChanged() }
+    }
+
+    fun reloadPacks() {
+        setPackList(prefs.iconPacks.getList())
+    }
+
+    private fun setPackList(packs: List<String>) {
+        onPackListUpdated(packs.filter { IconPackManager.isPackProvider(context, it) })
+    }
+
+    fun iterator() = appliedPacks.iterator()
+
+    fun currentPack() = if (!appliedPacks.isEmpty()) appliedPacks[0] else default.iconPack
+
+    fun getAvailablePacks(): MutableSet<PackInfo> {
+        val pm = context.packageManager
+        val packs = HashSet<PackInfo>()
+        CustomIconUtils.ICON_INTENTS.forEach { intent ->
+            pm.queryIntentActivities(Intent(intent), 0)
+                    .mapTo(packs) { PackInfo.forPackage(context, it.activityInfo.packageName) }
+        }
+        return packs
+    }
+
+    abstract class PackInfo(val context: Context, val packageName: String) : Comparable<PackInfo> {
+
+        abstract val displayName: String
+        abstract val displayIcon: Drawable
+
+        abstract fun load(): IconPack
+
+        override fun equals(other: Any?): Boolean {
+            return other is PackInfo && packageName == other.packageName
+        }
+
+        override fun hashCode(): Int {
+            return packageName.hashCode()
+        }
+
+        override fun compareTo(other: PackInfo): Int {
+            return displayName.compareTo(other.displayName)
+        }
+
+        companion object {
+
+            fun forPackage(context: Context, packageName: String): PackInfo {
+                if (TextUtils.isEmpty(packageName)) return DefaultPackInfo(context)
+                return PackInfoImpl(context, packageName)
+            }
+        }
+    }
+
+    class DefaultPackInfo(context: Context) : PackInfo(context, "") {
+
+        override val displayIcon by lazy { context.getDrawable(R.mipmap.ic_launcher)!! }
+        override val displayName by lazy { context.resources.getString(R.string.icon_pack_default) }
+
+        override fun load() = IconPackManager.getInstance(context).defaultPack
+    }
+
+    class PackInfoImpl(context: Context, packageName: String) : PackInfo(context, packageName) {
+
+        private val applicationInfo by lazy {
+            context.packageManager.getApplicationInfo(packageName, PackageManager.GET_META_DATA)
+        }
+
+        override val displayIcon by lazy {
+            context.packageManager.getApplicationIcon(applicationInfo)
+        }
+
+        override val displayName by lazy {
+            context.packageManager.getApplicationLabel(applicationInfo).toString()
+        }
+
+        override fun load() = IconPackImpl(context, packageName)
+    }
+
+    abstract inner class LoadedPack(protected var pack: IconPack) {
+
+        val packageName get() = pack.packPackageName
+        val iconPack get() = pack
+
+        open fun register() {
+
+        }
+
+        open fun unregister() {
+
+        }
+
+        open fun reloadPack() {
+            pack = IconPackImpl(context, packageName)
+        }
+    }
+
+    inner class LoadedPackImpl(pack: IconPack) : LoadedPack(pack) {
+
+        constructor(packageName: String) : this(IconPackImpl(context, packageName))
+
+        private val updateReceiver = object : BroadcastReceiver() {
+            override fun onReceive(context: Context, intent: Intent) {
+                if (intent.action == Intent.ACTION_PACKAGE_CHANGED) {
+                    reloadPack()
+                    iconPack.ensureInitialLoadComplete()
+                    manager.onPacksUpdated()
+                } else {
+                    reloadPacks()
+                }
+            }
+        }
+
+        override fun register() {
+            super.register()
+
+            context.registerReceiver(updateReceiver, ActionIntentFilter.newInstance(packageName,
+                    Intent.ACTION_PACKAGE_CHANGED,
+                    Intent.ACTION_PACKAGE_REPLACED,
+                    Intent.ACTION_PACKAGE_FULLY_REMOVED))
+        }
+
+        override fun unregister() {
+            super.unregister()
+
+            context.unregisterReceiver(updateReceiver)
+        }
+
+        override fun reloadPack() {
+            super.reloadPack()
+
+            pack = IconPackImpl(context, packageName)
+        }
+    }
+
+    inner class DefaultLoadedPack : LoadedPack(manager.defaultPack) {
+
+        override fun register() {
+        }
+
+        override fun unregister() {
+        }
+
+        override fun reloadPack() {
+        }
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/iconpack/IconPackManager.kt b/Omega/src/com/saggitt/omega/iconpack/IconPackManager.kt
new file mode 100644
index 0000000000..370a8765d3
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/iconpack/IconPackManager.kt
@@ -0,0 +1,320 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.iconpack
+
+import android.annotation.SuppressLint
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.content.pm.LauncherActivityInfo
+import android.content.pm.PackageManager
+import android.content.pm.ResolveInfo
+import android.content.pm.ShortcutInfo
+import android.graphics.Bitmap
+import android.graphics.drawable.Drawable
+import android.os.Handler
+import android.os.Parcel
+import android.os.Parcelable
+import android.text.TextUtils
+import com.android.launcher3.FastBitmapDrawable
+import com.android.launcher3.ItemInfo
+import com.android.launcher3.ItemInfoWithIcon
+import com.android.launcher3.Utilities
+import com.android.launcher3.shortcuts.ShortcutInfoCompat
+import com.android.launcher3.util.ComponentKey
+import com.android.launcher3.util.Executors.MAIN_EXECUTOR
+import com.saggitt.omega.icons.CustomDrawableFactory
+import com.saggitt.omega.icons.CustomIconProvider
+import com.saggitt.omega.override.AppInfoProvider
+import com.saggitt.omega.override.CustomInfoProvider
+import com.saggitt.omega.util.asNonEmpty
+import com.saggitt.omega.util.runOnMainThread
+import java.util.*
+import kotlin.collections.HashMap
+
+class IconPackManager(private val context: Context) {
+
+    private val appInfoProvider = AppInfoProvider.getInstance(context)
+    val defaultPack = DefaultPack(context)
+    private val uriPack = UriIconPack(context)
+    var dayOfMonth = 0
+        set(value) {
+            if (value != field) {
+                field = value
+                onDateChanged()
+            }
+        }
+
+    val packList = IconPackList(context, this)
+    val defaultPackProvider = PackProvider(privateObj, "")
+
+    private val listeners: MutableSet<() -> Unit> = mutableSetOf()
+
+    init {
+        context.registerReceiver(object : BroadcastReceiver() {
+            override fun onReceive(context: Context, intent: Intent?) {
+                dayOfMonth = Calendar.getInstance().get(Calendar.DAY_OF_MONTH)
+            }
+        }, IntentFilter(Intent.ACTION_DATE_CHANGED).apply {
+            addAction(Intent.ACTION_TIME_CHANGED)
+            addAction(Intent.ACTION_TIMEZONE_CHANGED)
+            if (!Utilities.ATLEAST_NOUGAT) {
+                addAction(Intent.ACTION_TIME_TICK)
+            }
+        }, null, Handler(MAIN_EXECUTOR.looper))
+    }
+
+    private fun onDateChanged() {
+        packList.onDateChanged()
+    }
+
+    private fun getIconPackInternal(name: String, put: Boolean = true, load: Boolean = false): IconPack? {
+        if (name == defaultPack.packPackageName) return defaultPack
+        if (name == uriPack.packPackageName) return uriPack
+        return if (isPackProvider(context, name)) {
+            packList.getPack(name, put).apply {
+                if (load) {
+                    ensureInitialLoadComplete()
+                }
+            }
+        } else null
+    }
+
+    fun getIconPack(name: String, put: Boolean = true, load: Boolean = false): IconPack? {
+        return getIconPackInternal(name, put, load)
+    }
+
+    fun getIconPack(packProvider: PackProvider, put: Boolean = true, load: Boolean = false): IconPack {
+        return getIconPackInternal(packProvider.name, put, load)!!
+    }
+
+    fun getIcon(launcherActivityInfo: LauncherActivityInfo,
+                iconDpi: Int, flattenDrawable: Boolean, itemInfo: ItemInfo?,
+                iconProvider: CustomIconProvider?): Drawable {
+        val customEntry = CustomInfoProvider.forItem<ItemInfo>(context, itemInfo)?.getIcon(itemInfo!!)
+                ?: appInfoProvider.getCustomIconEntry(launcherActivityInfo)
+        val customPack = customEntry?.run {
+            getIconPackInternal(packPackageName)
+        }
+        if (customPack != null) {
+            customPack.getIcon(launcherActivityInfo, iconDpi,
+                    flattenDrawable, customEntry, iconProvider)?.let { icon -> return icon }
+        }
+        packList.iterator().forEach { pack ->
+            pack.getIcon(launcherActivityInfo, iconDpi,
+                    flattenDrawable, null, iconProvider)?.let { return it }
+        }
+        return defaultPack.getIcon(launcherActivityInfo, iconDpi, flattenDrawable, null, iconProvider)
+    }
+
+    fun getIcon(shortcutInfo: ShortcutInfoCompat, iconDpi: Int): Drawable? {
+        packList.iterator().forEach { pack ->
+            pack.getIcon(shortcutInfo, iconDpi)?.let { return it }
+        }
+        return defaultPack.getIcon(shortcutInfo, iconDpi)
+    }
+
+    fun getIcon(shortcutInfo: ShortcutInfo, iconDpi: Int): Drawable? {
+        packList.iterator().forEach { pack ->
+            pack.getIcon(shortcutInfo, iconDpi)?.let { return it }
+        }
+        return defaultPack.getIcon(shortcutInfo, iconDpi)
+    }
+
+    fun newIcon(icon: Bitmap, itemInfo: ItemInfoWithIcon, drawableFactory: CustomDrawableFactory): FastBitmapDrawable {
+        val key = itemInfo.targetComponent?.let { ComponentKey(it, itemInfo.user) }
+        val customEntry = CustomInfoProvider.forItem<ItemInfo>(context, itemInfo)?.getIcon(itemInfo)
+                ?: key?.let { appInfoProvider.getCustomIconEntry(it) }
+        val customPack = customEntry?.run { getIconPackInternal(packPackageName) }
+        if (customPack != null) {
+            customPack.newIcon(icon, itemInfo, customEntry, drawableFactory)?.let { return it }
+        }
+        packList.iterator().forEach { pack ->
+            pack.newIcon(icon, itemInfo, customEntry, drawableFactory)?.let { return it }
+        }
+        return defaultPack.newIcon(icon, itemInfo, customEntry, drawableFactory)
+    }
+
+    fun maskSupported(): Boolean = packList.appliedPacks.any { it.supportsMasking() }
+
+    fun getEntryForComponent(component: ComponentKey): IconPack.Entry? {
+        packList.iterator().forEach {
+            val entry = it.getEntryForComponent(component)
+            if (entry != null) return entry
+        }
+        return defaultPack.getEntryForComponent(component)
+    }
+
+    fun getPackProviders(): Set<PackProvider> {
+        val pm = context.packageManager
+        val packs = HashSet<PackProvider>()
+        ICON_INTENTS.forEach { intent ->
+            pm.queryIntentActivities(Intent(intent), PackageManager.GET_META_DATA).forEach {
+                packs.add(PackProvider(privateObj, it.activityInfo.packageName))
+            }
+        }
+        return packs
+    }
+
+    fun getPackProviderInfos(): HashMap<String, IconPackInfo> {
+        val pm = context.packageManager
+        val packs = HashMap<String, IconPackInfo>()
+        ICON_INTENTS.forEach { intent ->
+            pm.queryIntentActivities(Intent(intent), PackageManager.GET_META_DATA).forEach {
+                packs[it.activityInfo.packageName] = IconPackInfo.fromResolveInfo(it, pm)
+            }
+        }
+        return packs
+    }
+
+    fun addListener(listener: () -> Unit) {
+        listeners.add(listener)
+        if (!packList.appliedPacks.isEmpty()) {
+            listener.invoke()
+        }
+    }
+
+    fun removeListener(listener: () -> Unit) {
+        listeners.remove(listener)
+    }
+
+    fun onPacksUpdated() {
+        runOnMainThread { listeners.forEach { it.invoke() } }
+    }
+
+    data class CustomIconEntry(val packPackageName: String, val icon: String? = null, val arg: String? = null) {
+
+        fun toPackString(): String {
+            return packPackageName
+        }
+
+        override fun toString(): String {
+            return "$packPackageName|${icon ?: ""}|${arg ?: ""}"
+        }
+
+        companion object {
+            fun fromString(string: String): CustomIconEntry {
+                return fromNullableString(string)!!
+            }
+
+            fun fromNullableString(string: String?): CustomIconEntry? {
+                if (string == null) return null
+                if (string.contains("|")) {
+                    val parts = string.split("|")
+                    if (parts[0].contains("/")) return parseLegacy(string)
+                    if (parts.size == 1) {
+                        return CustomIconEntry(parts[0])
+                    }
+                    return CustomIconEntry(parts[0], parts[1].asNonEmpty(), parts[2].asNonEmpty())
+                }
+                return parseLegacy(string)
+            }
+
+            private fun parseLegacy(string: String): CustomIconEntry? {
+                val parts = string.split("/")
+                val icon = TextUtils.join("/", parts.subList(1, parts.size))
+                if (parts[0] == "omegaUriPack" && !icon.isNullOrBlank()) {
+                    val iconParts = icon.split("|")
+                    return CustomIconEntry(parts[0], iconParts[0].asNonEmpty(), iconParts[1].asNonEmpty())
+                }
+                return CustomIconEntry(parts[0], icon.asNonEmpty())
+            }
+        }
+    }
+
+    data class IconPackInfo(val packageName: String, val icon: Drawable, val label: CharSequence) {
+        companion object {
+            fun fromResolveInfo(info: ResolveInfo, pm: PackageManager) = IconPackInfo(info.activityInfo.packageName, info.loadIcon(pm), info.loadLabel(pm))
+        }
+    }
+
+    class PackProvider(obj: Any, val name: String) : Parcelable {
+
+        constructor(parcel: Parcel) : this(privateObj, parcel.readString()!!)
+
+        init {
+            if (obj !== privateObj) {
+                UnsupportedOperationException("Cannot create PackProvider outside of IconPackManager")
+            }
+        }
+
+        override fun equals(other: Any?): Boolean {
+            return (other as? PackProvider)?.name == name
+        }
+
+        override fun hashCode() = name.hashCode()
+
+        override fun writeToParcel(parcel: Parcel, flags: Int) {
+            parcel.writeString(name)
+        }
+
+        override fun describeContents(): Int {
+            return 0
+        }
+
+        companion object CREATOR : Parcelable.Creator<PackProvider> {
+            override fun createFromParcel(parcel: Parcel): PackProvider {
+                return PackProvider(parcel)
+            }
+
+            override fun newArray(size: Int): Array<PackProvider?> {
+                return arrayOfNulls(size)
+            }
+        }
+    }
+
+    interface OnPackChangeListener {
+        fun onPackChanged()
+    }
+
+    companion object {
+
+        const val TAG = "IconPackManager"
+        private val privateObj = Object()
+
+        @SuppressLint("StaticFieldLeak")
+        private var INSTANCE: IconPackManager? = null
+
+        fun getInstance(context: Context): IconPackManager {
+            if (INSTANCE == null) {
+                INSTANCE = IconPackManager(context.applicationContext)
+            }
+            return INSTANCE!!
+        }
+
+        val ICON_INTENTS = arrayOf(
+                "com.fede.launcher.THEME_ICONPACK",
+                "com.anddoes.launcher.THEME",
+                "com.teslacoilsw.launcher.THEME",
+                "com.gau.go.launcherex.theme",
+                "org.adw.launcher.THEMES",
+                "net.oneplus.launcher.icons.ACTION_PICK_ICON",
+                "com.saggitt.omega.ICONPACK")
+
+        internal fun isPackProvider(context: Context, packageName: String?): Boolean {
+            if (packageName != null && !packageName.isEmpty()) {
+                return ICON_INTENTS.firstOrNull {
+                    context.packageManager.queryIntentActivities(
+                            Intent(it).setPackage(packageName), PackageManager.GET_META_DATA).iterator().hasNext()
+                } != null
+            }
+            return false
+        }
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/iconpack/IconPackPreference.kt b/Omega/src/com/saggitt/omega/iconpack/IconPackPreference.kt
new file mode 100644
index 0000000000..7c8d584219
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/iconpack/IconPackPreference.kt
@@ -0,0 +1,98 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.iconpack
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import android.util.AttributeSet
+import android.view.View
+import android.widget.ImageView
+import androidx.annotation.Keep
+import androidx.preference.Preference
+import com.android.launcher3.R
+import com.saggitt.omega.settings.SettingsActivity
+import com.saggitt.omega.settings.search.SearchIndex
+
+class IconPackPreference(context: Context, attrs: AttributeSet? = null) : Preference(context, attrs) {
+
+    private val ipm = IconPackManager.getInstance(context)
+    private val packList = ipm.packList
+
+    private val onChangeListener = ::updatePreview
+
+    init {
+        layoutResource = R.layout.pref_with_preview_icon
+        fragment = IconPackFragment::class.java.name
+        updatePreview()
+    }
+
+    override fun onAttached() {
+        super.onAttached()
+
+        ipm.addListener(onChangeListener)
+    }
+
+    override fun onDetached() {
+        super.onDetached()
+
+        ipm.removeListener(onChangeListener)
+    }
+
+    private fun updatePreview() {
+        try {
+            summary = if (packList.currentPack() is DefaultPack) {
+                packList.currentPack().displayName
+            } else {
+                packList.appliedPacks
+                        .filter { it !is DefaultPack }
+                        .joinToString(", ") { it.displayName }
+            }
+            icon = packList.currentPack().displayIcon
+        } catch (ignored: IllegalStateException) {
+            //TODO: Fix updating pref when scrolled down
+        }
+    }
+
+    class IconPackSlice(context: Context, attrs: AttributeSet) : SearchIndex.Slice(context, attrs) {
+
+        override fun createSliceView(): View {
+            return (View.inflate(context, R.layout.preview_icon, null) as ImageView).apply {
+                IconPackManager.getInstance(context).addListener {
+                    setImageDrawable(IconPackManager.getInstance(context).packList.currentPack().displayIcon)
+                }
+                setOnClickListener {
+                    context.startActivity(Intent()
+                            .setClass(context, SettingsActivity::class.java)
+                            .putExtra(SettingsActivity.EXTRA_FRAGMENT, IconPackFragment::class.java.name)
+                            .putExtra(SettingsActivity.EXTRA_FRAGMENT_ARGS, Bundle().apply {
+                                putString(SettingsActivity.SubSettingsFragment.TITLE, context.getString(R.string.icon_pack))
+                            })
+                    )
+                }
+            }
+        }
+    }
+
+    companion object {
+
+        @Keep
+        @JvmStatic
+        val sliceProvider = SearchIndex.SliceProvider.fromLambda(::IconPackSlice)
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/iconpack/IconPickerActivity.kt b/Omega/src/com/saggitt/omega/iconpack/IconPickerActivity.kt
new file mode 100644
index 0000000000..e4436cbfe5
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/iconpack/IconPickerActivity.kt
@@ -0,0 +1,384 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.iconpack
+
+import android.app.Activity
+import android.content.Context
+import android.content.Intent
+import android.graphics.drawable.Drawable
+import android.os.Bundle
+import android.os.Handler
+import android.os.Message
+import android.os.Process
+import android.text.TextUtils
+import android.view.*
+import android.widget.TextView
+import android.widget.Toast
+import androidx.appcompat.widget.ActionMenuView
+import androidx.appcompat.widget.SearchView
+import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.android.launcher3.R
+import com.android.launcher3.compat.LauncherAppsCompat
+import com.android.launcher3.util.Executors.ICON_PACK_UI_EXECUTOR
+import com.saggitt.omega.iconpack.EditIconActivity.Companion.EXTRA_ENTRY
+import com.saggitt.omega.settings.SettingsBaseActivity
+import com.saggitt.omega.util.*
+import com.saggitt.omega.views.FadingImageView
+import kotlinx.android.synthetic.omega.activity_settings_search.*
+import java.text.Collator
+import java.util.*
+import java.util.concurrent.Semaphore
+
+class IconPickerActivity : SettingsBaseActivity(), View.OnLayoutChangeListener, SearchView.OnQueryTextListener {
+    private val iconPackManager = IconPackManager.getInstance(this)
+    private val iconGrid by lazy { findViewById<RecyclerView>(R.id.list_results) }
+    private val iconPack by lazy {
+        iconPackManager.getIconPack(
+                intent.getParcelableExtra<IconPackManager.PackProvider>(EXTRA_ICON_PACK)!!, false)
+    }
+    private val items get() = searchItems ?: actualItems
+    private var actualItems = ArrayList<AdapterItem>()
+    private val adapter = IconGridAdapter()
+    private val layoutManager = GridLayoutManager(this, 1)
+    private var canceled = false
+    private val collator = Collator.getInstance()
+    private val showDebugInfo = omegaPrefs.showDebugInfo
+
+    private var dynamicPadding = 0
+
+    private val pickerComponent by lazy {
+        LauncherAppsCompat.getInstance(this)
+                .getActivityList(iconPack.packPackageName, Process.myUserHandle()).firstOrNull()?.componentName
+    }
+
+    private var searchItems: MutableList<AdapterItem>? = null
+    private val searchHandler = object : Handler(ICON_PACK_UI_EXECUTOR.looper) {
+        override fun handleMessage(msg: Message) {
+            if (msg.what == R.id.message_search) {
+                processSearchQuery(msg.obj as String?)
+            }
+        }
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        decorLayout.hideToolbar = true
+
+        setContentView(R.layout.activity_settings_search)
+        getContentFrame().addOnLayoutChangeListener(this)
+        setSupportActionBar(search_toolbar)
+        supportActionBar?.run {
+            setDisplayShowHomeEnabled(true)
+            setDisplayHomeAsUpEnabled(true)
+        }
+
+        search_view.queryHint = iconPack.displayName
+        search_view.setOnQueryTextListener(this)
+        search_view.setIconifiedByDefault(false)
+
+        items.add(LoadingItem())
+
+        runOnUiWorkerThread {
+            // make sure whatever running on ui worker has finished, then start parsing the pack
+            runOnThread(iconPackUiHandler) {
+                iconPack.getAllIcons(::addEntries, { canceled })
+                // Wait for the ui to finish processing new data
+                val waiter = Semaphore(0)
+                runOnUiThread {
+                    waiter.release()
+                }
+                waiter.acquireUninterruptibly()
+                waiter.release()
+            }
+        }
+        collator.apply {
+            decomposition = Collator.CANONICAL_DECOMPOSITION
+            strength = Collator.TERTIARY
+        }
+    }
+
+    override fun finish() {
+        super.finish()
+        canceled = true
+    }
+
+    private fun addEntries(entries: List<IconPack.PackEntry>) {
+        val newItems = entries.mapNotNull {
+            when (it) {
+                is IconPack.CategoryTitle -> CategoryItem(it.title)
+                is IconPack.Entry -> if (it.isAvailable) IconItem(it) else null
+                else -> null
+            }
+        }
+        runOnUiThread {
+            if (items.size == 1 && items[0] is LoadingItem) {
+                items.removeAt(0)
+                adapter.notifyItemRemoved(0)
+            }
+
+            val addIndex = items.size
+            items.addAll(newItems)
+            adapter.notifyItemRangeInserted(addIndex, newItems.size)
+        }
+    }
+
+    override fun onQueryTextSubmit(query: String): Boolean {
+        return true
+    }
+
+    override fun onQueryTextChange(query: String): Boolean {
+        addToSearchQueue(query)
+        return true
+    }
+
+    private fun addToSearchQueue(query: String?) {
+        searchHandler.removeMessages(R.id.message_search)
+        searchHandler.sendMessage(searchHandler.obtainMessage(R.id.message_search, query))
+    }
+
+    private fun processSearchQuery(query: String?) {
+        val q = query?.trim()
+        val filtered = if (!TextUtils.isEmpty(q)) {
+            actualItems.filter { it is IconItem && collator.equals(q!!, it.entry.displayName) }.toMutableList()
+        } else null
+        runOnUiThread {
+            val hashCode = items.hashCode()
+            searchItems = filtered
+            if (items.hashCode() != hashCode) {
+                adapter.notifyDataSetChanged()
+            }
+        }
+    }
+
+    override fun onCreateOptionsMenu(menu: Menu): Boolean {
+        menuInflater.inflate(R.menu.menu_icon_picker, menu)
+        if (pickerComponent == null) {
+            menu.removeItem(R.id.action_open_external)
+        }
+
+        search_toolbar.childs.firstOrNull { it is ActionMenuView }?.let {
+            (it as ActionMenuView).overflowIcon?.setTint(omegaPrefs.accentColor)
+        }
+        return true
+    }
+
+    override fun onBackPressed() {
+        if (!TextUtils.isEmpty(search_view.query)) {
+            search_view.setQuery(null, true)
+        } else {
+            super.onBackPressed()
+        }
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        return when (item.itemId) {
+            android.R.id.home -> {
+                finish()
+                true
+            }
+            R.id.action_open_external -> {
+                val intent = Intent("com.novalauncher.THEME")
+                        .addCategory("com.novalauncher.category.CUSTOM_ICON_PICKER")
+                        .setComponent(pickerComponent)
+                startActivityForResult(intent, 1000)
+                true
+            }
+            else -> super.onOptionsItemSelected(item)
+        }
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        if (requestCode == 1000 && resultCode == Activity.RESULT_OK && data != null) {
+            if (data.hasExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE)) {
+                val icon = data.getParcelableExtra<Intent.ShortcutIconResource>(Intent.EXTRA_SHORTCUT_ICON_RESOURCE)
+                val entry = (iconPack as IconPackImpl).createEntry(icon!!)
+                onSelectIcon(entry)
+                return
+            }
+        }
+        super.onActivityResult(requestCode, resultCode, data)
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        canceled = true
+    }
+
+    override fun onLayoutChange(v: View?, left: Int, top: Int, right: Int, bottom: Int, oldLeft: Int, oldTop: Int, oldRight: Int, oldBottom: Int) {
+        getContentFrame().removeOnLayoutChangeListener(this)
+        calculateDynamicGrid(iconGrid.width)
+        iconGrid.adapter = adapter
+        iconGrid.layoutManager = layoutManager
+        iconGrid.isVerticalScrollBarEnabled = false
+    }
+
+    private fun calculateDynamicGrid(width: Int) {
+        val iconPadding = resources.getDimensionPixelSize(R.dimen.icon_preview_padding)
+        val iconSize = resources.getDimensionPixelSize(R.dimen.icon_preview_size)
+        val iconSizeWithPadding = iconSize + iconPadding + iconPadding
+        val columnCount = width / iconSizeWithPadding
+        val usedWidth = iconSize * columnCount
+        dynamicPadding = (width - usedWidth) / (columnCount + 1) / 2
+        layoutManager.spanCount = columnCount
+        layoutManager.spanSizeLookup = object : GridLayoutManager.SpanSizeLookup() {
+            override fun getSpanSize(position: Int) = getItemSpan(position)
+        }
+        iconGrid.setPadding(iconPadding - dynamicPadding, iconPadding, iconPadding - dynamicPadding, iconPadding)
+    }
+
+    private fun getItemSpan(position: Int) = if (adapter.isItem(position)) 1 else layoutManager.spanCount
+
+    fun onSelectIcon(entry: IconPack.Entry) {
+        val customEntry = entry.toCustomEntry()
+        setResult(Activity.RESULT_OK, Intent().putExtra(EXTRA_ENTRY, customEntry.toString()))
+        finish()
+    }
+
+    inner class IconGridAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+
+        private val loadingType = 0
+        private val itemType = 1
+        private val categoryType = 2
+
+        override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+            val layoutInflater = LayoutInflater.from(parent.context)
+            return when (viewType) {
+                itemType -> IconHolder(layoutInflater.inflate(R.layout.icon_item, parent, false))
+                categoryType -> CategoryHolder(layoutInflater.inflate(R.layout.icon_category, parent, false))
+                else -> LoadingHolder(layoutInflater.inflate(R.layout.adapter_loading, parent, false))
+            }
+        }
+
+        override fun getItemCount() = items.size
+
+        override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
+            if (holder is IconHolder) {
+                holder.bind(items[position] as IconItem)
+            } else if (holder is CategoryHolder) {
+                holder.bind(items[position] as CategoryItem)
+            }
+        }
+
+        override fun getItemViewType(position: Int): Int {
+            return when {
+                items[position] is IconItem -> itemType
+                items[position] is CategoryItem -> categoryType
+                else -> loadingType
+            }
+        }
+
+        fun isItem(position: Int) = getItemViewType(position) == itemType
+
+        inner class IconHolder(itemView: View) : RecyclerView.ViewHolder(itemView), View.OnClickListener, IconItem.Callback {
+
+            private var iconLoader: IconItem? = null
+                set(value) {
+                    field?.callback = null
+                    field = value
+                    field?.callback = this
+                }
+            private var name = "Unknown"
+
+            init {
+                itemView.setOnClickListener(this)
+                (itemView.layoutParams as ViewGroup.MarginLayoutParams).apply {
+                    leftMargin = dynamicPadding
+                    rightMargin = dynamicPadding
+                }
+                if (showDebugInfo) {
+                    itemView.setOnLongClickListener {
+                        Toast.makeText(applicationContext, name, Toast.LENGTH_LONG).show()
+                        true
+                    }
+                }
+            }
+
+            fun bind(item: IconItem) {
+                (itemView as FadingImageView).image = null
+                iconLoader = item
+                iconLoader?.loadIcon()
+            }
+
+            override fun onIconLoaded(drawable: Drawable, name: String) {
+                (itemView as FadingImageView).image = drawable
+                this.name = name
+            }
+
+            override fun onClick(v: View) {
+                onSelectIcon((items[adapterPosition] as IconItem).entry)
+            }
+        }
+
+        inner class CategoryHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+
+            private val title: TextView = itemView.findViewById(android.R.id.title)
+
+            init {
+                (title.layoutParams as ViewGroup.MarginLayoutParams).apply {
+                    leftMargin = dynamicPadding
+                    rightMargin = dynamicPadding
+                }
+                val context = itemView.context
+                title.setTextColor(context.getColorAccent())
+            }
+
+            fun bind(category: CategoryItem) {
+                title.text = category.title
+            }
+        }
+
+        inner class LoadingHolder(itemView: View) : RecyclerView.ViewHolder(itemView)
+    }
+
+    open class AdapterItem
+
+    class CategoryItem(val title: String) : AdapterItem()
+
+    class IconItem(val entry: IconPack.Entry) : AdapterItem() {
+
+        var callback: Callback? = null
+
+        fun loadIcon() {
+            runOnUiWorkerThread {
+                val drawable = entry.drawable
+                val displayName = entry.displayName
+                runOnMainThread { callback?.onIconLoaded(drawable, displayName) }
+            }
+        }
+
+        interface Callback {
+
+            fun onIconLoaded(drawable: Drawable, name: String)
+        }
+    }
+
+    class LoadingItem : AdapterItem()
+
+    companion object {
+
+        private const val EXTRA_ICON_PACK = "pack"
+
+        fun newIntent(context: Context, provider: IconPackManager.PackProvider): Intent {
+            return Intent(context, IconPickerActivity::class.java).apply {
+                putExtra(EXTRA_ICON_PACK, provider)
+            }
+        }
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/iconpack/UriIconPack.kt b/Omega/src/com/saggitt/omega/iconpack/UriIconPack.kt
new file mode 100644
index 0000000000..96ae431c05
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/iconpack/UriIconPack.kt
@@ -0,0 +1,138 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.iconpack
+
+import android.content.Context
+import android.content.pm.LauncherActivityInfo
+import android.content.pm.ShortcutInfo
+import android.graphics.Bitmap
+import android.graphics.BitmapFactory
+import android.graphics.drawable.BitmapDrawable
+import android.graphics.drawable.Drawable
+import android.net.Uri
+import android.os.ParcelFileDescriptor
+import android.text.TextUtils
+import com.android.launcher3.FastBitmapDrawable
+import com.android.launcher3.ItemInfoWithIcon
+import com.android.launcher3.Utilities
+import com.android.launcher3.shortcuts.ShortcutInfoCompat
+import com.android.launcher3.util.ComponentKey
+import com.saggitt.omega.adaptive.AdaptiveIconGenerator
+import com.saggitt.omega.icons.CustomDrawableFactory
+import com.saggitt.omega.icons.CustomIconProvider
+import java.io.FileDescriptor
+
+class UriIconPack(context: Context) : IconPack(context, "omegaUriPack") {
+
+    override val packInfo = IconPackList.DefaultPackInfo(context)
+    override val entries = listOf<Entry>()
+
+    private val entryCache = mutableMapOf<Pair<String, Boolean>, UriEntry>()
+
+    override fun loadPack() {
+    }
+
+    override fun onDateChanged() {
+    }
+
+    override fun getEntryForComponent(key: ComponentKey): Entry? {
+        throw NotImplementedError()
+    }
+
+    private fun getUriEntry(entry: IconPackManager.CustomIconEntry?): UriEntry? {
+        if (entry == null) return null
+        if (TextUtils.isEmpty(entry.icon)) return null
+        val key = entry.icon!! to (entry.arg == "true")
+        val uriEntry = entryCache.getOrPut(key) { UriEntry.fromSpec(context, entry.icon, entry.arg) }
+        if (!uriEntry.isAvailable) return null
+        return uriEntry
+    }
+
+    override fun getIcon(entry: IconPackManager.CustomIconEntry, iconDpi: Int): Drawable? {
+        return getUriEntry(entry)?.drawable ?: super.getIcon(entry, iconDpi)
+    }
+
+    override fun getIcon(shortcutInfo: ShortcutInfo, iconDpi: Int): Drawable? {
+        throw NotImplementedError()
+    }
+
+    override fun getIcon(shortcutInfo: ShortcutInfoCompat, iconDpi: Int): Drawable? {
+        throw NotImplementedError()
+    }
+
+    override fun getIcon(launcherActivityInfo: LauncherActivityInfo, iconDpi: Int,
+                         flattenDrawable: Boolean, customIconEntry: IconPackManager.CustomIconEntry?,
+                         iconProvider: CustomIconProvider?): Drawable? {
+        val entry = getUriEntry(customIconEntry)
+        val icon = entry?.drawable
+        if (icon != null) {
+            return if (Utilities.ATLEAST_OREO && entry.adaptive) {
+                AdaptiveIconGenerator(context, icon, null).result
+            } else icon
+        }
+        return null
+    }
+
+    override fun newIcon(icon: Bitmap, itemInfo: ItemInfoWithIcon,
+                         customIconEntry: IconPackManager.CustomIconEntry?,
+                         drawableFactory: CustomDrawableFactory): FastBitmapDrawable? {
+        return FastBitmapDrawable(icon)
+    }
+
+    override fun supportsMasking() = false
+
+    class UriEntry(private val context: Context, val uri: Uri, var adaptive: Boolean) : Entry() {
+
+        override val identifierName = uri.toString()
+        override val displayName = identifierName
+
+        val bitmap by lazy { loadBitmap() }
+
+        override fun drawableForDensity(density: Int): Drawable {
+            return BitmapDrawable(context.resources, bitmap)
+        }
+
+        override val isAvailable by lazy {
+            try {
+                bitmap
+                true
+            } catch (ignored: Throwable) {
+                false
+            }
+        }
+
+        private fun loadBitmap(): Bitmap {
+            val parcelFileDescriptor: ParcelFileDescriptor = context.contentResolver.openFileDescriptor(uri, "r")!!
+            val fileDescriptor: FileDescriptor = parcelFileDescriptor.fileDescriptor
+            val image: Bitmap = BitmapFactory.decodeFileDescriptor(fileDescriptor)
+            parcelFileDescriptor.close()
+            return image
+        }
+
+        override fun toCustomEntry(): IconPackManager.CustomIconEntry {
+            return IconPackManager.CustomIconEntry("omegaUriPack", "$uri", "$adaptive")
+        }
+
+        companion object {
+
+            fun fromSpec(context: Context, spec: String?, arg: String?): UriEntry {
+                return UriEntry(context, Uri.parse(spec), arg == "true")
+            }
+        }
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/icons/CustomDrawableFactory.kt b/Omega/src/com/saggitt/omega/icons/CustomDrawableFactory.kt
new file mode 100644
index 0000000000..37ba364887
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/icons/CustomDrawableFactory.kt
@@ -0,0 +1,56 @@
+/*
+ *  Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ *
+ */
+
+package com.saggitt.omega.icons
+
+import android.content.Context
+import android.content.pm.ActivityInfo
+import android.os.Build
+import android.os.Process
+import android.os.UserHandle
+import androidx.annotation.RequiresApi
+import com.android.launcher3.FastBitmapDrawable
+import com.android.launcher3.ItemInfoWithIcon
+import com.android.launcher3.WorkspaceItemInfo
+import com.android.launcher3.graphics.DrawableFactory
+import com.android.launcher3.icons.BitmapInfo
+import com.saggitt.omega.iconpack.IconPackManager
+import com.saggitt.omega.icons.clock.CustomClock
+import com.saggitt.omega.icons.clock.DynamicClock
+
+class CustomDrawableFactory(context: Context) : DrawableFactory() {
+    private val iconPackManager = IconPackManager.getInstance(context)
+    val customClockDrawer by lazy { CustomClock(context) }
+    private val mDynamicClockDrawer by lazy { DynamicClock(context) }
+
+    @RequiresApi(Build.VERSION_CODES.O)
+    override fun newIcon(context: Context, info: ItemInfoWithIcon): FastBitmapDrawable {
+
+        if (info.usingLowResIcon()) {
+            return super.newIcon(context, info)
+        }
+        return iconPackManager.newIcon((info as? WorkspaceItemInfo)?.customIcon ?: info.iconBitmap,
+                info, this).also { it.setIsDisabled(info.isDisabled) }
+    }
+
+    override fun newIcon(context: Context?, icon: BitmapInfo, info: ActivityInfo): FastBitmapDrawable? {
+        return if (DynamicClock.DESK_CLOCK.packageName == info.packageName &&
+                UserHandle.getUserHandleForUid(info.applicationInfo.uid) == Process.myUserHandle()) {
+            mDynamicClockDrawer.drawIcon(icon.icon)
+        } else super.newIcon(context, icon, info)
+    }
+}
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/icons/CustomIconProvider.kt b/Omega/src/com/saggitt/omega/icons/CustomIconProvider.kt
new file mode 100644
index 0000000000..6d9aed07f6
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/icons/CustomIconProvider.kt
@@ -0,0 +1,76 @@
+/*
+ *  Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ *
+ */
+
+package com.saggitt.omega.icons
+
+import android.content.Context
+import android.content.pm.LauncherActivityInfo
+import android.content.pm.ShortcutInfo
+import android.graphics.drawable.AdaptiveIconDrawable
+import android.graphics.drawable.Drawable
+import android.os.Build
+import androidx.annotation.RequiresApi
+import com.android.launcher3.AdaptiveIconCompat
+import com.android.launcher3.ItemInfo
+import com.android.launcher3.R
+import com.android.launcher3.Utilities
+import com.android.launcher3.shortcuts.ShortcutInfoCompat
+import com.saggitt.omega.iconpack.IconPackManager
+
+class CustomIconProvider(context: Context) : DynamicIconProvider(context) {
+
+    private val iconPackManager by lazy { IconPackManager.getInstance(context) }
+
+    override fun getIcon(launcherActivityInfo: LauncherActivityInfo, iconDpi: Int, flattenDrawable: Boolean): Drawable {
+        return iconPackManager.getIcon(launcherActivityInfo, iconDpi, flattenDrawable, null, this)//.assertNotAdaptiveIconDrawable(launcherActivityInfo)
+    }
+
+    fun getIcon(launcherActivityInfo: LauncherActivityInfo, itemInfo: ItemInfo, iconDpi: Int, flattenDrawable: Boolean): Drawable {
+        return iconPackManager.getIcon(launcherActivityInfo, iconDpi, flattenDrawable, itemInfo, this)//.assertNotAdaptiveIconDrawable(launcherActivityInfo)
+    }
+
+    fun getIcon(shortcutInfo: ShortcutInfoCompat, iconDpi: Int): Drawable? {
+        return iconPackManager.getIcon(shortcutInfo, iconDpi).assertNotAdaptiveIconDrawable(shortcutInfo)
+    }
+
+    fun getIcon(shortcutInfo: ShortcutInfo, iconDpi: Int): Drawable? {
+        return iconPackManager.getIcon(shortcutInfo, iconDpi).assertNotAdaptiveIconDrawable(shortcutInfo)
+    }
+
+    @RequiresApi(Build.VERSION_CODES.O)
+    fun getDynamicIcon(launcherActivityInfo: LauncherActivityInfo?, iconDpi: Int, flattenDrawable: Boolean): Drawable {
+        return super.getIcon(launcherActivityInfo, iconDpi, flattenDrawable)//.assertNotAdaptiveIconDrawable(launcherActivityInfo)
+    }
+
+    private fun <T> T.assertNotAdaptiveIconDrawable(info: Any?): T {
+        if (Utilities.ATLEAST_OREO && this is AdaptiveIconDrawable) {
+            error("unwrapped AdaptiveIconDrawable for ${
+            if (info is LauncherActivityInfo) info.applicationInfo else info
+            }")
+        }
+        return this
+    }
+
+    companion object {
+
+        @JvmStatic
+        fun getAdaptiveIconDrawableWrapper(context: Context): AdaptiveIconCompat {
+            return AdaptiveIconCompat.wrap(context.getDrawable(
+                    R.drawable.adaptive_icon_drawable_wrapper)!!.mutate()) as AdaptiveIconCompat
+        }
+    }
+}
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/icons/DynamicIconProvider.java b/Omega/src/com/saggitt/omega/icons/DynamicIconProvider.java
new file mode 100644
index 0000000000..b2c452e058
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/icons/DynamicIconProvider.java
@@ -0,0 +1,146 @@
+/*
+ *  Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ *
+ */
+
+package com.saggitt.omega.icons;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.pm.LauncherActivityInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.ShortcutInfo;
+import android.content.res.Resources;
+import android.content.res.TypedArray;
+import android.graphics.drawable.Drawable;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Process;
+import android.os.UserHandle;
+
+import androidx.annotation.RequiresApi;
+
+import com.android.launcher3.AdaptiveIconCompat;
+import com.android.launcher3.IconProvider;
+import com.android.launcher3.LauncherAppState;
+import com.android.launcher3.LauncherModel;
+import com.android.launcher3.Utilities;
+import com.android.launcher3.compat.UserManagerCompat;
+import com.android.launcher3.shortcuts.DeepShortcutManager;
+import com.saggitt.omega.icons.clock.DynamicClock;
+
+import java.util.Calendar;
+import java.util.List;
+
+import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
+import static com.saggitt.omega.icons.calendar.DynamicCalendar.GOOGLE_CALENDAR;
+
+public class DynamicIconProvider extends IconProvider {
+    private final BroadcastReceiver mDateChangeReceiver;
+    private final Context mContext;
+    private final PackageManager mPackageManager;
+    private int mDateOfMonth;
+
+    public DynamicIconProvider(Context context) {
+        mContext = context;
+        mDateChangeReceiver = new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                if (!Utilities.ATLEAST_NOUGAT) {
+                    int dateOfMonth = Calendar.getInstance().get(Calendar.DAY_OF_MONTH);
+                    if (dateOfMonth == mDateOfMonth) {
+                        return;
+                    }
+                    mDateOfMonth = dateOfMonth;
+                }
+                for (UserHandle user : UserManagerCompat.getInstance(context).getUserProfiles()) {
+                    LauncherModel model = LauncherAppState.getInstance(context).getModel();
+                    model.onPackageChanged(GOOGLE_CALENDAR, user);
+                    List<ShortcutInfo> shortcuts = DeepShortcutManager.getInstance(context).queryForPinnedShortcuts(GOOGLE_CALENDAR, user);
+                    if (!shortcuts.isEmpty()) {
+                        model.updatePinnedShortcuts(GOOGLE_CALENDAR, shortcuts, user);
+                    }
+                }
+            }
+        };
+
+        IntentFilter intentFilter = new IntentFilter(Intent.ACTION_DATE_CHANGED);
+        intentFilter.addAction(Intent.ACTION_TIME_CHANGED);
+        intentFilter.addAction(Intent.ACTION_TIMEZONE_CHANGED);
+        if (!Utilities.ATLEAST_NOUGAT) {
+            intentFilter.addAction(Intent.ACTION_TIME_TICK);
+        }
+        mContext.registerReceiver(mDateChangeReceiver, intentFilter, null, new Handler(MODEL_EXECUTOR.getLooper()));
+        mPackageManager = mContext.getPackageManager();
+    }
+
+    private int getDayOfMonth() {
+        return Calendar.getInstance().get(Calendar.DAY_OF_MONTH) - 1;
+    }
+
+    private int getDayResId(Bundle bundle, Resources resources) {
+        if (bundle != null) {
+            int dateArrayId = bundle.getInt(GOOGLE_CALENDAR + ".dynamic_icons_nexus_round", 0);
+            if (dateArrayId != 0) {
+                try {
+                    TypedArray dateIds = resources.obtainTypedArray(dateArrayId);
+                    int dateId = dateIds.getResourceId(getDayOfMonth(), 0);
+                    dateIds.recycle();
+                    return dateId;
+                } catch (Resources.NotFoundException ex) {
+                    ex.printStackTrace();
+                }
+            }
+        }
+        return 0;
+    }
+
+    private boolean isCalendar(String s) {
+        return GOOGLE_CALENDAR.equals(s);
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.O)
+    @Override
+    public Drawable getIcon(LauncherActivityInfo launcherActivityInfo, int iconDpi, boolean flattenDrawable) {
+        Drawable drawable = null;
+        String packageName = launcherActivityInfo.getApplicationInfo().packageName;
+        if (isCalendar(packageName)) {
+            try {
+                Bundle metaData = mPackageManager.getActivityInfo(launcherActivityInfo.getComponentName(), PackageManager.GET_META_DATA | PackageManager.GET_UNINSTALLED_PACKAGES).metaData;
+                Resources resourcesForApplication = mPackageManager.getResourcesForApplication(packageName);
+                int dayResId = getDayResId(metaData, resourcesForApplication);
+                if (dayResId != 0) {
+                    drawable = AdaptiveIconCompat.wrapNullable(resourcesForApplication.getDrawableForDensity(dayResId, iconDpi));
+                }
+            } catch (PackageManager.NameNotFoundException ignored) {
+            }
+        } else if (!flattenDrawable &&
+                Utilities.ATLEAST_OREO &&
+                DynamicClock.DESK_CLOCK.equals(launcherActivityInfo.getComponentName()) &&
+                Process.myUserHandle().equals(launcherActivityInfo.getUser())) {
+            drawable = DynamicClock.getClock(mContext, iconDpi);
+        }
+        return drawable == null ? super.getIcon(launcherActivityInfo, iconDpi, flattenDrawable) : drawable;
+    }
+
+    @Override
+    public String getSystemStateForPackage(String systemState, String packageName) {
+        String suffix = isCalendar(packageName) ? " " + getDayOfMonth() : "";
+        return super.getSystemStateForPackage(systemState, packageName) + suffix;
+    }
+}
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/icons/IconCustomizeFragment.java b/Omega/src/com/saggitt/omega/icons/IconCustomizeFragment.java
new file mode 100644
index 0000000000..be4728875a
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/icons/IconCustomizeFragment.java
@@ -0,0 +1,189 @@
+/*
+ * Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ */
+
+package com.saggitt.omega.icons;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Switch;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.android.launcher3.R;
+import com.android.launcher3.Utilities;
+import com.saggitt.omega.OmegaPreferences;
+import com.saggitt.omega.util.OmegaUtilsKt;
+
+import java.util.Objects;
+
+public class IconCustomizeFragment extends Fragment {
+
+    private View coloredView;
+    private View shapeLessView;
+    private View legacyView;
+    private View whiteView;
+    private View adaptiveView;
+    private OmegaPreferences prefs;
+    private boolean coloredIcons;
+    private boolean shapeLess;
+    private boolean legacy;
+    private boolean white;
+    private boolean adaptive;
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_icon_customization, container, false);
+    }
+
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        Context mContext = getActivity();
+
+        prefs = Utilities.getOmegaPrefs(mContext);
+        coloredIcons = prefs.getColorizedLegacyTreatment();
+        shapeLess = prefs.getForceShapeless();
+        legacy = prefs.getEnableLegacyTreatment();
+        white = prefs.getEnableWhiteOnlyTreatment();
+        adaptive = prefs.getAdaptifyIconPacks();
+
+        RecyclerView shapeView = view.findViewById(R.id.shape_view);
+        GridLayoutManager layoutManager = new GridLayoutManager(mContext, 4);
+        shapeView.setLayoutManager(layoutManager);
+        IconShapeAdapter adapter = new IconShapeAdapter(Objects.requireNonNull(mContext));
+        shapeView.setAdapter(adapter);
+
+        coloredView = view.findViewById(R.id.colored_icons);
+        shapeLessView = view.findViewById(R.id.shapeless_icons);
+        legacyView = view.findViewById(R.id.legacy_icons);
+        whiteView = view.findViewById(R.id.white_icons);
+        adaptiveView = view.findViewById(R.id.adaptive_icons);
+
+        setupSwitchView(shapeLessView, shapeLess);
+        setupSwitchView(legacyView, legacy);
+        setupSwitchView(whiteView, white);
+        setupSwitchView(adaptiveView, adaptive);
+        setupSwitchView(coloredView, coloredIcons);
+        hideViews();
+    }
+
+    public void onPause() {
+        super.onPause();
+    }
+
+    /*
+     * Hidde options when the android version is lower than oreo
+     * */
+    private void hideViews() {
+        if (!Utilities.ATLEAST_OREO) {
+            coloredView.setVisibility(View.GONE);
+            shapeLessView.setVisibility(View.GONE);
+            legacyView.setVisibility(View.GONE);
+            whiteView.setVisibility(View.GONE);
+            adaptiveView.setVisibility(View.GONE);
+        }
+    }
+
+    /*
+     * Sync switch view according to the preference state.
+     * */
+    private void setupSwitchView(View itemView, boolean isChecked) {
+        Switch switchView = itemView.findViewById(R.id.switchWidget);
+        OmegaUtilsKt.applyColor(switchView, prefs.getAccentColor());
+        syncSwitch(switchView, isChecked);
+        itemView.setOnClickListener(view -> performClick(view, switchView));
+    }
+
+    public void performClick(View view, Switch switchView) {
+        if (view == coloredView) {
+            coloredIcons = !coloredIcons;
+            syncSwitch(switchView, coloredIcons);
+            prefs.setColorizedLegacyTreatment(coloredIcons);
+            updateWhite(coloredIcons);
+        } else if (view == shapeLessView) {
+            shapeLess = !shapeLess;
+            syncSwitch(switchView, shapeLess);
+            prefs.setForceShapeless(shapeLess);
+        } else if (view == legacyView) {
+            legacy = !legacy;
+            syncSwitch(switchView, legacy);
+            prefs.setEnableLegacyTreatment(legacy);
+            if (!legacy) {
+                updateColoredBackground(false);
+                updateAdaptive(false);
+                updateWhite(false);
+            } else {
+                updateColoredBackground(true);
+                updateAdaptive(true);
+                updateWhite(true);
+            }
+        } else if (view == whiteView) {
+            white = !white;
+            syncSwitch(switchView, white);
+            prefs.setEnableWhiteOnlyTreatment(white);
+        } else if (view == adaptiveView) {
+            adaptive = !adaptive;
+            syncSwitch(switchView, adaptive);
+
+            prefs.setAdaptifyIconPacks(adaptive);
+        }
+    }
+
+    private void updateColoredBackground(boolean state) {
+        if (!state) {
+            coloredView.setClickable(false);
+            prefs.setColorizedLegacyTreatment(false);
+            coloredView.findViewById(R.id.switchWidget).setEnabled(false);
+        } else {
+            coloredView.setClickable(true);
+            coloredView.findViewById(R.id.switchWidget).setEnabled(true);
+        }
+    }
+
+    private void updateWhite(boolean state) {
+        if (!state) {
+            whiteView.setClickable(false);
+            prefs.setEnableWhiteOnlyTreatment(false);
+            whiteView.findViewById(R.id.switchWidget).setEnabled(false);
+        } else {
+            whiteView.setClickable(true);
+            whiteView.findViewById(R.id.switchWidget).setEnabled(true);
+        }
+    }
+
+    private void updateAdaptive(boolean state) {
+        if (!state) {
+            adaptiveView.setClickable(false);
+            prefs.setAdaptifyIconPacks(false);
+            adaptiveView.findViewById(R.id.switchWidget).setEnabled(false);
+        } else {
+            adaptiveView.setClickable(true);
+            adaptiveView.findViewById(R.id.switchWidget).setEnabled(true);
+        }
+    }
+
+    private void syncSwitch(Switch switchCompat, boolean checked) {
+        switchCompat.setChecked(checked);
+    }
+}
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/icons/IconPreference.kt b/Omega/src/com/saggitt/omega/icons/IconPreference.kt
new file mode 100644
index 0000000000..5658800cec
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/icons/IconPreference.kt
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ */
+
+package com.saggitt.omega.icons
+
+import android.content.Context
+import android.graphics.PorterDuff
+import android.util.AttributeSet
+import androidx.preference.Preference
+import com.android.launcher3.R
+import com.saggitt.omega.adaptive.IconShapeDrawable
+import com.saggitt.omega.adaptive.IconShapeManager
+import com.saggitt.omega.util.dpToPx
+import com.saggitt.omega.util.getColorAttr
+
+class IconPreference(context: Context, attrs: AttributeSet? = null) : Preference(context, attrs) {
+    private var iconShape = IconShapeManager.getInstance(context).iconShape
+    private var iconShapeString = iconShape.toString()
+    private val drawable = IconShapeDrawable(dpToPx(48f).toInt(), iconShape).apply {
+        setColorFilter(context.getColorAttr(android.R.attr.colorControlNormal), PorterDuff.Mode.SRC_IN)
+    }
+
+    init {
+        layoutResource = R.layout.pref_with_preview_icon
+        fragment = IconCustomizeFragment::class.java.name
+        updatePreview()
+    }
+
+    private fun updatePreview() {
+        try {
+            summary = iconShapeString
+            icon = drawable
+        } catch (ignored: Exception) {
+        }
+    }
+}
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/icons/IconPreview.java b/Omega/src/com/saggitt/omega/icons/IconPreview.java
new file mode 100644
index 0000000000..5d15ef00de
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/icons/IconPreview.java
@@ -0,0 +1,233 @@
+/*
+ * Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ */
+
+package com.saggitt.omega.icons;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.drawable.Drawable;
+import android.os.Process;
+import android.util.AttributeSet;
+import android.util.DisplayMetrics;
+import android.view.View;
+import android.widget.LinearLayout;
+
+import androidx.annotation.Nullable;
+
+import com.android.launcher3.AppInfo;
+import com.android.launcher3.BubbleTextView;
+import com.android.launcher3.ItemInfo;
+import com.android.launcher3.ItemInfoWithIcon;
+import com.android.launcher3.Launcher;
+import com.android.launcher3.R;
+import com.android.launcher3.Utilities;
+import com.android.launcher3.allapps.AllAppsStore;
+import com.android.launcher3.logging.StatsLogUtils.LogContainerProvider;
+import com.android.launcher3.util.ComponentKey;
+import com.android.launcher3.util.Themes;
+import com.saggitt.omega.OmegaLauncher;
+import com.saggitt.omega.OmegaPreferences;
+import com.saggitt.omega.predictions.OmegaAppPredictor;
+import com.saggitt.omega.wallpaper.WallpaperPreviewProvider;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Random;
+
+import static com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
+import static com.android.launcher3.userevent.nano.LauncherLogProto.Target;
+import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
+import static java.lang.Math.max;
+
+public class IconPreview extends LinearLayout implements LogContainerProvider,
+        OmegaPreferences.OnPreferenceChangeListener, AllAppsStore.OnUpdateListener {
+
+    private final Drawable wallpaper;
+    private final int[] viewLocation = new int[2];
+    private final Launcher mLauncher;
+    private final ArrayList<ItemInfoWithIcon> mPreviewApps = new ArrayList<>();
+    private final List<ComponentKey> mPreviewAppComponents = new ArrayList<>();
+
+    private final int mIconTextColor;
+    private final int mIconCurrentTextAlpha;
+    private final PackageManager mPackageManager;
+    private String[] prefsToWatch = {"pref_iconShape", "pref_colorizeGeneratedBackgrounds",
+            "pref_enableWhiteOnlyTreatment", "pref_enableLegacyTreatment",
+            "pref_generateAdaptiveForIconPack", "pref_forceShapeless"};
+
+    protected final OmegaPreferences prefs;
+    private Random randomGenerator;
+
+    public IconPreview(Context context) {
+        this(context, null, 0);
+    }
+
+    public IconPreview(Context context, @Nullable AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public IconPreview(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        setOrientation(LinearLayout.HORIZONTAL);
+        wallpaper = WallpaperPreviewProvider.Companion.getInstance(context).getWallpaper();
+        mIconTextColor = Themes.getAttrColor(context, android.R.attr.textColorSecondary);
+        mIconCurrentTextAlpha = Color.alpha(mIconTextColor);
+        mPackageManager = context.getPackageManager();
+        mLauncher = OmegaLauncher.getLauncher(context);
+        prefs = Utilities.getOmegaPrefs(context);
+        randomGenerator = new Random();
+    }
+
+    @Override
+    public void onAppsUpdated() {
+        removeAllViews();
+        loadPreviewComponents();
+    }
+
+    public void loadPreviewComponents() {
+        List<ComponentKey> list = new ArrayList<>();
+        String[] components = OmegaAppPredictor.Companion.getPLACE_HOLDERS();
+
+        for (String placeHolder : components) {
+            Intent intent = mPackageManager.getLaunchIntentForPackage(placeHolder);
+            if (intent != null) {
+                ComponentName componentInfo = intent.getComponent();
+                if (componentInfo != null) {
+                    list.add(new ComponentKey(componentInfo, Process.myUserHandle()));
+                }
+            }
+        }
+        mPreviewAppComponents.clear();
+        mPreviewAppComponents.addAll(list);
+
+        mPreviewApps.clear();
+        mPreviewApps.addAll(processPreviewAppComponents(mPreviewAppComponents));
+        applyPreviewIcons();
+    }
+
+    private List<ItemInfoWithIcon> processPreviewAppComponents(List<ComponentKey> components) {
+        if (getAppsStore().getApps().length < 1) {
+            // Apps have not been bound yet.
+            return Collections.emptyList();
+        }
+
+        List<ItemInfoWithIcon> previewApps = new ArrayList<>();
+        for (ComponentKey mapper : components) {
+            ItemInfoWithIcon info = getAppsStore().getApp(mapper);
+            if (info != null) {
+                previewApps.add(info);
+            }
+            if (previewApps.size() == 20) {
+                break;
+            }
+        }
+        return previewApps;
+    }
+
+    private void applyPreviewIcons() {
+        for (int i = 0; i < 5; i++) {
+            BubbleTextView icon = (BubbleTextView) mLauncher.getLayoutInflater().inflate(
+                    R.layout.all_apps_icon, this, false);
+            LayoutParams lp = (LayoutParams) icon.getLayoutParams();
+            lp.height = mLauncher.getDeviceProfile().allAppsCellHeightPx;
+            lp.width = 0;
+            lp.weight = 1;
+            addView(icon);
+        }
+
+        for (int i = 0; i < 5; i++) {
+            BubbleTextView icon = (BubbleTextView) getChildAt(i);
+            icon.reset();
+            icon.setVisibility(View.VISIBLE);
+            icon.applyFromApplicationInfo((AppInfo) mPreviewApps.get(getRandomApp()));
+            icon.setTextColor(mIconTextColor);
+        }
+        mLauncher.reapplyUi();
+    }
+
+    private int getRandomApp() {
+        return randomGenerator.nextInt(mPreviewApps.size());
+    }
+
+    @Override
+    protected void onAttachedToWindow() {
+        super.onAttachedToWindow();
+        getAppsStore().registerIconContainer(this);
+        prefs.addOnPreferenceChangeListener(this, prefsToWatch);
+    }
+
+    @Override
+    protected void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+        getAppsStore().unregisterIconContainer(this);
+        prefs.reloadIcons();
+        prefs.removeOnPreferenceChangeListener(this, prefsToWatch);
+    }
+
+    private AllAppsStore getAppsStore() {
+        return mLauncher.getAppsView().getAppsStore();
+    }
+
+    @Override
+    protected void dispatchDraw(Canvas canvas) {
+        int width = wallpaper.getIntrinsicWidth();
+        int height = wallpaper.getIntrinsicHeight();
+        if (width == 0 || height == 0) {
+            super.dispatchDraw(canvas);
+            return;
+        }
+
+        getLocationInWindow(viewLocation);
+        DisplayMetrics dm = getResources().getDisplayMetrics();
+        float scaleX = (float) dm.widthPixels / width;
+        float scaleY = (float) dm.heightPixels / height;
+        float scale = max(scaleX, scaleY);
+
+        canvas.save();
+        canvas.translate(0f, -(float) viewLocation[1]);
+        canvas.scale(scale, scale);
+        wallpaper.setBounds(0, 0, width, height);
+        wallpaper.draw(canvas);
+        canvas.restore();
+
+        super.dispatchDraw(canvas);
+    }
+
+    @Override
+    public void fillInLogContainerData(View v, ItemInfo info, Target target, Target targetParent) {
+        target.gridX = info.cellX;
+        target.gridY = info.cellY;
+        target.pageIndex = 0;
+        targetParent.containerType = ContainerType.WORKSPACE;
+        if (info.container >= 0) {
+            targetParent.containerType = ContainerType.FOLDER;
+        }
+    }
+
+    @Override
+    public void onValueChanged(@NotNull String key, @NotNull OmegaPreferences prefs, boolean force) {
+        removeAllViews();
+        MAIN_EXECUTOR.execute(this::loadPreviewComponents);
+        invalidate();
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/icons/IconShapeAdapter.kt b/Omega/src/com/saggitt/omega/icons/IconShapeAdapter.kt
new file mode 100644
index 0000000000..fa50404423
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/icons/IconShapeAdapter.kt
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ */
+
+package com.saggitt.omega.icons
+
+import android.content.Context
+import android.graphics.Color
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Button
+import android.widget.ImageView
+import androidx.recyclerview.widget.RecyclerView
+import com.android.launcher3.R
+import com.android.launcher3.Utilities
+import java.util.*
+
+class IconShapeAdapter(context: Context) : RecyclerView.Adapter<IconShapeAdapter.Holder>() {
+    private val adapterItems = ArrayList<ShapeModel>()
+    private val mContext = context
+
+    init {
+        val shapeItems = context.resources.getStringArray(R.array.icon_shape_values)
+        for (shape in shapeItems) {
+            adapterItems.add(ShapeModel(shape, Utilities.getOmegaPrefs(mContext).iconShape == shape))
+        }
+        adapterItems.removeAt(0)
+    }
+
+    override fun onBindViewHolder(holder: Holder, position: Int) {
+        holder.bind(adapterItems[position], position)
+    }
+
+    override fun getItemCount(): Int {
+        return adapterItems.count()
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): Holder {
+        return createHolder(parent, R.layout.item_icon_shape, ::Holder)
+    }
+
+    private inline fun createHolder(parent: ViewGroup, resource: Int, creator: (View) -> Holder): Holder {
+        return creator(LayoutInflater.from(parent.context).inflate(resource, parent, false))
+    }
+
+    inner class Holder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+        private val iconButton = itemView.findViewById<Button>(R.id.shape_icon)
+        private val check = itemView.findViewById<ImageView>(R.id.check_mark)
+        private var prefs = Utilities.getOmegaPrefs(mContext)
+
+        fun bind(item: ShapeModel, itemPosition: Int) {
+            val drawable = item.getIcon(mContext, item.shapeName)
+            if (prefs.iconShape == item.shapeName) {
+                drawable.setTint(prefs.accentColor)
+                item.isSelected = true
+                check.drawable.setTint(Color.WHITE)
+                check.visibility = View.VISIBLE
+            } else {
+                drawable.setTint(mContext.getColor(R.color.transparentish))
+                item.isSelected = false
+                check.visibility = View.INVISIBLE
+            }
+
+            iconButton.background = drawable
+            iconButton.setOnClickListener {
+                adapterItems.get(itemPosition).isSelected = true
+                notifyDataSetChanged()
+                prefs.iconShape = item.shapeName
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/icons/IconShapeOverride.java b/Omega/src/com/saggitt/omega/icons/IconShapeOverride.java
new file mode 100644
index 0000000000..6dc7109d8f
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/icons/IconShapeOverride.java
@@ -0,0 +1,156 @@
+/*
+ *  Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ *
+ */
+
+package com.saggitt.omega.icons;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.content.res.Resources;
+import android.os.Build;
+import android.text.TextUtils;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+
+import com.android.launcher3.Utilities;
+
+import java.lang.reflect.Field;
+import java.util.Arrays;
+
+import static com.android.launcher3.Utilities.getDevicePrefs;
+import static com.android.launcher3.Utilities.getPrefs;
+
+/**
+ * Utility class to override shape of {@link android.graphics.drawable.AdaptiveIconDrawable}.
+ */
+@TargetApi(Build.VERSION_CODES.O)
+public class IconShapeOverride {
+
+    public static final String KEY_PREFERENCE = "pref_override_icon_shape";
+    private static final String TAG = "IconShapeOverride";
+
+    public static boolean isSupported() {
+        if (!Utilities.ATLEAST_OREO) {
+            return false;
+        }
+
+        try {
+            if (getSystemResField().get(null) != Resources.getSystem()) {
+                // Our assumption that mSystem is the system resource is not true.
+                return false;
+            }
+        } catch (Exception e) {
+            // Ignore, not supported
+            return false;
+        }
+
+        return getConfigResId() != 0;
+    }
+
+    public static void apply(Context context) {
+        if (!Utilities.ATLEAST_OREO) {
+            return;
+        }
+        String path = getAppliedValue(context);
+        if (TextUtils.isEmpty(path)) {
+            return;
+        }
+        if (!isSupported()) {
+            return;
+        }
+
+        // magic
+        try {
+            ResourcesOverride override =
+                    new ResourcesOverride(Resources.getSystem(), getConfigResId(), path);
+            getSystemResField().set(null, override);
+            int masks = getOverrideMasksResId();
+            if (masks != 0) {
+                override.setArrayOverrideId(masks);
+            }
+        } catch (Exception e) {
+            Log.e(TAG, "Unable to override icon shape", e);
+            // revert value.
+            getPrefs(context).edit().remove(KEY_PREFERENCE).apply();
+        }
+    }
+
+    private static Field getSystemResField() throws Exception {
+        Field staticField = Resources.class.getDeclaredField("mSystem");
+        staticField.setAccessible(true);
+        return staticField;
+    }
+
+    private static int getConfigResId() {
+        return Resources.getSystem().getIdentifier("config_icon_mask", "string", "android");
+    }
+
+    private static int getOverrideMasksResId() {
+        return Resources.getSystem().getIdentifier("system_icon_masks", "array", "android");
+    }
+
+    public static String getAppliedValue(Context context) {
+        String devValue = getDevicePrefs(context).getString(KEY_PREFERENCE, "");
+        if (!TextUtils.isEmpty(devValue)) {
+            // Migrate to general preferences to back up shape overrides
+            getPrefs(context).edit().putString(KEY_PREFERENCE, devValue).apply();
+            getDevicePrefs(context).edit().remove(KEY_PREFERENCE).apply();
+        }
+
+        return getPrefs(context).getString(KEY_PREFERENCE, "");
+    }
+
+    private static class ResourcesOverride extends Resources {
+
+        private final int mOverrideId;
+        private final String mOverrideValue;
+        private int mArrayOverrideId = 0;
+
+        @SuppressWarnings("deprecation")
+        public ResourcesOverride(Resources parent, int overrideId, String overrideValue) {
+            super(parent.getAssets(), parent.getDisplayMetrics(), parent.getConfiguration());
+            mOverrideId = overrideId;
+            mOverrideValue = overrideValue;
+        }
+
+        @NonNull
+        @Override
+        public String getString(int id) throws NotFoundException {
+            if (id == mOverrideId) {
+                return mOverrideValue;
+            }
+            return super.getString(id);
+        }
+
+        void setArrayOverrideId(int id) {
+            mArrayOverrideId = id;
+        }
+
+        // I do admit that this is one hell of a hack
+        @NonNull
+        @Override
+        public String[] getStringArray(int id) throws NotFoundException {
+            if (id != 0 && id == mArrayOverrideId) {
+                int size = super.getStringArray(id).length;
+                String[] arr = new String[size];
+                Arrays.fill(arr, mOverrideValue);
+                return arr;
+            }
+            return super.getStringArray(id);
+        }
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/icons/ShapeModel.java b/Omega/src/com/saggitt/omega/icons/ShapeModel.java
new file mode 100644
index 0000000000..b86d8b7fd8
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/icons/ShapeModel.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ */
+
+package com.saggitt.omega.icons;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+
+import com.android.launcher3.R;
+
+public class ShapeModel {
+
+    private final String shapeName;
+    private boolean isSelected;
+
+    public ShapeModel(String shape, boolean selected) {
+        this.shapeName = shape;
+        this.isSelected = selected;
+    }
+
+    public String getShapeName() {
+        return shapeName;
+    }
+
+    public boolean getIsSelected() {
+        return isSelected;
+    }
+
+    public void setIsSelected(boolean selected) {
+        this.isSelected = selected;
+    }
+
+    @SuppressLint("UseCompatLoadingForDrawables")
+    public Drawable getIcon(Context context, String shapeName) {
+        Drawable drawable = context.getResources().getDrawable(R.drawable.shape_circle, null);
+        switch (shapeName) {
+            case "circle":
+                drawable = context.getDrawable(R.drawable.shape_circle);
+                break;
+            case "square":
+                drawable = context.getDrawable(R.drawable.shape_square);
+                break;
+            case "roundedSquare":
+                drawable = context.getDrawable(R.drawable.shape_rounded);
+                break;
+            case "squircle":
+                drawable = context.getDrawable(R.drawable.shape_squircle);
+                break;
+            case "teardrop":
+                drawable = context.getDrawable(R.drawable.shape_teardrop);
+                break;
+            case "cylinder":
+                drawable = context.getDrawable(R.drawable.shape_cylinder);
+                break;
+        }
+        return drawable;
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/icons/calendar/DynamicCalendar.java b/Omega/src/com/saggitt/omega/icons/calendar/DynamicCalendar.java
index 318b61d462..8917b2d6da 100644
--- a/Omega/src/com/saggitt/omega/icons/calendar/DynamicCalendar.java
+++ b/Omega/src/com/saggitt/omega/icons/calendar/DynamicCalendar.java
@@ -11,7 +11,7 @@
 import java.util.Calendar;
 
 public class DynamicCalendar {
-    public static final String CALENDAR = "com.google.android.calendar";
+    public static final String GOOGLE_CALENDAR = "com.google.android.calendar";
 
     public static Drawable load(Context context, ComponentName component, int iconDpi) {
         try {
@@ -19,7 +19,7 @@ public static Drawable load(Context context, ComponentName component, int iconDp
             Bundle metaData = pm.getActivityInfo(component,
                     PackageManager.GET_META_DATA | PackageManager.GET_UNINSTALLED_PACKAGES).metaData;
 
-            Resources resourcesForApplication = pm.getResourcesForApplication(DynamicCalendar.CALENDAR);
+            Resources resourcesForApplication = pm.getResourcesForApplication(GOOGLE_CALENDAR);
             int dayResId = DynamicCalendar.getDayResId(metaData, resourcesForApplication);
             if (dayResId != 0) {
                 return resourcesForApplication.getDrawableForDensity(dayResId, iconDpi);
@@ -31,7 +31,7 @@ public static Drawable load(Context context, ComponentName component, int iconDp
 
     public static int getDayResId(Bundle bundle, Resources resources) {
         if (bundle != null) {
-            int dateArrayId = bundle.getInt(CALENDAR + ".dynamic_icons_nexus_round", 0);
+            int dateArrayId = bundle.getInt(GOOGLE_CALENDAR + ".dynamic_icons_nexus_round", 0);
             if (dateArrayId != 0) {
                 try {
                     TypedArray dateIds = resources.obtainTypedArray(dateArrayId);
diff --git a/Omega/src/com/saggitt/omega/icons/clock/AutoUpdateClock.java b/Omega/src/com/saggitt/omega/icons/clock/AutoUpdateClock.java
index 560a521692..4c98551cd3 100644
--- a/Omega/src/com/saggitt/omega/icons/clock/AutoUpdateClock.java
+++ b/Omega/src/com/saggitt/omega/icons/clock/AutoUpdateClock.java
@@ -1,20 +1,20 @@
 package com.saggitt.omega.icons.clock;
 
+import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Rect;
 import android.os.SystemClock;
 
 import com.android.launcher3.FastBitmapDrawable;
-import com.android.launcher3.ItemInfoWithIcon;
 import com.android.launcher3.Utilities;
 
 import java.util.TimeZone;
 
-class AutoUpdateClock extends FastBitmapDrawable implements Runnable {
+public class AutoUpdateClock extends FastBitmapDrawable implements Runnable {
     private ClockLayers mLayers;
 
-    AutoUpdateClock(ItemInfoWithIcon info, ClockLayers layers) {
-        super(info);
+    AutoUpdateClock(Bitmap bitmap, ClockLayers layers) {
+        super(bitmap);
         mLayers = layers;
     }
 
diff --git a/Omega/src/com/saggitt/omega/icons/clock/ClockLayers.java b/Omega/src/com/saggitt/omega/icons/clock/ClockLayers.java
index dbf20c5da6..ffdad399ad 100644
--- a/Omega/src/com/saggitt/omega/icons/clock/ClockLayers.java
+++ b/Omega/src/com/saggitt/omega/icons/clock/ClockLayers.java
@@ -79,4 +79,5 @@ boolean updateAngles() {
     void setTimeZone(TimeZone timeZone) {
         mCurrentTime.setTimeZone(timeZone);
     }
+
 }
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/icons/clock/CustomClock.java b/Omega/src/com/saggitt/omega/icons/clock/CustomClock.java
index 81c8773370..636262ff02 100644
--- a/Omega/src/com/saggitt/omega/icons/clock/CustomClock.java
+++ b/Omega/src/com/saggitt/omega/icons/clock/CustomClock.java
@@ -43,11 +43,8 @@ public void onReceive(Context context, Intent intent) {
 
     public static Drawable getClock(Context context, Drawable drawable, Metadata metadata) {
         ClockLayers clone = getClockLayers(context, drawable, metadata, false).clone();
-        if (clone != null) {
-            clone.updateAngles();
-            return clone.mDrawable;
-        }
-        return null;
+        clone.updateAngles();
+        return clone.mDrawable;
     }
 
     private static ClockLayers getClockLayers(Context context, Drawable drawableForDensity,
@@ -95,7 +92,7 @@ private static ClockLayers getClockLayers(Context context, Drawable drawableForD
 
     public FastBitmapDrawable drawIcon(ItemInfoWithIcon info, Drawable drawableForDensity,
                                        Metadata metadata) {
-        final AutoUpdateClock updater = new AutoUpdateClock(info,
+        final AutoUpdateClock updater = new AutoUpdateClock(info.iconBitmap,
                 getClockLayers(mContext, drawableForDensity, metadata, true).clone()
         );
         mUpdaters.add(updater);
diff --git a/Omega/src/com/saggitt/omega/icons/clock/DynamicClock.java b/Omega/src/com/saggitt/omega/icons/clock/DynamicClock.java
index 3864c952de..daa4d78673 100644
--- a/Omega/src/com/saggitt/omega/icons/clock/DynamicClock.java
+++ b/Omega/src/com/saggitt/omega/icons/clock/DynamicClock.java
@@ -8,6 +8,7 @@
 import android.content.IntentFilter;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
+import android.graphics.Bitmap;
 import android.graphics.drawable.AdaptiveIconDrawable;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.LayerDrawable;
@@ -17,7 +18,6 @@
 import android.os.Looper;
 import android.os.Process;
 
-import com.android.launcher3.ItemInfoWithIcon;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.icons.LauncherIcons;
 import com.android.launcher3.util.Preconditions;
@@ -137,8 +137,7 @@ private void loadTimeZone(String timeZoneId) {
 
     private void updateMainThread() {
         MAIN_EXECUTOR.execute(() -> updateWrapper(getClockLayers(mContext,
-                LauncherAppState.getIDP(mContext).fillResIconDpi,
-                true)));
+                LauncherAppState.getIDP(mContext).fillResIconDpi, true)));
     }
 
     private void updateWrapper(ClockLayers wrapper) {
@@ -148,12 +147,13 @@ private void updateWrapper(ClockLayers wrapper) {
         }
     }
 
-    public AutoUpdateClock drawIcon(ItemInfoWithIcon info) {
-        final AutoUpdateClock updater = new AutoUpdateClock(info, mLayers.clone());
+    public AutoUpdateClock drawIcon(Bitmap bitmap) {
+        final AutoUpdateClock updater = new AutoUpdateClock(bitmap, mLayers.clone());
         mUpdaters.add(updater);
         return updater;
     }
 
+
     @Override
     public void onReceive(Context context, Intent intent) {
         updateMainThread();
diff --git a/Omega/src/com/saggitt/omega/model/HomeWidgetMigrationTask.java b/Omega/src/com/saggitt/omega/model/HomeWidgetMigrationTask.java
new file mode 100644
index 0000000000..82c67a8131
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/model/HomeWidgetMigrationTask.java
@@ -0,0 +1,156 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.model;
+
+import android.annotation.SuppressLint;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.database.sqlite.SQLiteDatabase;
+import android.graphics.Point;
+import android.util.Log;
+
+import com.android.launcher3.InvariantDeviceProfile;
+import com.android.launcher3.LauncherAppState;
+import com.android.launcher3.LauncherAppWidgetProviderInfo;
+import com.android.launcher3.Utilities;
+import com.android.launcher3.Workspace;
+import com.android.launcher3.model.GridSizeMigrationTask;
+import com.android.launcher3.util.GridOccupancy;
+import com.android.launcher3.util.IntArray;
+import com.android.launcher3.widget.custom.CustomWidgetParser;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+
+import static com.android.launcher3.LauncherSettings.Favorites;
+import static com.android.launcher3.LauncherSettings.Settings;
+import static com.android.launcher3.provider.LauncherDbUtils.SQLiteTransaction;
+import static com.saggitt.omega.settings.SettingsActivity.ALLOW_OVERLAP_PREF;
+import static com.saggitt.omega.settings.SettingsActivity.SMARTSPACE_PREF;
+
+public class HomeWidgetMigrationTask extends GridSizeMigrationTask {
+
+    private static final String TAG = "HomeWidgetMigrationTask";
+
+    public static final String PREF_MIGRATION_STATUS = "pref_migratedSmartspace";
+
+    private final Context mContext;
+    private final int mTrgX, mTrgY;
+
+    private HomeWidgetMigrationTask(Context context,
+                                    SQLiteDatabase db,
+                                    HashSet<String> validPackages,
+                                    Point size) {
+        super(context, db, validPackages, size, size);
+
+        mContext = context;
+
+        mTrgX = size.x;
+        mTrgY = size.y;
+    }
+
+    @Override
+    protected boolean migrateWorkspace() throws Exception {
+        IntArray allScreens = getWorkspaceScreenIds(mDb);
+        if (allScreens.isEmpty()) {
+            throw new Exception("Unable to get workspace screens");
+        }
+
+        boolean allowOverlap = Utilities.getPrefs(mContext)
+                .getBoolean(ALLOW_OVERLAP_PREF, false);
+        GridOccupancy occupied = new GridOccupancy(mTrgX, mTrgY);
+
+        if (!allowOverlap) {
+            ArrayList<DbEntry> firstScreenItems = new ArrayList<>();
+            for (int i = 0; i < allScreens.size(); i++) {
+                int screenId = allScreens.get(i);
+                ArrayList<DbEntry> items = loadWorkspaceEntries(screenId);
+                if (screenId == Workspace.FIRST_SCREEN_ID) {
+                    firstScreenItems.addAll(items);
+                    break;
+                }
+            }
+
+            for (DbEntry item : firstScreenItems) {
+                occupied.markCells(item, true);
+            }
+        }
+
+        if (allowOverlap || occupied.isRegionVacant(0, 0, mTrgX, 1)) {
+            List<LauncherAppWidgetProviderInfo> customWidgets =
+                    CustomWidgetParser.getCustomWidgets(mContext);
+            if (!customWidgets.isEmpty()) {
+                LauncherAppWidgetProviderInfo provider = customWidgets.get(0);
+                int widgetId = CustomWidgetParser
+                        .getWidgetIdForCustomProvider(mContext, provider.provider);
+                long itemId = Settings.call(mContext.getContentResolver(),
+                        Settings.METHOD_NEW_ITEM_ID)
+                        .getLong(Settings.EXTRA_VALUE);
+
+                ContentValues values = new ContentValues();
+                values.put(Favorites._ID, itemId);
+                values.put(Favorites.CONTAINER, Favorites.CONTAINER_DESKTOP);
+                values.put(Favorites.SCREEN, Workspace.FIRST_SCREEN_ID);
+                values.put(Favorites.CELLX, 0);
+                values.put(Favorites.CELLY, 0);
+                values.put(Favorites.SPANX, mTrgX);
+                values.put(Favorites.SPANY, 1);
+                values.put(Favorites.ITEM_TYPE, Favorites.ITEM_TYPE_CUSTOM_APPWIDGET);
+                values.put(Favorites.APPWIDGET_ID, widgetId);
+                values.put(Favorites.APPWIDGET_PROVIDER, provider.provider.flattenToString());
+                mDb.insert(Favorites.TABLE_NAME, null, values);
+            }
+        }
+
+        return true;
+    }
+
+    @SuppressLint("ApplySharedPref")
+    public static void migrateIfNeeded(Context context) {
+        SharedPreferences prefs = Utilities.getPrefs(context);
+
+        boolean needsMigration = !prefs.getBoolean(PREF_MIGRATION_STATUS, false)
+                && prefs.getBoolean(SMARTSPACE_PREF, false);
+        if (!needsMigration) return;
+        // Save the pref so we only run migration once
+        prefs.edit().putBoolean(PREF_MIGRATION_STATUS, true).commit();
+
+        HashSet<String> validPackages = getValidPackages(context);
+
+        InvariantDeviceProfile idp = LauncherAppState.getIDP(context);
+        Point size = new Point(idp.numColumns, idp.numRows);
+
+        long migrationStartTime = System.currentTimeMillis();
+        try (SQLiteTransaction transaction = (SQLiteTransaction) Settings.call(
+                context.getContentResolver(), Settings.METHOD_NEW_TRANSACTION)
+                .getBinder(Settings.EXTRA_VALUE)) {
+            if (!new HomeWidgetMigrationTask(context, transaction.getDb(),
+                    validPackages, size).migrateWorkspace()) {
+                throw new RuntimeException("Failed to migrate Smartspace");
+            }
+        } catch (Exception e) {
+            Log.e(TAG, "Error during grid migration", e);
+        } finally {
+            Log.v(TAG, "Home widget migration completed in "
+                    + (System.currentTimeMillis() - migrationStartTime));
+        }
+    }
+}
+
diff --git a/Omega/src/com/saggitt/omega/override/AppInfoProvider.kt b/Omega/src/com/saggitt/omega/override/AppInfoProvider.kt
new file mode 100644
index 0000000000..8f268c5af0
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/override/AppInfoProvider.kt
@@ -0,0 +1,92 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.override
+
+import android.content.Context
+import android.content.pm.LauncherActivityInfo
+import com.android.launcher3.AppInfo
+import com.android.launcher3.LauncherAppState
+import com.android.launcher3.compat.LauncherAppsCompat
+import com.android.launcher3.util.ComponentKey
+import com.saggitt.omega.iconpack.IconPackManager
+import com.saggitt.omega.util.SingletonHolder
+import com.saggitt.omega.util.ensureOnMainThread
+import com.saggitt.omega.util.omegaPrefs
+import com.saggitt.omega.util.useApplicationContext
+
+class AppInfoProvider private constructor(context: Context) : CustomInfoProvider<AppInfo>(context) {
+
+    private val prefs = context.omegaPrefs
+    private val launcherApps by lazy { LauncherAppsCompat.getInstance(context) }
+
+    override fun getTitle(info: AppInfo): String {
+        return prefs.customAppName[info.toComponentKey()] ?: info.title.toString()
+    }
+
+    override fun getDefaultTitle(info: AppInfo): String {
+        val app = getLauncherActivityInfo(info)
+        return app?.label?.toString() ?: "" // TODO: can this really be null?
+    }
+
+    override fun getCustomTitle(info: AppInfo): String? {
+        return prefs.customAppName[ComponentKey(info.componentName, info.user)]
+    }
+
+    fun getTitle(app: LauncherActivityInfo): CharSequence {
+        return prefs.customAppName[getComponentKey(app)] ?: app.label
+    }
+
+    override fun setTitle(info: AppInfo, title: String?) {
+        setTitle(info.toComponentKey(), title)
+    }
+
+    fun setTitle(key: ComponentKey, title: String?) {
+        prefs.customAppName[key] = title
+        LauncherAppState.getInstance(context).iconCache.updateIconsForPkg(key.componentName.packageName, key.user)
+    }
+
+    override fun setIcon(info: AppInfo, entry: IconPackManager.CustomIconEntry?) {
+        setIcon(info.toComponentKey(), entry)
+    }
+
+    fun setIcon(key: ComponentKey, entry: IconPackManager.CustomIconEntry?) {
+        prefs.customAppIcon[key] = entry
+        LauncherAppState.getInstance(context).iconCache.updateIconsForPkg(key.componentName.packageName, key.user)
+    }
+
+    private fun getLauncherActivityInfo(info: AppInfo): LauncherActivityInfo? {
+        return launcherApps.resolveActivity(info.getIntent(), info.user)
+    }
+
+    fun getCustomIconEntry(app: LauncherActivityInfo): IconPackManager.CustomIconEntry? {
+        return getCustomIconEntry(getComponentKey(app))
+    }
+
+    fun getCustomIconEntry(key: ComponentKey): IconPackManager.CustomIconEntry? {
+        return prefs.customAppIcon[key]
+    }
+
+    override fun getIcon(info: AppInfo): IconPackManager.CustomIconEntry? {
+        return getCustomIconEntry(info.toComponentKey())
+    }
+
+    private fun getComponentKey(app: LauncherActivityInfo) = ComponentKey(app.componentName, app.user)
+
+    companion object : SingletonHolder<AppInfoProvider, Context>(ensureOnMainThread(
+            useApplicationContext(::AppInfoProvider)))
+}
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/override/CustomInfoProvider.kt b/Omega/src/com/saggitt/omega/override/CustomInfoProvider.kt
new file mode 100644
index 0000000000..0c6516f5d7
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/override/CustomInfoProvider.kt
@@ -0,0 +1,72 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.override
+
+import android.content.Context
+import com.android.launcher3.AppInfo
+import com.android.launcher3.FolderInfo
+import com.android.launcher3.ItemInfo
+import com.android.launcher3.WorkspaceItemInfo
+import com.saggitt.omega.iconpack.IconPackManager
+
+abstract class CustomInfoProvider<in T : ItemInfo>(val context: Context) {
+
+    abstract fun getTitle(info: T): String
+
+    abstract fun getDefaultTitle(info: T): String
+
+    abstract fun getCustomTitle(info: T): String?
+
+    abstract fun setTitle(info: T, title: String?)
+
+    open fun supportsIcon() = true
+
+    abstract fun setIcon(info: T, entry: IconPackManager.CustomIconEntry?)
+
+    abstract fun getIcon(info: T): IconPackManager.CustomIconEntry?
+
+    open fun supportsSwipeUp(info: T) = false
+
+    open fun setSwipeUpAction(info: T, action: String?) {
+        TODO("not implemented")
+    }
+
+    open fun getSwipeUpAction(info: T): String? {
+        TODO("not implemented")
+    }
+
+    open fun supportsBadgeVisible(info: T) = false
+
+    companion object {
+
+        @Suppress("UNCHECKED_CAST")
+        fun <T : ItemInfo> forItem(context: Context, info: ItemInfo?): CustomInfoProvider<T>? {
+            return when (info) {
+                is AppInfo -> AppInfoProvider.getInstance(context)
+                is WorkspaceItemInfo -> ShortcutInfoProvider.getInstance(context)
+                is FolderInfo -> FolderInfoProvider.getInstance(context)
+                else -> null
+            } as CustomInfoProvider<T>?
+        }
+
+        fun isEditable(info: ItemInfo): Boolean {
+            return info is AppInfo || (info is WorkspaceItemInfo && !info.hasPromiseIconUi())
+                    || info is FolderInfo
+        }
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/override/FolderInfoProvider.kt b/Omega/src/com/saggitt/omega/override/FolderInfoProvider.kt
new file mode 100644
index 0000000000..4710e09d7e
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/override/FolderInfoProvider.kt
@@ -0,0 +1,73 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.override
+
+import android.content.Context
+import com.android.launcher3.FolderInfo
+import com.android.launcher3.ItemInfo
+import com.android.launcher3.R
+import com.saggitt.omega.iconpack.IconPackManager
+import com.saggitt.omega.util.SingletonHolder
+import com.saggitt.omega.util.ensureOnMainThread
+import com.saggitt.omega.util.omegaPrefs
+import com.saggitt.omega.util.useApplicationContext
+
+class FolderInfoProvider(context: Context) : CustomInfoProvider<FolderInfo>(context) {
+
+    private val prefs = context.omegaPrefs
+
+    override fun getTitle(info: FolderInfo): String {
+        return info.title.toString()
+    }
+
+    override fun getDefaultTitle(info: FolderInfo): String {
+        return context.getString(R.string.folder_hint_text)
+    }
+
+    override fun getCustomTitle(info: FolderInfo): String? {
+        return info.title.toString()
+    }
+
+    override fun setTitle(info: FolderInfo, title: String?) {
+        info.setTitle(title ?: "")
+    }
+
+    override fun setIcon(info: FolderInfo, entry: IconPackManager.CustomIconEntry?) {
+        prefs.customAppIcon[info.toComponentKey()] = entry
+        info.onIconChanged()
+    }
+
+    override fun getIcon(info: FolderInfo): IconPackManager.CustomIconEntry? {
+        return prefs.customAppIcon[info.toComponentKey()]
+    }
+
+    override fun supportsSwipeUp(info: FolderInfo) = info.container != ItemInfo.NO_ID
+
+    override fun supportsIcon() = true
+
+    override fun setSwipeUpAction(info: FolderInfo, action: String?) {
+        info.setSwipeUpAction(context, action)
+    }
+
+    override fun getSwipeUpAction(info: FolderInfo): String? {
+        return info.swipeUpAction
+    }
+
+    companion object : SingletonHolder<FolderInfoProvider, Context>(ensureOnMainThread(
+            useApplicationContext(::FolderInfoProvider)))
+}
diff --git a/Omega/src/com/saggitt/omega/override/ShortcutInfoProvider.kt b/Omega/src/com/saggitt/omega/override/ShortcutInfoProvider.kt
new file mode 100644
index 0000000000..47f23a10c4
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/override/ShortcutInfoProvider.kt
@@ -0,0 +1,95 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.override
+
+import android.content.Context
+import android.content.pm.LauncherActivityInfo
+import android.os.Build
+import com.android.launcher3.LauncherAppState
+import com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT
+import com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT
+import com.android.launcher3.Utilities
+import com.android.launcher3.WorkspaceItemInfo
+import com.android.launcher3.compat.LauncherAppsCompat
+import com.android.launcher3.icons.LauncherIcons
+import com.saggitt.omega.iconpack.IconPackManager
+import com.saggitt.omega.util.SingletonHolder
+import com.saggitt.omega.util.ensureOnMainThread
+import com.saggitt.omega.util.useApplicationContext
+
+class ShortcutInfoProvider private constructor(context: Context) : CustomInfoProvider<WorkspaceItemInfo>(context) {
+
+    private val launcherApps by lazy { LauncherAppsCompat.getInstance(context) }
+
+    override fun getTitle(info: WorkspaceItemInfo): String {
+        return (info.customTitle ?: info.title).toString()
+    }
+
+    override fun getDefaultTitle(info: WorkspaceItemInfo): String {
+        return info.title.toString()
+    }
+
+    override fun getCustomTitle(info: WorkspaceItemInfo): String? {
+        return info.customTitle?.toString()
+    }
+
+    override fun setTitle(info: WorkspaceItemInfo, title: String?) {
+        info.setTitle(context, title)
+    }
+
+    override fun setIcon(info: WorkspaceItemInfo, entry: IconPackManager.CustomIconEntry?) {
+        info.setIconEntry(context, entry)
+        if (entry != null) {
+            val launcherActivityInfo = getLauncherActivityInfo(info)
+            val iconCache = LauncherAppState.getInstance(context).iconCache
+            val drawable = iconCache.getFullResIcon(launcherActivityInfo, false)
+            val bitmap = LauncherIcons.obtain(context).createBadgedIconBitmap(drawable, info.user, Build.VERSION_CODES.O_MR1)
+            info.setIcon(context, bitmap.icon)
+        } else {
+            info.setIcon(context, null)
+        }
+    }
+
+    override fun getIcon(info: WorkspaceItemInfo): IconPackManager.CustomIconEntry? {
+        return info.customIconEntry
+    }
+
+    override fun supportsSwipeUp(info: WorkspaceItemInfo) = true
+
+    override fun setSwipeUpAction(info: WorkspaceItemInfo, action: String?) {
+        info.setSwipeUpAction(context, action)
+    }
+
+    override fun getSwipeUpAction(info: WorkspaceItemInfo): String? {
+        return info.swipeUpAction
+    }
+
+    override fun supportsBadgeVisible(info: WorkspaceItemInfo) = when (info.itemType) {
+        ITEM_TYPE_SHORTCUT, ITEM_TYPE_DEEP_SHORTCUT -> {
+            Utilities.getOmegaPrefs(context).notificationCount
+        }
+        else -> false
+    }
+
+    private fun getLauncherActivityInfo(info: WorkspaceItemInfo): LauncherActivityInfo? {
+        return launcherApps.resolveActivity(info.getIntent(), info.user)
+    }
+
+    companion object : SingletonHolder<ShortcutInfoProvider, Context>(ensureOnMainThread(
+            useApplicationContext(::ShortcutInfoProvider)))
+}
diff --git a/Omega/src/com/saggitt/omega/perms/CustomPermissionManager.kt b/Omega/src/com/saggitt/omega/perms/CustomPermissionManager.kt
new file mode 100644
index 0000000000..9b6b9b8c48
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/perms/CustomPermissionManager.kt
@@ -0,0 +1,79 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.perms
+
+import android.content.Context
+import androidx.annotation.StringRes
+import com.android.launcher3.R
+import com.saggitt.omega.util.OmegaSingletonHolder
+import com.saggitt.omega.util.omegaPrefs
+
+class CustomPermissionManager private constructor(private val context: Context) {
+    private var grantedPerms by context.omegaPrefs.StringSetPref("pref_grantedCustomPerms", emptySet())
+    private var deniedPerms by context.omegaPrefs.StringSetPref("pref_deniedCustomPerms", emptySet())
+
+    fun checkPermission(permission: String) = grantedPerms.contains(permission)
+
+    fun checkOrRequestPermission(permission: String, @StringRes explanation: Int?, callback: (allowed: Boolean) -> Unit) {
+        deniedPerms.forEach {
+            //it.d()
+        }
+        if (!DEBUG_PROMPT_ALWAYS) {
+            if (deniedPerms.contains(permission)) {
+                callback(false)
+                return
+            } else if (checkPermission(permission)) {
+                callback(true)
+                return
+            }
+        }
+        val uiValues = MAP[permission]!!
+        CustomPermissionRequestDialog
+                .create(context, uiValues.first, uiValues.second, explanation)
+                .onResult { allowed ->
+                    if (allowed) {
+                        grantedPerms = grantedPerms + permission
+                    } else {
+                        deniedPerms = deniedPerms + permission
+                    }
+                }
+                .onResult(callback)
+                .show()
+    }
+
+    // todo: add ui to allow resetting permissions
+    fun resetPermission(permission: String) {
+        grantedPerms = grantedPerms - permission
+        deniedPerms = deniedPerms - permission
+    }
+
+    companion object : OmegaSingletonHolder<CustomPermissionManager>(::CustomPermissionManager) {
+        /**
+         * Allows access to coarse, network based location
+         */
+        const val PERMISSION_IPLOCATE = "PERMISSION_IPLOCATE"
+
+        private val MAP = mapOf(
+                PERMISSION_IPLOCATE to Pair(R.string.permission_iplocate, R.drawable.ic_location)
+        )
+
+        private const val DEBUG_PROMPT_ALWAYS = false
+    }
+}
+
+fun Context.checkCustomPermission(permission: String) = CustomPermissionManager.getInstance(this).checkPermission(permission)
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/perms/CustomPermissionRequestDialog.kt b/Omega/src/com/saggitt/omega/perms/CustomPermissionRequestDialog.kt
new file mode 100644
index 0000000000..5ee30a2a42
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/perms/CustomPermissionRequestDialog.kt
@@ -0,0 +1,95 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.perms
+
+import android.content.Context
+import android.view.View
+import android.widget.FrameLayout
+import androidx.annotation.DrawableRes
+import androidx.annotation.StringRes
+import androidx.appcompat.app.AlertDialog
+import com.android.launcher3.R
+import com.saggitt.omega.omegaApp
+import com.saggitt.omega.theme.ThemeOverride
+import com.saggitt.omega.theme.ThemedContextProvider
+import com.saggitt.omega.util.applyAccent
+import com.saggitt.omega.util.getColorAccent
+import com.saggitt.omega.util.isVisible
+import com.saggitt.omega.util.tintDrawable
+import kotlinx.android.synthetic.omega.perm_request_dialog.view.*
+
+class CustomPermissionRequestDialog private constructor(private val context: Context, private val string: Int, private val icon: Int, private val explanation: Int?) {
+    private val key = Pair(string, icon)
+    private val listeners = mutableSetOf<(Boolean) -> Unit>()
+
+    fun onResult(listener: (allowed: Boolean) -> Unit): CustomPermissionRequestDialog {
+        listeners.add(listener)
+        return this
+    }
+
+    fun show() {
+        if (SHOWING.containsKey(key)) {
+            SHOWING[key]?.let {
+                it.listeners.addAll(listeners)
+            }
+            return
+        }
+        SHOWING[key] = this
+        val themedContext = ThemedContextProvider(context.omegaApp.activityHandler.foregroundActivity
+                ?: context, null, ThemeOverride.Settings()).get()
+        AlertDialog.Builder(themedContext, ThemeOverride.AlertDialog().getTheme(context))
+                .setView(DialogView(context, string, icon, explanation))
+                .setIcon(icon)
+                .setPositiveButton(context.getString(R.string.allow).toUpperCase(), { _, _ ->
+                    SHOWING.remove(key)
+                    listeners.forEach { it(true) }
+                })
+                .setNegativeButton(context.getString(R.string.deny).toUpperCase(), { _, _ ->
+                    SHOWING.remove(key)
+                    listeners.forEach { it(false) }
+                })
+                .setOnDismissListener {
+                    SHOWING.remove(key)
+                }
+                .create()
+                .apply {
+                    applyAccent()
+                    show()
+                }
+    }
+
+    companion object {
+        fun create(context: Context, @StringRes string: Int, @DrawableRes icon: Int, explanation: Int?) = CustomPermissionRequestDialog(context, string, icon, explanation)
+
+        private val SHOWING = mutableMapOf<Pair<Int, Int>, CustomPermissionRequestDialog>()
+    }
+
+    inner class DialogView(context: Context, @StringRes private val string: Int, @DrawableRes private val icn: Int, @StringRes private val explanation: Int?) : FrameLayout(context) {
+        override fun onAttachedToWindow() {
+            super.onAttachedToWindow()
+            View.inflate(context, R.layout.perm_request_dialog, this)
+            message.setText(string)
+            icon.setImageResource(icn)
+            icon.tintDrawable(context.getColorAccent())
+            icon_info.isVisible = explanation != null
+            if (explanation != null) {
+                text_explanation.setText(explanation)
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/popup/OmegaShortcut.kt b/Omega/src/com/saggitt/omega/popup/OmegaShortcut.kt
new file mode 100644
index 0000000000..37fa41c492
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/popup/OmegaShortcut.kt
@@ -0,0 +1,124 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.popup
+
+import android.content.ComponentName
+import android.content.Context
+import android.content.Intent
+import android.content.pm.ApplicationInfo
+import android.net.Uri
+import android.view.View
+import com.android.launcher3.*
+import com.android.launcher3.ItemInfoWithIcon.FLAG_SYSTEM_YES
+import com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_APPLICATION
+import com.android.launcher3.compat.LauncherAppsCompat
+import com.android.launcher3.popup.SystemShortcut
+import com.saggitt.omega.override.CustomInfoProvider
+import com.saggitt.omega.util.OmegaSingletonHolder
+import com.saggitt.omega.util.hasFlag
+import com.saggitt.omega.util.omegaPrefs
+import com.saggitt.omega.views.CustomBottomSheet
+import java.net.URISyntaxException
+
+class OmegaShortcut(private val context: Context) {
+
+    private val shortcuts = listOf(
+            ShortcutEntry("edit", Edit(), true),
+            ShortcutEntry("info", SystemShortcut.AppInfo(), true),
+            ShortcutEntry("widgets", SystemShortcut.Widgets(), true),
+            ShortcutEntry("install", SystemShortcut.Install(), true),
+            ShortcutEntry("remove", Remove(), false),
+            ShortcutEntry("uninstall", Uninstall(), false)
+    )
+
+    inner class ShortcutEntry(key: String, val shortcut: SystemShortcut<*>, enabled: Boolean) {
+
+        val enabled by context.omegaPrefs.BooleanPref("pref_iconPopup_$key", enabled)
+    }
+
+    val enabledShortcuts get() = shortcuts.filter { it.enabled }.map { it.shortcut }
+
+    class Uninstall : SystemShortcut<Launcher>(R.drawable.ic_uninstall_no_shadow, R.string.uninstall_drop_target_label) {
+
+        override fun getOnClickListener(launcher: Launcher, itemInfo: ItemInfo): View.OnClickListener? {
+            if (itemInfo is ItemInfoWithIcon) {
+                if (itemInfo.runtimeStatusFlags.hasFlag(FLAG_SYSTEM_YES)) {
+                    return null
+                }
+            }
+
+            return getUninstallTarget(launcher, itemInfo)?.let { cn ->
+                View.OnClickListener {
+                    AbstractFloatingView.closeAllOpenViews(launcher)
+                    try {
+                        val i = Intent.parseUri(launcher.getString(R.string.delete_package_intent), 0)
+                                .setData(Uri.fromParts("package", cn.packageName, cn.className))
+                                .putExtra(Intent.EXTRA_USER, itemInfo.user)
+                        launcher.startActivity(i)
+                    } catch (e: URISyntaxException) {
+                    }
+                }
+            }
+        }
+
+        private fun getUninstallTarget(launcher: Launcher, item: ItemInfo): ComponentName? {
+            if (item.itemType == ITEM_TYPE_APPLICATION && item.id == ItemInfo.NO_ID) {
+                val intent = item.intent
+                val user = item.user
+                if (intent != null) {
+                    val info = LauncherAppsCompat.getInstance(launcher).resolveActivity(intent, user)
+                    if (info != null && !info.applicationInfo.flags.hasFlag(ApplicationInfo.FLAG_SYSTEM)) {
+                        return info.componentName
+                    }
+                }
+            }
+            return null
+        }
+    }
+
+    class Remove : SystemShortcut<Launcher>(R.drawable.ic_remove_no_shadow, R.string.remove_drop_target_label) {
+
+        override fun getOnClickListener(launcher: Launcher, itemInfo: ItemInfo): View.OnClickListener? {
+            if (itemInfo.id == ItemInfo.NO_ID) return null
+            return if (itemInfo is WorkspaceItemInfo || itemInfo is LauncherAppWidgetInfo || itemInfo is FolderInfo) {
+                View.OnClickListener {
+                    AbstractFloatingView.closeAllOpenViews(launcher)
+
+                    launcher.removeItem(null, itemInfo, true /* deleteFromDb */)
+                    launcher.model.forceReload()
+                    launcher.workspace.stripEmptyScreens()
+                }
+            } else null
+        }
+    }
+
+    class Edit : SystemShortcut<Launcher>(R.drawable.ic_edit_no_shadow, R.string.action_preferences) {
+
+        override fun getOnClickListener(launcher: Launcher, itemInfo: ItemInfo): View.OnClickListener? {
+            if (launcher.omegaPrefs.lockDesktop) return null
+            if (!CustomInfoProvider.isEditable(itemInfo)) return null
+            return View.OnClickListener {
+                AbstractFloatingView.closeAllOpenViews(launcher)
+                CustomBottomSheet.show(launcher, itemInfo)
+            }
+        }
+    }
+
+    companion object : OmegaSingletonHolder<OmegaShortcut>(::OmegaShortcut)
+
+}
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/predictions/AppPredictorCompat.java b/Omega/src/com/saggitt/omega/predictions/AppPredictorCompat.java
new file mode 100644
index 0000000000..5d5f3dc1af
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/predictions/AppPredictorCompat.java
@@ -0,0 +1,55 @@
+/*
+ *     Copyright (C) 2019 Lawnchair Team.
+ *
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.predictions;
+
+import android.content.Context;
+import android.os.Bundle;
+
+import androidx.annotation.NonNull;
+
+import java.util.List;
+
+import static com.android.launcher3.appprediction.PredictionUiStateManager.Client;
+
+public abstract class AppPredictorCompat {
+
+    public AppPredictorCompat(@NonNull Context context, @NonNull Client client, int count, Bundle extras) {
+
+    }
+
+    public abstract void notifyAppTargetEvent(@NonNull AppTargetEventCompat event);
+
+    public abstract void requestPredictionUpdate();
+
+    public abstract void destroy();
+
+    /**
+     * Callback for receiving prediction updates.
+     */
+    public interface Callback {
+
+        /**
+         * Called when a new set of predicted app targets are available.
+         *
+         * @param targets Sorted list of predicted targets.
+         */
+        void onTargetsAvailable(@NonNull List<AppTargetCompat> targets);
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/predictions/AppTargetCompat.java b/Omega/src/com/saggitt/omega/predictions/AppTargetCompat.java
new file mode 100644
index 0000000000..a9231e58a5
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/predictions/AppTargetCompat.java
@@ -0,0 +1,329 @@
+/*
+ * 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.
+ */
+package com.saggitt.omega.predictions;
+
+import android.annotation.SuppressLint;
+import android.app.prediction.AppTarget;
+import android.content.pm.ShortcutInfo;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.os.UserHandle;
+
+import androidx.annotation.IntRange;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.util.Preconditions;
+
+/**
+ * A representation of a launchable target.
+ */
+@SuppressLint("RestrictedApi")
+public final class AppTargetCompat implements Parcelable {
+
+    private final AppTargetIdCompat mId;
+    private final String mPackageName;
+    private final String mClassName;
+    private final UserHandle mUser;
+
+    private final ShortcutInfo mShortcutInfo;
+
+    private final int mRank;
+
+    /**
+     * @deprecated use the Builder class
+     */
+    @Deprecated
+    public AppTargetCompat(@NonNull AppTargetIdCompat id, @NonNull String packageName,
+                           @Nullable String className, @NonNull UserHandle user) {
+        mId = id;
+        mShortcutInfo = null;
+
+        mPackageName = Preconditions.checkNotNull(packageName);
+        mClassName = className;
+        mUser = Preconditions.checkNotNull(user);
+        mRank = 0;
+    }
+
+    /**
+     * @deprecated use the Builder class
+     */
+    @Deprecated
+    public AppTargetCompat(@NonNull AppTargetIdCompat id, @NonNull ShortcutInfo shortcutInfo,
+                           @Nullable String className) {
+        mId = id;
+        mShortcutInfo = Preconditions.checkNotNull(shortcutInfo);
+
+        mPackageName = mShortcutInfo.getPackage();
+        mUser = mShortcutInfo.getUserHandle();
+        mClassName = className;
+        mRank = 0;
+    }
+
+    public AppTargetCompat(AppTarget target) {
+        mId = new AppTargetIdCompat(target.getId());
+        mShortcutInfo = target.getShortcutInfo();
+        mPackageName = target.getPackageName();
+        mClassName = target.getClassName();
+        mUser = target.getUser();
+        mRank = target.getRank();
+    }
+
+    private AppTargetCompat(AppTargetIdCompat id, String packageName, UserHandle user,
+                            ShortcutInfo shortcutInfo, String className, int rank) {
+        mId = id;
+        mShortcutInfo = shortcutInfo;
+        mPackageName = packageName;
+        mClassName = className;
+        mUser = user;
+        mRank = rank;
+    }
+
+    private AppTargetCompat(Parcel parcel) {
+        mId = parcel.readTypedObject(AppTargetIdCompat.CREATOR);
+        mShortcutInfo = parcel.readTypedObject(ShortcutInfo.CREATOR);
+        if (mShortcutInfo == null) {
+            mPackageName = parcel.readString();
+            mUser = UserHandle.of(parcel.readInt());
+        } else {
+            mPackageName = mShortcutInfo.getPackage();
+            mUser = mShortcutInfo.getUserHandle();
+        }
+        mClassName = parcel.readString();
+        mRank = parcel.readInt();
+    }
+
+    /**
+     * Returns the target id.
+     */
+    @NonNull
+    public AppTargetIdCompat getId() {
+        return mId;
+    }
+
+    /**
+     * Returns the class name for the app target.
+     */
+    @Nullable
+    public String getClassName() {
+        return mClassName;
+    }
+
+    /**
+     * Returns the package name for the app target.
+     */
+    @NonNull
+    public String getPackageName() {
+        return mPackageName;
+    }
+
+    /**
+     * Returns the user for the app target.
+     */
+    @NonNull
+    public UserHandle getUser() {
+        return mUser;
+    }
+
+    /**
+     * Returns the shortcut info for the target.
+     */
+    @Nullable
+    public ShortcutInfo getShortcutInfo() {
+        return mShortcutInfo;
+    }
+
+    /**
+     * Returns the rank for the target. Rank of an AppTarget is a non-negative integer that
+     * represents the importance of this target compared to other candidate targets. A smaller value
+     * means higher importance in the list.
+     */
+    public @IntRange(from = 0)
+    int getRank() {
+        return mRank;
+    }
+
+    @Override
+    public boolean equals(@Nullable Object o) {
+        if (!getClass().equals(o != null ? o.getClass() : null)) return false;
+
+        AppTargetCompat other = (AppTargetCompat) o;
+        boolean sameClassName = (mClassName == null && other.mClassName == null)
+                || (mClassName != null && mClassName.equals(other.mClassName));
+        boolean sameShortcutInfo = (mShortcutInfo == null && other.mShortcutInfo == null)
+                || (mShortcutInfo != null && other.mShortcutInfo != null
+                && mShortcutInfo.getId() == other.mShortcutInfo.getId());
+        return mId.equals(other.mId)
+                && mPackageName.equals(other.mPackageName)
+                && sameClassName
+                && mUser.equals(other.mUser)
+                && sameShortcutInfo
+                && mRank == other.mRank;
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeTypedObject(mId, flags);
+        dest.writeTypedObject(mShortcutInfo, flags);
+        if (mShortcutInfo == null) {
+            dest.writeString(mPackageName);
+            dest.writeInt(mUser.hashCode());
+        }
+        dest.writeString(mClassName);
+        dest.writeInt(mRank);
+    }
+
+    public AppTarget toPlatformType() {
+        Parcel parcel = Parcel.obtain();
+        int flags = 0;
+        parcel.writeTypedObject(mId.toPlatformType(), flags);
+        parcel.writeTypedObject(mShortcutInfo, flags);
+        if (mShortcutInfo == null) {
+            parcel.writeString(mPackageName);
+            parcel.writeInt(mUser.hashCode());
+        }
+        parcel.writeString(mClassName);
+        parcel.writeInt(mRank);
+        return AppTarget.CREATOR.createFromParcel(parcel);
+    }
+
+    /**
+     * A builder for app targets.
+     */
+    public static final class Builder {
+
+        @NonNull
+        private final AppTargetIdCompat mId;
+
+        private String mPackageName;
+        private UserHandle mUser;
+        private ShortcutInfo mShortcutInfo;
+
+        private String mClassName;
+        private int mRank;
+
+        /**
+         * @removed
+         * @deprecated Use the other Builder constructors.
+         */
+        @Deprecated
+        public Builder(@NonNull AppTargetIdCompat id) {
+            mId = id;
+        }
+
+        /**
+         * @param id          A unique id for this launchable target.
+         * @param packageName PackageName of the target.
+         * @param user        The UserHandle of the user which this target belongs to.
+         */
+        public Builder(@NonNull AppTargetIdCompat id, @NonNull String packageName,
+                       @NonNull UserHandle user) {
+            mId = Preconditions.checkNotNull(id);
+            mPackageName = Preconditions.checkNotNull(packageName);
+            mUser = Preconditions.checkNotNull(user);
+        }
+
+        /**
+         * @param id   A unique id for this launchable target.
+         * @param info The ShortcutInfo that represents this launchable target.
+         */
+        public Builder(@NonNull AppTargetIdCompat id, @NonNull ShortcutInfo info) {
+            mId = Preconditions.checkNotNull(id);
+            mShortcutInfo = Preconditions.checkNotNull(info);
+            mPackageName = info.getPackage();
+            mUser = info.getUserHandle();
+        }
+
+        /**
+         * @removed
+         * @deprecated Use the appropriate constructor.
+         */
+        @NonNull
+        @Deprecated
+        public Builder setTarget(@NonNull String packageName, @NonNull UserHandle user) {
+            if (mPackageName != null) {
+                throw new IllegalArgumentException("Target is already set");
+            }
+            mPackageName = Preconditions.checkNotNull(packageName);
+            mUser = Preconditions.checkNotNull(user);
+            return this;
+        }
+
+        /**
+         * @removed
+         * @deprecated Use the appropriate constructor.
+         */
+        @NonNull
+        @Deprecated
+        public Builder setTarget(@NonNull ShortcutInfo info) {
+            setTarget(info.getPackage(), info.getUserHandle());
+            mShortcutInfo = Preconditions.checkNotNull(info);
+            return this;
+        }
+
+        /**
+         * Sets the className for the target.
+         */
+        @NonNull
+        public Builder setClassName(@NonNull String className) {
+            mClassName = Preconditions.checkNotNull(className);
+            return this;
+        }
+
+        /**
+         * Sets the rank of the target.
+         */
+        @NonNull
+        public Builder setRank(@IntRange(from = 0) int rank) {
+            if (rank < 0) {
+                throw new IllegalArgumentException("rank cannot be a negative value");
+            }
+            mRank = rank;
+            return this;
+        }
+
+        /**
+         * Builds a new AppTarget instance.
+         *
+         * @throws IllegalStateException if no target is set
+         * @see #setTarget(ShortcutInfo)
+         * @see #setTarget(String, UserHandle)
+         */
+        @NonNull
+        public AppTargetCompat build() {
+            if (mPackageName == null) {
+                throw new IllegalStateException("No target is set");
+            }
+            return new AppTargetCompat(mId, mPackageName, mUser, mShortcutInfo, mClassName, mRank);
+        }
+    }
+
+    public static final @NonNull
+    Parcelable.Creator<AppTargetCompat> CREATOR =
+            new Parcelable.Creator<AppTargetCompat>() {
+                public AppTargetCompat createFromParcel(Parcel parcel) {
+                    return new AppTargetCompat(parcel);
+                }
+
+                public AppTargetCompat[] newArray(int size) {
+                    return new AppTargetCompat[size];
+                }
+            };
+}
diff --git a/Omega/src/com/saggitt/omega/predictions/AppTargetEventCompat.java b/Omega/src/com/saggitt/omega/predictions/AppTargetEventCompat.java
new file mode 100644
index 0000000000..70fb091974
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/predictions/AppTargetEventCompat.java
@@ -0,0 +1,173 @@
+/*
+ * 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.
+ */
+package com.saggitt.omega.predictions;
+
+import android.app.prediction.AppTargetEvent;
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import androidx.annotation.IntDef;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * A representation of an app target event.
+ */
+public final class AppTargetEventCompat implements Parcelable {
+
+    /**
+     * @hide
+     */
+    @IntDef({ACTION_LAUNCH, ACTION_DISMISS, ACTION_PIN})
+    @Retention(RetentionPolicy.SOURCE)
+    public @interface ActionType {
+    }
+
+    /**
+     * Event type constant indicating an app target has been launched.
+     */
+    public static final int ACTION_LAUNCH = 1;
+
+    /**
+     * Event type constant indicating an app target has been dismissed.
+     */
+    public static final int ACTION_DISMISS = 2;
+
+    /**
+     * Event type constant indicating an app target has been pinned.
+     */
+    public static final int ACTION_PIN = 3;
+
+    private final AppTargetCompat mTarget;
+    private final String mLocation;
+    private final int mAction;
+
+    private AppTargetEventCompat(@Nullable AppTargetCompat target, @Nullable String location,
+                                 @ActionType int actionType) {
+        mTarget = target;
+        mLocation = location;
+        mAction = actionType;
+    }
+
+    private AppTargetEventCompat(Parcel parcel) {
+        mTarget = parcel.readParcelable(null);
+        mLocation = parcel.readString();
+        mAction = parcel.readInt();
+    }
+
+    /**
+     * Returns the app target.
+     */
+    @Nullable
+    public AppTargetCompat getTarget() {
+        return mTarget;
+    }
+
+    /**
+     * Returns the launch location.
+     */
+    @Nullable
+    public String getLaunchLocation() {
+        return mLocation;
+    }
+
+    /**
+     * Returns the action type.
+     */
+    public @ActionType
+    int getAction() {
+        return mAction;
+    }
+
+    @Override
+    public boolean equals(@Nullable Object o) {
+        if (!getClass().equals(o != null ? o.getClass() : null)) return false;
+
+        AppTargetEventCompat other = (AppTargetEventCompat) o;
+        return mTarget.equals(other.mTarget)
+                && mLocation.equals(other.mLocation)
+                && mAction == other.mAction;
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeParcelable(mTarget, 0);
+        dest.writeString(mLocation);
+        dest.writeInt(mAction);
+    }
+
+    public AppTargetEvent toPlatformType() {
+        return new AppTargetEvent.Builder(mTarget.toPlatformType(), mAction)
+                .setLaunchLocation(mLocation)
+                .build();
+    }
+
+    public static final @NonNull
+    Creator<AppTargetEventCompat> CREATOR =
+            new Creator<AppTargetEventCompat>() {
+                public AppTargetEventCompat createFromParcel(Parcel parcel) {
+                    return new AppTargetEventCompat(parcel);
+                }
+
+                public AppTargetEventCompat[] newArray(int size) {
+                    return new AppTargetEventCompat[size];
+                }
+            };
+
+    /**
+     * A builder for app target events.
+     */
+    public static final class Builder {
+        private AppTargetCompat mTarget;
+        private String mLocation;
+        private @ActionType
+        int mAction;
+
+        /**
+         * @param target     The app target that is associated with this event.
+         * @param actionType The event type, which is one of the values in {@link ActionType}.
+         */
+        public Builder(@Nullable AppTargetCompat target, @ActionType int actionType) {
+            mTarget = target;
+            mAction = actionType;
+        }
+
+        /**
+         * Sets the launch location.
+         */
+        @NonNull
+        public Builder setLaunchLocation(@Nullable String location) {
+            mLocation = location;
+            return this;
+        }
+
+        /**
+         * Builds a new event instance.
+         */
+        @NonNull
+        public AppTargetEventCompat build() {
+            return new AppTargetEventCompat(mTarget, mLocation, mAction);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/predictions/AppTargetIdCompat.java b/Omega/src/com/saggitt/omega/predictions/AppTargetIdCompat.java
new file mode 100644
index 0000000000..e85eb5bcc9
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/predictions/AppTargetIdCompat.java
@@ -0,0 +1,96 @@
+/*
+ * 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.
+ */
+package com.saggitt.omega.predictions;
+
+import android.app.prediction.AppTargetId;
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+/**
+ * The id for a prediction target. See {@link AppTargetCompat}.
+ */
+public final class AppTargetIdCompat implements Parcelable {
+
+    @NonNull
+    private final String mId;
+
+    /**
+     * Creates a new id for a prediction target.
+     */
+    public AppTargetIdCompat(@NonNull String id) {
+        mId = id;
+    }
+
+    public AppTargetIdCompat(AppTargetId targetId) {
+        mId = targetId.getId();
+    }
+
+    private AppTargetIdCompat(Parcel parcel) {
+        mId = parcel.readString();
+    }
+
+    /**
+     * Returns the id.
+     *
+     * @hide
+     */
+    @NonNull
+    public String getId() {
+        return mId;
+    }
+
+    @Override
+    public boolean equals(@Nullable Object o) {
+        if (!getClass().equals(o != null ? o.getClass() : null)) return false;
+
+        AppTargetIdCompat other = (AppTargetIdCompat) o;
+        return mId.equals(other.mId);
+    }
+
+    @Override
+    public int hashCode() {
+        return mId.hashCode();
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeString(mId);
+    }
+
+    public AppTargetId toPlatformType() {
+        return new AppTargetId(mId);
+    }
+
+    public static final @NonNull
+    Creator<AppTargetIdCompat> CREATOR =
+            new Creator<AppTargetIdCompat>() {
+                public AppTargetIdCompat createFromParcel(Parcel parcel) {
+                    return new AppTargetIdCompat(parcel);
+                }
+
+                public AppTargetIdCompat[] newArray(int size) {
+                    return new AppTargetIdCompat[size];
+                }
+            };
+}
diff --git a/Omega/src/com/saggitt/omega/predictions/CustomAppPredictor.java b/Omega/src/com/saggitt/omega/predictions/CustomAppPredictor.java
deleted file mode 100644
index b7d64cdb73..0000000000
--- a/Omega/src/com/saggitt/omega/predictions/CustomAppPredictor.java
+++ /dev/null
@@ -1,330 +0,0 @@
-/*
- *  Copyright (c) 2020 Omega Launcher
- *
- *  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.
- *
- */
-
-package com.saggitt.omega.predictions;
-
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.pm.PackageManager;
-import android.os.Process;
-import android.os.UserHandle;
-import android.util.Log;
-import android.view.View;
-import android.view.ViewParent;
-
-import com.android.launcher3.AppFilter;
-import com.android.launcher3.AppInfo;
-import com.android.launcher3.Utilities;
-import com.android.launcher3.allapps.AllAppsContainerView;
-import com.android.launcher3.allapps.AllAppsStore;
-import com.android.launcher3.appprediction.ComponentKeyMapper;
-import com.android.launcher3.appprediction.DynamicItemCache;
-import com.android.launcher3.logging.UserEventDispatcher;
-import com.android.launcher3.util.ComponentKey;
-import com.saggitt.omega.settings.SettingsActivity;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-public class CustomAppPredictor extends UserEventDispatcher implements SharedPreferences.OnSharedPreferenceChangeListener, AllAppsStore.OnUpdateListener {
-    private static final int BOOST_ON_OPEN = 9;
-    private static final String PREDICTION_SET = "pref_prediction_set";
-    private static final String PREDICTION_PREFIX = "pref_prediction_count_";
-    private static final String HIDDEN_PREDICTIONS_SET_PREF = "pref_hidden_prediction_set";
-    private static final Set<String> EMPTY_SET = new HashSet<>();
-    private final static String[] PLACE_HOLDERS = new String[]{
-            "com.google.android.apps.photos",
-            "com.google.android.apps.maps",
-            "com.google.android.gm",
-            "com.google.android.deskclock",
-            "com.google.android.youtube",
-            "com.android.settings",
-            "com.whatsapp",
-            "com.facebook.katana",
-            "com.facebook.orca",
-            "com.yodo1.crossyroad",
-            "com.spotify.music",
-            "com.android.chrome",
-            "com.instagram.android",
-            "com.skype.raider",
-            "com.snapchat.android",
-            "com.viber.voip",
-            "com.twitter.android",
-            "com.android.phone",
-            "com.google.android.music",
-            "com.google.android.calendar",
-            "com.google.android.apps.genie.geniewidget",
-            "com.netflix.mediaclient",
-            "bbc.iplayer.android",
-            "com.google.android.videos",
-            "com.amazon.mShop.android.shopping",
-            "com.microsoft.office.word",
-            "com.google.android.apps.docs",
-            "com.google.android.keep",
-            "com.google.android.apps.plus",
-            "com.google.android.talk"
-    };
-    private static int MAX_PREDICTIONS = 12;
-    protected final AppFilter mAppFilter;
-    private final Context mContext;
-    private final SharedPreferences mPrefs;
-    private final PackageManager mPackageManager;
-    private final DynamicItemCache mDynamicItemCache;
-
-    private final UiManager mUiManager;
-
-    public CustomAppPredictor(Context context) {
-        mContext = context;
-        mAppFilter = AppFilter.newInstance(mContext);
-        mPrefs = Utilities.getPrefs(context);
-        mPrefs.registerOnSharedPreferenceChangeListener(this);
-        mPackageManager = context.getPackageManager();
-
-        mDynamicItemCache = new DynamicItemCache(context, this::onAppsUpdated);
-        mUiManager = new UiManager(this);
-    }
-
-    public static void setComponentNameState(Context context, ComponentKey key, boolean hidden) {
-        String comp = key.toString();
-        Set<String> hiddenApps = getHiddenApps(context);
-        while (hiddenApps.contains(comp)) {
-            hiddenApps.remove(comp);
-        }
-        if (hidden) {
-            hiddenApps.add(comp);
-        }
-        setHiddenApps(context, hiddenApps);
-    }
-
-    public static boolean isHiddenApp(Context context, ComponentKey key) {
-        return getHiddenApps(context).contains(key.toString());
-    }
-
-    @SuppressWarnings("ConstantConditions") // This can't be null anyway
-    private static Set<String> getHiddenApps(Context context) {
-        return new HashSet<>(Utilities.getOmegaPrefs(context).getHiddenPredictionAppSet());
-    }
-
-    private static void setHiddenApps(Context context, Set<String> hiddenApps) {
-        Utilities.getOmegaPrefs(context).setHiddenPredictionAppSet(hiddenApps);
-    }
-
-    public void onAppsUpdated() {
-        dispatchOnChange(false);
-    }
-
-    private void dispatchOnChange(boolean changed) {
-
-    }
-
-    public List<ComponentKeyMapper> getPredictions() {
-        List<ComponentKeyMapper> list = new ArrayList<>();
-        if (isPredictorEnabled()) {
-            clearNonExistentPackages();
-
-            List<String> predictionList = new ArrayList<>(getStringSetCopy());
-
-            Collections.sort(predictionList, (o1, o2) -> Integer.compare(getLaunchCount(o2), getLaunchCount(o1)));
-
-            for (String prediction : predictionList) {
-                Log.d("CustomAppPredictor", "Loading " + prediction);
-                list.add(getComponentFromString(prediction));
-            }
-
-            if (list.size() < MAX_PREDICTIONS) {
-                for (String placeHolder : PLACE_HOLDERS) {
-                    Intent intent = mPackageManager.getLaunchIntentForPackage(placeHolder);
-                    if (intent != null) {
-                        ComponentName componentInfo = intent.getComponent();
-                        if (componentInfo != null) {
-                            ComponentKey key = new ComponentKey(componentInfo, Process.myUserHandle());
-                            if (!predictionList.contains(key.toString())) {
-                                list.add(new ComponentKeyMapper(mContext, key, mDynamicItemCache));
-                            }
-                        }
-                    }
-                }
-            }
-
-            if (list.size() > MAX_PREDICTIONS) {
-                list = list.subList(0, MAX_PREDICTIONS);
-            }
-        }
-        return list;
-    }
-
-    public void logAppLaunch(View v, Intent intent, UserHandle user) {
-        super.logAppLaunch(v, intent, user);
-        if (isPredictorEnabled() && recursiveIsDrawer(v)) {
-            ComponentName componentInfo = intent.getComponent();
-            if (componentInfo != null && mAppFilter.shouldShowApp(componentInfo, Process.myUserHandle())) {
-                clearNonExistentPackages();
-
-                Set<String> predictionSet = getStringSetCopy();
-                SharedPreferences.Editor edit = mPrefs.edit();
-
-                String prediction = new ComponentKey(componentInfo, user).toString();
-                if (predictionSet.contains(prediction)) {
-                    edit.putInt(PREDICTION_PREFIX + prediction, getLaunchCount(prediction) + BOOST_ON_OPEN);
-                } else if (predictionSet.size() < MAX_PREDICTIONS || decayHasSpotFree(predictionSet, edit)) {
-                    predictionSet.add(prediction);
-                }
-
-                edit.putStringSet(PREDICTION_SET, predictionSet);
-                edit.apply();
-
-                mUiManager.onPredictionsUpdated();
-            }
-        }
-    }
-
-    private boolean decayHasSpotFree(Set<String> toDecay, SharedPreferences.Editor edit) {
-        boolean spotFree = false;
-        Set<String> toRemove = new HashSet<>();
-        for (String prediction : toDecay) {
-            int launchCount = getLaunchCount(prediction);
-            if (launchCount > 0) {
-                edit.putInt(PREDICTION_PREFIX + prediction, --launchCount);
-            } else if (!spotFree) {
-                edit.remove(PREDICTION_PREFIX + prediction);
-                toRemove.add(prediction);
-                spotFree = true;
-            }
-        }
-        for (String prediction : toRemove) {
-            toDecay.remove(prediction);
-        }
-        return spotFree;
-    }
-
-    /**
-     * Zero-based launch count of a shortcut
-     *
-     * @param component serialized component
-     * @return the number of launches, at least zero
-     */
-    private int getLaunchCount(String component) {
-        return mPrefs.getInt(PREDICTION_PREFIX + component, 0);
-    }
-
-    protected boolean recursiveIsDrawer(View v) {
-        if (v != null) {
-            ViewParent parent = v.getParent();
-            while (parent != null) {
-                if (parent instanceof AllAppsContainerView) {
-                    return true;
-                }
-                parent = parent.getParent();
-            }
-        }
-        return false;
-    }
-
-    protected boolean isPredictorEnabled() {
-        return Utilities.getPrefs(mContext).getBoolean(SettingsActivity.SHOW_PREDICTIONS_PREF, true);
-    }
-
-    @Override
-    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
-        if (key.equals(SettingsActivity.SHOW_PREDICTIONS_PREF)) {
-            if (!isPredictorEnabled()) {
-                Set<String> predictionSet = getStringSetCopy();
-
-                SharedPreferences.Editor edit = mPrefs.edit();
-                for (String prediction : predictionSet) {
-                    Log.i("Predictor", "Clearing " + prediction + " at " + getLaunchCount(prediction));
-                    edit.remove(PREDICTION_PREFIX + prediction);
-                }
-                edit.putStringSet(PREDICTION_SET, EMPTY_SET);
-                edit.apply();
-            }
-            mUiManager.onPredictionsUpdated();
-        } else if (key.equals(HIDDEN_PREDICTIONS_SET_PREF)) {
-            mUiManager.onPredictionsUpdated();
-        }
-    }
-
-    protected ComponentKeyMapper<AppInfo> getComponentFromString(String str) {
-        return new ComponentKeyMapper<>(mContext,
-                new ComponentKey(new ComponentName(mContext, str), Process.myUserHandle()), mDynamicItemCache);
-    }
-
-    private void clearNonExistentPackages() {
-        Set<String> originalSet = mPrefs.getStringSet(PREDICTION_SET, EMPTY_SET);
-        Set<String> predictionSet = new HashSet<>(originalSet);
-
-        SharedPreferences.Editor edit = mPrefs.edit();
-        for (String prediction : originalSet) {
-            try {
-                mPackageManager.getPackageInfo(new ComponentKey(new ComponentName(mContext, prediction), Process.myUserHandle()).componentName.getPackageName(), 0);
-            } catch (PackageManager.NameNotFoundException e) {
-                predictionSet.remove(prediction);
-                edit.remove(PREDICTION_PREFIX + prediction);
-            }
-        }
-
-        edit.putStringSet(PREDICTION_SET, predictionSet);
-        edit.apply();
-    }
-
-    private Set<String> getStringSetCopy() {
-        return new HashSet<>(mPrefs.getStringSet(PREDICTION_SET, EMPTY_SET));
-    }
-
-    public static class UiManager {
-
-        private final CustomAppPredictor mPredictor;
-        private final List<Listener> mListeners = new ArrayList<>();
-
-        public UiManager(CustomAppPredictor predictor) {
-            mPredictor = predictor;
-        }
-
-        public void addListener(Listener listener) {
-            mListeners.add(listener);
-            listener.onPredictionsUpdated();
-        }
-
-        public void removeListener(Listener listener) {
-            mListeners.remove(listener);
-        }
-
-        public boolean isEnabled() {
-            return mPredictor.isPredictorEnabled();
-        }
-
-        public List<ComponentKeyMapper> getPredictions() {
-            return mPredictor.getPredictions();
-        }
-
-        public void onPredictionsUpdated() {
-            for (Listener listener : mListeners) {
-                listener.onPredictionsUpdated();
-            }
-        }
-
-        public interface Listener {
-
-            void onPredictionsUpdated();
-        }
-    }
-}
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/predictions/OmegaAppPredictor.kt b/Omega/src/com/saggitt/omega/predictions/OmegaAppPredictor.kt
new file mode 100644
index 0000000000..da461e4580
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/predictions/OmegaAppPredictor.kt
@@ -0,0 +1,327 @@
+/*
+ *     Copyright (C) 2019 Lawnchair Team.
+ *
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.predictions
+
+import android.bluetooth.BluetoothHeadset
+import android.bluetooth.BluetoothProfile
+import android.content.*
+import android.content.pm.PackageManager
+import android.os.Bundle
+import android.os.Handler
+import android.os.Process
+import android.os.SystemClock
+import android.text.TextUtils
+import com.android.launcher3.AppFilter
+import com.android.launcher3.Utilities
+import com.android.launcher3.Utilities.makeComponentKey
+import com.android.launcher3.appprediction.PredictionUiStateManager
+import com.android.launcher3.appprediction.PredictionUiStateManager.Client.HOME
+import com.android.launcher3.appprediction.PredictionUiStateManager.Client.OVERVIEW
+import com.android.launcher3.model.AppLaunchTracker.CONTAINER_ALL_APPS
+import com.android.launcher3.util.ComponentKey
+import com.saggitt.omega.predictions.AppTargetEventCompat.ACTION_LAUNCH
+import com.saggitt.omega.util.runOnMainThread
+import java.util.*
+import java.util.concurrent.TimeUnit
+
+open class OmegaAppPredictor(
+        private val context: Context, count: Int,
+        extras: Bundle?) : AppPredictorCompat(context, HOME, count, extras) {
+
+    private val homeCallback = PredictionUiStateManager.INSTANCE.get(context).appPredictorCallback(HOME)
+    private val overviewCallback = PredictionUiStateManager.INSTANCE.get(context).appPredictorCallback(OVERVIEW)
+    private val maxPredictions = count
+
+    private val handler = Handler()
+    private val packageManager = context.packageManager
+    private val appFilter = AppFilter.newInstance(context)
+
+    private val devicePrefs = Utilities.getDevicePrefs(context)
+    private val appsList = CountRankedArrayPreference(devicePrefs, "recent_app_launches", 250)
+    private val phonesList = CountRankedArrayPreference(devicePrefs, "plugged_app_launches", 20)
+
+    /**
+     * Time at which headphones have been plugged in / connected. 0 if disconnected, -1 before initialized
+     */
+    private var phonesConnectedAt = -1L
+        set(value) {
+            field = value
+            if (value != -1L) {
+                phonesLaunches = 0
+                updatePredictions()
+                if (value != 0L) {
+                    // Ensure temporary predictions get removed again after
+                    handler.postDelayed(this::updatePredictions, DURATION_RECENTLY)
+                }
+            }
+        }
+
+    /**
+     * Whether headphones have just been plugged in / connected (in the last two minutes)
+     * TODO: Is two minutes appropriate or do we want to increase this?
+     */
+    private val phonesJustConnected get() = phonesConnectedAt > 0 && SystemClock.uptimeMillis() in phonesConnectedAt until phonesConnectedAt + DURATION_RECENTLY
+
+    /**
+     * Whether or not the current app launch is relevant for headphone suggestions or not
+     */
+    private val relevantForPhones get() = phonesLaunches < 2 && phonesJustConnected
+
+    /**
+     * Number of launches recorded since headphones were connected
+     */
+    private var phonesLaunches = 0
+    private val phonesStateChangeReceiver by lazy {
+        object : BroadcastReceiver() {
+            private var firstReceive = true
+
+            override fun onReceive(context: Context, intent: Intent) {
+                if (!firstReceive) {
+                    phonesConnectedAt = when (intent.action) {
+                        Intent.ACTION_HEADSET_PLUG -> {
+                            when (intent.getIntExtra("state", -1)) {
+                                1 -> SystemClock.currentThreadTimeMillis()
+                                else -> 0
+                            }
+                        }
+                        BluetoothHeadset.ACTION_CONNECTION_STATE_CHANGED -> {
+                            when (intent.getIntExtra(BluetoothProfile.EXTRA_STATE, -1)) {
+                                2 -> SystemClock.currentThreadTimeMillis()
+                                else -> 0
+                            }
+                        }
+                        else -> 0
+                    }
+                }
+                firstReceive = false
+            }
+        }
+    }
+
+    init {
+        // This object is currently a singleton, so just register and forget
+        context.registerReceiver(
+                phonesStateChangeReceiver,
+                IntentFilter(Intent.ACTION_HEADSET_PLUG).apply {
+                    addAction(BluetoothHeadset.ACTION_CONNECTION_STATE_CHANGED)
+                }, null, handler)
+    }
+
+    override fun notifyAppTargetEvent(event: AppTargetEventCompat) {
+        if (event.action == ACTION_LAUNCH) {
+            val target = event.target
+            if (target?.className != null) {
+                val component = ComponentName(target.packageName, target.className!!)
+                val key = ComponentKey(component, target.user).toString()
+                if (appFilter.shouldShowApp(component, target.user)) {
+                    clearRemovedComponents()
+
+                    var changed = false
+                    if (event.launchLocation == CONTAINER_ALL_APPS) {
+                        appsList.add(key)
+                        changed = true
+                    }
+                    if (relevantForPhones) {
+                        phonesList.add(key)
+                        phonesLaunches++
+                        changed = true
+                    }
+
+                    if (changed) {
+                        updatePredictions()
+                    }
+                }
+            }
+        }
+    }
+
+    override fun requestPredictionUpdate() {
+        updatePredictions()
+    }
+
+    override fun destroy() {
+
+    }
+
+    private fun updatePredictions() {
+        clearRemovedComponents()
+
+        val user = Process.myUserHandle()
+        val appList = if (phonesJustConnected) phonesList.getRanked().take(MAX_HEADPHONE_SUGGESTIONS).toMutableList() else mutableListOf()
+        appList.addAll(appsList.getRanked().filterNot { appList.contains(it) }.take(maxPredictions - appList.size))
+        val fullList = appList.map { makeComponentKey(context, it) }
+                .filterNot { isHiddenApp(context, it) }.toMutableList()
+        if (fullList.size < maxPredictions) {
+            fullList.addAll(
+                    PLACE_HOLDERS.mapNotNull { packageManager.getLaunchIntentForPackage(it)?.component }
+                            .map { ComponentKey(it, user) }
+            )
+        }
+        val targets = fullList.take(maxPredictions).mapIndexed { rank, key ->
+            val id = AppTargetIdCompat("app:${key.componentName}")
+            AppTargetCompat.Builder(id, key.componentName.packageName, key.user)
+                    .setClassName(key.componentName.className)
+                    .setRank(rank)
+                    .build()
+        }
+        runOnMainThread {
+            homeCallback.onTargetsAvailable(targets)
+            overviewCallback.onTargetsAvailable(targets)
+        }
+    }
+
+    private fun clearRemovedComponents() {
+        appsList.removeAll {
+            if (TextUtils.isEmpty(it)) {
+                return@removeAll true
+            }
+            val key = makeComponentKey(context, it)
+            val component = key.componentName
+            try {
+                packageManager.getActivityInfo(component, 0)
+                false
+            } catch (ignored: PackageManager.NameNotFoundException) {
+                val intent = packageManager.getLaunchIntentForPackage(component.packageName)
+                if (intent != null) {
+                    val componentInfo = intent.component
+                    if (componentInfo != null) {
+                        appsList.replace(it, key.toString())
+                        return@removeAll false
+                    }
+                }
+                true
+            }
+        }
+        phonesList.removeAll {
+            if (TextUtils.isEmpty(it)) {
+                return@removeAll true
+            }
+            val key = makeComponentKey(context, it)
+            val component = key.componentName
+            try {
+                packageManager.getActivityInfo(component, 0)
+                false
+            } catch (ignored: PackageManager.NameNotFoundException) {
+                val intent = packageManager.getLaunchIntentForPackage(component.packageName)
+                if (intent != null) {
+                    val componentInfo = intent.component
+                    if (componentInfo != null) {
+                        phonesList.replace(it, key.toString())
+                        return@removeAll false
+                    }
+                }
+                true
+            }
+        }
+    }
+
+    /**
+     * A ranked list with roll over to get/store currently relevant events and rank them by occurence
+     */
+    inner class CountRankedArrayPreference(private val prefs: SharedPreferences, private val key: String, private val maxSize: Int = -1, private val delimiter: String = ";") {
+        private var list = load()
+
+        fun getRanked(): Set<String> = list.distinct().sortedBy { value -> list.count { it == value } }.reversed().toSet()
+
+        fun add(string: String) {
+            list.add(0, string)
+            if (maxSize >= 0 && list.size > maxSize) {
+                list = list.drop(maxSize).toMutableList()
+            }
+            save()
+        }
+
+        fun clear() {
+            list.clear()
+            prefs.edit().remove(key).apply()
+        }
+
+        fun removeAll(filter: (String) -> Boolean) = list.removeAll(filter)
+        fun replace(filter: String, replacement: String) {
+            list = list.map { if (it == filter) replacement else it }.toMutableList()
+        }
+
+        fun contains(element: String) = list.contains(element)
+
+        private fun load() = (prefs.getString(key, "") ?: "").split(delimiter).toMutableList()
+        private fun save() {
+            val strValue = list.joinToString(delimiter)
+            prefs.edit().putString(key, strValue).apply()
+        }
+    }
+
+    companion object {
+
+        const val KEY_ID = "id"
+        const val KEY_EXPIRATION = "expiration"
+        const val KEY_PUBLISHER = "publisher"
+        const val KEY_BADGE = "badge"
+        const val KEY_POSITION = "position"
+
+        // TODO: Increase to two?
+        const val MAX_HEADPHONE_SUGGESTIONS = 1
+
+        // Our definition of "Recently"
+        @JvmStatic
+        val DURATION_RECENTLY = TimeUnit.MINUTES.toMillis(2)
+
+        val PLACE_HOLDERS =
+                arrayOf("com.google.android.apps.photos", "com.google.android.youtube",
+                        "com.instagram.android", "com.whatsapp", "com.facebook.katana",
+                        "com.facebook.orca", "com.google.android.apps.maps", "com.yodo1.crossyroad",
+                        "com.spotify.music", "com.google.android.calendar", "com.android.settings",
+                        "com.skype.raider", "com.snapchat.android", "com.viber.voip",
+                        "com.twitter.android", "com.android.phone", "com.google.android.music",
+                        "com.android.chrome", "com.google.android.apps.genie.geniewidget",
+                        "com.netflix.mediaclient", "bbc.iplayer.android",
+                        "com.google.android.videos", "com.amazon.mShop.android.shopping",
+                        "com.microsoft.office.word", "com.google.android.apps.docs",
+                        "com.google.android.gm", "com.google.android.deskclock",
+                        "com.google.android.keep", "com.google.android.apps.plus",
+                        "com.google.android.talk")
+
+        @JvmStatic
+        fun isHiddenApp(context: Context, key: ComponentKey): Boolean {
+            return getHiddenApps(context).contains(key.toString())
+        }
+
+        private // This can't be null anyway
+        fun getHiddenApps(context: Context): MutableSet<String> {
+            return HashSet(Utilities.getOmegaPrefs(context).hiddenPredictionAppSet)
+        }
+
+        private fun setHiddenApps(context: Context, hiddenApps: Set<String>) {
+            Utilities.getOmegaPrefs(context).hiddenPredictionAppSet = hiddenApps
+        }
+
+        @JvmStatic
+        fun setComponentNameState(context: Context, key: ComponentKey, hidden: Boolean) {
+            val comp = key.toString()
+            val hiddenApps = getHiddenApps(context)
+            while (hiddenApps.contains(comp)) {
+                hiddenApps.remove(comp)
+            }
+            if (hidden) {
+                hiddenApps.add(comp)
+            }
+            setHiddenApps(context, hiddenApps)
+        }
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/predictions/OmegaEventPredictor.kt b/Omega/src/com/saggitt/omega/predictions/OmegaEventPredictor.kt
deleted file mode 100644
index 1afdf42556..0000000000
--- a/Omega/src/com/saggitt/omega/predictions/OmegaEventPredictor.kt
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- *  Copyright (c) 2020 Omega Launcher
- *
- *  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.
- *
- */
-
-package com.saggitt.omega.predictions
-
-import android.content.Context
-import android.content.SharedPreferences
-import android.content.pm.PackageManager
-import android.os.Process
-import com.android.launcher3.LauncherAppState
-import com.android.launcher3.Utilities
-import com.android.launcher3.util.ComponentKey
-import com.saggitt.omega.allapps.PredictionsFloatingHeader
-import com.saggitt.omega.util.runOnMainThread
-
-open class OmegaEventPredictor(private val context: Context) : CustomAppPredictor(context) {
-
-    private val packageManager by lazy { context.packageManager }
-    private val launcher by lazy { LauncherAppState.getInstance(context).launcher }
-    private val predictionsHeader by lazy { launcher.appsView.floatingHeaderView as PredictionsFloatingHeader }
-
-    private val devicePrefs = Utilities.getDevicePrefs(context)
-    private val appsList = CountRankedArrayPreference(devicePrefs, "recent_app_launches", 250)
-
-    override fun updatePredictions() {
-        super.updatePredictions()
-        if (isPredictorEnabled) {
-            runOnMainThread {
-                predictionsHeader.setPredictedApps(isPredictorEnabled, predictions)
-            }
-        }
-    }
-
-    /* override fun logAppLaunch(v: View?, intent: Intent?, user: UserHandle?) {
-         super.logAppLaunch(v, intent, user)
-         logAppLaunchImpl(v, intent, user ?: Process.myUserHandle())
-     }
-
-     private fun logAppLaunchImpl(v: View?, intent: Intent?, user: UserHandle) {
-         if (isPredictorEnabled) {
-             //updatePredictions()
-              if (intent?.component != null && mAppFilter.shouldShowApp(intent.component, user)) {
-                 clearRemovedComponents()
-
-                 var changed = false
-                 val key = ComponentKey(intent.component, user).toString()
-                 if (recursiveIsDrawer(v)) {
-                     appsList.add(key)
-                     changed = true
-                 }
-                 if (changed) {
-                     updatePredictions()
-                 }
-             }
-         }
-     }
- */
-    // TODO: Extension function?
-    private fun clearRemovedComponents() {
-        appsList.removeAll {
-            val component = getComponentFromString(it).componentKey?.componentName
-                    ?: return@removeAll true
-            try {
-                packageManager.getActivityInfo(component, 0)
-                false
-            } catch (ignored: PackageManager.NameNotFoundException) {
-                val intent = packageManager.getLaunchIntentForPackage(component.packageName)
-                if (intent != null) {
-                    val componentInfo = intent.component
-                    if (componentInfo != null) {
-                        val key = ComponentKey(componentInfo, Process.myUserHandle())
-                        appsList.replace(it, key.toString())
-                        return@removeAll false
-                    }
-                }
-                true
-            }
-        }
-    }
-
-    /**
-     * A ranked list with roll over to get/store currently relevant events and rank them by occurence
-     */
-    inner class CountRankedArrayPreference(private val prefs: SharedPreferences, private val key: String, private val maxSize: Int = -1, private val delimiter: String = ";") {
-        private var list = load()
-
-        fun getRanked(): Set<String> = list.distinct().sortedBy { value -> list.count { it == value } }.reversed().toSet()
-
-        fun add(string: String) {
-            list.add(0, string)
-            if (maxSize >= 0 && list.size > maxSize) {
-                list = list.drop(maxSize).toMutableList()
-            }
-            save()
-        }
-
-        fun clear() {
-            list.clear()
-            prefs.edit().remove(key).apply()
-        }
-
-        fun removeAll(filter: (String) -> Boolean) = list.removeAll(filter)
-        fun replace(filter: String, replacement: String) {
-            list = list.map { if (it == filter) replacement else it }.toMutableList()
-        }
-
-        fun contains(element: String) = list.contains(element)
-
-        private fun load() = (prefs.getString(key, "") ?: "").split(delimiter).toMutableList()
-        private fun save() {
-            val strValue = list.joinToString(delimiter)
-            prefs.edit().putString(key, strValue).apply()
-        }
-    }
-}
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/predictions/OmegaPredictionManager.kt b/Omega/src/com/saggitt/omega/predictions/OmegaPredictionManager.kt
new file mode 100644
index 0000000000..9f53330417
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/predictions/OmegaPredictionManager.kt
@@ -0,0 +1,104 @@
+/*
+ *     Copyright (C) 2019 Lawnchair Team.
+ *
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.predictions
+
+import android.content.ComponentName
+import android.content.Context
+import android.content.pm.PackageManager
+import android.content.res.Resources
+import android.os.Bundle
+import android.text.TextUtils
+import android.util.Log
+import com.android.launcher3.Utilities
+import com.android.launcher3.appprediction.PredictionUiStateManager
+import com.android.launcher3.appprediction.PredictionUiStateManager.Client.HOME
+import com.android.launcher3.appprediction.PredictionUiStateManager.Client.OVERVIEW
+import com.android.launcher3.util.PackageManagerHelper
+import com.saggitt.omega.util.OmegaSingletonHolder
+import com.saggitt.omega.util.omegaPrefs
+import com.saggitt.omega.util.runOnMainThread
+
+class OmegaPredictionManager(private val context: Context) {
+
+    private val noOpAppPredictor = NoOpAppPredictor(context)
+    private val omegaAppPredictor by lazy {
+        OmegaAppPredictor(context, 12, null)
+    }
+    private val predictionsEnabled get() = context.omegaPrefs.showPredictions
+
+    fun createPredictor(client: PredictionUiStateManager.Client, count: Int, extras: Bundle?): AppPredictorCompat {
+        return when {
+            !predictionsEnabled -> noOpAppPredictor
+            usePlatformPredictor() -> PlatformAppPredictor(context, client, count, extras)
+            else -> omegaAppPredictor
+        }
+    }
+
+    private fun usePlatformPredictor(): Boolean {
+        if (!Utilities.ATLEAST_Q) {
+            return false
+        }
+        val predictorService = getPredictorService() ?: return false
+        Log.i("OmegaPredictionManager", "Platform predictor: ${predictorService.packageName}")
+        if (predictorService.packageName in platformPredictorBlacklist) return false
+        return PackageManagerHelper.isAppEnabled(
+                context.packageManager, predictorService.packageName, 0) && usageStatsGranted()
+    }
+
+    private fun getPredictorService(): ComponentName? {
+        val res = Resources.getSystem()
+        val id = res.getIdentifier("config_defaultAppPredictionService", "string", "android")
+        if (id == 0) return null
+        val string = res.getString(id)
+        if (TextUtils.isEmpty(string)) return null
+        return ComponentName.unflattenFromString(string)
+    }
+
+    private fun usageStatsGranted(): Boolean {
+        return Utilities.isRecentsEnabled() || context.checkSelfPermission(
+                android.Manifest.permission.PACKAGE_USAGE_STATS) == PackageManager.PERMISSION_GRANTED
+    }
+
+    class NoOpAppPredictor(context: Context) : AppPredictorCompat(context, HOME, 0, null) {
+
+        private val homeCallback = PredictionUiStateManager.INSTANCE.get(context).appPredictorCallback(HOME)
+        private val overviewCallback = PredictionUiStateManager.INSTANCE.get(context).appPredictorCallback(OVERVIEW)
+
+        override fun notifyAppTargetEvent(event: AppTargetEventCompat) {
+
+        }
+
+        override fun requestPredictionUpdate() {
+            runOnMainThread {
+                homeCallback.onTargetsAvailable(emptyList())
+                overviewCallback.onTargetsAvailable(emptyList())
+            }
+        }
+
+        override fun destroy() {
+
+        }
+    }
+
+    companion object :
+            OmegaSingletonHolder<OmegaPredictionManager>(::OmegaPredictionManager) {
+        private val platformPredictorBlacklist = listOf("com.oneplus.asti")
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/predictions/PlatformAppPredictor.java b/Omega/src/com/saggitt/omega/predictions/PlatformAppPredictor.java
new file mode 100644
index 0000000000..15f0418f6b
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/predictions/PlatformAppPredictor.java
@@ -0,0 +1,84 @@
+/*
+ *     Copyright (C) 2019 Lawnchair Team.
+ *
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.predictions;
+
+import android.app.prediction.AppPredictionContext;
+import android.app.prediction.AppPredictionManager;
+import android.app.prediction.AppPredictor;
+import android.content.Context;
+import android.os.Bundle;
+
+import androidx.annotation.NonNull;
+
+import com.android.launcher3.appprediction.PredictionUiStateManager;
+import com.android.launcher3.appprediction.PredictionUiStateManager.Client;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
+
+public class PlatformAppPredictor extends AppPredictorCompat {
+
+    private AppPredictor mPredictor;
+
+    public PlatformAppPredictor(@NonNull Context context,
+                                @NonNull Client client, int count,
+                                Bundle extras) {
+        super(context, client, count, extras);
+
+        AppPredictionManager apm = context.getSystemService(AppPredictionManager.class);
+
+        mPredictor = apm.createAppPredictionSession(
+                new AppPredictionContext.Builder(context)
+                        .setUiSurface(client.id)
+                        .setPredictedTargetCount(count)
+                        .setExtras(extras)
+                        .build());
+        mPredictor.registerPredictionUpdates(MAIN_EXECUTOR,
+                wrapCallback(PredictionUiStateManager.INSTANCE.get(context).appPredictorCallback(client)));
+        mPredictor.requestPredictionUpdate();
+    }
+
+    @Override
+    public void notifyAppTargetEvent(@NonNull AppTargetEventCompat event) {
+        mPredictor.notifyAppTargetEvent(event.toPlatformType());
+    }
+
+    @Override
+    public void requestPredictionUpdate() {
+        mPredictor.requestPredictionUpdate();
+    }
+
+    @Override
+    public void destroy() {
+        mPredictor.destroy();
+    }
+
+    private android.app.prediction.AppPredictor.Callback wrapCallback(AppPredictorCompat.Callback callback) {
+        return platformTargets -> {
+            List<AppTargetCompat> targets = new ArrayList<>();
+            for (android.app.prediction.AppTarget platformTarget : platformTargets) {
+                targets.add(new AppTargetCompat(platformTarget));
+            }
+            callback.onTargetsAvailable(targets);
+        };
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/preferences/AppsAdapter.kt b/Omega/src/com/saggitt/omega/preferences/AppsAdapter.kt
new file mode 100644
index 0000000000..f57c7884ed
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/preferences/AppsAdapter.kt
@@ -0,0 +1,174 @@
+/*
+ *  Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ *
+ */
+
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.preferences
+
+import android.content.Context
+import android.content.pm.LauncherActivityInfo
+import android.graphics.drawable.BitmapDrawable
+import android.graphics.drawable.Drawable
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.CheckBox
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+import com.android.launcher3.AppFilter
+import com.android.launcher3.AppInfo
+import com.android.launcher3.LauncherAppState
+import com.android.launcher3.R
+import com.android.launcher3.compat.LauncherAppsCompat
+import com.android.launcher3.compat.UserManagerCompat
+import com.android.launcher3.util.ComponentKey
+import com.android.launcher3.util.Executors.MAIN_EXECUTOR
+import com.android.launcher3.util.Executors.MODEL_EXECUTOR
+import java.util.Comparator.comparing
+
+open class AppsAdapter(
+        private val context: Context,
+        private val callback: Callback? = null,
+        private val filter: AppFilter? = null)
+    : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+
+    private val TYPE_LOADING = 0
+    private val TYPE_ITEM = 1
+
+    var isLoaded = false
+    val apps = ArrayList<App>()
+
+    open val comparator = defaultComparator
+
+    fun postLoadApps() {
+        MODEL_EXECUTOR.handler.postAtFrontOfQueue(::loadAppsList)
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+        val layoutInflater = LayoutInflater.from(parent.context)
+        return if (getItemViewType(0) == TYPE_ITEM) {
+            AppHolder(layoutInflater.inflate(R.layout.app_item, parent, false))
+        } else {
+            LoadingHolder(layoutInflater.inflate(R.layout.adapter_loading, parent, false))
+        }
+    }
+
+    override fun getItemCount() = if (isLoaded) apps.size else 1
+
+    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
+        if (holder is AppHolder) {
+            holder.bind(position)
+        }
+    }
+
+    override fun getItemViewType(position: Int): Int {
+        return if (isLoaded) TYPE_ITEM else TYPE_LOADING
+    }
+
+    protected open fun loadAppsList() {
+        apps.addAll(getAppsList(context)
+                .map { App(context, it) }
+                .sortedWith(comparator))
+        MAIN_EXECUTOR.handler.postAtFrontOfQueue(::onAppsListLoaded)
+    }
+
+    protected open fun onAppsListLoaded() {
+        isLoaded = true
+        notifyDataSetChanged()
+    }
+
+    open fun onBindApp(app: App, holder: AppHolder) {
+    }
+
+    open fun onClickApp(position: Int, holder: AppHolder) {
+        callback?.onAppSelected(apps[position])
+    }
+
+    private fun getAppsList(context: Context): List<LauncherActivityInfo> {
+        val apps = ArrayList<LauncherActivityInfo>()
+        val profiles = UserManagerCompat.getInstance(context).userProfiles
+        val launcherAppsCompat = LauncherAppsCompat.getInstance(context)
+        profiles.forEach { apps += launcherAppsCompat.getActivityList(null, it) }
+        return if (filter != null) {
+            apps.filter { filter.shouldShowApp(it.componentName, it.user) }
+        } else {
+            apps
+        }
+    }
+
+    class App(context: Context, val info: LauncherActivityInfo) {
+
+        val iconDrawable: Drawable
+        val key = ComponentKey(info.componentName, info.user)
+
+        init {
+            val appInfo = AppInfo(context, info, info.user)
+            LauncherAppState.getInstance(context).iconCache.getTitleAndIcon(appInfo, false)
+            iconDrawable = BitmapDrawable(context.resources, appInfo.iconBitmap)
+        }
+    }
+
+    inner class AppHolder(itemView: View) : RecyclerView.ViewHolder(itemView), View.OnClickListener {
+
+        private val label: TextView = itemView.findViewById(R.id.label)
+        private val icon: ImageView = itemView.findViewById(R.id.icon)
+        val checkBox: CheckBox = itemView.findViewById(R.id.check)
+
+        init {
+            itemView.setOnClickListener(this)
+        }
+
+        fun bind(position: Int) {
+            val app = apps[position]
+            label.text = app.info.label
+            icon.setImageDrawable(app.iconDrawable)
+
+            onBindApp(app, this)
+        }
+
+        override fun onClick(v: View) {
+            onClickApp(adapterPosition, this)
+        }
+    }
+
+    inner class LoadingHolder(itemView: View) : RecyclerView.ViewHolder(itemView)
+
+    interface Callback {
+
+        fun onAppSelected(app: App)
+    }
+
+    companion object {
+        val defaultComparator = comparing<App, String> { it.info.label.toString().toLowerCase() }
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/preferences/AppsAdapterWithShortcuts.kt b/Omega/src/com/saggitt/omega/preferences/AppsAdapterWithShortcuts.kt
new file mode 100644
index 0000000000..9cbb44967d
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/preferences/AppsAdapterWithShortcuts.kt
@@ -0,0 +1,303 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.saggitt.omega.preferences
+
+import android.animation.ObjectAnimator
+import android.animation.ValueAnimator
+import android.content.Context
+import android.content.pm.LauncherActivityInfo
+import android.content.pm.ShortcutInfo
+import android.content.res.ColorStateList
+import android.graphics.drawable.BitmapDrawable
+import android.graphics.drawable.Drawable
+import android.os.Handler
+import android.text.TextUtils
+import android.util.DisplayMetrics
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.ProgressBar
+import android.widget.TextView
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.RecyclerView
+import com.android.launcher3.*
+import com.android.launcher3.compat.LauncherAppsCompat
+import com.android.launcher3.compat.UserManagerCompat
+import com.android.launcher3.shortcuts.DeepShortcutManager
+import com.android.launcher3.util.ComponentKey
+import com.android.launcher3.util.Executors.MODEL_EXECUTOR
+import com.saggitt.omega.icons.CustomIconProvider
+import com.saggitt.omega.util.isVisible
+
+open class AppsAdapterWithShortcuts(
+        private val context: Context,
+        private val callback: Callback? = null,
+        private val filter: AppFilter? = null)
+    : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+
+    companion object {
+        private const val TYPE_LOADING = 0
+        private const val TYPE_APP = 1
+        private const val TYPE_SHORTCUT = 2
+
+        private val iconDpi = LauncherAppState.getInstanceNoCreate().invariantDeviceProfile.fillResIconDpi
+
+        private var iconProvider: IconProvider? = null
+    }
+
+    var items = ArrayList<Item>().apply { add(LoadingItem()) }
+    val apps = ArrayList<AppItem>()
+    val handler = Handler()
+    val shortcutManager = DeepShortcutManager.getInstance(context)
+
+    init {
+        if (iconProvider == null) {
+            iconProvider = IconProvider.INSTANCE.get(context)
+        }
+        Handler(MODEL_EXECUTOR.looper).postAtFrontOfQueue(::loadAppsList)
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+        val layoutInflater = LayoutInflater.from(parent.context)
+        return when (viewType) {
+            TYPE_APP -> AppHolder(layoutInflater.inflate(R.layout.app_item, parent, false))
+            TYPE_SHORTCUT -> ShortcutHolder(layoutInflater.inflate(R.layout.app_item, parent, false))
+            else -> LoadingHolder(layoutInflater.inflate(R.layout.adapter_loading, parent, false))
+        }
+    }
+
+    override fun getItemCount() = items.size
+
+    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
+        if (holder is AppHolder) {
+            holder.bind(items[position] as AppItem)
+        } else if (holder is ShortcutHolder) {
+            holder.bind(items[position] as ShortcutItem)
+        }
+    }
+
+    override fun getItemViewType(position: Int): Int {
+        return when (items[position]) {
+            is AppItem -> TYPE_APP
+            is ShortcutItem -> TYPE_SHORTCUT
+            else -> TYPE_LOADING
+        }
+    }
+
+    protected open fun loadAppsList() {
+        val apps = getAppsList(context)
+                .sortedBy { it.label.toString().toLowerCase() }
+                .map { AppItem(context, it) }
+        handler.postAtFrontOfQueue { onAppsListLoaded(apps) }
+    }
+
+    protected open fun onAppsListLoaded(apps: List<AppItem>) {
+        items.clear()
+        items.addAll(apps)
+        this.apps.addAll(apps)
+        notifyDataSetChanged()
+    }
+
+    open fun onClickApp(position: Int) {
+        val item = items[position]
+        if (item is AppItem) {
+            callback?.onAppSelected(item)
+        } else if (item is ShortcutItem) {
+            callback?.onShortcutSelected(item)
+        }
+    }
+
+    fun onToggleApp(position: Int) {
+        val app = items[position] as? AppItem
+        if (app != null) {
+            app.expanded = !app.expanded
+            val oldItems = items
+            val newItems = ArrayList<Item>()
+            apps.forEach {
+                newItems.add(it)
+                if (it.expanded) {
+                    newItems.addAll(it.shortcuts)
+                }
+            }
+            items = newItems
+            val diffResult = DiffUtil.calculateDiff(DiffCallback(oldItems, newItems))
+            diffResult.dispatchUpdatesTo(this)
+        }
+    }
+
+    private fun getAppsList(context: Context): List<LauncherActivityInfo> {
+        val apps = ArrayList<LauncherActivityInfo>()
+        val profiles = UserManagerCompat.getInstance(context).userProfiles
+        val launcherAppsCompat = LauncherAppsCompat.getInstance(context)
+        profiles.forEach { apps += launcherAppsCompat.getActivityList(null, it) }
+        return if (filter != null) {
+            apps.filter { filter.shouldShowApp(it.componentName, it.user) }
+        } else {
+            apps
+        }
+    }
+
+    interface Item
+
+    inner class AppItem(context: Context, val info: LauncherActivityInfo) : Item {
+
+        val iconDrawable: Drawable
+        val key = ComponentKey(info.componentName, info.user)
+        val shortcuts = loadShortcuts()
+        val hasShortcuts get() = !shortcuts.isEmpty()
+        var expanded = false
+
+        init {
+            val appInfo = AppInfo(context, info, info.user)
+            LauncherAppState.getInstance(context).iconCache.getTitleAndIcon(appInfo, false)
+            iconDrawable = BitmapDrawable(context.resources, appInfo.iconBitmap)
+        }
+
+        private fun loadShortcuts(): List<ShortcutItem> {
+            val shortcuts = shortcutManager.queryForShortcutsContainer(key.componentName, key.user) as? List<ShortcutInfo>
+                    ?: emptyList()
+            return shortcuts.map { ShortcutItem(it) }
+        }
+
+        fun clone(context: Context, expanded: Boolean) = AppItem(context, info).also { it.expanded = expanded }
+    }
+
+    inner class ShortcutItem(val info: ShortcutInfo) : Item {
+
+        val label = if (!TextUtils.isEmpty(info.longLabel)) info.longLabel else info.shortLabel
+
+        // TODO: debug why wrong icons are loaded from the provider at times
+        val iconDrawable = if (iconProvider is CustomIconProvider && false) {
+            (iconProvider as CustomIconProvider).getIcon(info, iconDpi)
+        } else {
+            shortcutManager.getShortcutIconDrawable(info, DisplayMetrics.DENSITY_XXHIGH)
+        }
+    }
+
+    class LoadingItem : Item
+
+    inner class AppHolder(itemView: View) : RecyclerView.ViewHolder(itemView),
+            View.OnClickListener, ValueAnimator.AnimatorUpdateListener {
+
+        private val label: TextView = itemView.findViewById(R.id.label)
+        private val icon: ImageView = itemView.findViewById(R.id.icon)
+        private val caretContainer: View = itemView.findViewById(R.id.caretContainer)
+        private val caretView: ImageView = itemView.findViewById(R.id.caretImageView)
+        private val caretDrawable = CaretDrawable(context).apply { caretProgress = CaretDrawable.PROGRESS_CARET_POINTING_DOWN }
+        private var caretPointingUp = false
+            set(value) {
+                animator?.cancel()
+                field = value
+            }
+        private var animator: ValueAnimator? = null
+            set(value) {
+                field?.cancel()
+                field = value
+                field?.addUpdateListener(this)
+                field?.start()
+            }
+
+        init {
+            itemView.setOnClickListener(this)
+            caretView.setImageDrawable(caretDrawable)
+            caretContainer.setOnClickListener(this)
+        }
+
+        fun bind(app: AppItem) {
+            label.text = app.info.label
+            icon.setImageDrawable(app.iconDrawable)
+            caretContainer.isVisible = app.hasShortcuts
+            caretPointingUp = app.expanded
+            caretDrawable.caretProgress = if (caretPointingUp) CaretDrawable.PROGRESS_CARET_POINTING_UP else CaretDrawable.PROGRESS_CARET_POINTING_DOWN
+        }
+
+        override fun onClick(v: View) {
+            if (v == itemView) {
+                onClickApp(adapterPosition)
+            } else if (v == caretContainer) {
+                onToggleApp(adapterPosition)
+                animateCaretPointingUp(!caretPointingUp)
+            }
+        }
+
+        private fun animateCaretPointingUp(pointingUp: Boolean) {
+            caretPointingUp = pointingUp
+            animator = ObjectAnimator.ofFloat(caretDrawable.caretProgress, if (pointingUp) CaretDrawable.PROGRESS_CARET_POINTING_UP else CaretDrawable.PROGRESS_CARET_POINTING_DOWN)
+                    .setDuration(200)
+        }
+
+        override fun onAnimationUpdate(animator: ValueAnimator) {
+            caretDrawable.caretProgress = animator.animatedValue as Float
+        }
+    }
+
+    inner class ShortcutHolder(itemView: View) : RecyclerView.ViewHolder(itemView), View.OnClickListener {
+
+        private val label: TextView = itemView.findViewById(R.id.label)
+        private val icon: ImageView = itemView.findViewById(R.id.shortcutIcon)
+
+        init {
+            itemView.setOnClickListener(this)
+            itemView.findViewById<View>(R.id.icon).isVisible = false
+            icon.isVisible = true
+        }
+
+        fun bind(shortcut: ShortcutItem) {
+            label.text = shortcut.label
+            icon.setImageDrawable(shortcut.iconDrawable)
+        }
+
+        override fun onClick(v: View) {
+            onClickApp(adapterPosition)
+        }
+    }
+
+    inner class LoadingHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+        init {
+            val progressBar = itemView.findViewById<ProgressBar>(R.id.progress)
+            progressBar.indeterminateTintList = ColorStateList.valueOf(Utilities.getOmegaPrefs(context).accentColor)
+        }
+    }
+
+    class DiffCallback(val old: List<Item>, val new: List<Item>) : DiffUtil.Callback() {
+
+        override fun getOldListSize() = old.size
+
+        override fun getNewListSize() = new.size
+
+        override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
+            val oldItem = old[oldItemPosition]
+            val newItem = new[newItemPosition]
+            if (oldItem is AppItem && newItem is AppItem) {
+                return oldItem.info == newItem.info
+            }
+            return old[oldItemPosition] == new[newItemPosition]
+        }
+
+        override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
+            return old[oldItemPosition] === new[newItemPosition]
+        }
+
+    }
+
+    interface Callback {
+
+        fun onAppSelected(app: AppItem)
+        fun onShortcutSelected(shortcut: ShortcutItem)
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/preferences/AutoModeScalePreference.java b/Omega/src/com/saggitt/omega/preferences/AutoModeScalePreference.java
new file mode 100644
index 0000000000..49388d33bc
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/preferences/AutoModeScalePreference.java
@@ -0,0 +1,46 @@
+/*
+ *  Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ *
+ */
+
+package com.saggitt.omega.preferences;
+
+import android.content.Context;
+import android.util.AttributeSet;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public class AutoModeScalePreference extends AutoModeSeekbarPreference {
+
+    public AutoModeScalePreference(@NotNull Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public AutoModeScalePreference(@NotNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    public void updateDisplayedValue() {
+        super.updateDisplayedValue();
+        if (current < low && current != -1f) {
+            persistFloat(current);
+        }
+    }
+
+    public boolean persistFloat(Float value) {
+        return super.persistFloat((value < low) ? -1f : value);
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/preferences/AutoModeSeekbarPreference.java b/Omega/src/com/saggitt/omega/preferences/AutoModeSeekbarPreference.java
new file mode 100644
index 0000000000..4c2f1c2a9f
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/preferences/AutoModeSeekbarPreference.java
@@ -0,0 +1,55 @@
+/*
+ *  Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ *
+ */
+
+package com.saggitt.omega.preferences;
+
+import android.content.Context;
+import android.util.AttributeSet;
+
+import com.android.launcher3.R;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public class AutoModeSeekbarPreference extends SeekbarPreference {
+    protected Float low = min;
+    private Context mContext;
+
+    public AutoModeSeekbarPreference(@NotNull Context context) {
+        this(context, null, 0);
+    }
+
+    public AutoModeSeekbarPreference(@NotNull Context context, @Nullable AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public AutoModeSeekbarPreference(@NotNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        mContext = context;
+        min -= (max - min) / steps;
+        steps += 1;
+        defaultValue = min;
+    }
+
+    public void updateSummary() {
+        if (current < low) {
+            mValueText.setText(mContext.getString(R.string.automatic_short));
+        } else {
+            super.updateSummary();
+        }
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/preferences/ButtonPreference.java b/Omega/src/com/saggitt/omega/preferences/ButtonPreference.java
new file mode 100644
index 0000000000..a3563a7844
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/preferences/ButtonPreference.java
@@ -0,0 +1,67 @@
+/*
+ * 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.
+ */
+package com.saggitt.omega.preferences;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceViewHolder;
+
+/**
+ * Extension of {@link Preference} which makes the widget layout clickable.
+ *
+ * @see #setWidgetLayoutResource(int)
+ */
+public class ButtonPreference extends Preference {
+
+    private boolean mWidgetFrameVisible = false;
+
+    public ButtonPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+
+    public ButtonPreference(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    public ButtonPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public ButtonPreference(Context context) {
+        super(context);
+    }
+
+    public void setWidgetFrameVisible(boolean isVisible) {
+        if (mWidgetFrameVisible != isVisible) {
+            mWidgetFrameVisible = isVisible;
+            notifyChanged();
+        }
+    }
+
+    @Override
+    public void onBindViewHolder(PreferenceViewHolder holder) {
+        super.onBindViewHolder(holder);
+
+        ViewGroup widgetFrame = holder.itemView.findViewById(android.R.id.widget_frame);
+        if (widgetFrame != null) {
+            widgetFrame.setVisibility(mWidgetFrameVisible ? View.VISIBLE : View.GONE);
+        }
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/preferences/CaretDrawable.java b/Omega/src/com/saggitt/omega/preferences/CaretDrawable.java
new file mode 100644
index 0000000000..d0d0c6174a
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/preferences/CaretDrawable.java
@@ -0,0 +1,182 @@
+/*
+ * 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.
+ */
+
+package com.saggitt.omega.preferences;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.graphics.Canvas;
+import android.graphics.ColorFilter;
+import android.graphics.Paint;
+import android.graphics.Path;
+import android.graphics.PixelFormat;
+import android.graphics.drawable.Drawable;
+
+import com.android.launcher3.R;
+import com.android.launcher3.util.Themes;
+import com.saggitt.omega.util.OmegaUtilsKt;
+
+public class CaretDrawable extends Drawable {
+
+    public static final float PROGRESS_CARET_POINTING_UP = 1f;
+    public static final float PROGRESS_CARET_POINTING_DOWN = 0;
+    public static final float PROGRESS_CARET_NEUTRAL = 0.5f;
+
+    private float mCaretProgress = PROGRESS_CARET_NEUTRAL;
+
+    private Paint mShadowPaint = new Paint();
+    private Paint mCaretPaint = new Paint();
+    private Path mPath = new Path();
+    private final int mCaretSizePx;
+    private final boolean mUseShadow;
+    private final int mWorkspaceTextColor;
+    private boolean mHidden;
+    private boolean mForceDark;
+
+    public CaretDrawable(Context context) {
+        final Resources res = context.getResources();
+
+        final int strokeWidth = res.getDimensionPixelSize(R.dimen.all_apps_caret_stroke_width);
+        final int shadowSpread = res.getDimensionPixelSize(R.dimen.all_apps_caret_shadow_spread);
+
+        boolean isLauncher = OmegaUtilsKt.getLauncherOrNull(context) != null;
+        mWorkspaceTextColor = Themes.getAttrColor(context, isLauncher
+                ? R.attr.workspaceTextColor : android.R.attr.textColorPrimary);
+        mCaretPaint.setColor(mWorkspaceTextColor);
+        mCaretPaint.setAntiAlias(true);
+        mCaretPaint.setStrokeWidth(strokeWidth);
+        mCaretPaint.setStyle(Paint.Style.STROKE);
+        mCaretPaint.setStrokeCap(Paint.Cap.ROUND);
+        mCaretPaint.setStrokeJoin(Paint.Join.ROUND);
+
+        mShadowPaint.setColor(res.getColor(R.color.default_shadow_color_no_alpha));
+        mShadowPaint.setAlpha(Themes.getAlpha(context, android.R.attr.spotShadowAlpha));
+        mShadowPaint.setAntiAlias(true);
+        mShadowPaint.setStrokeWidth(strokeWidth + (shadowSpread * 2));
+        mShadowPaint.setStyle(Paint.Style.STROKE);
+        mShadowPaint.setStrokeCap(Paint.Cap.ROUND);
+        mShadowPaint.setStrokeJoin(Paint.Join.ROUND);
+
+        mUseShadow = isLauncher && !Themes.getAttrBoolean(context, R.attr.isWorkspaceDarkText);
+
+        mCaretSizePx = res.getDimensionPixelSize(R.dimen.all_apps_caret_size);
+    }
+
+    @Override
+    public int getIntrinsicHeight() {
+        return mCaretSizePx;
+    }
+
+    @Override
+    public int getIntrinsicWidth() {
+        return mCaretSizePx;
+    }
+
+    @Override
+    public void draw(Canvas canvas) {
+        if (mHidden) {
+            return;
+        }
+
+        // Assumes caret paint is more important than shadow paint
+        if (Float.compare(mCaretPaint.getAlpha(), 0f) == 0) {
+            return;
+        }
+
+        // Assumes shadow stroke width is larger
+        final float width = getBounds().width() - mShadowPaint.getStrokeWidth();
+        final float height = getBounds().height() - mShadowPaint.getStrokeWidth();
+        final float left = getBounds().left + (mShadowPaint.getStrokeWidth() / 2);
+        final float top = getBounds().top + (mShadowPaint.getStrokeWidth() / 2);
+
+        // When the bounds are square, this will result in a caret with a right angle
+        final float verticalInset = (height / 4);
+        final float caretHeight = (height - (verticalInset * 2));
+
+        mPath.reset();
+        mPath.moveTo(left, top + caretHeight * (1 - getNormalizedCaretProgress()));
+        mPath.lineTo(left + (width / 2), top + caretHeight * getNormalizedCaretProgress());
+        mPath.lineTo(left + width, top + caretHeight * (1 - getNormalizedCaretProgress()));
+        if (mUseShadow && !mForceDark) {
+            canvas.drawPath(mPath, mShadowPaint);
+        }
+        canvas.drawPath(mPath, mCaretPaint);
+    }
+
+    /**
+     * Sets the caret progress
+     *
+     * @param progress The progress ({@value #PROGRESS_CARET_POINTING_UP} for pointing up,
+     *                 {@value #PROGRESS_CARET_POINTING_DOWN} for pointing down, {@value #PROGRESS_CARET_NEUTRAL}
+     *                 for neutral)
+     */
+    public void setCaretProgress(float progress) {
+        mCaretProgress = progress;
+        invalidateSelf();
+    }
+
+    /**
+     * Returns the caret progress
+     *
+     * @return The progress
+     */
+    public float getCaretProgress() {
+        return mCaretProgress;
+    }
+
+    /**
+     * Returns the caret progress normalized to [0..1]
+     *
+     * @return The normalized progress
+     */
+    public float getNormalizedCaretProgress() {
+        return (mCaretProgress - PROGRESS_CARET_POINTING_UP) /
+                (PROGRESS_CARET_POINTING_DOWN - PROGRESS_CARET_POINTING_UP);
+    }
+
+    @Override
+    public int getOpacity() {
+        return PixelFormat.TRANSLUCENT;
+    }
+
+    @Override
+    public void setAlpha(int alpha) {
+        mCaretPaint.setAlpha(alpha);
+        mShadowPaint.setAlpha(alpha);
+        invalidateSelf();
+    }
+
+    @Override
+    public void setColorFilter(ColorFilter cf) {
+        // no-op
+    }
+
+    public void setHidden(boolean hidden) {
+        mHidden = hidden;
+    }
+
+    public boolean isHidden() {
+        return mHidden;
+    }
+
+    public void setForceDark(boolean forceDark) {
+        if (mForceDark != forceDark) {
+            mForceDark = forceDark;
+            mCaretPaint.setColor(mForceDark ? 0x99000000 : mWorkspaceTextColor);
+            invalidateSelf();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/preferences/DockGridSizePreference.kt b/Omega/src/com/saggitt/omega/preferences/DockGridSizePreference.kt
new file mode 100644
index 0000000000..ef93ba394b
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/preferences/DockGridSizePreference.kt
@@ -0,0 +1,25 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.saggitt.omega.preferences
+
+import android.content.Context
+import android.util.AttributeSet
+import com.android.launcher3.Utilities
+
+class DockGridSizePreference(context: Context, attrs: AttributeSet?) :
+        SingleDimensionGridSizePreference(
+                context, attrs, Utilities.getOmegaPrefs(context).dockGridSize)
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/preferences/DrawerGridSizePreference.kt b/Omega/src/com/saggitt/omega/preferences/DrawerGridSizePreference.kt
new file mode 100644
index 0000000000..4ec1633f8f
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/preferences/DrawerGridSizePreference.kt
@@ -0,0 +1,28 @@
+/*
+ *  Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ *
+ */
+
+package com.saggitt.omega.preferences
+
+import android.content.Context
+import android.util.AttributeSet
+import com.android.launcher3.Utilities
+
+class DrawerGridSizePreference(context: Context, attrs: AttributeSet?) :
+        SingleDimensionGridSizePreference(context, attrs, Utilities.getOmegaPrefs(context).drawerGridSize)
+
+class PredictionGridSizePreference(context: Context, attrs: AttributeSet?) :
+        SingleDimensionGridSizePreference(context, attrs, Utilities.getOmegaPrefs(context).predictionGridSize)
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/preferences/DrawerTabEditBottomSheet.kt b/Omega/src/com/saggitt/omega/preferences/DrawerTabEditBottomSheet.kt
new file mode 100644
index 0000000000..ff21427ddf
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/preferences/DrawerTabEditBottomSheet.kt
@@ -0,0 +1,127 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.preferences
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Button
+import android.widget.FrameLayout
+import android.widget.TextView
+import com.android.launcher3.Launcher
+import com.android.launcher3.R
+import com.android.launcher3.Utilities
+import com.saggitt.omega.groups.AppGroups
+import com.saggitt.omega.groups.DrawerFolders
+import com.saggitt.omega.groups.DrawerTabs
+import com.saggitt.omega.settings.SettingsBottomSheet
+import com.saggitt.omega.util.applyColor
+import com.saggitt.omega.util.omegaPrefs
+import com.saggitt.omega.views.BaseBottomSheet
+
+@SuppressLint("ViewConstructor")
+class DrawerTabEditBottomSheet(context: Context, config: AppGroups.Group.CustomizationMap,
+                               private val callback: (Boolean) -> Unit) : FrameLayout(context), View.OnClickListener {
+
+    init {
+        View.inflate(context, R.layout.drawer_tab_edit_bottom_sheet, this)
+
+        val accent = Utilities.getOmegaPrefs(context).accentColor
+        val container = findViewById<ViewGroup>(R.id.customization_container)
+        config.sortedEntries.reversed().forEach { entry ->
+            entry.createRow(context, container, accent)?.let { container.addView(it, 0) }
+        }
+
+        findViewById<Button>(R.id.save).apply {
+            applyColor(accent)
+            setTextColor(accent)
+            setOnClickListener(this@DrawerTabEditBottomSheet)
+        }
+        findViewById<TextView>(R.id.cancel).apply {
+            setOnClickListener(this@DrawerTabEditBottomSheet)
+        }
+    }
+
+    override fun onClick(v: View) {
+        when (v.id) {
+            R.id.save -> callback(true)
+            R.id.cancel -> callback(false)
+        }
+    }
+
+    companion object {
+
+        fun show(context: Context, config: AppGroups.Group.CustomizationMap, animate: Boolean, callback: () -> Unit) {
+            val sheet = SettingsBottomSheet.inflate(context)
+            sheet.show(DrawerTabEditBottomSheet(context, config) {
+                if (it) {
+                    callback()
+                }
+                sheet.close(true)
+            }, animate)
+        }
+
+        fun show(launcher: Launcher, config: AppGroups.Group.CustomizationMap, animate: Boolean, callback: () -> Unit) {
+            val sheet = BaseBottomSheet.inflate(launcher)
+            sheet.show(DrawerTabEditBottomSheet(launcher, config) {
+                if (it) {
+                    callback()
+                }
+                sheet.close(true)
+            }, animate)
+        }
+
+        fun newGroup(context: Context, emptyGroup: AppGroups.Group, animate: Boolean, callback: (AppGroups.Group.CustomizationMap) -> Unit) {
+            val config = emptyGroup.customizations
+            show(context, config, animate) {
+                callback(config)
+            }
+        }
+
+        fun edit(context: Context, group: AppGroups.Group, callback: () -> Unit) {
+            val config = AppGroups.Group.CustomizationMap(group.customizations)
+            show(context, config, true) {
+                group.customizations.applyFrom(config)
+                callback()
+            }
+        }
+
+        fun editTab(launcher: Launcher, group: DrawerTabs.Tab) {
+            val config = AppGroups.Group.CustomizationMap(group.customizations)
+            edit(launcher, config, group, true) {
+                launcher.omegaPrefs.drawerTabs.saveToJson()
+            }
+        }
+
+        fun editFolder(launcher: Launcher, group: DrawerFolders.Folder) {
+            val config = AppGroups.Group.CustomizationMap(group.customizations)
+            edit(launcher, config, group, true) {
+                launcher.omegaPrefs.appGroupsManager.drawerFolders.saveToJson()
+            }
+        }
+
+        fun edit(launcher: Launcher, config: AppGroups.Group.CustomizationMap,
+                 group: AppGroups.Group, animate: Boolean = true, callback: () -> Unit) {
+            show(launcher, config, animate) {
+                group.customizations.applyFrom(config)
+                callback()
+            }
+        }
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/preferences/DrawerTabTypeSelectionBottomSheet.kt b/Omega/src/com/saggitt/omega/preferences/DrawerTabTypeSelectionBottomSheet.kt
new file mode 100644
index 0000000000..d4665cd90b
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/preferences/DrawerTabTypeSelectionBottomSheet.kt
@@ -0,0 +1,94 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.preferences
+
+import android.content.Context
+import android.content.res.ColorStateList
+import android.graphics.drawable.RippleDrawable
+import android.view.View
+import android.view.ViewGroup
+import android.widget.FrameLayout
+import android.widget.ImageView
+import android.widget.Space
+import android.widget.TextView
+import androidx.core.graphics.ColorUtils
+import com.android.launcher3.R
+import com.saggitt.omega.settings.SettingsBottomSheet
+import com.saggitt.omega.util.dpToPx
+import com.saggitt.omega.util.getColorAccent
+import com.saggitt.omega.util.getColorAttr
+import com.saggitt.omega.util.tintDrawable
+
+class DrawerTabTypeSelectionBottomSheet(context: Context, selectionItems: Map<Int, Array<Int>>, callback: (which: Int) -> Unit) : FrameLayout(context) {
+    init {
+        View.inflate(context, R.layout.drawer_tab_select_type_bottom_sheet, this)
+
+        val accent = context.getColorAccent()
+        val container = findViewById<ViewGroup>(R.id.types_container)
+
+        findViewById<TextView>(android.R.id.title).setTextColor(accent)
+
+        val tintNormal = ColorUtils.setAlphaComponent(context.getColorAttr(android.R.attr.colorControlHighlight), 255)
+        val tintList = ColorStateList(arrayOf(
+                intArrayOf(android.R.attr.state_selected),
+                intArrayOf()),
+                intArrayOf(
+                        accent,
+                        tintNormal))
+        val rippleTintList = ColorStateList(arrayOf(
+                intArrayOf(android.R.attr.state_selected),
+                intArrayOf()),
+                intArrayOf(
+                        ColorUtils.setAlphaComponent(accent, 31),
+                        ColorUtils.setAlphaComponent(tintNormal, 31)))
+
+        for (item in selectionItems) {
+            val view = View.inflate(context, R.layout.drawer_tab_type_item, null)
+
+            view.background.setTintList(tintList)
+            (view.background as RippleDrawable).setColor(rippleTintList)
+
+            view.findViewById<TextView>(android.R.id.title).setText(item.value[0])
+            view.findViewById<TextView>(android.R.id.summary).setText(item.value[1])
+            view.findViewById<ImageView>(android.R.id.icon).apply {
+                tintDrawable(accent)
+                setImageResource(item.value[2])
+            }
+
+            view.setOnClickListener {
+                callback(item.key)
+            }
+
+            container.addView(view)
+
+            val spacer = Space(context)
+            spacer.minimumHeight = dpToPx(16f).toInt()
+            container.addView(spacer)
+        }
+    }
+
+    companion object {
+        fun show(context: Context, selectionItems: Map<Int, Array<Int>>, callback: (which: Int) -> Unit) {
+            val sheet = SettingsBottomSheet.inflate(context)
+            sheet.show(DrawerTabTypeSelectionBottomSheet(context, selectionItems) {
+                sheet.close(false)
+                callback(it)
+            }, true)
+        }
+    }
+}
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/preferences/FeedProviderPreference.kt b/Omega/src/com/saggitt/omega/preferences/FeedProviderPreference.kt
new file mode 100644
index 0000000000..a269ae37da
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/preferences/FeedProviderPreference.kt
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2019 oldosfan.
+ * Copyright (c) 2019 the Lawnchair developers
+ *
+ *     This file is part of Librechair.
+ *
+ *     Librechair is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Librechair is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Librechair.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.preferences
+
+import android.content.Context
+import android.util.AttributeSet
+import androidx.preference.ListPreference
+
+class FeedProviderPreference(context: Context, attrs: AttributeSet?) :
+        ListPreference(context, attrs) {
+    init {
+        /*entries = OverlayUtil.availableFeedProviders(context)
+                .map { context.packageManager.getApplicationLabel(it) }.toTypedArray()
+        entryValues = OverlayUtil.availableFeedProviders(context)
+                .map { it.packageName }.toTypedArray()
+        setDefaultValue(context.packageName)*/
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/preferences/GridSize.kt b/Omega/src/com/saggitt/omega/preferences/GridSize.kt
new file mode 100644
index 0000000000..a7846149dd
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/preferences/GridSize.kt
@@ -0,0 +1,53 @@
+/*
+ *  Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ *
+ */
+
+package com.saggitt.omega.preferences
+
+import com.saggitt.omega.OmegaPreferences
+import com.saggitt.omega.util.JavaField
+
+open class GridSize(
+        prefs: OmegaPreferences,
+        rowsKey: String,
+        targetObject: Any,
+        private val onChangeListener: () -> Unit) {
+
+    var numRows by JavaField<Int>(targetObject, rowsKey)
+    val numRowsOriginal by JavaField<Int>(targetObject, "${rowsKey}Original")
+
+    protected val onChange = {
+        applyCustomization()
+        onChangeListener.invoke()
+    }
+
+    var numRowsPref by prefs.IntPref("pref_$rowsKey", 0, onChange)
+
+    init {
+        applyNumRows()
+    }
+
+    protected open fun applyCustomization() {
+        applyNumRows()
+    }
+
+    private fun applyNumRows() {
+        numRows = fromPref(numRowsPref, numRowsOriginal)
+    }
+
+    fun fromPref(value: Int, default: Int) = if (value != 0) value else default
+    fun toPref(value: Int, default: Int) = if (value != default) value else 0
+}
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/preferences/GridSize2D.kt b/Omega/src/com/saggitt/omega/preferences/GridSize2D.kt
new file mode 100644
index 0000000000..05e05644ab
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/preferences/GridSize2D.kt
@@ -0,0 +1,46 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.saggitt.omega.preferences
+
+import com.saggitt.omega.OmegaPreferences
+import com.saggitt.omega.util.JavaField
+
+class GridSize2D(
+        prefs: OmegaPreferences,
+        rowsKey: String,
+        columnsKey: String,
+        targetObject: Any,
+        onChangeListener: () -> Unit) : GridSize(prefs, rowsKey, targetObject, onChangeListener) {
+
+    var numColumns by JavaField<Int>(targetObject, columnsKey)
+    val numColumnsOriginal by JavaField<Int>(targetObject, "${columnsKey}Original")
+
+    var numColumnsPref by prefs.IntPref("pref_$columnsKey", 0, onChange)
+
+    init {
+        applyNumColumns()
+    }
+
+    override fun applyCustomization() {
+        super.applyCustomization()
+        applyNumColumns()
+    }
+
+    private fun applyNumColumns() {
+        numColumns = fromPref(numColumnsPref, numColumnsOriginal)
+    }
+}
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/preferences/GridSizeDialogFragmentCompat.java b/Omega/src/com/saggitt/omega/preferences/GridSizeDialogFragmentCompat.java
new file mode 100644
index 0000000000..e3f856a3bd
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/preferences/GridSizeDialogFragmentCompat.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ */
+
+package com.saggitt.omega.preferences;
+
+import android.os.Bundle;
+import android.view.View;
+import android.widget.NumberPicker;
+
+import androidx.appcompat.app.AlertDialog;
+import androidx.core.util.Pair;
+import androidx.preference.PreferenceDialogFragmentCompat;
+
+import com.android.launcher3.R;
+import com.saggitt.omega.util.OmegaUtilsKt;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Objects;
+
+public class GridSizeDialogFragmentCompat extends PreferenceDialogFragmentCompat {
+
+    private final String SAVE_STATE_ROWS = "rows";
+    private final String SAVE_STATE_COLUMNS = "columns";
+
+    private GridSizePreference gridSizePreference;
+
+    private int numRows = 0;
+    private int numColumns = 0;
+
+    private NumberPicker numRowsPicker;
+    private NumberPicker numColumnsPicker;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        gridSizePreference = (GridSizePreference) getPreference();
+        Pair<Integer, Integer> size = gridSizePreference.getSize();
+
+        if (savedInstanceState != null) {
+            numRows = savedInstanceState.getInt(SAVE_STATE_ROWS);
+            numColumns = savedInstanceState.getInt(SAVE_STATE_COLUMNS);
+        } else {
+            numRows = size.first;
+            numColumns = size.second;
+        }
+    }
+
+    public void onBindDialogView(View view) {
+        super.onBindDialogView(view);
+
+        numRowsPicker = view.findViewById(R.id.rowsPicker);
+        numColumnsPicker = view.findViewById(R.id.columnsPicker);
+
+        numRowsPicker.setMinValue(3);
+        numRowsPicker.setMaxValue(9);
+        numColumnsPicker.setMinValue(3);
+        numColumnsPicker.setMaxValue(9);
+
+        numRowsPicker.setValue(numRows);
+        numColumnsPicker.setValue(numColumns);
+
+    }
+
+    public void onStart() {
+        super.onStart();
+        OmegaUtilsKt.applyAccent(((AlertDialog) Objects.requireNonNull(getDialog())));
+    }
+
+    public void onDialogClosed(boolean positiveResult) {
+        if (positiveResult) {
+            gridSizePreference.setSize(numRowsPicker.getValue(), numColumnsPicker.getValue());
+        }
+    }
+
+    public void onPrepareDialogBuilder(AlertDialog.Builder builder) {
+        super.onPrepareDialogBuilder(builder);
+        builder.setNeutralButton(R.string.theme_default, (dialogInterface, i) -> gridSizePreference.setSize(0, 0));
+        builder.setNegativeButton(R.string.dialog_cancel, ((dialogInterface, i) -> {
+            dismiss();
+        }));
+        builder.setPositiveButton(R.string.dialog_ok, ((dialogInterface, i) -> {
+            saveGridSize();
+        }));
+    }
+
+    public void saveGridSize() {
+        gridSizePreference.setSize(numRowsPicker.getValue(), numColumnsPicker.getValue());
+    }
+
+    public void onSaveInstanceState(@NotNull Bundle outState) {
+        super.onSaveInstanceState(outState);
+
+        outState.putInt(SAVE_STATE_ROWS, numRowsPicker.getValue());
+        outState.putInt(SAVE_STATE_COLUMNS, numColumnsPicker.getValue());
+    }
+
+    public static GridSizeDialogFragmentCompat newInstance(String key) {
+        GridSizeDialogFragmentCompat fragment = new GridSizeDialogFragmentCompat();
+        Bundle bundle = new Bundle(1);
+        bundle.putString(ARG_KEY, key);
+
+        fragment.setArguments(bundle);
+        return fragment;
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/preferences/GridSizePreference.java b/Omega/src/com/saggitt/omega/preferences/GridSizePreference.java
new file mode 100644
index 0000000000..0be26ac6e4
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/preferences/GridSizePreference.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ */
+
+package com.saggitt.omega.preferences;
+
+import android.content.Context;
+import android.util.AttributeSet;
+
+import androidx.core.util.Pair;
+import androidx.preference.DialogPreference;
+
+import com.android.launcher3.R;
+import com.android.launcher3.Utilities;
+
+public class GridSizePreference extends DialogPreference {
+    private GridSize2D gridSize;
+    private Pair defaultSize;
+
+    public GridSizePreference(Context context) {
+        this(context, null, 0);
+    }
+
+    public GridSizePreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        updateSummary();
+    }
+
+    public GridSizePreference(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        updateSummary();
+    }
+
+    public Pair getSize() {
+
+        gridSize = Utilities.getOmegaPrefs(getContext()).getGridSize();
+        defaultSize = new Pair(gridSize.getNumRowsOriginal(), gridSize.getNumColumnsOriginal());
+
+        int rows = gridSize.fromPref(gridSize.getNumRows(), (int) defaultSize.first);
+        int columns = gridSize.fromPref(gridSize.getNumColumns(), (int) defaultSize.second);
+        return new Pair(rows, columns);
+    }
+
+
+    public void setSize(int rows, int columns) {
+        gridSize.setNumRowsPref(gridSize.toPref(rows, (int) defaultSize.first));
+        gridSize.setNumColumnsPref(gridSize.toPref(columns, (int) defaultSize.second));
+        updateSummary();
+    }
+
+
+    private void updateSummary() {
+        Pair value = getSize();
+        setSummary(String.format("%d x %d", value.first, value.second));
+    }
+
+    @Override
+    public int getDialogLayoutResource() {
+        return R.layout.pref_dialog_grid_size;
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/preferences/HeaderPreference.kt b/Omega/src/com/saggitt/omega/preferences/HeaderPreference.kt
index a13c6cf4d1..ca978ab554 100644
--- a/Omega/src/com/saggitt/omega/preferences/HeaderPreference.kt
+++ b/Omega/src/com/saggitt/omega/preferences/HeaderPreference.kt
@@ -24,10 +24,10 @@ import androidx.preference.Preference
 import androidx.preference.PreferenceViewHolder
 import com.android.launcher3.R
 import com.android.launcher3.R.id.app_build
-import com.saggitt.omega.util.AboutUtils
+import com.saggitt.omega.util.ContextUtils
 
 class HeaderPreference(context: Context, attrs: AttributeSet? = null) : Preference(context, attrs) {
-    val aboutUtils by lazy { AboutUtils(context) }
+    val aboutUtils by lazy { ContextUtils(context) }
 
     init {
         layoutResource = R.layout.activity_about
diff --git a/Omega/src/com/saggitt/omega/preferences/HiddenAppsFragment.kt b/Omega/src/com/saggitt/omega/preferences/HiddenAppsFragment.kt
new file mode 100644
index 0000000000..811ee4eebf
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/preferences/HiddenAppsFragment.kt
@@ -0,0 +1,70 @@
+/*
+ *  Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ *
+ */
+
+package com.saggitt.omega.preferences
+
+import android.os.Bundle
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.android.launcher3.R
+import com.android.launcher3.Utilities
+import com.saggitt.omega.allapps.OmegaAppFilter
+import com.saggitt.omega.views.RecyclerViewFragment
+
+class HiddenAppsFragment : RecyclerViewFragment(), SelectableAppsAdapter.Callback {
+
+    private lateinit var adapter: SelectableAppsAdapter
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setHasOptionsMenu(true)
+    }
+
+    override fun onRecyclerViewCreated(recyclerView: RecyclerView) {
+        val context = recyclerView.context
+        adapter = SelectableAppsAdapter.ofProperty(context,
+                Utilities.getOmegaPrefs(context)::hiddenAppSet, this, OmegaAppFilter(context))
+        recyclerView.setHasFixedSize(true)
+        recyclerView.layoutManager = LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
+        recyclerView.adapter = adapter
+    }
+
+    override fun onSelectionsChanged(newSize: Int) {
+        if (newSize > 0) {
+            activity?.title = "$newSize${getString(R.string.hide_app_selected)}"
+        } else {
+            activity?.title = getString(R.string.title__drawer_hide_apps)
+        }
+    }
+
+    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+        return inflater.inflate(R.menu.menu_hide_apps, menu)
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        return when (item.itemId) {
+            R.id.action_reset -> {
+                adapter.clearSelection()
+                true
+            }
+            else -> super.onOptionsItemSelected(item)
+        }
+    }
+}
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/preferences/MultiSelectTabPreference.kt b/Omega/src/com/saggitt/omega/preferences/MultiSelectTabPreference.kt
new file mode 100644
index 0000000000..c68e0c3f88
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/preferences/MultiSelectTabPreference.kt
@@ -0,0 +1,129 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.preferences
+
+import android.app.AlertDialog
+import android.content.Context
+import android.text.TextUtils
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.CheckedTextView
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.android.launcher3.R
+import com.android.launcher3.util.ComponentKey
+import com.saggitt.omega.groups.DrawerTabs
+import com.saggitt.omega.groups.ui.AppCategorizationFragment
+import com.saggitt.omega.settings.SettingsActivity
+import com.saggitt.omega.util.addOrRemove
+import com.saggitt.omega.util.applyAccent
+import com.saggitt.omega.util.omegaPrefs
+
+class MultiSelectTabPreference(context: Context, attrs: AttributeSet?) : RecyclerViewPreference(context, attrs) {
+
+    lateinit var componentKey: ComponentKey
+    private val selections = mutableMapOf<DrawerTabs.CustomTab, Boolean>()
+    private val tabs = context.omegaPrefs.drawerTabs.getGroups().mapNotNull { it as? DrawerTabs.CustomTab }
+    var edited = false
+        private set
+
+    override fun onBindRecyclerView(recyclerView: RecyclerView) {
+        recyclerView.adapter = Adapter()
+        recyclerView.layoutManager = LinearLayoutManager(themedContext)
+    }
+
+    override fun onPrepareDialogBuilder(builder: AlertDialog.Builder) {
+        super.onPrepareDialogBuilder(builder)
+
+        builder.setPositiveButton(android.R.string.ok) { _, _ ->
+            tabs.forEach {
+                if (it.contents.value().addOrRemove(componentKey, selections[it] == true)) {
+                    edited = true
+                }
+            }
+            selections.clear()
+            loadSummary()
+        }
+        builder.setNeutralButton(R.string.tabs_manage) { _, _ ->
+            SettingsActivity.startFragment(context, AppCategorizationFragment::class.java.name, R.string.title__drawer_categorization)
+        }
+        builder.setOnDismissListener {
+            selections.clear()
+            loadSummary()
+        }
+    }
+
+    fun loadSummary() {
+        val added = tabs
+                .filter { it.contents.value().contains(componentKey) }
+                .map { it.getTitle() }
+        summary = if (!added.isEmpty()) {
+            TextUtils.join(", ", added)
+        } else {
+            context.getString(R.string.none)
+        }
+    }
+
+    inner class Adapter : RecyclerView.Adapter<Adapter.Holder>() {
+
+        init {
+            tabs.forEach {
+                selections[it] = it.contents.value().contains(componentKey)
+            }
+        }
+
+        override fun getItemCount() = tabs.count()
+
+        override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): Holder {
+            return Holder(LayoutInflater.from(parent.context).inflate(R.layout.tab_item_check, parent, false))
+        }
+
+        override fun onBindViewHolder(holder: Holder, position: Int) {
+            holder.bind(tabs[position])
+        }
+
+        inner class Holder(itemView: View) : RecyclerView.ViewHolder(itemView), View.OnClickListener {
+
+            private val textView = (itemView as CheckedTextView).apply {
+                applyAccent()
+            }
+            private var checked = false
+                set(value) {
+                    field = value
+                    textView.isChecked = value
+                }
+
+            init {
+                itemView.setOnClickListener(this)
+            }
+
+            fun bind(tab: DrawerTabs.CustomTab) {
+                textView.text = tab.getTitle()
+                checked = selections[tab] == true
+            }
+
+            override fun onClick(v: View) {
+                checked = !checked
+                val tab = tabs[adapterPosition]
+                selections[tab] = checked
+            }
+        }
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/preferences/PreviewPreference.kt b/Omega/src/com/saggitt/omega/preferences/PreviewPreference.kt
new file mode 100644
index 0000000000..8e4954b316
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/preferences/PreviewPreference.kt
@@ -0,0 +1,59 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.preferences
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.preference.Preference
+import androidx.preference.PreferenceViewHolder
+import com.android.launcher3.R
+
+class PreviewPreference(context: Context, attrs: AttributeSet) : Preference(context, attrs) {
+
+    private var previewView: View? = null
+    private var layoutId = 0
+
+    init {
+        layoutResource = R.layout.preference_preview
+        val ta = context.obtainStyledAttributes(attrs, R.styleable.PreviewPreference)
+        layoutId = ta.getResourceId(R.styleable.PreviewPreference_previewLayout, 0)
+        ta.recycle()
+    }
+
+    override fun onBindViewHolder(holder: PreferenceViewHolder) {
+        super.onBindViewHolder(holder)
+
+        val parent = holder.itemView as ViewGroup
+        parent.removeAllViews()
+        parent.addView(getPreviewView(parent))
+    }
+
+    private fun getPreviewView(parent: ViewGroup): View {
+        if (previewView == null)
+            previewView = LayoutInflater.from(context).inflate(layoutId, parent, false)
+        return previewView!!.also { (it.parent as? ViewGroup)?.removeView(previewView) }
+    }
+
+    override fun onDependencyChanged(dependency: Preference?, disableDependent: Boolean) {
+        super.onDependencyChanged(dependency, disableDependent)
+        isVisible = isEnabled
+    }
+}
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/preferences/RecyclerViewPreference.kt b/Omega/src/com/saggitt/omega/preferences/RecyclerViewPreference.kt
new file mode 100644
index 0000000000..e9c6674371
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/preferences/RecyclerViewPreference.kt
@@ -0,0 +1,44 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.preferences
+
+import android.content.Context
+import android.preference.DialogPreference
+import android.util.AttributeSet
+import android.view.View
+import androidx.appcompat.view.ContextThemeWrapper
+import androidx.recyclerview.widget.RecyclerView
+import com.android.launcher3.R
+import com.saggitt.omega.theme.ThemeOverride
+
+abstract class RecyclerViewPreference(context: Context, attrs: AttributeSet?) : DialogPreference(context, attrs) {
+
+    private val themeRes = ThemeOverride.LauncherDialog().getTheme(context)
+    protected val themedContext = ContextThemeWrapper(context, themeRes)
+
+    init {
+        dialogLayoutResource = R.layout.dialog_preference_recyclerview
+    }
+
+    override fun onBindDialogView(view: View) {
+        super.onBindDialogView(view)
+        onBindRecyclerView(view.findViewById(R.id.list))
+    }
+
+    abstract fun onBindRecyclerView(recyclerView: RecyclerView)
+}
diff --git a/Omega/src/com/saggitt/omega/preferences/SearchProviderPreference.kt b/Omega/src/com/saggitt/omega/preferences/SearchProviderPreference.kt
new file mode 100644
index 0000000000..1fe05aecb7
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/preferences/SearchProviderPreference.kt
@@ -0,0 +1,84 @@
+/*
+ *  Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ *
+ */
+
+package com.saggitt.omega.preferences
+
+import android.content.Context
+import android.content.res.TypedArray
+import android.util.AttributeSet
+import androidx.preference.DialogPreference
+import com.android.launcher3.R
+import com.saggitt.omega.OmegaPreferences
+import com.saggitt.omega.search.SearchProviderController
+import com.saggitt.omega.util.omegaPrefs
+
+class SearchProviderPreference(context: Context, attrs: AttributeSet?) : DialogPreference(context, attrs),
+        OmegaPreferences.OnPreferenceChangeListener {
+
+    var value = ""
+    var defaultValue = ""
+
+    init {
+        layoutResource = R.layout.preference_preview_icon
+        updateIcon()
+    }
+
+    override fun onAttached() {
+        super.onAttached()
+        context.omegaPrefs.addOnPreferenceChangeListener("pref_globalSearchProvider", this)
+    }
+
+    override fun onDetached() {
+        super.onDetached()
+        context.omegaPrefs.removeOnPreferenceChangeListener("pref_globalSearchProvider", this)
+    }
+
+    override fun onValueChanged(key: String, prefs: OmegaPreferences, force: Boolean) {
+        if (key == this.key) {
+            value = getPersistedString(defaultValue)
+            notifyChanged()
+        }
+    }
+
+    override fun getSummary(): CharSequence {
+        updateIcon()
+        return SearchProviderController.getInstance(context).searchProvider.name
+    }
+
+    private fun updateIcon() {
+        try {
+            icon = SearchProviderController.getInstance(context).searchProvider.getIcon()
+        } catch (ex: Exception) {
+        }
+    }
+
+    override fun onSetInitialValue(restorePersistedValue: Boolean, defaultValue: Any?) {
+        value = if (restorePersistedValue) {
+            getPersistedString(defaultValue as String?) ?: ""
+        } else {
+            defaultValue as String? ?: ""
+        }
+    }
+
+    override fun onGetDefaultValue(a: TypedArray, index: Int): String? {
+        defaultValue = a.getString(index)!!
+        return defaultValue
+    }
+
+    override fun getDialogLayoutResource() = R.layout.dialog_preference_recyclerview
+
+}
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/preferences/SeekbarPreference.kt b/Omega/src/com/saggitt/omega/preferences/SeekbarPreference.kt
new file mode 100644
index 0000000000..0fc4524ba4
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/preferences/SeekbarPreference.kt
@@ -0,0 +1,154 @@
+/*
+ *  Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ *
+ */
+
+package com.saggitt.omega.preferences
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.content.res.ColorStateList
+import android.util.AttributeSet
+import android.view.ContextMenu
+import android.view.MenuItem
+import android.view.View
+import android.widget.SeekBar
+import android.widget.TextView
+import androidx.preference.Preference
+import androidx.preference.PreferenceViewHolder
+import com.android.launcher3.R
+import com.android.launcher3.Utilities
+
+open class SeekbarPreference
+@JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0)
+    : Preference(context, attrs, defStyleAttr), SeekBar.OnSeekBarChangeListener, View.OnCreateContextMenuListener,
+        MenuItem.OnMenuItemClickListener {
+
+    private var mSeekbar: SeekBar? = null
+    @JvmField
+    var mValueText: TextView? = null
+    @JvmField
+    var min: Float = 0.toFloat()
+    @JvmField
+    var max: Float = 0.toFloat()
+    @JvmField
+    var current: Float = 0.toFloat()
+    @JvmField
+    var defaultValue: Float = 0.toFloat()
+    private var multiplier: Int = 0
+    private var format: String? = null
+    @JvmField
+    var steps: Int = 100
+    private var lastPersist = Float.NaN
+
+    open val allowResetToDefault = true
+
+    init {
+        layoutResource = R.layout.preference_seekbar
+        init(context, attrs!!)
+    }
+
+    private fun init(context: Context, attrs: AttributeSet) {
+        val ta = context.obtainStyledAttributes(attrs, R.styleable.SeekbarPreference)
+        min = ta.getFloat(R.styleable.SeekbarPreference_minValue, 0f)
+        max = ta.getFloat(R.styleable.SeekbarPreference_maxValue, 100f)
+        multiplier = ta.getInt(R.styleable.SeekbarPreference_summaryMultiplier, 1)
+        format = ta.getString(R.styleable.SeekbarPreference_summaryFormat)
+        defaultValue = ta.getFloat(R.styleable.SeekbarPreference_defaultSeekbarValue, min)
+        steps = ta.getInt(R.styleable.SeekbarPreference_steps, 100)
+        if (format == null) {
+            format = "%.2f"
+        }
+        ta.recycle()
+    }
+
+    override fun onBindViewHolder(holder: PreferenceViewHolder) {
+        super.onBindViewHolder(holder)
+        val view = holder.itemView
+        mSeekbar = view.findViewById(R.id.seekbar)
+        mValueText = view.findViewById(R.id.txtValue)
+        mSeekbar!!.max = steps
+
+        mSeekbar!!.setOnSeekBarChangeListener(this)
+        val stateList = ColorStateList.valueOf(Utilities.getOmegaPrefs(context).accentColor)
+        mSeekbar!!.thumbTintList = stateList
+        mSeekbar!!.progressTintList = stateList
+        mSeekbar!!.progressBackgroundTintList = stateList
+
+        current = getPersistedFloat(defaultValue)
+        val progress = ((current - min) / ((max - min) / steps))
+        mSeekbar!!.progress = Math.round(progress)
+
+        if (allowResetToDefault) view.setOnCreateContextMenuListener(this)
+        updateSummary()
+    }
+
+    fun setValue(value: Float) {
+        current = value
+        persistFloat(value)
+        updateDisplayedValue()
+    }
+
+    protected open fun updateDisplayedValue() {
+        mSeekbar?.setOnSeekBarChangeListener(null)
+        val progress = ((current - min) / ((max - min) / steps))
+        mSeekbar!!.progress = Math.round(progress)
+        updateSummary()
+        mSeekbar?.setOnSeekBarChangeListener(this)
+    }
+
+    override fun onProgressChanged(seekBar: SeekBar, progress: Int, fromUser: Boolean) {
+        current = min + (max - min) / steps * progress
+        current = Math.round(current * 100f) / 100f //round to .00 places
+        updateSummary()
+
+        persistFloat(current)
+    }
+
+    @SuppressLint("SetTextI18n")
+    protected open fun updateSummary() {
+        if (format != "%.2f") {
+            mValueText!!.text = String.format(format!!, current * multiplier)
+        } else {
+            mValueText!!.text = (current * multiplier).toInt().toString() + "dp"
+        }
+    }
+
+    override fun onStartTrackingTouch(seekBar: SeekBar) {}
+
+    override fun onStopTrackingTouch(seekBar: SeekBar) {
+        persistFloat(current)
+    }
+
+    override fun persistFloat(value: Float): Boolean {
+        if (value == lastPersist) return true
+        lastPersist = value
+        return super.persistFloat(value)
+    }
+
+    override fun onCreateContextMenu(menu: ContextMenu, v: View, menuInfo: ContextMenu.ContextMenuInfo?) {
+        menu.setHeaderTitle(title)
+        menu.add(0, 0, 0, R.string.reset_to_default)
+        for (i in (0 until menu.size())) {
+            menu.getItem(i).setOnMenuItemClickListener(this)
+        }
+    }
+
+    override fun onMenuItemClick(item: MenuItem): Boolean {
+        setValue(defaultValue)
+        return true
+    }
+}
+
diff --git a/Omega/src/com/saggitt/omega/preferences/SelectSearchProviderFragment.kt b/Omega/src/com/saggitt/omega/preferences/SelectSearchProviderFragment.kt
new file mode 100644
index 0000000000..fc7ff1f3fe
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/preferences/SelectSearchProviderFragment.kt
@@ -0,0 +1,112 @@
+/*
+ *  Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ *
+ */
+
+package com.saggitt.omega.preferences
+
+import android.content.Context
+import android.content.res.ColorStateList
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.CheckedTextView
+import android.widget.ImageView
+import androidx.appcompat.app.AlertDialog
+import androidx.preference.PreferenceDialogFragmentCompat
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.android.launcher3.R
+import com.android.launcher3.Utilities
+import com.saggitt.omega.search.SearchProvider
+import com.saggitt.omega.search.SearchProviderController
+import com.saggitt.omega.util.applyAccent
+import com.saggitt.omega.util.omegaPrefs
+
+class SelectSearchProviderFragment : PreferenceDialogFragmentCompat() {
+
+    private val key by lazy { requireArguments().getString("key") }
+    private val value by lazy { requireArguments().getString("value") }
+
+    private var selectedProvider: SearchProvider? = null
+
+    override fun onBindDialogView(view: View) {
+        super.onBindDialogView(view)
+
+        val recyclerView = view.findViewById<RecyclerView>(R.id.list)
+        recyclerView.adapter = ProviderListAdapter(activity as Context)
+        recyclerView.layoutManager = LinearLayoutManager(activity)
+    }
+
+    private fun saveChanges() {
+        Utilities.getOmegaPrefs(activity).sharedPrefs.edit().putString(key, selectedProvider.toString()).apply()
+        dismiss()
+    }
+
+    override fun onPrepareDialogBuilder(builder: AlertDialog.Builder) {
+        super.onPrepareDialogBuilder(builder)
+
+        builder.setPositiveButton(null, null)
+    }
+
+    override fun onStart() {
+        super.onStart()
+        (dialog as AlertDialog).applyAccent()
+    }
+
+    override fun onDialogClosed(positiveResult: Boolean) {
+    }
+
+    inner class ProviderListAdapter(private val context: Context) : RecyclerView.Adapter<ProviderListAdapter.Holder>() {
+
+        val Providers = SearchProviderController.getSearchProviders(context)
+        override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): Holder {
+            return Holder(LayoutInflater.from(context).inflate(R.layout.list_item_icon, parent, false))
+        }
+
+        override fun getItemCount() = Providers.size
+
+        override fun onBindViewHolder(holder: Holder, position: Int) {
+            holder.text.text = Providers[position].name
+            holder.text.isChecked = Providers[position]::class.java.name == value
+            holder.providerIcon.setImageDrawable((Providers[position].getIcon()))
+        }
+
+        inner class Holder(itemView: View) : RecyclerView.ViewHolder(itemView), View.OnClickListener {
+            val providerIcon = itemView.findViewById<ImageView>(R.id.provider_icon)
+            val text = itemView.findViewById<CheckedTextView>(android.R.id.text1)!!.apply {
+                setOnClickListener(this@Holder)
+                val tintList = ColorStateList.valueOf(context.omegaPrefs.accentColor)
+                compoundDrawableTintList = tintList
+                backgroundTintList = tintList
+            }
+
+            override fun onClick(v: View) {
+                selectedProvider = Providers[adapterPosition]
+                saveChanges()
+            }
+        }
+    }
+
+    companion object {
+        fun newInstance(preference: SearchProviderPreference) = SelectSearchProviderFragment().apply {
+            arguments = Bundle(2).apply {
+                putString("key", preference.key)
+                putString("value", preference.value)
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/preferences/SelectableAppsActivity.kt b/Omega/src/com/saggitt/omega/preferences/SelectableAppsActivity.kt
new file mode 100644
index 0000000000..b5fcf88e2b
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/preferences/SelectableAppsActivity.kt
@@ -0,0 +1,143 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.preferences
+
+import android.app.Activity
+import android.content.ComponentName
+import android.content.Context
+import android.content.Intent
+import android.os.*
+import androidx.fragment.app.Fragment
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.android.launcher3.AppFilter
+import com.android.launcher3.R
+import com.android.launcher3.Utilities
+import com.android.launcher3.util.ComponentKey
+import com.android.launcher3.util.Executors.MAIN_EXECUTOR
+import com.saggitt.omega.allapps.OmegaAppFilter
+import com.saggitt.omega.groups.DrawerTabs
+import com.saggitt.omega.settings.SettingsActivity
+import com.saggitt.omega.views.RecyclerViewFragment
+
+class SelectableAppsActivity : SettingsActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        supportActionBar?.setDisplayShowHomeEnabled(true)
+        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+    }
+
+    override fun createLaunchFragment(intent: Intent): Fragment {
+        return Fragment.instantiate(this, SelectionFragment::class.java.name, intent.extras)
+    }
+
+    override fun shouldShowSearch(): Boolean {
+        return false
+    }
+
+    class SelectionFragment : RecyclerViewFragment(), SelectableAppsAdapter.Callback {
+
+        private var selection: Set<String> = emptySet()
+        private var changed = false
+
+        override fun onRecyclerViewCreated(recyclerView: RecyclerView) {
+            val arguments = requireArguments()
+            val isWork = if (arguments.containsKey(KEY_FILTER_IS_WORK))
+                arguments.getBoolean(KEY_FILTER_IS_WORK) else null
+            selection = HashSet(arguments.getStringArrayList(KEY_SELECTION))
+
+            val context = recyclerView.context
+            recyclerView.setHasFixedSize(true)
+            recyclerView.layoutManager = LinearLayoutManager(context)
+            recyclerView.adapter = SelectableAppsAdapter.ofProperty(requireActivity(),
+                    ::selection, this, createAppFilter(context, DrawerTabs.getWorkFilter(isWork)))
+        }
+
+        override fun onDestroy() {
+            super.onDestroy()
+
+            val receiver = arguments?.getParcelable<Parcelable>(KEY_CALLBACK) as ResultReceiver
+            if (changed) {
+                receiver.send(Activity.RESULT_OK, Bundle(1).apply {
+                    putStringArrayList(KEY_SELECTION, ArrayList(selection))
+                })
+            } else {
+                receiver.send(Activity.RESULT_CANCELED, null)
+            }
+        }
+
+        override fun onResume() {
+            super.onResume()
+
+            updateTitle(selection.size)
+        }
+
+        override fun onSelectionsChanged(newSize: Int) {
+            changed = true
+            updateTitle(newSize)
+        }
+
+        private fun updateTitle(size: Int) {
+            activity?.title = getString(R.string.selected_count, size)
+        }
+    }
+
+    companion object {
+
+        private const val KEY_SELECTION = "selection"
+        private const val KEY_CALLBACK = "callback"
+        private const val KEY_FILTER_IS_WORK = "filterIsWork"
+
+        fun start(context: Context, selection: Collection<ComponentKey>,
+                  callback: (Collection<ComponentKey>?) -> Unit, filterIsWork: Boolean? = null) {
+            val intent = Intent(context, SelectableAppsActivity::class.java).apply {
+                putStringArrayListExtra(KEY_SELECTION, ArrayList(selection.map { it.toString() }))
+                putExtra(KEY_CALLBACK, object : ResultReceiver(MAIN_EXECUTOR.handler) {
+
+                    override fun onReceiveResult(resultCode: Int, resultData: Bundle?) {
+                        if (resultCode == Activity.RESULT_OK) {
+                            callback(resultData!!.getStringArrayList(KEY_SELECTION)!!.map {
+                                Utilities.makeComponentKey(context, it)
+                            })
+                        } else {
+                            callback(null)
+                        }
+                    }
+                })
+                filterIsWork?.let { putExtra(KEY_FILTER_IS_WORK, it) }
+            }
+            context.startActivity(intent)
+        }
+
+        private fun createAppFilter(context: Context, predicate: (ComponentKey) -> Boolean): AppFilter {
+            return object : AppFilter() {
+
+                val base = OmegaAppFilter(context)
+
+                override fun shouldShowApp(app: ComponentName, user: UserHandle?): Boolean {
+                    if (!base.shouldShowApp(app, user)) {
+                        return false
+                    }
+                    return predicate(ComponentKey(app, user ?: Process.myUserHandle()))
+                }
+            }
+        }
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/preferences/SelectableAppsAdapter.kt b/Omega/src/com/saggitt/omega/preferences/SelectableAppsAdapter.kt
new file mode 100644
index 0000000000..7792c29ec3
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/preferences/SelectableAppsAdapter.kt
@@ -0,0 +1,121 @@
+/*
+ *  Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ *
+ */
+
+package com.saggitt.omega.preferences
+
+import android.content.Context
+import android.content.res.ColorStateList
+import android.view.View
+import com.android.launcher3.AppFilter
+import com.android.launcher3.Utilities
+import com.android.launcher3.Utilities.makeComponentKey
+import com.android.launcher3.util.ComponentKey
+import com.saggitt.omega.util.comparing
+import com.saggitt.omega.util.then
+import kotlin.reflect.KMutableProperty0
+
+abstract class SelectableAppsAdapter(context: Context, private val callback: Callback? = null, filter: AppFilter? = null)
+    : AppsAdapter(context, null, filter) {
+
+    private val selections = HashSet<ComponentKey>()
+    private val accentTintList = ColorStateList.valueOf(Utilities.getOmegaPrefs(context).accentColor)
+
+    override val comparator = comparing<App, Int> { if (isSelected(it.key)) 0 else 1 }
+            .then { it.info.label.toString().toLowerCase() }
+
+    init {
+        postLoadApps()
+        callback?.onSelectionsChanged(0)
+    }
+
+    override fun onAppsListLoaded() {
+        val tmp = HashSet(selections)
+        selections.clear()
+        apps.forEach {
+            if (it.key in tmp) {
+                selections.add(it.key)
+            }
+        }
+        super.onAppsListLoaded()
+        callback?.onSelectionsChanged(selections.size)
+    }
+
+    override fun onBindApp(app: App, holder: AppHolder) {
+        super.onBindApp(app, holder)
+        holder.checkBox.apply {
+            visibility = View.VISIBLE
+            isChecked = isSelected(app.key)
+            buttonTintList = accentTintList
+        }
+    }
+
+    override fun onClickApp(position: Int, holder: AppHolder) {
+        super.onClickApp(position, holder)
+        toggleSelection(position)
+        holder.checkBox.isChecked = isSelected(apps[position].key)
+    }
+
+    private fun isSelected(component: ComponentKey) = selections.contains(component)
+
+    private fun toggleSelection(position: Int) {
+        val app = apps[position]
+        val componentKey = app.key
+        if (selections.contains(componentKey)) {
+            selections.remove(componentKey)
+        } else {
+            selections.add(componentKey)
+        }
+        setSelections(selections)
+        callback?.onSelectionsChanged(selections.size)
+    }
+
+    fun clearSelection() {
+        selections.clear()
+        setSelections(selections)
+        callback?.onSelectionsChanged(0)
+        notifyDataSetChanged()
+    }
+
+    override fun loadAppsList() {
+        selections.addAll(getInitialSelections())
+        super.loadAppsList()
+    }
+
+    abstract fun getInitialSelections(): Set<ComponentKey>
+
+    abstract fun setSelections(selections: Set<ComponentKey>)
+
+    interface
+
+    Callback {
+
+        fun onSelectionsChanged(newSize: Int)
+    }
+
+    companion object {
+
+        fun ofProperty(context: Context, property: KMutableProperty0<Set<String>>,
+                       callback: Callback? = null, filter: AppFilter? = null) = object : SelectableAppsAdapter(context, callback, filter) {
+
+            override fun getInitialSelections() = HashSet(property.get().map { makeComponentKey(context, it) })
+
+            override fun setSelections(selections: Set<ComponentKey>) {
+                property.set(HashSet(selections.map { it.toString() }))
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/preferences/SingleDimensionGridSizeDialogFragmentCompat.kt b/Omega/src/com/saggitt/omega/preferences/SingleDimensionGridSizeDialogFragmentCompat.kt
new file mode 100644
index 0000000000..abcaad120e
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/preferences/SingleDimensionGridSizeDialogFragmentCompat.kt
@@ -0,0 +1,109 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.preferences
+
+import android.os.Bundle
+import android.view.View
+import android.widget.SeekBar
+import android.widget.TextView
+import androidx.appcompat.app.AlertDialog
+import androidx.preference.PreferenceDialogFragmentCompat
+import com.android.launcher3.R
+import com.saggitt.omega.util.applyAccent
+
+
+class SingleDimensionGridSizeDialogFragmentCompat : PreferenceDialogFragmentCompat(), SeekBar.OnSeekBarChangeListener {
+
+    private val gridSizePreference get() = preference as SingleDimensionGridSizePreference
+
+    private var numRows = 0
+
+    private val minValue = 3
+    private val maxValue = 9
+
+    private lateinit var numRowsPicker: SeekBar
+    private lateinit var numRowsLabel: TextView
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+
+        val size = gridSizePreference.getSize()
+        numRows = savedInstanceState?.getInt(SAVE_STATE_ROWS) ?: size
+    }
+
+    override fun onBindDialogView(view: View) {
+        super.onBindDialogView(view)
+
+        numRowsPicker = view.findViewById(R.id.numRowsPicker)
+        numRowsLabel = view.findViewById(R.id.numRowsLabel)
+
+        numRowsPicker.max = maxValue - minValue
+        numRowsPicker.progress = numRows - minValue
+        numRowsPicker.setOnSeekBarChangeListener(this)
+
+        numRowsLabel.text = "${numRowsPicker.progress + minValue}"
+    }
+
+    override fun onDialogClosed(positiveResult: Boolean) {
+        if (positiveResult) {
+            gridSizePreference.setSize(numRowsPicker.progress + minValue)
+        }
+    }
+
+    override fun onPrepareDialogBuilder(builder: AlertDialog.Builder) {
+        super.onPrepareDialogBuilder(builder)
+
+        builder.setNeutralButton(R.string.theme_default, { _, _ ->
+            gridSizePreference.setSize(0)
+        })
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+
+        outState.putInt(SAVE_STATE_ROWS, numRowsPicker.progress)
+    }
+
+    override fun onProgressChanged(seekBar: SeekBar?, progress: Int, fromUser: Boolean) {
+        numRowsLabel.text = "${progress + minValue}"
+    }
+
+    override fun onStartTrackingTouch(seekBar: SeekBar?) {
+
+    }
+
+    override fun onStopTrackingTouch(seekBar: SeekBar?) {
+
+    }
+
+    override fun onStart() {
+        super.onStart()
+        (dialog as AlertDialog).applyAccent()
+    }
+
+    companion object {
+        const val SAVE_STATE_ROWS = "rows"
+
+        fun newInstance(key: String?) = SingleDimensionGridSizeDialogFragmentCompat().apply {
+            arguments = Bundle(1).apply {
+                putString(ARG_KEY, key)
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/preferences/SingleDimensionGridSizePreference.kt b/Omega/src/com/saggitt/omega/preferences/SingleDimensionGridSizePreference.kt
new file mode 100644
index 0000000000..7859f3f4ec
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/preferences/SingleDimensionGridSizePreference.kt
@@ -0,0 +1,48 @@
+/*
+ *  Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ *
+ */
+
+package com.saggitt.omega.preferences
+
+import android.content.Context
+import android.util.AttributeSet
+import androidx.preference.DialogPreference
+import com.android.launcher3.R
+
+abstract class SingleDimensionGridSizePreference(context: Context, attrs: AttributeSet?, private val gridSize: GridSize) :
+        DialogPreference(context, attrs) {
+    val defaultSize by lazy { gridSize.numRowsOriginal }
+
+    init {
+        updateSummary()
+    }
+
+    fun getSize(): Int {
+        return gridSize.fromPref(gridSize.numRows, defaultSize)
+    }
+
+    fun setSize(rows: Int) {
+        gridSize.numRowsPref = gridSize.toPref(rows, defaultSize)
+        updateSummary()
+    }
+
+    private fun updateSummary() {
+        val value = getSize()
+        summary = "$value"
+    }
+
+    override fun getDialogLayoutResource() = R.layout.preference_grid_size
+}
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/preferences/SmartspaceAddToHomePreference.kt b/Omega/src/com/saggitt/omega/preferences/SmartspaceAddToHomePreference.kt
new file mode 100644
index 0000000000..8805f5363f
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/preferences/SmartspaceAddToHomePreference.kt
@@ -0,0 +1,69 @@
+/*
+ *     Copyright (C) 2019 Lawnchair Team.
+ *
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.preferences
+
+import android.content.Context
+import android.content.Intent
+import android.util.AttributeSet
+import androidx.preference.Preference
+import com.android.launcher3.BuildConfig
+import com.android.launcher3.Launcher
+import com.android.launcher3.LauncherAppState
+import com.android.launcher3.states.InternalStateHandler
+import com.android.launcher3.widget.WidgetsFullSheet
+
+class SmartspaceAddToHomePreference(context: Context, attrs: AttributeSet?) :
+        Preference(context, attrs), ResumablePreference,
+        ControlledPreference by ControlledPreference.Delegate(context, attrs) {
+
+    override fun onResume() {
+        isVisible = hasSmartspaceWidget(context) != true
+    }
+
+    override fun onClick() {
+        val homeIntent = OpenWidgetsInitListener().addToIntent(
+                Intent(Intent.ACTION_MAIN)
+                        .addCategory(Intent.CATEGORY_HOME)
+                        .setPackage(BuildConfig.APPLICATION_ID)
+                        .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK))
+
+        context.startActivity(homeIntent)
+    }
+
+    class OpenWidgetsInitListener : InternalStateHandler() {
+
+        override fun init(launcher: Launcher, alreadyOnHome: Boolean): Boolean {
+            WidgetsFullSheet.show(launcher, true)
+            return true
+        }
+    }
+
+    companion object {
+
+        fun hasSmartspaceWidget(context: Context): Boolean? {
+            return LauncherAppState.getInstance(context).model.loadedWidgets?.any { it.isCustomWidget }
+        }
+
+        @JvmStatic
+        fun showSmartspaceInPreview(context: Context): Boolean {
+            return hasSmartspaceWidget(context) != false
+        }
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/preferences/SmartspaceEventProvidersAdapter.kt b/Omega/src/com/saggitt/omega/preferences/SmartspaceEventProvidersAdapter.kt
new file mode 100644
index 0000000000..ca662b052f
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/preferences/SmartspaceEventProvidersAdapter.kt
@@ -0,0 +1,300 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.preferences
+
+import android.content.Context
+import android.os.Handler
+import android.util.Log
+import android.view.LayoutInflater
+import android.view.MotionEvent
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.recyclerview.widget.ItemTouchHelper
+import androidx.recyclerview.widget.RecyclerView
+import com.android.launcher3.R
+import com.saggitt.omega.smartspace.OmegaSmartspaceController
+import com.saggitt.omega.smartspace.SmartspaceDataWidget
+import com.saggitt.omega.smartspace.eventprovider.*
+import com.saggitt.omega.smartspace.weather.FakeDataProvider
+import com.saggitt.omega.util.getColorAccent
+import com.saggitt.omega.util.isVisible
+import com.saggitt.omega.util.omegaPrefs
+
+class SmartspaceEventProvidersAdapter(private val context: Context)
+    : RecyclerView.Adapter<SmartspaceEventProvidersAdapter.Holder>() {
+
+    private val prefs = context.omegaPrefs
+    private val allProviders = ArrayList<ProviderItem>()
+    private val handler = Handler()
+
+    private var dividerIndex = 0
+
+    private val adapterItems = ArrayList<Item>()
+    private val currentSpecs = ArrayList<String>()
+    private val otherItems = ArrayList<ProviderItem>()
+    private val divider = DividerItem()
+    private var isDragging = false
+
+    var itemTouchHelper: ItemTouchHelper? = null
+
+    init {
+        allProviders.addAll(getEventProviders(context).map { ProviderItem(ProviderInfo(it)) })
+        currentSpecs.addAll(prefs.eventProviders.getAll())
+
+        fillItems()
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): Holder {
+        return when (viewType) {
+            TYPE_HEADER -> createHolder(parent, R.layout.event_provider_text_item, ::HeaderHolder)
+            TYPE_ITEM -> createHolder(parent, R.layout.event_provider_dialog_item, ::ProviderHolder)
+            TYPE_DIVIDER -> createHolder(parent, R.layout.event_providers_divider_item, ::DividerHolder)
+            else -> throw IllegalArgumentException("type must be either TYPE_TEXT, " +
+                    "TYPE_PROVIDER or TYPE_DIVIDER")
+        }
+    }
+
+    override fun getItemCount() = adapterItems.count()
+
+    override fun onBindViewHolder(holder: Holder, position: Int) {
+        holder.bind(adapterItems[position])
+    }
+
+    override fun getItemViewType(position: Int): Int {
+        return adapterItems[position].type
+    }
+
+    fun saveSpecs(): ArrayList<String> {
+        val newSpecs = ArrayList<String>()
+        val iterator = adapterItems.iterator()
+
+        while (iterator.hasNext()) {
+            val item = iterator.next()
+            if (item is ProviderItem) {
+                newSpecs.add(item.info.name)
+                Log.d("SmartspaceEventProvider", "adding item ${item.info.name}")
+            }
+            if (item is DividerItem) break
+        }
+        return newSpecs
+    }
+
+    private fun fillItems() {
+        otherItems.clear()
+        otherItems.addAll(allProviders)
+
+        adapterItems.clear()
+        adapterItems.add(HeaderItem())
+        currentSpecs.forEach {
+            val item = getAndRemoveOther(it)
+            if (item != null) {
+                adapterItems.add(item)
+            }
+        }
+        dividerIndex = adapterItems.count()
+        adapterItems.add(divider)
+        adapterItems.addAll(otherItems)
+    }
+
+    private fun getAndRemoveOther(s: String): ProviderItem? {
+        val iterator = otherItems.iterator()
+        while (iterator.hasNext()) {
+            val item = iterator.next()
+            if (item.info.name == s) {
+                iterator.remove()
+                return item
+            }
+        }
+        return null
+    }
+
+    private fun move(from: Int, to: Int): Boolean {
+        if (to == from) return true
+        move(from, to, adapterItems)
+        dividerIndex = adapterItems.indexOf(divider)
+        return true
+    }
+
+    private fun <T> move(from: Int, to: Int, list: MutableList<T>) {
+        list.add(to, list.removeAt(from))
+        notifyItemMoved(from, to)
+    }
+
+    private inline fun createHolder(parent: ViewGroup, resource: Int, creator: (View) -> Holder): Holder {
+        return creator(LayoutInflater.from(parent.context).inflate(resource, parent, false))
+    }
+
+    abstract class Item {
+
+        abstract val isStatic: Boolean
+        abstract val type: Int
+    }
+
+    class HeaderItem : Item() {
+
+        override val isStatic = true
+        override val type = TYPE_HEADER
+    }
+
+    open class ProviderItem(val info: ProviderInfo) : Item() {
+
+        override val isStatic = false
+        override val type = TYPE_ITEM
+    }
+
+    class DividerItem : Item() {
+
+        override val isStatic = true
+        override val type = TYPE_DIVIDER
+    }
+
+    abstract class Holder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+
+        open fun bind(item: Item) {
+
+        }
+    }
+
+    inner class ProviderInfo(val name: String) {
+
+        val displayName = OmegaSmartspaceController.getDisplayName(context, name)
+    }
+
+    class HeaderHolder(itemView: View) : Holder(itemView) {
+
+        init {
+            itemView.findViewById<TextView>(android.R.id.text1).apply {
+                setText(R.string.enabled_icon_packs)
+                setTextColor(context.getColorAccent())
+            }
+        }
+    }
+
+    open inner class ProviderHolder(itemView: View) : Holder(itemView), View.OnClickListener, View.OnTouchListener {
+
+        val title: TextView = itemView.findViewById(android.R.id.title)
+        val summary: TextView = itemView.findViewById(android.R.id.summary)
+        private val dragHandle: View = itemView.findViewById(R.id.drag_handle)
+        private val packItem
+            get() = adapterItems[adapterPosition] as? ProviderItem
+                    ?: throw IllegalArgumentException("item must be ProviderItem")
+
+        init {
+            itemView.setOnClickListener(this)
+            dragHandle.setOnTouchListener(this)
+        }
+
+        override fun bind(item: Item) {
+            val packItem = item as? ProviderItem
+                    ?: throw IllegalArgumentException("item must be ProviderItem")
+            title.text = packItem.info.displayName
+            itemView.isClickable = !packItem.isStatic
+            dragHandle.isVisible = !packItem.isStatic
+        }
+
+        override fun onClick(v: View) {
+            val item = packItem
+            if (adapterPosition > dividerIndex) {
+                adapterItems.removeAt(adapterPosition)
+                adapterItems.add(1, item)
+                notifyItemMoved(adapterPosition, 1)
+                dividerIndex++
+            } else {
+                adapterItems.removeAt(adapterPosition)
+                adapterItems.add(dividerIndex, item)
+                notifyItemMoved(adapterPosition, dividerIndex)
+                dividerIndex--
+            }
+            notifyItemChanged(dividerIndex)
+        }
+
+        override fun onTouch(v: View, event: MotionEvent): Boolean {
+            if (v == dragHandle && event.actionMasked == MotionEvent.ACTION_DOWN) {
+                itemTouchHelper?.startDrag(this)
+            }
+            return false
+        }
+    }
+
+    inner class DividerHolder(itemView: View) : Holder(itemView) {
+
+        val text: TextView = itemView.findViewById(android.R.id.text1)
+
+        init {
+            text.setTextColor(text.context.getColorAccent())
+        }
+
+        override fun bind(item: Item) {
+            super.bind(item)
+            if (isDragging || dividerIndex == adapterItems.size - 1) {
+                text.setText(R.string.drag_to_disable_packs)
+            } else {
+                text.setText(R.string.drag_to_enable_packs)
+            }
+        }
+    }
+
+    inner class TouchHelperCallback : ItemTouchHelper.Callback() {
+
+        override fun onSelectedChanged(viewHolder: RecyclerView.ViewHolder?, actionState: Int) {
+            super.onSelectedChanged(viewHolder, actionState)
+            isDragging = actionState == ItemTouchHelper.ACTION_STATE_DRAG
+            handler.post { notifyItemChanged(dividerIndex) }
+        }
+
+        override fun canDropOver(recyclerView: RecyclerView, current: RecyclerView.ViewHolder, target: RecyclerView.ViewHolder): Boolean {
+            return target.adapterPosition in 1..dividerIndex
+        }
+
+        override fun getMovementFlags(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder): Int {
+            val item = adapterItems[viewHolder.adapterPosition]
+            val dragFlags = if (item.isStatic) 0 else ItemTouchHelper.UP or ItemTouchHelper.DOWN
+            return makeMovementFlags(dragFlags, 0)
+        }
+
+        override fun onMove(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder, target: RecyclerView.ViewHolder): Boolean {
+            return move(viewHolder.adapterPosition, target.adapterPosition)
+        }
+
+        override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) {
+
+        }
+    }
+
+    companion object {
+
+        const val TYPE_HEADER = 0
+        const val TYPE_ITEM = 1
+        const val TYPE_DIVIDER = 2
+
+        fun getEventProviders(context: Context): List<String> {
+            val list = ArrayList<String>()
+            list.add(CalendarEventProvider::class.java.name)
+            list.add(SmartspaceDataWidget::class.java.name)
+            list.add(NowPlayingProvider::class.java.name)
+            list.add(NotificationUnreadProvider::class.java.name)
+            list.add(BatteryStatusProvider::class.java.name)
+            list.add(AlarmEventProvider::class.java.name)
+            list.add(PersonalityProvider::class.java.name)
+            if (context.omegaPrefs.showDebugInfo)
+                list.add(FakeDataProvider::class.java.name)
+            return list
+        }
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/preferences/SmartspaceEventProvidersFragment.kt b/Omega/src/com/saggitt/omega/preferences/SmartspaceEventProvidersFragment.kt
new file mode 100644
index 0000000000..5c5853802e
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/preferences/SmartspaceEventProvidersFragment.kt
@@ -0,0 +1,68 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.preferences
+
+import android.os.Bundle
+import android.view.View
+import androidx.appcompat.app.AlertDialog
+import androidx.preference.PreferenceDialogFragmentCompat
+import androidx.recyclerview.widget.DefaultItemAnimator
+import androidx.recyclerview.widget.ItemTouchHelper
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.android.launcher3.R
+import com.saggitt.omega.util.applyAccent
+
+class SmartspaceEventProvidersFragment : PreferenceDialogFragmentCompat() {
+
+    private val providersPreference get() = preference as SmartspaceEventProvidersPreference
+    private lateinit var adapter: SmartspaceEventProvidersAdapter
+
+    override fun onBindDialogView(view: View) {
+        super.onBindDialogView(view)
+        adapter = SmartspaceEventProvidersAdapter(view.context)
+
+        val recyclerView = view.findViewById<RecyclerView>(R.id.list)
+        recyclerView.layoutManager = LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
+        recyclerView.adapter = adapter
+        (recyclerView.itemAnimator as? DefaultItemAnimator)?.supportsChangeAnimations = false
+        adapter.itemTouchHelper = ItemTouchHelper(adapter.TouchHelperCallback()).apply {
+            attachToRecyclerView(recyclerView)
+        }
+    }
+
+    override fun onDialogClosed(positiveResult: Boolean) {
+        if (positiveResult) {
+            providersPreference.setProviders(adapter.saveSpecs())
+        }
+    }
+
+    override fun onStart() {
+        super.onStart()
+        (dialog as AlertDialog).applyAccent()
+    }
+
+    companion object {
+
+        fun newInstance(key: String?) = SmartspaceEventProvidersFragment().apply {
+            arguments = Bundle(1).apply {
+                putString(ARG_KEY, key)
+            }
+        }
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/preferences/SmartspaceEventProvidersPreference.kt b/Omega/src/com/saggitt/omega/preferences/SmartspaceEventProvidersPreference.kt
new file mode 100644
index 0000000000..9170935f48
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/preferences/SmartspaceEventProvidersPreference.kt
@@ -0,0 +1,85 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+
+package com.saggitt.omega.preferences
+
+import android.content.Context
+import android.text.TextUtils
+import android.util.AttributeSet
+import android.widget.TextView
+import androidx.preference.DialogPreference
+import androidx.preference.PreferenceViewHolder
+import com.android.launcher3.R
+import com.saggitt.omega.OmegaPreferences
+import com.saggitt.omega.omegaApp
+import com.saggitt.omega.smartspace.OmegaSmartspaceController
+import com.saggitt.omega.util.omegaPrefs
+import com.saggitt.omega.util.runOnMainThread
+
+class SmartspaceEventProvidersPreference(context: Context, attrs: AttributeSet?) :
+        DialogPreference(context, attrs),
+        ControlledPreference by ControlledPreference.Delegate(context, attrs),
+        OmegaPreferences.MutableListPrefChangeListener {
+
+    private val providersPref = context.omegaPrefs.eventProviders
+
+    init {
+        updateSummary()
+    }
+
+    fun setProviders(providers: List<String>) {
+        context.omegaPrefs.eventProviders.setAll(providers)
+        context.omegaApp.smartspace.onProviderChanged()
+    }
+
+    private fun updateSummary() {
+        val providerNames = providersPref.getAll()
+                .map { OmegaSmartspaceController.getDisplayName(context, it) }
+        if (providerNames.isNotEmpty()) {
+            summary = TextUtils.join(", ", providerNames)
+        } else {
+            setSummary(R.string.weather_provider_disabled)
+        }
+    }
+
+    override fun onBindViewHolder(holder: PreferenceViewHolder) {
+        super.onBindViewHolder(holder)
+
+        val summaryView = holder.findViewById(android.R.id.summary) as TextView
+        summaryView.maxLines = 1
+        summaryView.ellipsize = TextUtils.TruncateAt.END
+    }
+
+    override fun onAttached() {
+        super.onAttached()
+        providersPref.addListener(this)
+    }
+
+    override fun onDetached() {
+        super.onDetached()
+        providersPref.removeListener(this)
+    }
+
+    override fun onListPrefChanged(key: String) {
+        runOnMainThread {
+            updateSummary()
+        }
+    }
+
+    override fun getDialogLayoutResource() = R.layout.dialog_preference_recyclerview
+}
diff --git a/Omega/src/com/saggitt/omega/preferences/SmartspaceProviderPreference.kt b/Omega/src/com/saggitt/omega/preferences/SmartspaceProviderPreference.kt
new file mode 100644
index 0000000000..41bd516597
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/preferences/SmartspaceProviderPreference.kt
@@ -0,0 +1,104 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.saggitt.omega.preferences
+
+import android.content.Context
+import android.util.AttributeSet
+import androidx.preference.ListPreference
+import com.android.launcher3.Utilities
+import com.saggitt.omega.OmegaPreferences
+import com.saggitt.omega.smartspace.BlankDataProvider
+import com.saggitt.omega.smartspace.FeedBridge
+import com.saggitt.omega.smartspace.OmegaSmartspaceController
+import com.saggitt.omega.smartspace.SmartspaceDataWidget
+import com.saggitt.omega.smartspace.weather.FakeDataProvider
+import com.saggitt.omega.smartspace.weather.OnePlusWeatherDataProvider
+import com.saggitt.omega.smartspace.weather.PEWeatherDataProvider
+import com.saggitt.omega.smartspace.weather.SmartspacePixelBridge
+import com.saggitt.omega.util.buildEntries
+
+class SmartspaceProviderPreference(context: Context, attrs: AttributeSet?)
+    : ListPreference(context, attrs), OmegaPreferences.OnPreferenceChangeListener {
+
+    private val prefs = Utilities.getOmegaPrefs(context)
+    private val forWeather by lazy { key == "pref_smartspace_widget_provider" }
+
+    init {
+        buildEntries {
+            getProviders().forEach {
+                addEntry(OmegaSmartspaceController.getDisplayName(it), it)
+            }
+        }
+    }
+
+    override fun onSetInitialValue(restoreValue: Boolean, defaultValue: Any?) {
+        super.onSetInitialValue(true, defaultValue)
+    }
+
+    private fun getProviders(): List<String> {
+        return if (forWeather) getWeatherProviders() else SmartspaceEventProvidersAdapter.getEventProviders(context)
+    }
+
+    private fun getWeatherProviders(): List<String> {
+        val list = ArrayList<String>()
+        list.add(BlankDataProvider::class.java.name)
+        list.add(SmartspaceDataWidget::class.java.name)
+        if (FeedBridge.getInstance(context).resolveBridge()?.supportsSmartspace == true)
+            list.add(SmartspacePixelBridge::class.java.name)
+        if (PEWeatherDataProvider.isAvailable(context))
+            list.add(PEWeatherDataProvider::class.java.name)
+        if (OnePlusWeatherDataProvider.isAvailable(context))
+            list.add(OnePlusWeatherDataProvider::class.java.name)
+        if (prefs.showDebugInfo)
+            list.add(FakeDataProvider::class.java.name)
+        return list
+    }
+
+    override fun shouldDisableDependents(): Boolean {
+        return super.shouldDisableDependents() || value == BlankDataProvider::class.java.name
+    }
+
+    override fun onValueChanged(key: String, prefs: OmegaPreferences, force: Boolean) {
+        if (value != getPersistedValue()) {
+            value = getPersistedValue()
+        }
+        notifyDependencyChange(shouldDisableDependents())
+    }
+
+    override fun onAttached() {
+        super.onAttached()
+
+        prefs.addOnPreferenceChangeListener(key, this)
+    }
+
+    override fun onDetached() {
+        super.onDetached()
+
+        prefs.removeOnPreferenceChangeListener(key, this)
+    }
+
+    override fun getPersistedString(defaultReturnValue: String?): String {
+        return getPersistedValue()!!
+    }
+
+    private fun getPersistedValue() = prefs.sharedPrefs.getString(key, SmartspaceDataWidget::class.java.name)
+
+    override fun persistString(value: String?): Boolean {
+        prefs.sharedPrefs.edit().putString(key, value ?: BlankDataProvider::class.java.name).apply()
+        return true
+    }
+}
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/preferences/StyledIconPreference.kt b/Omega/src/com/saggitt/omega/preferences/StyledIconPreference.kt
index 9c3ea20c7f..469592984a 100644
--- a/Omega/src/com/saggitt/omega/preferences/StyledIconPreference.kt
+++ b/Omega/src/com/saggitt/omega/preferences/StyledIconPreference.kt
@@ -17,29 +17,32 @@
 package com.saggitt.omega.preferences
 
 import android.content.Context
+import android.content.res.ColorStateList
 import android.util.AttributeSet
 import android.view.ViewGroup
 import android.widget.ImageView
 import androidx.preference.Preference
 import androidx.preference.PreferenceViewHolder
 import com.android.launcher3.R
+import com.android.launcher3.util.Themes
 import com.saggitt.omega.util.forEachIndexed
 
 open class StyledIconPreference : Preference {
     var count = 1
     var index = 0
 
-    @JvmOverloads
     constructor (context: Context) : super(context)
 
-    @JvmOverloads
     constructor (context: Context, attrs: AttributeSet) : super(context, attrs)
 
     override fun onBindViewHolder(holder: PreferenceViewHolder) {
         super.onBindViewHolder(holder)
+        val iconColor = ColorStateList.valueOf(Themes.getAttrColor(context, R.color.setting_icon_color))
         holder.findViewById(androidx.appcompat.R.id.icon)?.let { it as? ImageView }?.apply {
             val size = resources.getDimensionPixelSize(R.dimen.dashboard_tile_image_size)
             layoutParams = ViewGroup.LayoutParams(size, size)
+            imageTintList = iconColor
+            backgroundTintList = iconColor
         }
     }
 
diff --git a/Omega/src/com/saggitt/omega/preferences/StyledSwitchPreference.kt b/Omega/src/com/saggitt/omega/preferences/StyledSwitchPreference.kt
index c225ff8724..ed5b924ef4 100644
--- a/Omega/src/com/saggitt/omega/preferences/StyledSwitchPreference.kt
+++ b/Omega/src/com/saggitt/omega/preferences/StyledSwitchPreference.kt
@@ -1,26 +1,26 @@
 /*
- *     This file is part of Lawnchair Launcher.
+ *  Copyright (c) 2020 Omega Launcher
  *
- *     Lawnchair Launcher is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
+ *  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
  *
- *     Lawnchair Launcher is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
+ *  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.
  *
- *     You should have received a copy of the GNU General Public License
- *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
  */
+
 package com.saggitt.omega.preferences
 
 import android.content.Context
 import android.util.AttributeSet
 import android.view.View
 import android.widget.Switch
-import androidx.preference.AndroidResources
 import androidx.preference.PreferenceViewHolder
 import androidx.preference.SwitchPreference
 import com.android.launcher3.Utilities
@@ -32,7 +32,7 @@ open class StyledSwitchPreference(context: Context, attrs: AttributeSet?) : Swit
 
     override fun onBindViewHolder(holder: PreferenceViewHolder?) {
         super.onBindViewHolder(holder)
-        checkableView = holder?.findViewById(AndroidResources.ANDROID_R_SWITCH_WIDGET)
+        checkableView = holder?.findViewById(android.R.id.switch_widget)
         (checkableView as Switch).applyColor(Utilities.getOmegaPrefs(context).accentColor)
     }
 }
diff --git a/Omega/src/com/saggitt/omega/preferences/StyledSwitchPreferenceCompat.java b/Omega/src/com/saggitt/omega/preferences/StyledSwitchPreferenceCompat.java
new file mode 100644
index 0000000000..3f59b69302
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/preferences/StyledSwitchPreferenceCompat.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ */
+
+package com.saggitt.omega.preferences;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.Switch;
+
+import androidx.preference.PreferenceViewHolder;
+import androidx.preference.SwitchPreference;
+
+import com.android.launcher3.Utilities;
+import com.saggitt.omega.util.OmegaUtilsKt;
+
+import org.jetbrains.annotations.Nullable;
+
+public class StyledSwitchPreferenceCompat extends SwitchPreference implements ControlledPreference {
+
+    private final ControlledPreference.Delegate delegate;
+    private View checkableView;
+
+    public StyledSwitchPreferenceCompat(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        delegate = new Delegate(context, attrs);
+    }
+
+    public StyledSwitchPreferenceCompat(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        delegate = new Delegate(context, attrs);
+    }
+
+    public void onBindViewHolder(@Nullable PreferenceViewHolder holder) {
+        super.onBindViewHolder(holder);
+        checkableView = holder.findViewById(android.R.id.switch_widget);
+        OmegaUtilsKt.applyColor((Switch) checkableView, Utilities.getOmegaPrefs(getContext()).getAccentColor());
+    }
+
+    @Nullable
+    @Override
+    public PreferenceController getController() {
+        return delegate.getController();
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/preferences/StyledSwitchPreferenceCompat.kt b/Omega/src/com/saggitt/omega/preferences/StyledSwitchPreferenceCompat.kt
deleted file mode 100644
index 3c15218214..0000000000
--- a/Omega/src/com/saggitt/omega/preferences/StyledSwitchPreferenceCompat.kt
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- *     This file is part of Lawnchair Launcher.
- *
- *     Lawnchair Launcher is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Lawnchair Launcher is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.saggitt.omega.preferences
-
-import android.content.Context
-import android.util.AttributeSet
-import android.view.View
-import android.widget.Switch
-import androidx.preference.AndroidResources
-import androidx.preference.PreferenceViewHolder
-import androidx.preference.SwitchPreference
-import com.android.launcher3.Utilities
-import com.saggitt.omega.OmegaPreferences
-import com.saggitt.omega.settings.search.SearchIndex
-import com.saggitt.omega.util.applyColor
-import com.saggitt.omega.util.omegaPrefs
-
-open class StyledSwitchPreferenceCompat(context: Context, attrs: AttributeSet? = null) :
-        SwitchPreference(context, attrs),
-        ControlledPreference by ControlledPreference.Delegate(context, attrs) {
-
-    protected var checkableView: View? = null
-        private set
-
-    override fun onBindViewHolder(holder: PreferenceViewHolder?) {
-        super.onBindViewHolder(holder)
-        checkableView = holder?.findViewById(AndroidResources.ANDROID_R_SWITCH_WIDGET)
-        (checkableView as Switch).applyColor(Utilities.getOmegaPrefs(context).accentColor)
-    }
-
-
-    open class SwitchSlice(context: Context, attrs: AttributeSet) : SearchIndex.Slice(context, attrs) {
-
-        private val defaultValue: Boolean
-
-        init {
-            val ta = context.obtainStyledAttributes(attrs, intArrayOf(android.R.attr.defaultValue))
-            defaultValue = ta.getBoolean(0, false)
-            ta.recycle()
-        }
-
-        override fun createSliceView(): View {
-            return SwitchSliceView(context, key, defaultValue)
-        }
-    }
-
-    class SwitchSliceView(
-            context: Context,
-            private val key: String,
-            private val defaultValue: Boolean)
-        : Switch(context), OmegaPreferences.OnPreferenceChangeListener {
-
-        init {
-            applyColor(context.omegaPrefs.accentColor)
-            setOnCheckedChangeListener { _, isChecked ->
-                context.omegaPrefs.sharedPrefs.edit().putBoolean(key, isChecked).apply()
-            }
-        }
-
-        override fun onAttachedToWindow() {
-            super.onAttachedToWindow()
-            context.omegaPrefs.addOnPreferenceChangeListener(key, this)
-        }
-
-        override fun onDetachedFromWindow() {
-            super.onDetachedFromWindow()
-            context.omegaPrefs.removeOnPreferenceChangeListener(key, this)
-        }
-
-        override fun onValueChanged(key: String, prefs: OmegaPreferences, force: Boolean) {
-            isChecked = prefs.sharedPrefs.getBoolean(key, defaultValue)
-        }
-    }
-}
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/preferences/ThemedPreferenceCategory.java b/Omega/src/com/saggitt/omega/preferences/ThemedPreferenceCategory.java
index ee17443188..0f6423525d 100644
--- a/Omega/src/com/saggitt/omega/preferences/ThemedPreferenceCategory.java
+++ b/Omega/src/com/saggitt/omega/preferences/ThemedPreferenceCategory.java
@@ -30,10 +30,13 @@ public class ThemedPreferenceCategory extends PreferenceCategory {
     private Context mContext;
 
     public ThemedPreferenceCategory(Context context) {
-        this(context, null, 0);
+        super(context);
+        mContext = context;
     }
+
     public ThemedPreferenceCategory(Context context, AttributeSet attrs) {
-        this(context, attrs, 0);
+        super(context, attrs);
+        mContext = context;
     }
 
     public ThemedPreferenceCategory(Context context, AttributeSet attrs, int defStyle) {
diff --git a/Omega/src/com/saggitt/omega/qsb/AbstractQsbLayout.java b/Omega/src/com/saggitt/omega/qsb/AbstractQsbLayout.java
new file mode 100644
index 0000000000..f5cf5c7722
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/qsb/AbstractQsbLayout.java
@@ -0,0 +1,757 @@
+/*
+ *  Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ *
+ */
+package com.saggitt.omega.qsb;
+
+import android.content.ActivityNotFoundException;
+import android.content.ClipData;
+import android.content.ClipboardManager;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
+import android.content.res.ColorStateList;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.Paint.Style;
+import android.graphics.PorterDuff;
+import android.graphics.PorterDuffXfermode;
+import android.graphics.Rect;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.GradientDrawable;
+import android.graphics.drawable.InsetDrawable;
+import android.graphics.drawable.RippleDrawable;
+import android.text.TextPaint;
+import android.text.TextUtils;
+import android.text.TextUtils.TruncateAt;
+import android.util.AttributeSet;
+import android.util.FloatProperty;
+import android.util.TypedValue;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.View.OnLongClickListener;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
+import androidx.core.graphics.ColorUtils;
+
+import com.android.launcher3.DeviceProfile;
+import com.android.launcher3.Insettable;
+import com.android.launcher3.Launcher;
+import com.android.launcher3.LauncherAppState;
+import com.android.launcher3.R;
+import com.android.launcher3.Utilities;
+import com.android.launcher3.graphics.IconShape;
+import com.android.launcher3.graphics.NinePatchDrawHelper;
+import com.android.launcher3.icons.ShadowGenerator;
+import com.android.launcher3.uioverrides.WallpaperColorInfo;
+import com.android.launcher3.util.Themes;
+import com.android.launcher3.util.TransformingTouchDelegate;
+import com.saggitt.omega.OmegaLauncher;
+import com.saggitt.omega.search.SearchProvider;
+import com.saggitt.omega.search.SearchProviderController;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Objects;
+
+import static com.saggitt.omega.util.Config.GOOGLE_QSB;
+import static com.saggitt.omega.util.OmegaUtilsKt.round;
+
+public abstract class AbstractQsbLayout extends FrameLayout implements OnSharedPreferenceChangeListener,
+        OnClickListener, OnLongClickListener, Insettable, SearchProviderController.OnProviderChangeListener,
+        WallpaperColorInfo.OnChangeListener {
+    protected final static String TAG = "AbstractQsbLayout";
+
+    private static final Rect mSrcRect = new Rect();
+    protected final TextPaint qsbTextHintSize;
+    protected final Paint mMicStrokePaint;
+    protected final Paint CV;
+    protected final NinePatchDrawHelper mShadowHelper;
+    protected final NinePatchDrawHelper mClearShadowHelper;
+    protected final OmegaLauncher mLauncher;
+    protected final int qsbTextSpacing;
+    protected final int twoBubbleGap;
+    protected final int mSearchIconWidth;
+    private final int qsbDoodle;
+    private final int mShadowMargin;
+    private final int qsbHintLenght;
+    public FloatProperty HOTSEAT_PROGRESS = new FloatProperty<AbstractQsbLayout>("hotseatProgress") {
+        @Override
+        public void setValue(AbstractQsbLayout qsb, float v) {
+            if (qsb.mHotseatProgress != v) {
+                qsb.mHotseatProgress = v;
+                qsb.invalidate();
+            }
+        }
+
+        @Override
+        public Float get(AbstractQsbLayout qsb) {
+            return qsb.mHotseatProgress;
+        }
+    };
+    protected int mResult;
+    private final TransformingTouchDelegate mTouchDelegate;
+    private final boolean workspaceDarkText;
+    protected int mColor;
+    protected boolean mIsRtl;
+    protected boolean mUseTwoBubbles;
+    protected boolean mShowAssistant;
+    public float micStrokeWidth;
+    protected ImageView mMicIconView;
+    protected ImageView mLogoIconView;
+    protected boolean Dh;
+    protected ImageView mHotseatLogoIconView;
+    protected String Dg;
+    protected FrameLayout mMicFrame;
+    protected float mHotseatProgress = 1f;
+    protected Bitmap mAllAppsShadowBitmap;
+    protected Bitmap mHotseatShadowBitmap;
+    protected Bitmap mBubbleShadowBitmap;
+    protected Bitmap mClearBitmap;
+
+    protected int mAllAppsBgColor;
+    protected int mHotseatBgColor;
+    protected int mBubbleBgColor;
+    private float mRadius;
+
+    public AbstractQsbLayout(Context context) {
+        this(context, null);
+    }
+
+    public AbstractQsbLayout(Context context, AttributeSet attributeSet) {
+        this(context, attributeSet, 0);
+    }
+
+    public AbstractQsbLayout(Context context, AttributeSet attributeSet, int i) {
+        super(context, attributeSet, i);
+        qsbTextHintSize = new TextPaint();
+        mMicStrokePaint = new Paint(1);
+        CV = new Paint(1);
+        mShadowHelper = new NinePatchDrawHelper();
+        mClearShadowHelper = new NinePatchDrawHelper();
+        mClearShadowHelper.paint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.DST_OUT));
+        mResult = 0;
+        mLauncher = (OmegaLauncher) Launcher.getLauncher(context);
+        workspaceDarkText = Themes.getAttrBoolean(mLauncher, R.attr.isWorkspaceDarkText);
+        setOnLongClickListener(this);
+        qsbDoodle = getResources().getDimensionPixelSize(R.dimen.qsb_doodle_tap_target_logo_width);
+        mSearchIconWidth = getResources().getDimensionPixelSize(R.dimen.qsb_mic_width);
+        qsbTextSpacing = getResources().getDimensionPixelSize(R.dimen.qsb_text_spacing);
+        twoBubbleGap = getResources().getDimensionPixelSize(R.dimen.qsb_two_bubble_gap);
+        qsbTextHintSize.setTextSize((float) getResources().getDimensionPixelSize(R.dimen.qsb_hint_text_size));
+        mShadowMargin = getResources().getDimensionPixelSize(R.dimen.qsb_shadow_margin);
+        qsbHintLenght = getResources().getDimensionPixelSize(R.dimen.qsb_max_hint_length);
+        mIsRtl = Utilities.isRtl(getResources());
+        mTouchDelegate = new TransformingTouchDelegate(this);
+        setTouchDelegate(mTouchDelegate);
+        CV.setColor(Color.WHITE);
+        mRadius = round(Utilities.getOmegaPrefs(getContext()).getSearchBarRadius());
+    }
+
+    public static float getCornerRadius(Context context, float defaultRadius) {
+        float radius = round(Utilities.getOmegaPrefs(context).getSearchBarRadius());
+        if (radius >= 0f) {
+            return radius;
+        }
+        TypedValue edgeRadius = IconShape.getShape().getAttrValue(R.attr.qsbEdgeRadius);
+        if (edgeRadius != null) {
+            return edgeRadius.getDimension(context.getResources().getDisplayMetrics());
+        } else {
+            return defaultRadius;
+        }
+    }
+
+    public abstract void startSearch(String str, int i);
+
+    protected void onAttachedToWindow() {
+        super.onAttachedToWindow();
+        getDevicePreferences().registerOnSharedPreferenceChangeListener(this);
+        mTouchDelegate.setDelegateView(mMicFrame);
+        SearchProviderController.Companion.getInstance(getContext()).addOnProviderChangeListener(this);
+        WallpaperColorInfo instance = WallpaperColorInfo.getInstance(getContext());
+        instance.addOnChangeListener(this);
+        onExtractedColorsChanged(instance);
+
+        updateConfiguration();
+    }
+
+    public boolean onTouchEvent(MotionEvent motionEvent) {
+        if (motionEvent.getActionMasked() == 0) {
+            View findViewById = findViewById(R.id.g_icon);
+            int i = 0;
+            int i2 = 1;
+            if (mIsRtl) {
+                if (Float.compare(motionEvent.getX(), (float) (dI() ? getWidth() - qsbDoodle : findViewById.getLeft())) >= 0) {
+                    i = 1;
+                }
+            } else {
+                if (Float.compare(motionEvent.getX(), (float) (dI() ? qsbDoodle : findViewById.getRight())) <= 0) {
+                    i = 1;
+                }
+            }
+            if (i == 0) {
+                i2 = 2;
+            }
+            mResult = i2;
+        }
+        return super.onTouchEvent(motionEvent);
+    }
+
+    protected final SharedPreferences getDevicePreferences() {
+        loadIcons();
+        SharedPreferences devicePrefs = Utilities.getPrefs(getContext());
+        loadPreferences(devicePrefs);
+        return devicePrefs;
+    }
+
+    protected void loadIcons() {
+        mLogoIconView = findViewById(R.id.g_icon);
+        mMicIconView = findViewById(R.id.mic_icon);
+        mHotseatLogoIconView = findViewById(R.id.g_icon_hotseat);
+        mMicFrame = findViewById(R.id.mic_frame);
+        mMicIconView.setOnClickListener(this);
+        mLogoIconView.setOnClickListener(this);
+    }
+
+    protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
+        super.onLayout(changed, left, top, right, bottom);
+        if (mIsRtl) {
+            mSrcRect.left -= mShadowMargin;
+        } else {
+            mSrcRect.right += mShadowMargin;
+        }
+        mTouchDelegate.setBounds(mSrcRect.left, mSrcRect.top, mSrcRect.right, mSrcRect.bottom);
+    }
+
+    protected void onDetachedFromWindow() {
+        Utilities.getPrefs(getContext()).unregisterOnSharedPreferenceChangeListener(this);
+        SearchProviderController.Companion.getInstance(getContext()).removeOnProviderChangeListener(this);
+        WallpaperColorInfo.getInstance(getContext()).removeOnChangeListener(this);
+        super.onDetachedFromWindow();
+    }
+
+    @Override
+    public void onExtractedColorsChanged(WallpaperColorInfo wallpaperColorInfo) {
+        setColor(ColorUtils.compositeColors(ColorUtils.compositeColors(
+                Themes.getAttrBoolean(mLauncher, R.attr.isMainColorDark)
+                        ? -650362813 : -855638017, Themes.getAttrColor(mLauncher, R.attr.allAppsScrimColor)), wallpaperColorInfo.getMainColor()));
+    }
+
+    private void setColor(int color) {
+        if (mColor != color) {
+            mColor = color;
+            mAllAppsShadowBitmap = null;
+            setHotseatBgColor(color);
+            setAllAppsBgColor(color);
+            invalidate();
+        }
+    }
+
+    public final void setAllAppsBgColor(int color) {
+        if (mAllAppsBgColor != color) {
+            mAllAppsBgColor = color;
+            mAllAppsShadowBitmap = null;
+            invalidate();
+        }
+    }
+
+    public final void setHotseatBgColor(int color) {
+        if (mHotseatBgColor != color) {
+            mHotseatBgColor = color;
+            mHotseatShadowBitmap = null;
+            invalidate();
+        }
+    }
+
+    public final void az(int i) {
+        mBubbleBgColor = i;
+        if (mBubbleBgColor != mAllAppsBgColor || mBubbleShadowBitmap != mAllAppsShadowBitmap) {
+            mBubbleShadowBitmap = null;
+            invalidate();
+        }
+    }
+
+    public final void addOrUpdateSearchPaint(float value) {
+        micStrokeWidth = TypedValue.applyDimension(1, value, getResources().getDisplayMetrics());
+        mMicStrokePaint.setStrokeWidth(micStrokeWidth);
+        mMicStrokePaint.setStyle(Style.STROKE);
+        mMicStrokePaint.setColor(0xFFBDC1C6);
+    }
+
+    private void updateConfiguration() {
+        addOrUpdateSearchPaint(0.0f);
+        addOrUpdateSearchRipple();
+    }
+
+    @Override
+    public void setInsets(Rect rect) {
+        requestLayout();
+    }
+
+    @Override
+    public void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        DeviceProfile dp = mLauncher.getDeviceProfile();
+        int round = Math.round(((float) dp.iconSizePx) * 0.92f);
+        setMeasuredDimension(calculateMeasuredDimension(dp, round, widthMeasureSpec), View.MeasureSpec.getSize(heightMeasureSpec));
+        for (int childCount = getChildCount() - 1; childCount >= 0; childCount--) {
+            View childAt = getChildAt(childCount);
+            measureChildWithMargins(childAt, widthMeasureSpec, 0, heightMeasureSpec, 0);
+            if (childAt.getMeasuredWidth() <= round) {
+                LayoutParams layoutParams = (LayoutParams) childAt.getLayoutParams();
+                int measuredWidth = (round - childAt.getMeasuredWidth()) / 2;
+                layoutParams.rightMargin = measuredWidth;
+                layoutParams.leftMargin = measuredWidth;
+            }
+        }
+    }
+
+    //SEARCH BAR WIDTH
+    public int getMeasuredWidth(int width, @NotNull DeviceProfile dp) {
+        int leftRightPadding = dp.desiredWorkspaceLeftRightMarginPx
+                + dp.cellLayoutPaddingLeftRightPx;
+        return width - leftRightPadding * 2;
+    }
+
+    public int calculateMeasuredDimension(DeviceProfile dp, int round, int widthMeasureSpec) {
+        int width = getMeasuredWidth(MeasureSpec.getSize(widthMeasureSpec), dp);
+        int calculateCellWidth = width - ((width / dp.inv.numHotseatIcons) - round);
+        return getPaddingRight() + getPaddingLeft() + calculateCellWidth;
+    }
+
+    final void drawMainPill(Canvas canvas) {
+        if (mAllAppsBgColor == mHotseatBgColor || mHotseatProgress == 0f) {
+            drawShadow(mAllAppsShadowBitmap, canvas);
+        } else if (mHotseatProgress == 1f) {
+            drawShadow(mHotseatShadowBitmap, canvas);
+        } else {
+            mShadowHelper.paint.setAlpha(Math.round(255 * (1 - mHotseatProgress)));
+            drawShadow(mAllAppsShadowBitmap, canvas);
+            mShadowHelper.paint.setAlpha(Math.round(255 * mHotseatProgress));
+            drawShadow(mHotseatShadowBitmap, canvas);
+            mShadowHelper.paint.setAlpha(255);
+        }
+    }
+
+    protected void clearMainPillBg(Canvas canvas) {
+    }
+
+    protected void clearPillBg(Canvas canvas, int left, int top, int right) {
+    }
+
+    public void draw(Canvas canvas) {
+        ensureHotseatShadowBitmap();
+        clearMainPillBg(canvas);
+        drawQsb(canvas);
+        super.draw(canvas);
+    }
+
+    public void drawQsb(Canvas canvas) {
+        int i;
+        drawMainPill(canvas);
+        if (mUseTwoBubbles) {
+            int paddingLeft;
+            int paddingLeft2;
+            if (mBubbleShadowBitmap == null) {
+                if (mAllAppsBgColor == mBubbleBgColor) {
+                    mBubbleShadowBitmap = mAllAppsShadowBitmap;
+                } else {
+                    mBubbleShadowBitmap = createShadowBitmap(mBubbleBgColor, true);
+                }
+            }
+            Bitmap bitmap2 = mBubbleShadowBitmap;
+            i = getShadowDimens(bitmap2);
+            int paddingTop = getPaddingTop() - ((bitmap2.getHeight() - getHeightWithoutPadding()) / 2);
+            if (mIsRtl) {
+                paddingLeft = getPaddingLeft() - i;
+                paddingLeft2 = getPaddingLeft() + i;
+                i = getMicWidth();
+            } else {
+                paddingLeft = ((getWidth() - getPaddingRight()) - getMicWidth()) - i;
+                paddingLeft2 = getWidth() - getPaddingRight();
+            }
+            clearPillBg(canvas, paddingLeft, paddingTop, paddingLeft2 + i);
+            mShadowHelper.draw(bitmap2, canvas, (float) paddingLeft, (float) paddingTop, (float) (paddingLeft2 + i));
+        }
+        if (micStrokeWidth > 0.0f && mMicFrame.getVisibility() == View.VISIBLE) {
+            float i2;
+            i = mIsRtl ? getPaddingLeft() : (getWidth() - getPaddingRight()) - getMicWidth();
+            int paddingTop = getPaddingTop();
+            int paddingLeft = mIsRtl ? getPaddingLeft() + getMicWidth() : getWidth() - getPaddingRight();
+            int paddingBottom = LauncherAppState.getInstance(getContext()).getInvariantDeviceProfile().iconBitmapSize - getPaddingBottom();
+            float f = ((float) (paddingBottom - paddingTop)) * 0.5f;
+            float i3 = micStrokeWidth / 2.0f;
+            if (mUseTwoBubbles) {
+                i2 = i3;
+            } else {
+                i2 = i3;
+                canvas.drawRoundRect(i + i3, paddingTop + i3, paddingLeft - i3, (paddingBottom - i3) + 1, f, f, CV);
+            }
+            canvas.drawRoundRect(i + i2, paddingTop + i2, paddingLeft - i2, (paddingBottom - i2) + 1, f, f, mMicStrokePaint);
+        }
+    }
+
+    final void ensureAllAppsShadowBitmap() {
+        if (mAllAppsShadowBitmap == null) {
+            mAllAppsShadowBitmap = createShadowBitmap(mAllAppsBgColor, true);
+            mClearBitmap = null;
+            if (Color.alpha(mAllAppsBgColor) != 255) {
+                mClearBitmap = createShadowBitmap(0xFF000000, false);
+            }
+        }
+    }
+
+    final void ensureHotseatShadowBitmap() {
+        ensureAllAppsShadowBitmap();
+        if (mHotseatShadowBitmap == null) {
+            if (mHotseatBgColor == mAllAppsBgColor) {
+                mHotseatShadowBitmap = mAllAppsShadowBitmap;
+            } else {
+                mHotseatShadowBitmap = createShadowBitmap(mHotseatBgColor, true);
+            }
+        }
+    }
+
+    private Bitmap createShadowBitmap(int bgColor, boolean withShadow) {
+        float iconSize = (float) LauncherAppState.getInstance(getContext()).getInvariantDeviceProfile().iconBitmapSize;
+        return createShadowBitmap(0.010416667f * iconSize, iconSize * 0.020833334f, bgColor, withShadow);
+    }
+
+    protected final Bitmap createShadowBitmap(float f, float f2, int i, boolean withShadow) {
+        int height = getHeightWithoutPadding();
+        int i2 = height + 20;
+        ShadowGenerator.Builder builder = new ShadowGenerator.Builder(i);
+        builder.shadowBlur = f;
+        builder.keyShadowDistance = f2;
+        if (!withShadow) {
+            builder.ambientShadowAlpha = 0;
+        }
+        builder.keyShadowAlpha = builder.ambientShadowAlpha;
+        Bitmap pill;
+        if (mRadius < 0) {
+            TypedValue edgeRadius = IconShape.getShape().getAttrValue(R.attr.qsbEdgeRadius);
+            if (edgeRadius != null) {
+                pill = builder.createPill(i2, height,
+                        edgeRadius.getDimension(getResources().getDisplayMetrics()));
+            } else {
+                pill = builder.createPill(i2, height);
+            }
+        } else {
+            pill = builder.createPill(i2, height, mRadius);
+        }
+        /*if (Utilities.ATLEAST_Q) {
+            return pill.copy(Config.HARDWARE, false);
+        }*/
+        return pill;
+    }
+
+    protected final void drawShadow(Bitmap bitmap, Canvas canvas) {
+        drawPill(mShadowHelper, bitmap, canvas);
+    }
+
+    protected final void drawPill(NinePatchDrawHelper helper, Bitmap bitmap, Canvas canvas) {
+        int shadowDimens = getShadowDimens(bitmap);
+        int paddingLeft = getPaddingLeft() - shadowDimens;
+        int paddingTop = getPaddingTop() - ((bitmap.getHeight() - getHeightWithoutPadding()) / 2);
+        int width = (getWidth() - getPaddingRight()) + shadowDimens;
+        if (mIsRtl) {
+            paddingLeft += getRtlDimens();
+        } else {
+            width -= getRtlDimens();
+        }
+        helper.draw(bitmap, canvas, (float) paddingLeft, (float) paddingTop, (float) width);
+    }
+
+    protected final int getShadowDimens(@NotNull Bitmap bitmap) {
+        return (bitmap.getWidth() - (getHeightWithoutPadding() + 20)) / 2;
+    }
+
+    protected final int getHeightWithoutPadding() {
+        return (getHeight() - getPaddingTop()) - getPaddingBottom();
+    }
+
+    protected final int getIconWidth() {
+        return mUseTwoBubbles ? mSearchIconWidth : mSearchIconWidth + qsbTextSpacing;
+    }
+
+    protected final void setHintText(String str, TextView textView) {
+        String str2;
+        if (TextUtils.isEmpty(str) || !dE()) {
+            str2 = str;
+        } else {
+            str2 = TextUtils.ellipsize(str, qsbTextHintSize, (float) qsbHintLenght, TruncateAt.END).toString();
+        }
+        Dg = str2;
+        textView.setText(this.Dg);
+        int i = 17;
+        if (dE()) {
+            i = 8388629;
+            if (mIsRtl) {
+                textView.setPadding(getIconWidth(), 0, 0, 0);
+            } else {
+                textView.setPadding(0, 0, getIconWidth() + 75, 0);
+            }
+        }
+        textView.setGravity(i);
+        ((LayoutParams) textView.getLayoutParams()).gravity = i;
+        textView.setContentDescription(str);
+    }
+
+    protected final boolean dE() {
+        if (!Dh && !mUseTwoBubbles) {
+            return mUseTwoBubbles;
+        }
+        return true;
+    }
+
+    protected final int getRtlDimens() {
+        return mUseTwoBubbles ? getMicWidth() + twoBubbleGap : 0;
+    }
+
+    protected int getMicWidth() {
+        if (!mUseTwoBubbles || TextUtils.isEmpty(this.Dg)) {
+            return mSearchIconWidth;
+        }
+        return (Math.round(qsbTextHintSize.measureText(this.Dg)) + qsbTextSpacing) + mSearchIconWidth;
+    }
+
+    protected final void addOrUpdateSearchRipple() {
+        int width;
+        int height;
+        int micWidth;
+        int micHeight;
+        InsetDrawable insetDrawable = (InsetDrawable) createRipple().mutate();
+        RippleDrawable oldRipple = (RippleDrawable) insetDrawable.getDrawable();
+        if (mIsRtl) {
+            width = getRtlDimens();
+            height = 0;
+        } else {
+            width = 0;
+            height = getRtlDimens();
+        }
+        Objects.requireNonNull(oldRipple).setLayerInset(0, width, 0, height, 0);
+        setBackground(insetDrawable);
+        RippleDrawable newRipple = (RippleDrawable) Objects.requireNonNull(oldRipple.getConstantState()).newDrawable().mutate();
+        newRipple.setLayerInset(0, 0, mShadowMargin, 0, mShadowMargin);
+        mMicIconView.setBackground(newRipple);
+        mMicFrame.getLayoutParams().width = getMicWidth();
+        if (mIsRtl) {
+            micWidth = 0;
+        } else {
+            micWidth = getMicWidth() - mSearchIconWidth;
+        }
+        if (mIsRtl) {
+            micHeight = getMicWidth() - mSearchIconWidth;
+        } else {
+            micHeight = 0;
+        }
+        mMicIconView.setPadding(micWidth, 0, micHeight, 0);
+        mMicIconView.requestLayout();
+    }
+
+    private InsetDrawable createRipple() {
+        GradientDrawable shape = new GradientDrawable();
+        shape.setShape(GradientDrawable.RECTANGLE);
+        shape.setCornerRadius(getCornerRadius());
+        shape.setColor(ContextCompat.getColor(getContext(), android.R.color.white));
+
+        ColorStateList rippleColor = ContextCompat.getColorStateList(getContext(), R.color.focused_background);
+        RippleDrawable ripple = new RippleDrawable(rippleColor, null, shape);
+        return new InsetDrawable(ripple, mShadowMargin);
+    }
+
+    protected float getCornerRadius() {
+        mRadius = getCornerRadius(getContext(),
+                Utilities.pxFromDp(100, getResources().getDisplayMetrics()));
+        return mRadius;
+    }
+
+    public boolean dI() {
+        return false;
+    }
+
+    public void onClick(View view) {
+        SearchProviderController controller = SearchProviderController.Companion.getInstance(mLauncher);
+        SearchProvider provider = controller.getSearchProvider();
+        if (view == mMicIconView) {
+            if (controller.isGoogle()) {
+                fallbackSearch(mShowAssistant ? Intent.ACTION_VOICE_COMMAND : "android.intent.action.VOICE_ASSIST");
+            } else if (mShowAssistant && provider.getSupportsAssistant()) {
+                provider.startAssistant(intent -> {
+                    getContext().startActivity(intent);
+                    return null;
+                });
+            } else if (provider.getSupportsVoiceSearch()) {
+                provider.startVoiceSearch(intent -> {
+                    getContext().startActivity(intent);
+                    return null;
+                });
+            }
+        } else if (view == mLogoIconView) {
+            if (provider.getSupportsFeed() && logoCanOpenFeed()) {
+                provider.startFeed(intent -> {
+                    getContext().startActivity(intent);
+                    return null;
+                });
+            } else {
+                startSearch("", mResult);
+            }
+        }
+    }
+
+    protected boolean logoCanOpenFeed() {
+        return true;
+    }
+
+    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
+        switch (key) {
+            case "opa_enabled":
+            case "opa_assistant":
+            case "pref_searchbar_radius":
+            case "pref_bubbleSearchStyle":
+                loadPreferences(sharedPreferences);
+        }
+    }
+
+    @Override
+    public void onSearchProviderChanged() {
+        loadPreferences(Utilities.getPrefs(getContext()));
+    }
+
+    protected void loadPreferences(SharedPreferences sharedPreferences) {
+        post(() -> {
+            SearchProvider provider = SearchProviderController.Companion.getInstance(getContext()).getSearchProvider();
+            boolean providerSupported = provider.getSupportsAssistant() || provider.getSupportsVoiceSearch();
+            boolean showMic = sharedPreferences.getBoolean("opa_enabled", true) && providerSupported;
+            mShowAssistant = sharedPreferences.getBoolean("opa_assistant", true);
+            mLogoIconView.setImageDrawable(getIcon());
+            mHotseatLogoIconView.setImageDrawable(getHotseatIcon(true));
+            mMicFrame.setVisibility(showMic ? View.VISIBLE : View.GONE);
+            mMicIconView.setVisibility(View.VISIBLE);
+            mMicIconView.setImageDrawable(getMicIcon());
+            mUseTwoBubbles = useTwoBubbles();
+            mRadius = Utilities.getOmegaPrefs(getContext()).getSearchBarRadius();
+            clearBitmaps();
+            addOrUpdateSearchRipple();
+            invalidate();
+        });
+    }
+
+    private void clearBitmaps() {
+        mAllAppsShadowBitmap = null;
+        mHotseatShadowBitmap = null;
+        mClearBitmap = null;
+    }
+
+    protected Drawable getHotseatIcon(boolean colored) {
+        return getIcon(colored);
+    }
+
+    protected Drawable getIcon() {
+        return getIcon(true);
+    }
+
+    protected Drawable getIcon(boolean colored) {
+        SearchProvider provider = SearchProviderController.Companion.getInstance(getContext()).getSearchProvider();
+        return provider.getIcon(colored);
+    }
+
+    protected Drawable getMicIcon() {
+        return getMicIcon(true);
+    }
+
+    protected Drawable getMicIcon(boolean colored) {
+        SearchProvider provider = SearchProviderController.Companion.getInstance(getContext()).getSearchProvider();
+        if (mShowAssistant && provider.getSupportsAssistant()) {
+            return provider.getAssistantIcon(colored);
+        } else if (provider.getSupportsVoiceSearch()) {
+            return provider.getVoiceIcon(colored);
+        } else {
+            mUseTwoBubbles = false;
+            mMicIconView.setVisibility(View.GONE);
+            return new ColorDrawable(Color.TRANSPARENT);
+        }
+    }
+
+    public boolean onLongClick(View view) {
+        if (view != this) {
+            return false;
+        }
+        return dK();
+    }
+
+    protected boolean dK() {
+        String clipboardText = getClipboardText();
+        Intent settingsBroadcast = createSettingsBroadcast();
+        Intent settingsIntent = createSettingsIntent();
+        if (settingsIntent == null && settingsBroadcast == null && clipboardText == null) {
+            return false;
+        }
+
+        startActionMode(new QsbActionMode(this, clipboardText, settingsBroadcast, settingsIntent), 1);
+
+        return true;
+    }
+
+    @Nullable
+    protected String getClipboardText() {
+        ClipboardManager clipboardManager = ContextCompat
+                .getSystemService(getContext(), ClipboardManager.class);
+        ClipData primaryClip = Objects.requireNonNull(clipboardManager).getPrimaryClip();
+        if (primaryClip != null) {
+            for (int i = 0; i < primaryClip.getItemCount(); i++) {
+                CharSequence text = primaryClip.getItemAt(i).coerceToText(getContext());
+                if (!TextUtils.isEmpty(text)) {
+                    return text.toString();
+                }
+            }
+        }
+        return null;
+    }
+
+    protected Intent createSettingsBroadcast() {
+        return null;
+    }
+
+    protected Intent createSettingsIntent() {
+        return null;
+    }
+
+    protected void fallbackSearch(String action) {
+        try {
+            getContext().startActivity(new Intent(action)
+                    .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK)
+                    .setPackage(GOOGLE_QSB));
+        } catch (ActivityNotFoundException e) {
+            noGoogleAppSearch();
+        }
+    }
+
+    protected void noGoogleAppSearch() {
+    }
+
+    public boolean useTwoBubbles() {
+        return mMicIconView.getVisibility() == View.VISIBLE && Utilities.getOmegaPrefs(mLauncher).getDualBubbleSearch();
+    }
+}
+
diff --git a/Omega/src/com/saggitt/omega/qsb/AllAppsQsbLayout.java b/Omega/src/com/saggitt/omega/qsb/AllAppsQsbLayout.java
new file mode 100644
index 0000000000..9cabf36525
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/qsb/AllAppsQsbLayout.java
@@ -0,0 +1,465 @@
+/*
+ *  Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ *
+ */
+package com.saggitt.omega.qsb;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
+import android.util.AttributeSet;
+import android.view.KeyEvent;
+import android.view.View;
+import android.view.animation.Interpolator;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.app.ActivityOptionsCompat;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.android.launcher3.BaseRecyclerView;
+import com.android.launcher3.DeviceProfile;
+import com.android.launcher3.Launcher;
+import com.android.launcher3.R;
+import com.android.launcher3.Utilities;
+import com.android.launcher3.allapps.AllAppsContainerView;
+import com.android.launcher3.allapps.SearchUiManager;
+import com.android.launcher3.anim.PropertySetter;
+import com.android.launcher3.util.PackageManagerHelper;
+import com.saggitt.omega.OmegaPreferences;
+import com.saggitt.omega.search.SearchProvider;
+import com.saggitt.omega.search.SearchProviderController;
+import com.saggitt.omega.search.SearchThread;
+import com.saggitt.omega.search.providers.AppSearchSearchProvider;
+import com.saggitt.omega.search.webproviders.WebSearchProvider;
+
+import static com.android.launcher3.LauncherState.ALL_APPS_CONTENT;
+import static com.android.launcher3.LauncherState.ALL_APPS_HEADER;
+import static com.android.launcher3.LauncherState.HOTSEAT_SEARCH_BOX;
+import static com.android.launcher3.anim.Interpolators.LINEAR;
+import static com.android.launcher3.anim.PropertySetter.NO_ANIM_PROPERTY_SETTER;
+
+public class AllAppsQsbLayout extends AbstractQsbLayout implements SearchUiManager, QsbChangeListener {
+
+    private final QsbConfiguration configuration;
+    private final int mTopAdjusting;
+    public float mVerticalOffset;
+    boolean mDoNotRemoveFallback;
+    private boolean mLowPerformanceMode;
+    private int mShadowAlpha;
+    private Bitmap mShadowBitmap;
+    private boolean mUseFallbackSearch;
+    private FallbackAppsSearchView mFallback;
+    private TextView mHint;
+    private AllAppsContainerView mAppsView;
+    private final OmegaPreferences prefs;
+
+    // This value was used to position the QSB. We store it here for translationY animations.
+    private final float mFixedTranslationY;
+    private final float mMarginTopAdjusting;
+
+    private boolean widgetMode;
+
+    public AllAppsQsbLayout(Context context) {
+        this(context, null);
+    }
+
+    public AllAppsQsbLayout(Context context, AttributeSet attributeSet) {
+        this(context, attributeSet, 0);
+    }
+
+    public AllAppsQsbLayout(Context context, AttributeSet attributeSet, int i) {
+        super(context, attributeSet, i);
+        mShadowAlpha = 0;
+        setOnClickListener(this);
+        configuration = QsbConfiguration.getInstance(context);
+        mTopAdjusting = getResources().getDimensionPixelSize(R.dimen.qsb_margin_top_adjusting);
+        mVerticalOffset = getResources().getDimensionPixelSize(R.dimen.all_apps_search_vertical_offset);
+        setClipToPadding(false);
+        prefs = OmegaPreferences.Companion.getInstanceNoCreate();
+
+        mLowPerformanceMode = prefs.getLowPerformanceMode();
+
+        mFixedTranslationY = getTranslationY();
+        mMarginTopAdjusting = mFixedTranslationY - getPaddingTop();
+    }
+
+    protected void onFinishInflate() {
+        super.onFinishInflate();
+        mHint = findViewById(R.id.qsb_hint);
+    }
+
+    public void setWidgetMode(boolean enable) {
+        widgetMode = enable;
+        loadIcons();
+        setContentVisibility(HOTSEAT_SEARCH_BOX, NO_ANIM_PROPERTY_SETTER, LINEAR);
+    }
+
+    public void setInsets(Rect insets) {
+        removeFallBack();
+        MarginLayoutParams mlp = (MarginLayoutParams) getLayoutParams();
+        mlp.topMargin = Math.round(Math.max(-mFixedTranslationY, insets.top - mMarginTopAdjusting));
+        requestLayout();
+    }
+
+    protected void onAttachedToWindow() {
+        super.onAttachedToWindow();
+        updateConfiguration();
+        configuration.addListener(this);
+    }
+
+    @Override
+    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
+        super.onSharedPreferenceChanged(sharedPreferences, key);
+        if (key.equals("pref_allAppsGoogleSearch")) {
+            loadPreferences(sharedPreferences);
+        }
+    }
+
+    @Override
+    protected Drawable getIcon(boolean colored) {
+        if (prefs.getAllAppsGlobalSearch()) {
+            return super.getIcon(colored);
+        } else {
+            return new AppSearchSearchProvider(getContext()).getIcon(colored);
+        }
+    }
+
+    @Override
+    protected boolean logoCanOpenFeed() {
+        return super.logoCanOpenFeed() && prefs.getAllAppsGlobalSearch();
+    }
+
+    @Override
+    protected Drawable getMicIcon(boolean colored) {
+        if (prefs.getAllAppsGlobalSearch()) {
+            mMicIconView.setVisibility(View.VISIBLE);
+            return super.getMicIcon(colored);
+        } else {
+            mMicIconView.setVisibility(View.GONE);
+            return null;
+        }
+    }
+
+    protected void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+        configuration.removeListener(this);
+    }
+
+    public final void initialize(AllAppsContainerView allAppsContainerView) {
+        mAppsView = allAppsContainerView;
+        mAppsView.addElevationController(new RecyclerView.OnScrollListener() {
+            @Override
+            public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
+                setShadowAlpha(((BaseRecyclerView) recyclerView).getCurrentScrollY());
+            }
+        });
+        mAppsView.setRecyclerViewVerticalFadingEdgeEnabled(!mLowPerformanceMode);
+    }
+
+    public final void onChange() {
+        updateConfiguration();
+        invalidate();
+    }
+
+    private void updateConfiguration() {
+        az(mColor);
+        addOrUpdateSearchPaint(configuration.micStrokeWidth());
+        Dh = configuration.hintIsForAssistant();
+        mUseTwoBubbles = useTwoBubbles();
+        setHintText(configuration.hintTextValue(), mHint);
+        addOrUpdateSearchRipple();
+    }
+
+    public void onClick(View view) {
+        super.onClick(view);
+        startSearch("", mResult);
+    }
+
+    public final void l(String str) {
+        startSearch(str, 0);
+    }
+
+    @Override
+    public void startSearch() {
+        post(() -> startSearch("", mResult));
+    }
+
+    @Override
+    public final void startSearch(String str, int i) {
+        if (mHotseatProgress < 0.5) {
+            startDrawerSearch(str, i);
+        } else {
+            startHotseatSearch();
+        }
+    }
+
+    private void startDrawerSearch(String str, int i) {
+        SearchProviderController controller = SearchProviderController.Companion
+                .getInstance(getContext());
+        SearchProvider provider = controller.getSearchProvider();
+        if (shouldUseFallbackSearch(provider)) {
+            searchFallback(str);
+        } else if (controller.isGoogle()) {
+            final ConfigBuilder f = new ConfigBuilder(this, true);
+            if (!mLauncher.getGoogleNow().startSearch(f.build(), f.getExtras())) {
+                searchFallback(str);
+                if (mFallback != null) {
+                    mFallback.setHint(null);
+                }
+            }
+        } else {
+            provider.startSearch(intent -> {
+                mLauncher.startActivity(intent);
+                return null;
+            });
+        }
+    }
+
+    private void startHotseatSearch() {
+        SearchProviderController controller = SearchProviderController.Companion.getInstance(getContext());
+        if (controller.isGoogle()) {
+            startGoogleSearch();
+        } else {
+            controller.getSearchProvider().startSearch(intent -> {
+                mLauncher.openQsb();
+                getContext().startActivity(intent, ActivityOptionsCompat
+                        .makeClipRevealAnimation(this, 0, 0, getWidth(), getHeight()).toBundle());
+                return null;
+            });
+        }
+    }
+
+    private void startGoogleSearch() {
+        final ConfigBuilder f = new ConfigBuilder(this, false);
+        if (!forceFallbackSearch() && mLauncher.getGoogleNow()
+                .startSearch(f.build(), f.getExtras())) {
+            SharedPreferences devicePrefs = Utilities.getDevicePrefs(getContext());
+            devicePrefs.edit().putInt("key_hotseat_qsb_tap_count",
+                    devicePrefs.getInt("key_hotseat_qsb_tap_count", 0) + 1).apply();
+            mLauncher.playQsbAnimation();
+        } else {
+            getContext().sendOrderedBroadcast(getSearchIntent(), null,
+                    new BroadcastReceiver() {
+                        @Override
+                        public void onReceive(Context context, Intent intent) {
+                            if (getResultCode() == 0) {
+                                fallbackSearch(
+                                        "com.google.android.googlequicksearchbox.TEXT_ASSIST");
+                            } else {
+                                mLauncher.playQsbAnimation();
+                            }
+                        }
+                    }, null, 0, null, null);
+        }
+    }
+
+    private boolean forceFallbackSearch() {
+        return !PackageManagerHelper.isAppEnabled(getContext().getPackageManager(),
+                "com.google.android.apps.nexuslauncher", 0);
+    }
+
+    private Intent getSearchIntent() {
+        int[] array = new int[2];
+        getLocationInWindow(array);
+        Rect rect = new Rect(0, 0, getWidth(), getHeight());
+        rect.offset(array[0], array[1]);
+        rect.inset(getPaddingLeft(), getPaddingTop());
+        return ConfigBuilder.getSearchIntent(rect, findViewById(R.id.g_icon), mMicIconView);
+    }
+
+    private boolean shouldUseFallbackSearch() {
+        SearchProviderController controller = SearchProviderController.Companion.getInstance(mLauncher);
+        SearchProvider provider = controller.getSearchProvider();
+        return shouldUseFallbackSearch(provider);
+    }
+
+    private boolean shouldUseFallbackSearch(SearchProvider provider) {
+        return !Utilities
+                .getOmegaPrefs(getContext()).getAllAppsGlobalSearch()
+                || provider instanceof AppSearchSearchProvider
+                || provider instanceof WebSearchProvider;
+    }
+
+    public void searchFallback(String query) {
+        ensureFallbackView();
+        mFallback.setText(query);
+        mFallback.showKeyboard();
+    }
+
+    public final void resetSearch() {
+        setShadowAlpha(0);
+        if (mUseFallbackSearch) {
+            resetFallbackView();
+        } else if (!mDoNotRemoveFallback) {
+            removeFallbackView();
+        }
+    }
+
+    @Override
+    public void preDispatchKeyEvent(KeyEvent event) {
+    }
+
+    private void ensureFallbackView() {
+        if (mFallback == null) {
+            setOnClickListener(null);
+            mFallback = (FallbackAppsSearchView) this.mLauncher.getLayoutInflater()
+                    .inflate(R.layout.all_apps_google_search_fallback, this, false);
+            AllAppsContainerView allAppsContainerView = this.mAppsView;
+            mFallback.allAppsQsbLayout = this;
+            mFallback.mApps = allAppsContainerView.getApps();
+            mFallback.mAppsView = allAppsContainerView;
+            mFallback.mSearchBarController.initialize(new SearchThread(mFallback.getContext()), mFallback,
+                    Launcher.getLauncher(mFallback.getContext()), mFallback);
+            addView(mFallback);
+        }
+    }
+
+    private void removeFallbackView() {
+        if (mFallback != null) {
+            mFallback.clearSearchResult();
+            setOnClickListener(this);
+            removeView(mFallback);
+            mFallback = null;
+        }
+    }
+
+    private void resetFallbackView() {
+        if (mFallback != null) {
+            mFallback.reset();
+            mFallback.clearSearchResult();
+        }
+    }
+
+    protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
+        super.onLayout(changed, left, top, right, bottom);
+        View parent = (View) getParent();
+        setTranslationX((float) ((parent.getPaddingLeft() + (
+                (((parent.getWidth() - parent.getPaddingLeft()) - parent.getPaddingRight()) - (right - left))
+                        / 2)) - left));
+    }
+
+    public void draw(Canvas canvas) {
+        if (mShadowAlpha > 0) {
+            if (mShadowBitmap == null) {
+                mShadowBitmap = createShadowBitmap(
+                        getResources().getDimension(R.dimen.hotseat_qsb_scroll_shadow_blur_radius),
+                        getResources().getDimension(R.dimen.hotseat_qsb_scroll_key_shadow_offset),
+                        0, true);
+            }
+            mShadowHelper.paint.setAlpha(mShadowAlpha);
+            drawShadow(mShadowBitmap, canvas);
+            mShadowHelper.paint.setAlpha(255);
+        }
+        super.draw(canvas);
+    }
+
+    final void setShadowAlpha(int i) {
+        i = Utilities.boundToRange(i, 0, 255);
+        if (mShadowAlpha != i) {
+            mShadowAlpha = i;
+            invalidate();
+        }
+    }
+
+    protected final boolean dK() {
+        if (mFallback != null) {
+            return false;
+        }
+        return super.dK();
+    }
+
+    protected final void removeFallBack() {
+        if (mUseFallbackSearch) {
+            removeFallbackView();
+            mUseFallbackSearch = false;
+        }
+    }
+
+    public boolean hasOverlappingRendering() {
+        return false;
+    }
+
+    //Used when search bar is disabled
+    public int getTopMargin(Rect rect) {
+        return Math.max(Math.round(-mVerticalOffset), rect.top - mTopAdjusting);
+    }
+
+    @Override
+    public float getScrollRangeDelta(Rect insets) {
+        DeviceProfile wallpaperDeviceProfile = mLauncher.getWallpaperDeviceProfile();
+        int i = (wallpaperDeviceProfile.hotseatBarSizePx - wallpaperDeviceProfile.hotseatCellHeightPx) - getLayoutParams().height;
+        int bottom = insets.bottom;
+        return ((getLayoutParams().height + Math.max(-mVerticalOffset, insets.top - mTopAdjusting)) +
+                mVerticalOffset) + (bottom + (i - bottom) * 0.45f);
+    }
+
+    @Override
+    public void setContentVisibility(int visibleElements, PropertySetter setter, Interpolator interpolator) {
+        OmegaPreferences prefs = Utilities.getOmegaPrefs(getContext());
+        boolean hotseatQsbEnabled = prefs.getDockSearchBar() || widgetMode;
+        boolean hotseatQsbVisible = (visibleElements & HOTSEAT_SEARCH_BOX) != 0;
+        boolean drawerQsbEnabled = prefs.getAllAppsSearch();
+        boolean drawerQsbVisible = (visibleElements & ALL_APPS_HEADER) != 0;
+        boolean qsbVisible = (hotseatQsbEnabled && hotseatQsbVisible) || (drawerQsbEnabled && drawerQsbVisible);
+        float hotseatProgress, micProgress;
+        if (!hotseatQsbEnabled) {
+            hotseatProgress = 0;
+        } else if (!drawerQsbEnabled) {
+            hotseatProgress = 1;
+        } else {
+            hotseatProgress = (visibleElements & ALL_APPS_CONTENT) != 0 ? 0 : 1;
+        }
+        if (prefs.getAllAppsGlobalSearch()) {
+            micProgress = 1f;
+        } else {
+            micProgress = hotseatProgress;
+        }
+        setter.setFloat(this, HOTSEAT_PROGRESS, hotseatProgress, LINEAR);
+        setter.setViewAlpha(this, qsbVisible ? 1 : 0, interpolator);
+        setter.setViewAlpha(mLogoIconView, 1 - hotseatProgress, interpolator);
+        setter.setViewAlpha(mHotseatLogoIconView, hotseatProgress, interpolator);
+        setter.setViewAlpha(mMicIconView, micProgress, interpolator);
+        if (mMicIconView != null) {
+            mMicIconView.setVisibility(micProgress > 0 ? View.VISIBLE : View.INVISIBLE);
+        }
+    }
+
+    @Nullable
+    @Override
+    protected String getClipboardText() {
+        return shouldUseFallbackSearch() ? super.getClipboardText() : null;
+    }
+
+    @Override
+    protected void clearMainPillBg(Canvas canvas) {
+        if (!mLowPerformanceMode && mClearBitmap != null) {
+            drawPill(mClearShadowHelper, mClearBitmap, canvas);
+        }
+    }
+
+    @Override
+    protected void clearPillBg(Canvas canvas, int left, int top, int right) {
+        if (!mLowPerformanceMode && mClearBitmap != null) {
+            mClearShadowHelper.draw(mClearBitmap, canvas, left, top, right);
+        }
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/qsb/ConfigBuilder.java b/Omega/src/com/saggitt/omega/qsb/ConfigBuilder.java
new file mode 100644
index 0000000000..dc6835ea70
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/qsb/ConfigBuilder.java
@@ -0,0 +1,364 @@
+/*
+ *  Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ *
+ */
+
+package com.saggitt.omega.qsb;
+
+import android.app.PendingIntent;
+import android.content.ComponentName;
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Point;
+import android.graphics.Rect;
+import android.net.Uri;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.RemoteViews;
+
+import androidx.core.graphics.ColorUtils;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.android.launcher3.AppInfo;
+import com.android.launcher3.BubbleTextView;
+import com.android.launcher3.R;
+import com.android.launcher3.Utilities;
+import com.android.launcher3.allapps.AllAppsRecyclerView;
+import com.android.launcher3.allapps.AlphabeticalAppsList;
+import com.android.launcher3.compat.UserManagerCompat;
+import com.android.launcher3.icons.BitmapRenderer;
+import com.android.launcher3.uioverrides.WallpaperColorInfo;
+import com.android.launcher3.util.Themes;
+import com.google.android.apps.nexuslauncher.search.nano.SearchProto.AppIndex;
+import com.google.android.apps.nexuslauncher.search.nano.SearchProto.Columns;
+import com.google.android.apps.nexuslauncher.search.nano.SearchProto.SearchBase;
+import com.google.protobuf.nano.MessageNano;
+import com.saggitt.omega.OmegaLauncher;
+import com.saggitt.omega.search.AppSearchProvider;
+import com.saggitt.omega.util.Config;
+
+import java.util.ArrayList;
+
+import static com.google.android.apps.nexuslauncher.search.nano.SearchProto.SearchView;
+
+
+public class ConfigBuilder {
+    private final SearchBase mNano;
+    private final OmegaLauncher mActivity;
+    private final Bundle mBundle;
+    private final AbstractQsbLayout mQsbLayout;
+    private final boolean mIsAllApps;
+    private final UserManagerCompat mUserManager;
+    private boolean co;
+    private BubbleTextView mBubbleTextView;
+
+    public ConfigBuilder(AbstractQsbLayout qsbLayout, boolean isAllApps) {
+        mBundle = new Bundle();
+        mNano = new SearchBase();
+        mQsbLayout = qsbLayout;
+        mActivity = qsbLayout.mLauncher;
+        mIsAllApps = isAllApps;
+        mUserManager = UserManagerCompat.getInstance(mActivity);
+    }
+
+    public static Intent getSearchIntent(Rect sourceBounds, View gIcon, View micIcon) {
+        Intent intent = new Intent("com.google.nexuslauncher.FAST_TEXT_SEARCH");
+        intent.setSourceBounds(sourceBounds);
+        if (micIcon.getVisibility() != View.VISIBLE) {
+            intent.putExtra("source_mic_alpha", 0f);
+        }
+        return intent.putExtra("source_round_left", true)
+                .putExtra("source_round_right", true)
+                .putExtra("source_logo_offset", getCenter(gIcon, sourceBounds))
+                .putExtra("source_mic_offset", getCenter(micIcon, sourceBounds))
+                .putExtra("use_fade_animation", true)
+                .setPackage(Config.GOOGLE_QSB)
+                .addFlags(Intent.FLAG_ACTIVITY_NO_HISTORY | Intent.FLAG_ACTIVITY_NEW_TASK);
+    }
+
+    private static Point getCenter(final View view, final Rect rect) {
+        final int[] location = new int[2];
+        view.getLocationInWindow(location);
+        final Point point = new Point();
+        point.x = location[0] - rect.left + view.getWidth() / 2;
+        point.y = location[1] - rect.top + view.getHeight() / 2;
+        return point;
+    }
+
+    private static Columns getViewBounds(final View view) {
+        final Columns a = new Columns();
+        a.iconDistance = view.getWidth();
+        a.height = view.getHeight();
+        final int[] array = new int[2];
+        view.getLocationInWindow(array);
+        a.edgeMargin = array[0];
+        a.innerMargin = array[1];
+        return a;
+    }
+
+    private void updateHotseatSearchDimens() {
+        if (mNano.appsView != null) {
+            return;
+        }
+        final Columns apps = mNano.apps;
+        final Columns appsView = new Columns();
+        appsView.edgeMargin = apps.edgeMargin;
+        appsView.innerMargin = apps.innerMargin + apps.height;
+        appsView.height = apps.height;
+        appsView.iconDistance = apps.iconDistance;
+        mNano.appsView = appsView;
+    }
+
+    private AllAppsRecyclerView getAppsView() {
+        return (AllAppsRecyclerView) mActivity.findViewById(R.id.apps_list_view);
+    }
+
+    private int getBackgroundColor() {
+        return ColorUtils.compositeColors(Themes.getAttrColor(mActivity, R.attr.allAppsScrimColor),
+                ColorUtils.setAlphaComponent(WallpaperColorInfo.getInstance(mActivity).getMainColor(), 255));
+    }
+
+    public final AppIndex updatePredictions(AppInfo appInfo, int n) {
+        final AppIndex apps = new AppIndex();
+        apps.label = appInfo.title.toString();
+        apps.iconBitmap = "icon_bitmap_" + n;
+        mBundle.putParcelable(apps.iconBitmap, appInfo.iconBitmap);
+        Uri uri = AppSearchProvider.buildUri(appInfo, mUserManager);
+        apps.searchUri = uri.toString();
+        apps.predictionRank = new Intent("com.google.android.apps.nexuslauncher.search.APP_LAUNCH",
+                uri.buildUpon().appendQueryParameter("predictionRank", Integer.toString(n)).build())
+                .toUri(0);
+        return apps;
+    }
+
+    private RemoteViews searchIconTemplate() {
+        final RemoteViews remoteViews = new RemoteViews(mActivity.getPackageName(), R.layout.apps_search_icon_template);
+
+        final int iconSize = mBubbleTextView.getIconSize();
+        final int horizontalPadding = (mBubbleTextView.getWidth() - iconSize) / 2;
+        final int paddingTop = mBubbleTextView.getPaddingTop();
+        final int paddingBottom = mBubbleTextView.getHeight() - iconSize - paddingTop;
+        remoteViews.setViewPadding(android.R.id.icon, horizontalPadding, paddingTop, horizontalPadding, paddingBottom);
+        final int minPadding = Math.min((int) (iconSize * 0.12f), Math.min(horizontalPadding, Math.min(paddingTop, paddingBottom)));
+        remoteViews.setViewPadding(R.id.click_feedback_wrapper, horizontalPadding - minPadding, paddingTop - minPadding, horizontalPadding - minPadding, paddingBottom - minPadding);
+        remoteViews.setTextViewTextSize(android.R.id.title, 0, mActivity.getDeviceProfile().allAppsIconTextSizePx);
+        remoteViews.setViewPadding(android.R.id.title, mBubbleTextView.getPaddingLeft(), mBubbleTextView.getCompoundDrawablePadding() + mBubbleTextView.getIconSize(), mBubbleTextView.getPaddingRight(), 0);
+
+        return remoteViews;
+    }
+
+    private RemoteViews searchQsbTemplate() {
+        final RemoteViews remoteViews = new RemoteViews(mActivity.getPackageName(), R.layout.apps_search_qsb_template);
+
+        final int effectiveHeight = mQsbLayout.getHeight() - mQsbLayout.getPaddingTop() - mQsbLayout.getPaddingBottom() + 20;
+        final Bitmap mShadowBitmap = mQsbLayout.mAllAppsShadowBitmap;
+        if (mShadowBitmap != null) {
+            final int internalWidth = (mShadowBitmap.getWidth() - effectiveHeight) / 2;
+            final int verticalPadding = (mQsbLayout.getHeight() - mShadowBitmap.getHeight()) / 2;
+            remoteViews.setViewPadding(R.id.qsb_background_container, mQsbLayout.getPaddingLeft() - internalWidth, verticalPadding, mQsbLayout.getPaddingRight() - internalWidth, verticalPadding);
+            final Bitmap bitmap = Bitmap.createBitmap(mShadowBitmap, 0, 0, mShadowBitmap.getWidth() / 2, mShadowBitmap.getHeight());
+            final Bitmap bitmap2 = Bitmap.createBitmap(mShadowBitmap, (mShadowBitmap.getWidth() - 20) / 2, 0, 20, mShadowBitmap.getHeight());
+            remoteViews.setImageViewBitmap(R.id.qsb_background_1, bitmap);
+            remoteViews.setImageViewBitmap(R.id.qsb_background_2, bitmap2);
+            remoteViews.setImageViewBitmap(R.id.qsb_background_3, bitmap);
+        }
+        if (mQsbLayout.mMicIconView.getVisibility() != View.VISIBLE) {
+            remoteViews.setViewVisibility(R.id.mic_icon, View.INVISIBLE);
+        }
+
+        final View gIcon = mQsbLayout.findViewById(R.id.g_icon);
+        int horizontalPadding = mQsbLayout.getLayoutDirection() == View.LAYOUT_DIRECTION_RTL ?
+                mQsbLayout.getWidth() - gIcon.getRight() :
+                gIcon.getLeft();
+        remoteViews.setViewPadding(R.id.qsb_icon_container, horizontalPadding, 0, horizontalPadding, 0);
+
+        return remoteViews;
+    }
+
+    private void createSearchTemplate() {
+        mNano.searchTemplate = "search_box_template";
+        mBundle.putParcelable(mNano.searchTemplate, searchQsbTemplate());
+        mNano.gIcon = R.id.g_icon;
+        mNano.micIcon = mQsbLayout.mMicIconView.getVisibility() == View.VISIBLE ?
+                R.id.mic_icon :
+                0;
+        final Columns viewBounds = getViewBounds(mActivity.getDragLayer());
+        final int topShift = mNano.apps.innerMargin + (co ? 0 : mNano.apps.height);
+        viewBounds.innerMargin += topShift;
+        viewBounds.height -= topShift;
+        mNano.viewBounds = viewBounds;
+        if (viewBounds.iconDistance > 0 && viewBounds.height > 0) {
+            Bitmap bitmap = BitmapRenderer.createHardwareBitmap(viewBounds.iconDistance, viewBounds.height, out -> a(topShift, out));
+            mBundle.putParcelable(mNano.view, bitmap);
+        } else {
+            String stringBuilder = "Invalid preview bitmap size. width: " +
+                    viewBounds.iconDistance +
+                    "hight: " +
+                    viewBounds.height +
+                    " top shift: " +
+                    topShift;
+            Log.e("ConfigBuilder", stringBuilder);
+            viewBounds.height = 0;
+            viewBounds.edgeMargin = 0;
+            viewBounds.innerMargin = 0;
+            viewBounds.iconDistance = 0;
+            Bitmap bitmap = Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888);
+            bitmap.setPixel(0, 0, 0);
+            mBundle.putParcelable(mNano.view, bitmap);
+        }
+    }
+
+    private void a(int i, Canvas canvas) {
+        int save = canvas.save();
+        canvas.translate(0.0f, (float) (-i));
+        a(canvas, mActivity.getAppsView().getRecyclerViewContainer());
+        a(canvas, mActivity.getAppsView().getFloatingHeaderView());
+        canvas.restoreToCount(save);
+    }
+
+    private void a(Canvas canvas, View view) {
+        final int[] array = {0, 0};
+        mActivity.getDragLayer().mapCoordInSelfToDescendant(mActivity.getAppsView(), array);
+        mActivity.getDragLayer().mapCoordInSelfToDescendant(view, array);
+        canvas.translate((float) (-array[0]), (float) (-array[1]));
+        view.draw(canvas);
+        canvas.translate((float) array[0], (float) array[1]);
+    }
+
+    private void setAllAppsSearchView() {
+        View view = null;
+        AllAppsRecyclerView appsView = getAppsView();
+        GridLayoutManager.SpanSizeLookup spanSizeLookup = ((GridLayoutManager) appsView.getLayoutManager())
+                .getSpanSizeLookup();
+        int allAppsCols = Math.min(mActivity.getDeviceProfile().inv.numColsDrawer, appsView.getChildCount());
+        int childCount = appsView.getChildCount();
+        BubbleTextView[] bubbleTextViewArr = new BubbleTextView[allAppsCols];
+        int i4 = -1;
+        for (int i = 0; i < childCount; i++) {
+            RecyclerView.ViewHolder childViewHolder = appsView.getChildViewHolder(appsView.getChildAt(i));
+            if (childViewHolder.itemView instanceof BubbleTextView) {
+                int spanGroupIndex = spanSizeLookup.getSpanGroupIndex(childViewHolder.getLayoutPosition(), allAppsCols);
+                if (spanGroupIndex >= 0) {
+                    if (i4 >= 0) {
+                        if (spanGroupIndex != i4) {
+                            view = childViewHolder.itemView;
+                            break;
+                        }
+                    }
+                    i4 = spanGroupIndex;
+                    int index = ((GridLayoutManager.LayoutParams) childViewHolder.itemView.getLayoutParams()).getSpanIndex();
+                    bubbleTextViewArr[index] = (BubbleTextView) childViewHolder.itemView;
+                }
+            }
+        }
+        if (bubbleTextViewArr.length == 0 || bubbleTextViewArr[0] == null) {
+            Log.e("ConfigBuilder", "No icons rendered in all apps");
+            setHotseatSearchView();
+            return;
+        }
+        mBubbleTextView = bubbleTextViewArr[0];
+        mNano.allAppsCols = allAppsCols;
+        int iconCountOffset = 0;
+        for (int i = 0; i < bubbleTextViewArr.length; i++) {
+            if (bubbleTextViewArr[i] == null) {
+                iconCountOffset = allAppsCols - i;
+                allAppsCols = i;
+                break;
+            }
+        }
+        co = appsView.getChildViewHolder(bubbleTextViewArr[0]).getItemViewType() == 4;
+        Columns lastColumn = getViewBounds(bubbleTextViewArr[allAppsCols - 1]);
+        Columns firstColumn = getViewBounds(bubbleTextViewArr[0]);
+        if (Utilities.isRtl(mActivity.getResources())) {
+            Columns temp = lastColumn;
+            lastColumn = firstColumn;
+            firstColumn = temp;
+        }
+        int iconWidth = lastColumn.iconDistance;
+        int totalIconDistance = lastColumn.edgeMargin - firstColumn.edgeMargin;
+        int iconDistance = totalIconDistance / allAppsCols;
+        firstColumn.iconDistance = iconWidth + totalIconDistance;
+        if (Utilities.isRtl(mActivity.getResources())) {
+            firstColumn.edgeMargin -= iconCountOffset * iconWidth;
+            firstColumn.iconDistance += iconCountOffset * iconWidth;
+        } else {
+            firstColumn.iconDistance += iconCountOffset * (iconDistance + iconWidth);
+        }
+        mNano.apps = firstColumn;
+        if (!this.co) {
+            firstColumn.innerMargin -= firstColumn.height;
+        } else if (view != null) {
+            Columns viewBounds3 = getViewBounds(view);
+            viewBounds3.iconDistance = firstColumn.iconDistance;
+            mNano.appsView = viewBounds3;
+        }
+        updateHotseatSearchDimens();
+    }
+
+    private void setHotseatSearchView() {
+        mNano.allAppsCols = mActivity.getDeviceProfile().inv.numColumns;
+        final int width = mActivity.getHotseat().getWidth();
+        final int dimensionPixelSize = mActivity.getResources().getDimensionPixelSize(R.dimen.dynamic_grid_edge_margin);
+        final Columns appCol = new Columns();
+        appCol.edgeMargin = dimensionPixelSize;
+        appCol.iconDistance = width - dimensionPixelSize - dimensionPixelSize;
+        appCol.height = mActivity.getDeviceProfile().allAppsCellHeightPx;
+        mNano.apps = appCol;
+        updateHotseatSearchDimens();
+        AlphabeticalAppsList apps = getAppsView().getApps();
+        mBubbleTextView = (BubbleTextView) mActivity.getLayoutInflater().inflate(R.layout.all_apps_icon, getAppsView(), false);
+        ViewGroup.LayoutParams layoutParams = mBubbleTextView.getLayoutParams();
+        layoutParams.height = appCol.height;
+        layoutParams.width = appCol.iconDistance / mNano.allAppsCols;
+        if (!apps.getApps().isEmpty()) {
+            mBubbleTextView.applyFromApplicationInfo(apps.getApps().get(0));
+        }
+        mBubbleTextView.measure(View.MeasureSpec.makeMeasureSpec(layoutParams.width, View.MeasureSpec.EXACTLY), View.MeasureSpec.makeMeasureSpec(layoutParams.height, View.MeasureSpec.EXACTLY));
+        mBubbleTextView.layout(0, 0, layoutParams.width, layoutParams.height);
+        final ArrayList<AppIndex> list = new ArrayList<>(mNano.allAppsCols);
+        mNano.index = list.toArray(new AppIndex[0]);
+    }
+
+    public byte[] build() {
+        mNano.bgColor = getBackgroundColor();
+        mNano.isDark = Themes.getAttrBoolean(mActivity, R.attr.isMainColorDark);
+        if (mIsAllApps) {
+            setAllAppsSearchView();
+        } else {
+            setHotseatSearchView();
+        }
+        mNano.iconViewTemplate = "icon_view_template";
+        mBundle.putParcelable(mNano.iconViewTemplate, searchIconTemplate());
+        mNano.iconLongClick = "icon_long_click";
+        mBundle.putParcelable(mNano.iconLongClick, PendingIntent.getBroadcast(mActivity, 2055, new Intent().setComponent(new ComponentName(mActivity, LongClickReceiver.class)), PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_ONE_SHOT));
+        LongClickReceiver.bq(mActivity);
+        mNano.bounds = getViewBounds(mQsbLayout);
+        mNano.isAllApps = mIsAllApps;
+        if (mIsAllApps) {
+            createSearchTemplate();
+        }
+        SearchView searchView = new SearchView();
+        searchView.base = mNano;
+        return MessageNano.toByteArray(searchView);
+    }
+
+    public Bundle getExtras() {
+        return mBundle;
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/qsb/FallbackAppsSearchView.java b/Omega/src/com/saggitt/omega/qsb/FallbackAppsSearchView.java
new file mode 100644
index 0000000000..cdadf381dd
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/qsb/FallbackAppsSearchView.java
@@ -0,0 +1,119 @@
+/*
+ *  Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ *
+ */
+package com.saggitt.omega.qsb;
+
+import android.content.Context;
+import android.content.Intent;
+import android.util.AttributeSet;
+
+import com.android.launcher3.ExtendedEditText;
+import com.android.launcher3.Launcher;
+import com.android.launcher3.allapps.AllAppsContainerView;
+import com.android.launcher3.allapps.AllAppsStore.OnUpdateListener;
+import com.android.launcher3.allapps.AlphabeticalAppsList;
+import com.android.launcher3.allapps.FloatingHeaderView;
+import com.android.launcher3.allapps.search.AllAppsSearchBarController;
+import com.android.launcher3.allapps.search.AllAppsSearchBarController.Callbacks;
+import com.android.launcher3.util.ComponentKey;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class FallbackAppsSearchView extends ExtendedEditText implements OnUpdateListener, Callbacks {
+    AllAppsSearchBarController mSearchBarController;
+    AllAppsQsbLayout allAppsQsbLayout;
+    AlphabeticalAppsList mApps;
+    AllAppsContainerView mAppsView;
+
+    public FallbackAppsSearchView(Context context) {
+        this(context, null);
+    }
+
+    public FallbackAppsSearchView(Context context, AttributeSet attributeSet) {
+        this(context, attributeSet, 0);
+    }
+
+    public FallbackAppsSearchView(Context context, AttributeSet attributeSet, int i) {
+        super(context, attributeSet, i);
+        mSearchBarController = new AllAppsSearchBarController();
+    }
+
+    protected void onAttachedToWindow() {
+        super.onAttachedToWindow();
+        Launcher.getLauncher(getContext()).getAppsView().getAppsStore().addUpdateListener(this);
+    }
+
+    protected void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+        Launcher.getLauncher(getContext()).getAppsView().getAppsStore().removeUpdateListener(this);
+    }
+
+    @Override
+    public boolean onSubmitSearch() {
+        if (mApps.hasNoFilteredResults()) {
+            return false;
+        }
+        Intent i = mApps.getFilteredApps().get(0).getIntent();
+        getContext().startActivity(i);
+        return true;
+    }
+
+    @Override
+    public void onSearchResult(String query, ArrayList<ComponentKey> apps, List<String> suggestions) {
+        if (getParent() != null) {
+            if (apps != null) {
+                mApps.setOrderedFilter(apps);
+            }
+            if (suggestions != null) {
+                mApps.setSearchSuggestions(suggestions);
+            }
+            if (apps != null || suggestions != null) {
+                notifyResultChanged();
+                hidePredictionRowView(true);
+                mAppsView.setLastSearchQuery(query);
+            }
+        }
+    }
+
+    @Override
+    public final void clearSearchResult() {
+        if (getParent() != null) {
+            if (mApps.setOrderedFilter(null) || mApps.setSearchSuggestions(null)) {
+                notifyResultChanged();
+            }
+            hidePredictionRowView(false);
+            allAppsQsbLayout.mDoNotRemoveFallback = true;
+            mAppsView.onClearSearchResult();
+            allAppsQsbLayout.mDoNotRemoveFallback = false;
+        }
+    }
+
+
+    public void onAppsUpdated() {
+        mSearchBarController.refreshSearchResult();
+    }
+
+    private void hidePredictionRowView(boolean z) {
+        FloatingHeaderView predictionsFloatingHeader = mAppsView.getFloatingHeaderView();
+        predictionsFloatingHeader.setCollapsed(z);
+    }
+
+    private void notifyResultChanged() {
+        allAppsQsbLayout.setShadowAlpha(0);
+        mAppsView.onSearchResultsChanged();
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/qsb/HotseatQsbWidget.java b/Omega/src/com/saggitt/omega/qsb/HotseatQsbWidget.java
new file mode 100644
index 0000000000..312e556feb
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/qsb/HotseatQsbWidget.java
@@ -0,0 +1,80 @@
+/*
+ *  Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ *
+ */
+
+package com.saggitt.omega.qsb;
+
+import android.app.WallpaperInfo;
+import android.app.WallpaperManager;
+import android.content.Context;
+import android.content.res.Resources;
+import android.graphics.Rect;
+import android.util.AttributeSet;
+import android.widget.FrameLayout;
+
+import com.android.launcher3.DeviceProfile;
+import com.android.launcher3.R;
+import com.android.launcher3.Utilities;
+import com.android.launcher3.views.ActivityContext;
+
+public class HotseatQsbWidget extends FrameLayout {
+    private boolean mIsGoogleColored;
+
+    public HotseatQsbWidget(Context context) {
+        this(context, null);
+    }
+
+    public HotseatQsbWidget(Context context, AttributeSet attributeSet) {
+        this(context, attributeSet, 0);
+    }
+
+    public HotseatQsbWidget(Context context, AttributeSet attributeSet, int i) {
+        super(context, attributeSet, i);
+    }
+
+    public static boolean isGoogleColored(Context context) {
+        if (Utilities.getOmegaPrefs(context).getDockColoredGoogle()) {
+            return true;
+        }
+        WallpaperInfo wallpaperInfo = WallpaperManager.getInstance(context).getWallpaperInfo();
+        return wallpaperInfo != null && wallpaperInfo.getComponent().flattenToString()
+                .equals(context.getString(R.string.default_live_wallpaper));
+    }
+
+    public static int getBottomMargin(ActivityContext launcher) {
+        Context context = (Context) launcher;
+        Resources resources = context.getResources();
+        int minBottom = launcher.getDeviceProfile().getInsets().bottom + resources
+                .getDimensionPixelSize(R.dimen.hotseat_qsb_bottom_margin);
+
+        DeviceProfile profile = launcher.getDeviceProfile();
+        Rect rect = profile.getInsets();
+        Rect hotseatLayoutPadding = profile.getHotseatLayoutPadding();
+
+        int hotseatTop = profile.hotseatBarSizePx + rect.bottom;
+        int hotseatIconsTop = hotseatTop - hotseatLayoutPadding.top;
+
+        float f = ((hotseatIconsTop - hotseatLayoutPadding.bottom) + (profile.iconSizePx * 0.92f)) / 2.0f;
+        float f2 = ((float) rect.bottom) * 0.67f;
+        int bottomMargin = Math.round(f2 + (
+                ((((((float) hotseatTop) - f2) - f) - resources
+                        .getDimension(R.dimen.qsb_widget_height))
+                        - ((float) profile.verticalDragHandleSizePx)) / 2.0f));
+
+        return Math.max(minBottom, bottomMargin);
+    }
+}
+
diff --git a/Omega/src/com/saggitt/omega/qsb/ItemDragListener.java b/Omega/src/com/saggitt/omega/qsb/ItemDragListener.java
new file mode 100644
index 0000000000..5b98b9cdaf
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/qsb/ItemDragListener.java
@@ -0,0 +1,56 @@
+/*
+ *  Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ *
+ */
+
+package com.saggitt.omega.qsb;
+
+import android.content.pm.LauncherActivityInfo;
+import android.graphics.Rect;
+import android.view.View;
+
+import com.android.launcher3.InstallShortcutReceiver;
+import com.android.launcher3.ItemInfo;
+import com.android.launcher3.WorkspaceItemInfo;
+import com.android.launcher3.compat.ShortcutConfigActivityInfo;
+import com.android.launcher3.dragndrop.BaseItemDragListener;
+import com.android.launcher3.userevent.nano.LauncherLogProto;
+import com.android.launcher3.widget.PendingAddShortcutInfo;
+import com.android.launcher3.widget.PendingItemDragHelper;
+
+public class ItemDragListener extends BaseItemDragListener {
+    private final LauncherActivityInfo mActivityInfo;
+
+    public ItemDragListener(LauncherActivityInfo activityInfo, Rect rect) {
+        super(rect, rect.width(), rect.width());
+        mActivityInfo = activityInfo;
+    }
+
+    protected PendingItemDragHelper createDragHelper() {
+        PendingAddShortcutInfo tag = new PendingAddShortcutInfo(new ShortcutConfigActivityInfo.ShortcutConfigActivityInfoVO(mActivityInfo) {
+
+            public WorkspaceItemInfo createShortcutInfo() {
+                return InstallShortcutReceiver.fromActivityInfo(mActivityInfo, mLauncher);
+            }
+        });
+        View view = new View(mLauncher);
+        view.setTag(tag);
+        return new PendingItemDragHelper(view);
+    }
+
+    @Override
+    public void fillInLogContainerData(View v, ItemInfo info, LauncherLogProto.Target target, LauncherLogProto.Target targetParent) {
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/qsb/LongClickReceiver.java b/Omega/src/com/saggitt/omega/qsb/LongClickReceiver.java
new file mode 100644
index 0000000000..fe3258e6b7
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/qsb/LongClickReceiver.java
@@ -0,0 +1,58 @@
+/*
+ *  Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ *
+ */
+package com.saggitt.omega.qsb;
+
+import android.content.BroadcastReceiver;
+import android.content.ClipData;
+import android.content.ClipDescription;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.LauncherActivityInfo;
+import android.os.Bundle;
+
+import com.android.launcher3.compat.LauncherAppsCompat;
+import com.android.launcher3.util.ComponentKey;
+import com.saggitt.omega.OmegaLauncher;
+import com.saggitt.omega.search.AppSearchProvider;
+
+import java.lang.ref.WeakReference;
+
+public class LongClickReceiver extends BroadcastReceiver {
+    private static WeakReference<OmegaLauncher> bR = new WeakReference<>(null);
+
+    public static void bq(final OmegaLauncher nexusLauncherActivity) {
+        LongClickReceiver.bR = new WeakReference<>(nexusLauncherActivity);
+    }
+
+    public void onReceive(final Context context, final Intent intent) {
+        final OmegaLauncher launcher = LongClickReceiver.bR.get();
+        if (launcher != null) {
+            final ComponentKey dl = AppSearchProvider.uriToComponent(intent.getData(), context);
+            final LauncherActivityInfo resolveActivity = LauncherAppsCompat.getInstance(context).resolveActivity(new Intent(Intent.ACTION_MAIN).setComponent(dl.componentName), dl.user);
+            if (resolveActivity == null) {
+                return;
+            }
+            final ItemDragListener onDragListener = new ItemDragListener(resolveActivity, intent.getSourceBounds());
+            onDragListener.init(launcher, false);
+            launcher.getDragLayer().setOnDragListener(onDragListener);
+            final ClipData clipData = new ClipData(new ClipDescription("", new String[]{onDragListener.getMimeType()}), new ClipData.Item(""));
+            final Bundle bundle = new Bundle();
+            bundle.putParcelable("clip_data", clipData);
+            this.setResult(-1, null, bundle);
+        }
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/qsb/OPAStatusReceiver.java b/Omega/src/com/saggitt/omega/qsb/OPAStatusReceiver.java
new file mode 100644
index 0000000000..7a913d1f99
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/qsb/OPAStatusReceiver.java
@@ -0,0 +1,30 @@
+/*
+ *  Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ *
+ */
+package com.saggitt.omega.qsb;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+import com.android.launcher3.Utilities;
+
+public class OPAStatusReceiver extends BroadcastReceiver {
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        Utilities.getDevicePrefs(context).edit().putBoolean("opa_enabled", intent.getBooleanExtra("OPA_ENABLED", false)).apply();
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/qsb/QsbActionMode.java b/Omega/src/com/saggitt/omega/qsb/QsbActionMode.java
new file mode 100644
index 0000000000..a9dc1df857
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/qsb/QsbActionMode.java
@@ -0,0 +1,81 @@
+/*
+ *  Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ *
+ */
+
+package com.saggitt.omega.qsb;
+
+import android.annotation.SuppressLint;
+import android.content.Intent;
+import android.text.TextUtils;
+import android.view.ActionMode;
+import android.view.Menu;
+import android.view.MenuItem;
+
+import com.android.launcher3.Launcher;
+import com.android.launcher3.R;
+
+public class QsbActionMode implements ActionMode.Callback {
+    final AbstractQsbLayout qsbLayout;
+    private final String clipboardText;
+    private final Intent settingsBroadcast;
+    private final Intent settingsIntent;
+
+    public QsbActionMode(AbstractQsbLayout layout, String clipboardText, Intent settingBroadcast, Intent settingsIntent) {
+        this.qsbLayout = layout;
+        this.clipboardText = clipboardText;
+        this.settingsBroadcast = settingBroadcast;
+        this.settingsIntent = settingsIntent;
+    }
+
+    @SuppressLint("ResourceType")
+    public boolean onCreateActionMode(ActionMode actionMode, Menu menu) {
+        actionMode.setTitle(null);
+        actionMode.setSubtitle(null);
+        actionMode.setTitleOptionalHint(true);
+        actionMode.setTag(Launcher.AUTO_CANCEL_ACTION_MODE);
+        if (clipboardText != null) {
+            menu.add(0, 16908322, 0, 17039371).setShowAsAction(1);
+        }
+        if (settingsBroadcast != null || settingsIntent != null) {
+            menu.add(0, R.id.hotseat_qsb_menu_item, 0, R.string.customize).setShowAsAction(8);
+        }
+        return clipboardText != null || settingsBroadcast != null || settingsIntent != null;
+    }
+
+    public boolean onPrepareActionMode(ActionMode actionMode, Menu menu) {
+        return true;
+    }
+
+    public boolean onActionItemClicked(ActionMode actionMode, MenuItem menuItem) {
+        if (menuItem.getItemId() == 16908322 && !TextUtils.isEmpty(clipboardText)) {
+            qsbLayout.startSearch(clipboardText, 3);
+            actionMode.finish();
+            return true;
+        } else if (menuItem.getItemId() == R.id.hotseat_qsb_menu_item && !(this.settingsBroadcast == null && this.settingsIntent == null)) {
+            if (settingsBroadcast != null) {
+                this.qsbLayout.getContext().sendBroadcast(this.settingsBroadcast);
+            } else if (settingsIntent != null) {
+                this.qsbLayout.getContext().startActivity(settingsIntent);
+            }
+            actionMode.finish();
+            return true;
+        }
+        return false;
+    }
+
+    public void onDestroyActionMode(ActionMode actionMode) {
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/qsb/QsbAnimationController.java b/Omega/src/com/saggitt/omega/qsb/QsbAnimationController.java
new file mode 100644
index 0000000000..240fa990c0
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/qsb/QsbAnimationController.java
@@ -0,0 +1,132 @@
+/*
+ *  Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ *
+ */
+package com.saggitt.omega.qsb;
+
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.animation.AnimatorSet;
+import android.animation.ObjectAnimator;
+import android.view.View;
+
+import com.android.launcher3.Launcher;
+import com.android.launcher3.LauncherRootView;
+import com.android.launcher3.LauncherState;
+import com.android.launcher3.LauncherStateManager;
+import com.android.launcher3.anim.Interpolators;
+
+public class QsbAnimationController implements LauncherRootView.WindowStateListener, LauncherStateManager.StateListener {
+    private final Launcher mLauncher;
+    public boolean mGoogleHasFocus;
+    AnimatorSet mAnimatorSet;
+    private boolean mSearchRequested;
+
+    public QsbAnimationController(Launcher launcher) {
+        mLauncher = launcher;
+        mLauncher.getStateManager().addStateListener(this);
+        mLauncher.getRootView().setWindowStateListener(this);
+    }
+
+    public final void dZ() {
+        if (mLauncher.hasWindowFocus()) {
+            mSearchRequested = true;
+        } else {
+            openQsb();
+        }
+    }
+
+    public AnimatorSet openQsb() {
+        mSearchRequested = false;
+        playAnimation(mGoogleHasFocus = true, true);
+        return mAnimatorSet;
+    }
+
+    public final void z(boolean z) {
+        mSearchRequested = false;
+        if (mGoogleHasFocus) {
+            mGoogleHasFocus = false;
+            playAnimation(false, z);
+        }
+    }
+
+    @Override
+    public void onWindowFocusChanged(boolean hasFocus) {
+        if (hasFocus || !mSearchRequested) {
+            if (hasFocus) {
+                z(true);
+            }
+            return;
+        }
+        openQsb();
+    }
+
+    @Override
+    public void onWindowVisibilityChanged(int visibility) {
+        z(false);
+    }
+
+    private void playAnimation(boolean z, boolean z2) {
+        if (mAnimatorSet != null) {
+            mAnimatorSet.cancel();
+            mAnimatorSet = null;
+        }
+        View view = mLauncher.getDragLayer();
+        if (mLauncher.isInState(LauncherState.ALL_APPS)) {
+            view.setAlpha(1.0f);
+            view.setTranslationY(0.0f);
+            return;
+        }
+        mAnimatorSet = new AnimatorSet();
+        mAnimatorSet.addListener(new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                if (animation == mAnimatorSet) {
+                    mAnimatorSet = null;
+                }
+            }
+        });
+        if (z) {
+            mAnimatorSet.play(ObjectAnimator.ofFloat(view, View.ALPHA, 0f));
+            Animator animator = ObjectAnimator.ofFloat(view, View.TRANSLATION_Y, (float) ((-mLauncher.getHotseat().getHeight()) / 2));
+            animator.setInterpolator(Interpolators.ACCEL);
+            mAnimatorSet.play(animator);
+            mAnimatorSet.setDuration(200);
+        } else {
+            mAnimatorSet.play(ObjectAnimator.ofFloat(view, View.ALPHA, 1f));
+            Animator animator = ObjectAnimator.ofFloat(view, View.TRANSLATION_Y, 0f);
+            animator.setInterpolator(Interpolators.DEACCEL);
+            mAnimatorSet.play(animator);
+            mAnimatorSet.setDuration(200);
+        }
+        mAnimatorSet.start();
+        if (!z2) {
+            mAnimatorSet.end();
+        }
+    }
+
+    public void onStateTransitionStart(LauncherState launcherState) {
+    }
+
+    public void onStateTransitionComplete(LauncherState launcherState) {
+        a(launcherState);
+    }
+
+    private void a(LauncherState launcherState) {
+        if (mGoogleHasFocus && launcherState != LauncherState.ALL_APPS && !mLauncher.hasWindowFocus()) {
+            playAnimation(true, false);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/qsb/QsbChangeListener.java b/Omega/src/com/saggitt/omega/qsb/QsbChangeListener.java
new file mode 100644
index 0000000000..f851e358b9
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/qsb/QsbChangeListener.java
@@ -0,0 +1,22 @@
+/*
+ *  Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ *
+ */
+
+package com.saggitt.omega.qsb;
+
+public interface QsbChangeListener {
+    void onChange();
+}
diff --git a/Omega/src/com/saggitt/omega/qsb/QsbConfiguration.java b/Omega/src/com/saggitt/omega/qsb/QsbConfiguration.java
new file mode 100644
index 0000000000..1b29f6571a
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/qsb/QsbConfiguration.java
@@ -0,0 +1,63 @@
+/*
+ *  Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ *
+ */
+
+package com.saggitt.omega.qsb;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+
+import java.util.ArrayList;
+
+@TargetApi(26)
+public class QsbConfiguration {
+    private static QsbConfiguration INSTANCE;
+
+    private final ArrayList<QsbChangeListener> mListeners = new ArrayList<>(2);
+
+    private QsbConfiguration(Context context) {
+    }
+
+    public static QsbConfiguration getInstance(Context context) {
+        if (INSTANCE == null) {
+            INSTANCE = new QsbConfiguration(context.getApplicationContext());
+        }
+        return INSTANCE;
+    }
+
+    public final float micStrokeWidth() {
+        // pixel_2018_qsb_mic_stroke_width_dp
+        return 0f;
+    }
+
+    public final String hintTextValue() {
+        // pixel_2017_qsb_hint_text_value
+        return "";
+    }
+
+    public final boolean hintIsForAssistant() {
+        // pixel_2018_qsb_hint_is_for_assistant
+        return false;
+    }
+
+    public final void addListener(QsbChangeListener qsbChangeListener) {
+        mListeners.add(qsbChangeListener);
+    }
+
+    public final void removeListener(QsbChangeListener qsbChangeListener) {
+        mListeners.remove(qsbChangeListener);
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/qsb/SearchWidget.java b/Omega/src/com/saggitt/omega/qsb/SearchWidget.java
new file mode 100644
index 0000000000..4bf09eb8b5
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/qsb/SearchWidget.java
@@ -0,0 +1,53 @@
+/*
+ *  Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ *
+ */
+
+package com.saggitt.omega.qsb;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.FrameLayout;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.android.launcher3.R;
+import com.saggitt.omega.allapps.BlurQsbLayout;
+import com.saggitt.omega.util.OmegaUtilsKt;
+
+public class SearchWidget extends FrameLayout {
+    public SearchWidget(@NonNull Context context) {
+        this(context, null, 0);
+    }
+
+    public SearchWidget(@NonNull Context context, @Nullable AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public SearchWidget(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    public void addView(View child) {
+        super.addView(child);
+        if (child instanceof BlurQsbLayout) {
+            ((BlurQsbLayout) child).setWidgetMode(true);
+
+            ((BlurQsbLayout) child).setScrimView(OmegaUtilsKt.getLauncherOrNull(getContext()).findViewById(R.id.scrim_view));
+        }
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/search/AppItemInfoWithIcon.java b/Omega/src/com/saggitt/omega/search/AppItemInfoWithIcon.java
new file mode 100644
index 0000000000..c267acce9e
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/search/AppItemInfoWithIcon.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2019 Paranoid Android
+ *
+ * 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.
+ */
+package com.saggitt.omega.search;
+
+import android.content.Intent;
+
+import com.android.launcher3.ItemInfoWithIcon;
+import com.android.launcher3.util.ComponentKey;
+
+public class AppItemInfoWithIcon extends ItemInfoWithIcon {
+
+    public Intent mIntent;
+
+    public AppItemInfoWithIcon(ComponentKey componentKey) {
+        mIntent = new Intent("android.intent.action.MAIN").addCategory("android.intent.category.LAUNCHER").setComponent(componentKey.componentName).addFlags(270532608);
+        user = componentKey.user;
+    }
+
+
+    public AppItemInfoWithIcon(AppItemInfoWithIcon appItemInfoWithIcon) {
+        super(appItemInfoWithIcon);
+    }
+
+    public Intent getIntent() {
+        return mIntent;
+    }
+
+    @Override
+    public AppItemInfoWithIcon clone() {
+        return new AppItemInfoWithIcon(this);
+    }
+
+}
diff --git a/Omega/src/com/saggitt/omega/search/AppLaunchActivity.java b/Omega/src/com/saggitt/omega/search/AppLaunchActivity.java
new file mode 100644
index 0000000000..aa49f93f4f
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/search/AppLaunchActivity.java
@@ -0,0 +1,79 @@
+/*
+ *  Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ *
+ */
+
+package com.saggitt.omega.search;
+
+import android.net.Uri;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.View;
+import android.widget.Toast;
+
+import com.android.launcher3.BaseActivity;
+import com.android.launcher3.ItemInfo;
+import com.android.launcher3.LauncherAppState;
+import com.android.launcher3.R;
+import com.android.launcher3.Utilities;
+import com.android.launcher3.compat.LauncherAppsCompat;
+import com.android.launcher3.util.ComponentKey;
+import com.android.launcher3.util.PackageManagerHelper;
+import com.android.launcher3.views.BaseDragLayer;
+
+public class AppLaunchActivity extends BaseActivity {
+    private void startUri(Uri uri) {
+        try {
+            ComponentKey dl = AppSearchProvider.uriToComponent(uri, this);
+            ItemInfo dVar = new AppItemInfoWithIcon(dl);
+            if (!getPackageManager().isSafeMode() || Utilities.isSystemApp(this, dVar.getIntent())) {
+                if (dl.user.equals(android.os.Process.myUserHandle())) {
+                    startActivity(dVar.getIntent());
+                } else {
+                    LauncherAppsCompat.getInstance(this).startActivityForProfile(dl.componentName, dl.user, getIntent().getSourceBounds(), null);
+                }
+                View view = new View(this);
+                view.setTag(dVar);
+                String predictionRank = uri.getQueryParameter("predictionRank");
+                new LogContainerProvider(this, TextUtils.isEmpty(predictionRank) ? -1 : Integer.parseInt(predictionRank)).addView(view);
+                return;
+            }
+            Toast.makeText(this, R.string.safemode_shortcut_error, Toast.LENGTH_SHORT).show();
+        } catch (Exception e) {
+            Toast.makeText(this, R.string.activity_not_found, Toast.LENGTH_SHORT).show();
+        }
+
+    }
+
+    protected void onCreate(final Bundle bundle) {
+        super.onCreate(bundle);
+        mDeviceProfile = LauncherAppState.getIDP(this).getDeviceProfile(this);
+        final Uri data = getIntent().getData();
+        if (data == null) {
+            String query = getIntent().getStringExtra("query");
+            if (!TextUtils.isEmpty(query)) {
+                startActivity(PackageManagerHelper.getMarketSearchIntent(this, query));
+            }
+        } else {
+            startUri(data);
+        }
+        finish();
+    }
+
+    @Override
+    public BaseDragLayer getDragLayer() {
+        return null;
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/search/AppSearchProvider.java b/Omega/src/com/saggitt/omega/search/AppSearchProvider.java
new file mode 100644
index 0000000000..8e7fc54dfa
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/search/AppSearchProvider.java
@@ -0,0 +1,246 @@
+/*
+ * Copyright (C) 2019 Paranoid Android
+ *
+ * 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.
+ */
+package com.saggitt.omega.search;
+
+import android.content.ComponentName;
+import android.content.ContentProvider;
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.database.MatrixCursor;
+import android.graphics.Bitmap;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Looper;
+import android.os.ParcelFileDescriptor;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+
+import com.android.launcher3.AppFilter;
+import com.android.launcher3.AppInfo;
+import com.android.launcher3.BuildConfig;
+import com.android.launcher3.LauncherAppState;
+import com.android.launcher3.LauncherModel;
+import com.android.launcher3.compat.UserManagerCompat;
+import com.android.launcher3.model.AllAppsList;
+import com.android.launcher3.model.BgDataModel;
+import com.android.launcher3.model.LoaderResults;
+import com.android.launcher3.util.ComponentKey;
+import com.android.launcher3.util.LooperExecutor;
+import com.saggitt.omega.allapps.FuzzyAppSearchAlgorithm;
+import com.saggitt.omega.allapps.OmegaAppFilter;
+
+import java.io.FileNotFoundException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Future;
+import java.util.concurrent.FutureTask;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
+
+public class AppSearchProvider extends ContentProvider {
+    private static final String[] eK = new String[]{"_id", "suggest_text_1", "suggest_icon_1", "suggest_intent_action", "suggest_intent_data"};
+    private final PipeDataWriter<Future> mPipeDataWriter;
+    private LooperExecutor mLooper;
+    private LauncherAppState mApp;
+
+    private AppFilter mBaseFilter;
+
+    public AppSearchProvider() {
+        mPipeDataWriter = (output, uri, mimeType, opts, args) -> {
+            ParcelFileDescriptor.AutoCloseOutputStream outStream = null;
+            try {
+                outStream = new ParcelFileDescriptor.AutoCloseOutputStream(output);
+                ((Bitmap) args.get()).compress(Bitmap.CompressFormat.PNG, 100, outStream);
+            } catch (Throwable e) {
+                Log.w("AppSearchProvider", "fail to write to pipe", e);
+            }
+            if (outStream != null) {
+                try {
+                    outStream.close();
+                } catch (Throwable ignored) {
+                }
+            }
+        };
+    }
+
+    public static ComponentKey uriToComponent(final Uri uri, final Context context) {
+        return new ComponentKey(ComponentName.unflattenFromString(uri.getQueryParameter("component")),
+                UserManagerCompat.getInstance(context).getUserForSerialNumber(Long.parseLong(uri.getQueryParameter("user"))));
+    }
+
+    public static Uri buildUri(final AppInfo appInfo, final UserManagerCompat userManagerCompat) {
+        return new Uri.Builder()
+                .scheme("content")
+                .authority(BuildConfig.APPLICATION_ID + ".appssearch")
+                .appendQueryParameter("component", appInfo.componentName.flattenToShortString())
+                .appendQueryParameter("user", Long.toString(userManagerCompat.getSerialNumberForUser(appInfo.user)))
+                .build();
+    }
+
+    private Cursor listToCursor(final List<AppInfo> list) {
+        final MatrixCursor matrixCursor = new MatrixCursor(AppSearchProvider.eK, list.size());
+        final UserManagerCompat instance = UserManagerCompat.getInstance(this.getContext());
+
+        int n = 0;
+        for (AppInfo appInfo : list) {
+            final String uri = buildUri(appInfo, instance).toString();
+            final MatrixCursor.RowBuilder row = matrixCursor.newRow();
+            row.add(n++).add(appInfo.title.toString()).add(uri).add("com.google.android.apps.nexuslauncher.search.APP_LAUNCH").add(uri);
+        }
+
+        return matrixCursor;
+    }
+
+    public Bundle call(final String s, final String s2, final Bundle bundle) {
+        if (Looper.myLooper() == Looper.getMainLooper()) {
+            Log.d("AppSearchProvider", "Content provider accessed on main thread");
+            return null;
+        }
+        if ("loadIcon".equals(s)) try {
+            final Uri parse = Uri.parse(s2);
+            final ComponentKey dl = uriToComponent(parse, this.getContext());
+            final Callable<Bitmap> g = () -> {
+                final AppItemInfoWithIcon d = new AppItemInfoWithIcon(dl);
+                mApp.getIconCache().getTitleAndIcon(d, false);
+                return d.iconBitmap;
+            };
+            final Bundle bundle2 = new Bundle();
+            bundle2.putParcelable("suggest_icon_1", mLooper.submit(g).get());
+            return bundle2;
+        } catch (Exception ex) {
+            Log.e("AppSearchProvider", "Unable to load icon " + ex);
+            return null;
+        }
+        return super.call(s, s2, bundle);
+    }
+
+    public int delete(final Uri uri, final String s, final String[] array) {
+        throw new UnsupportedOperationException();
+    }
+
+    public String getType(final Uri uri) {
+        return "vnd.android.cursor.dir/vnd.android.search.suggest";
+    }
+
+    public Uri insert(final Uri uri, final ContentValues contentValues) {
+        throw new UnsupportedOperationException();
+    }
+
+    public boolean onCreate() {
+        mLooper = new LooperExecutor(MODEL_EXECUTOR.getLooper());
+        mApp = LauncherAppState.getInstance(getContext());
+        return true;
+    }
+
+    public ParcelFileDescriptor openFile(final Uri uri, final String s) throws FileNotFoundException {
+        if (Looper.myLooper() == Looper.getMainLooper()) {
+            Log.e("AppSearchProvider", "Content provider accessed on main thread");
+            return null;
+        }
+        try {
+            final ComponentKey dl = uriToComponent(uri, getContext());
+            final String s2 = "image/png";
+            final Callable<Bitmap> g = () -> {
+                final AppItemInfoWithIcon d = new AppItemInfoWithIcon(dl);
+                mApp.getIconCache().getTitleAndIcon(d, false);
+                return d.iconBitmap;
+            };
+            return openPipeHelper(uri, s2, null, mLooper.submit(g), this.mPipeDataWriter);
+        } catch (Exception ex) {
+            throw new FileNotFoundException(ex.getMessage());
+        }
+    }
+
+    public Cursor query(@NonNull Uri uri, final String[] array, final String s, final String[] array2, final String s2) {
+        if (Looper.myLooper() == Looper.getMainLooper()) {
+            Log.e("AppSearchProvider", "Content provider accessed on main thread");
+            return new MatrixCursor(AppSearchProvider.eK, 0);
+        }
+        List<AppInfo> list;
+        try {
+            final f f = new f(uri.getLastPathSegment());
+            this.mApp.getModel().enqueueModelUpdateTask(f);
+            list = f.eN.get(5, TimeUnit.SECONDS);
+        } catch (InterruptedException | ExecutionException | TimeoutException ex) {
+            Log.d("AppSearchProvider", "Error searching apps", ex);
+            list = new ArrayList<>();
+        }
+        return this.listToCursor(list);
+    }
+
+    public int update(final Uri uri, final ContentValues contentValues, final String s, final String[] array) {
+        throw new UnsupportedOperationException();
+    }
+
+    public AppFilter getBaseFilter() {
+        if (mBaseFilter == null)
+            mBaseFilter = new OmegaAppFilter(Objects.requireNonNull(getContext()));
+        return mBaseFilter;
+    }
+
+    class f implements Callable<List<AppInfo>>, LauncherModel.ModelUpdateTask {
+        private final FutureTask<List<AppInfo>> eN;
+        private final String mQuery;
+        private AllAppsList mAllAppsList;
+        private LauncherAppState mApp;
+        private BgDataModel mBgDataModel;
+        private LauncherModel mModel;
+
+        f(final String s) {
+            this.mQuery = s.toLowerCase();
+            this.eN = new FutureTask<>(this);
+        }
+
+        public List<AppInfo> call() {
+            if (!mModel.isModelLoaded()) {
+                Log.d("AppSearchProvider", "Workspace not loaded, loading now");
+                mModel.startLoaderForResults(new LoaderResults(this.mApp, this.mBgDataModel, this.mAllAppsList, 0, null));
+            }
+            if (!mModel.isModelLoaded()) {
+                Log.d("AppSearchProvider", "Loading workspace failed");
+                return Collections.emptyList();
+            }
+            final List<AppInfo> results = FuzzyAppSearchAlgorithm.query(mApp.getContext(), mQuery, mAllAppsList.data, getBaseFilter());
+
+            for (AppInfo appInfo : results) {
+                if (appInfo.usingLowResIcon()) {
+                    mApp.getIconCache().getTitleAndIcon(appInfo, false);
+                }
+            }
+            return results;
+        }
+
+        public void init(final LauncherAppState mApp, final LauncherModel mModel, final BgDataModel mBgDataModel, final AllAppsList mAllAppsList, final Executor executor) {
+            this.mApp = mApp;
+            this.mModel = mModel;
+            this.mBgDataModel = mBgDataModel;
+            this.mAllAppsList = mAllAppsList;
+        }
+
+        public void run() {
+            this.eN.run();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/search/LogContainerProvider.java b/Omega/src/com/saggitt/omega/search/LogContainerProvider.java
new file mode 100644
index 0000000000..c3cd1f91d5
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/search/LogContainerProvider.java
@@ -0,0 +1,43 @@
+/*
+ *  Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ *
+ */
+
+package com.saggitt.omega.search;
+
+import android.content.Context;
+import android.view.View;
+import android.widget.FrameLayout;
+
+import com.android.launcher3.ItemInfo;
+import com.android.launcher3.userevent.nano.LauncherLogProto;
+
+class LogContainerProvider extends FrameLayout {
+    private final int mPredictedRank;
+
+    public LogContainerProvider(Context context, int predictedRank) {
+        super(context);
+        mPredictedRank = predictedRank;
+    }
+
+    public void fillInLogContainerData(View v, ItemInfo info, LauncherLogProto.Target target, LauncherLogProto.Target targetParent) {
+        if (mPredictedRank >= 0) {
+            targetParent.containerType = 7;
+            target.predictedRank = mPredictedRank;
+        } else {
+            targetParent.containerType = 8;
+        }
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/search/SearchProvider.kt b/Omega/src/com/saggitt/omega/search/SearchProvider.kt
new file mode 100644
index 0000000000..294a373f03
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/search/SearchProvider.kt
@@ -0,0 +1,83 @@
+/*
+ *  Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ *
+ */
+package com.saggitt.omega.search
+
+import android.content.Context
+import android.content.Intent
+import android.graphics.drawable.Drawable
+import com.android.launcher3.R
+import com.android.launcher3.graphics.ShadowDrawable
+import com.saggitt.omega.settings.search.SettingsSearchActivity
+
+abstract class SearchProvider(val context: Context) {
+    abstract val name: String
+    abstract val supportsVoiceSearch: Boolean
+    abstract val supportsAssistant: Boolean
+    abstract val supportsFeed: Boolean
+    open val settingsIntent get() = Intent().setClass(context, SettingsSearchActivity::class.java)
+
+    /**
+     * Whether the settings intent needs to be sent as broadcast
+     */
+    open val isBroadcast = false
+    open val isAvailable: Boolean = true
+
+    abstract fun startSearch(callback: (intent: Intent) -> Unit = {})
+
+    open fun startVoiceSearch(callback: (intent: Intent) -> Unit = {}) {
+        if (supportsVoiceSearch) throw RuntimeException("Voice search supported but not implemented")
+    }
+
+    open fun startAssistant(callback: (intent: Intent) -> Unit = {}) {
+        if (supportsAssistant) throw RuntimeException("Assistant supported but not implemented")
+    }
+
+    open fun startFeed(callback: (intent: Intent) -> Unit = {}) {
+        if (supportsFeed) throw RuntimeException("Feed supported but not implemented")
+    }
+
+    protected fun wrapInShadowDrawable(d: Drawable): Drawable {
+        return ShadowDrawable.wrap(context, d, R.color.qsb_icon_shadow_color,
+                4f, R.color.qsb_dark_icon_tint).apply { applyTheme(context.theme) }
+    }
+
+    fun getIcon(colored: Boolean) = if (colored) getIcon() else getShadowIcon()
+
+    abstract fun getIcon(): Drawable
+
+    open fun getShadowIcon(): Drawable {
+        return wrapInShadowDrawable(getIcon())
+    }
+
+    fun getVoiceIcon(colored: Boolean) = if (colored) getVoiceIcon() else getShadowVoiceIcon()
+
+    open fun getVoiceIcon(): Drawable? = if (supportsVoiceSearch)
+        throw RuntimeException("Voice search supported but not implemented")
+    else null
+
+    open fun getShadowVoiceIcon() = getVoiceIcon()?.let { wrapInShadowDrawable(it) }
+
+    fun getAssistantIcon(colored: Boolean) = if (colored) getAssistantIcon() else getShadowAssistantIcon()
+
+    open fun getAssistantIcon(): Drawable? = if (supportsAssistant)
+        throw RuntimeException("Assistant supported but not implemented")
+    else null
+
+    open fun getShadowAssistantIcon() = getAssistantIcon()?.let { wrapInShadowDrawable(it) }
+
+    override fun toString() = this::class.java.name
+}
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/search/SearchProviderController.kt b/Omega/src/com/saggitt/omega/search/SearchProviderController.kt
new file mode 100644
index 0000000000..f7bb32d8b0
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/search/SearchProviderController.kt
@@ -0,0 +1,133 @@
+/*
+ *  Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ *
+ */
+package com.saggitt.omega.search
+
+import android.content.Context
+import android.view.ContextThemeWrapper
+import com.android.launcher3.Utilities
+import com.saggitt.omega.search.providers.*
+import com.saggitt.omega.search.webproviders.*
+import com.saggitt.omega.theme.ThemeManager
+import com.saggitt.omega.theme.ThemeOverride
+import com.saggitt.omega.util.SingletonHolder
+import com.saggitt.omega.util.ensureOnMainThread
+import com.saggitt.omega.util.useApplicationContext
+
+class SearchProviderController(private val context: Context) {
+
+    private val prefs by lazy { Utilities.getOmegaPrefs(context) }
+    private var cache: SearchProvider? = null
+    private var cached: String = ""
+
+    private val themeOverride = ThemeOverride(ThemeOverride.Launcher(), ThemeListener())
+    private var themeRes: Int = 0
+
+    private val listeners = HashSet<OnProviderChangeListener>()
+
+    val isGoogle get() = searchProvider is GoogleSearchProvider
+
+    init {
+        ThemeManager.getInstance(context).addOverride(themeOverride)
+    }
+
+    fun addOnProviderChangeListener(listener: OnProviderChangeListener) {
+        listeners.add(listener)
+    }
+
+    fun removeOnProviderChangeListener(listener: OnProviderChangeListener) {
+        listeners.remove(listener)
+    }
+
+    fun onSearchProviderChanged() {
+        cache = null
+        notifyProviderChanged()
+    }
+
+    private fun notifyProviderChanged() {
+        HashSet(listeners).forEach(OnProviderChangeListener::onSearchProviderChanged)
+    }
+
+    val searchProvider: SearchProvider
+        get() {
+            val curr = prefs.searchProvider
+            if (cache == null || cached != curr) {
+                cache = null
+                try {
+                    val constructor = Class.forName(prefs.searchProvider).getConstructor(Context::class.java)
+                    val themedContext = ContextThemeWrapper(context, themeRes)
+                    val prov = constructor.newInstance(themedContext) as SearchProvider
+                    if (prov.isAvailable) {
+                        cache = prov
+                    }
+                } catch (ignored: Exception) {
+                }
+                if (cache == null) cache = GoogleSearchProvider(context)
+                cached = cache!!::class.java.name
+                notifyProviderChanged()
+            }
+            return cache!!
+        }
+
+    inner class ThemeListener : ThemeOverride.ThemeOverrideListener {
+
+        override val isAlive = true
+
+        override fun applyTheme(themeRes: Int) {
+            this@SearchProviderController.themeRes = themeRes
+        }
+
+        override fun reloadTheme() {
+            cache = null
+            applyTheme(themeOverride.getTheme(context))
+            onSearchProviderChanged()
+        }
+    }
+
+    interface OnProviderChangeListener {
+
+        fun onSearchProviderChanged()
+    }
+
+    companion object : SingletonHolder<SearchProviderController, Context>(ensureOnMainThread(useApplicationContext(::SearchProviderController))) {
+        fun getSearchProviders(context: Context) = listOf(
+                AppSearchSearchProvider(context),
+                GoogleSearchProvider(context),
+                SFinderSearchProvider(context),
+                GoogleGoSearchProvider(context),
+                FirefoxSearchProvider(context),
+                DuckDuckGoSearchProvider(context),
+                BingSearchProvider(context),
+                BaiduSearchProvider(context),
+                YandexSearchProvider(context),
+                QwantSearchProvider(context),
+                SearchLiteSearchProvider(context),
+                CoolSearchSearchProvider(context),
+                EdgeSearchProvider(context),
+
+                /*Web Providers*/
+                BaiduWebSearchProvider(context),
+                BingWebSearchProvider(context),
+                DDGWebSearchProvider(context),
+                EcosiaWebSearchProvider(context),
+                GoogleWebSearchProvider(context),
+                QwantWebSearchProvider(context),
+                StartpageWebSearchProvider(context),
+                YahooWebSearchProvider(context),
+                YandexWebSearchProvider(context)
+        ).filter { it.isAvailable }
+    }
+}
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/search/SearchResult.java b/Omega/src/com/saggitt/omega/search/SearchResult.java
new file mode 100644
index 0000000000..be1dcede39
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/search/SearchResult.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2019 Paranoid Android
+ *
+ * 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.
+ */
+package com.saggitt.omega.search;
+
+import com.android.launcher3.allapps.search.AllAppsSearchBarController;
+import com.android.launcher3.util.ComponentKey;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class SearchResult {
+
+    final AllAppsSearchBarController.Callbacks mCallbacks;
+    final String mQuery;
+    final ArrayList<ComponentKey> mApps;
+    final List<String> mSuggestions;
+
+    SearchResult(String query, AllAppsSearchBarController.Callbacks callbacks) {
+        mApps = new ArrayList<>();
+        mQuery = query;
+        mCallbacks = callbacks;
+        mSuggestions = new ArrayList<>();
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/search/SearchThread.java b/Omega/src/com/saggitt/omega/search/SearchThread.java
new file mode 100644
index 0000000000..968b47b1e6
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/search/SearchThread.java
@@ -0,0 +1,118 @@
+/*
+ *  Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ *
+ */
+
+package com.saggitt.omega.search;
+
+import android.content.Context;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.os.Message;
+
+import com.android.launcher3.BuildConfig;
+import com.android.launcher3.allapps.search.AllAppsSearchBarController;
+import com.android.launcher3.allapps.search.SearchAlgorithm;
+import com.saggitt.omega.search.webproviders.WebSearchProvider;
+
+import java.util.Collections;
+import java.util.List;
+
+public class SearchThread implements SearchAlgorithm, Handler.Callback {
+    private static HandlerThread handlerThread;
+    private final Handler mHandler;
+    private final Context mContext;
+    private final Handler mUiHandler;
+    private boolean mInterruptActiveRequests;
+
+    public SearchThread(Context context) {
+        mContext = context;
+        mUiHandler = new Handler(this);
+        if (handlerThread == null) {
+            handlerThread = new HandlerThread("search-thread", -2);
+            handlerThread.start();
+        }
+        mHandler = new Handler(SearchThread.handlerThread.getLooper(), this);
+    }
+
+    private void dj(SearchResult componentList) {
+        Uri uri = new Uri.Builder()
+                .scheme("content")
+                .authority(BuildConfig.APPLICATION_ID + ".appssearch")
+                .appendPath(componentList.mQuery)
+                .build();
+
+        Cursor cursor = null;
+        try {
+            cursor = mContext.getContentResolver().query(uri, null, null, null, null);
+            int suggestIntentData = cursor.getColumnIndex("suggest_intent_data");
+            while (cursor.moveToNext()) {
+                componentList.mApps.add(AppSearchProvider.uriToComponent(Uri.parse(cursor.getString(suggestIntentData)), mContext));
+            }
+        } catch (NullPointerException ignored) {
+
+        } finally {
+            if (cursor != null) {
+                cursor.close();
+            }
+        }
+        componentList.mSuggestions.addAll(getSuggestions(componentList.mQuery));
+        Message.obtain(mUiHandler, 200, componentList).sendToTarget();
+    }
+
+    public void cancel(boolean interruptActiveRequests) {
+        mInterruptActiveRequests = interruptActiveRequests;
+        mHandler.removeMessages(100);
+        if (interruptActiveRequests) {
+            mUiHandler.removeMessages(200);
+        }
+    }
+
+    public void doSearch(String query, AllAppsSearchBarController.Callbacks callback) {
+        mHandler.removeMessages(100);
+        Message.obtain(mHandler, 100, new SearchResult(query, callback)).sendToTarget();
+    }
+
+    private List<String> getSuggestions(String query) {
+        SearchProvider provider = SearchProviderController.Companion
+                .getInstance(mContext).getSearchProvider();
+        if (provider instanceof WebSearchProvider) {
+            return ((WebSearchProvider) provider).getSuggestions(query);
+        }
+        return Collections.emptyList();
+    }
+
+    public boolean handleMessage(final Message message) {
+        switch (message.what) {
+            default: {
+                return false;
+            }
+            case 100: {
+                dj((SearchResult) message.obj);
+                break;
+            }
+            case 200: {
+                if (!mInterruptActiveRequests) {
+                    SearchResult searchResult = (SearchResult) message.obj;
+                    searchResult.mCallbacks.onSearchResult(searchResult.mQuery, searchResult.mApps, searchResult.mSuggestions);
+                }
+                break;
+            }
+        }
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/search/providers/AppSearchSearchProvider.java b/Omega/src/com/saggitt/omega/search/providers/AppSearchSearchProvider.java
new file mode 100644
index 0000000000..01b1bfa145
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/search/providers/AppSearchSearchProvider.java
@@ -0,0 +1,78 @@
+/*
+ *  Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ *
+ */
+
+package com.saggitt.omega.search.providers;
+
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.drawable.Drawable;
+
+import com.android.launcher3.Launcher;
+import com.android.launcher3.LauncherAppState;
+import com.android.launcher3.LauncherState;
+import com.android.launcher3.R;
+import com.saggitt.omega.search.SearchProvider;
+
+import org.jetbrains.annotations.NotNull;
+
+import kotlin.Unit;
+import kotlin.jvm.functions.Function1;
+
+public class AppSearchSearchProvider extends SearchProvider {
+    private Context mContext;
+    public AppSearchSearchProvider(Context context) {
+        super(context);
+        mContext = context;
+    }
+
+    @Override
+    public void startSearch(@NotNull Function1<? super Intent, Unit> callback) {
+        Launcher launcher = LauncherAppState.getInstanceNoCreate().getLauncher();
+        launcher.getStateManager().goToState(LauncherState.ALL_APPS, true, (Runnable) (new Runnable() {
+            public final void run() {
+                launcher.getAppsView().getSearchUiManager().startSearch();
+            }
+        }));
+    }
+
+    @NotNull
+    @Override
+    public Drawable getIcon() {
+        return mContext.getDrawable(R.drawable.ic_allapps_search).mutate();
+    }
+
+    @NotNull
+    @Override
+    public String getName() {
+        return mContext.getString(R.string.search_provider_appsearch);
+    }
+
+    @Override
+    public boolean getSupportsAssistant() {
+        return false;
+    }
+
+    @Override
+    public boolean getSupportsFeed() {
+        return false;
+    }
+
+    @Override
+    public boolean getSupportsVoiceSearch() {
+        return false;
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/search/providers/BaiduSearchProvider.kt b/Omega/src/com/saggitt/omega/search/providers/BaiduSearchProvider.kt
new file mode 100644
index 0000000000..7296f43f1f
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/search/providers/BaiduSearchProvider.kt
@@ -0,0 +1,37 @@
+package com.saggitt.omega.search.providers
+
+import android.content.Context
+import android.content.Intent
+import android.graphics.Color
+import android.graphics.drawable.Drawable
+import androidx.annotation.Keep
+import com.android.launcher3.R
+import com.android.launcher3.util.PackageManagerHelper
+import com.saggitt.omega.search.SearchProvider
+
+@Keep
+class BaiduSearchProvider(context: Context) : SearchProvider(context) {
+
+
+    override val name = context.getString(R.string.search_provider_baidu)
+    override val supportsVoiceSearch = true
+    override val supportsAssistant = false
+    override val supportsFeed = true
+
+    override val isAvailable: Boolean
+        get() = PackageManagerHelper.isAppEnabled(context.packageManager, PACKAGE, 0)
+
+    override fun startSearch(callback: (intent: Intent) -> Unit) = callback(Intent(Intent.ACTION_ASSIST).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK).setPackage(PACKAGE))
+    override fun startVoiceSearch(callback: (intent: Intent) -> Unit) = callback(Intent(Intent.ACTION_SEARCH_LONG_PRESS).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK).setPackage(PACKAGE))
+    override fun startFeed(callback: (intent: Intent) -> Unit) = callback(Intent("$PACKAGE.action.HOME").addFlags(Intent.FLAG_ACTIVITY_NEW_TASK).setPackage(PACKAGE))
+
+    override fun getIcon(): Drawable = context.getDrawable(R.drawable.ic_baidu)!!
+
+    override fun getVoiceIcon(): Drawable = context.getDrawable(R.drawable.ic_qsb_mic)!!.mutate().apply {
+        setTint(Color.parseColor("#2d03e4"))
+    }
+
+    companion object {
+        const val PACKAGE = "com.baidu.searchbox"
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/search/providers/BingSearchProvider.java b/Omega/src/com/saggitt/omega/search/providers/BingSearchProvider.java
new file mode 100644
index 0000000000..f7428ab0a6
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/search/providers/BingSearchProvider.java
@@ -0,0 +1,130 @@
+/*
+ *  Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ *
+ */
+
+package com.saggitt.omega.search.providers;
+
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.Color;
+import android.graphics.drawable.Drawable;
+
+import com.android.launcher3.R;
+import com.android.launcher3.util.PackageManagerHelper;
+import com.saggitt.omega.search.SearchProvider;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Objects;
+
+import kotlin.Unit;
+import kotlin.jvm.functions.Function1;
+
+public class BingSearchProvider extends SearchProvider {
+    private String PACKAGE = "com.microsoft.bing";
+    private String PACKAGE_CORTANA = "com.microsoft.cortana";
+    private String PACKAGE_ALEXA = "com.amazon.dee.app";
+
+    public BingSearchProvider(Context context) {
+        super(context);
+    }
+
+    @NotNull
+    @Override
+    public Drawable getIcon() {
+        return getContext().getDrawable(R.drawable.ic_bing);
+    }
+
+    @NotNull
+    @Override
+    public String getName() {
+        return getContext().getString(R.string.search_provider_bing);
+    }
+
+    @Override
+    public boolean getSupportsAssistant() {
+        return isCortanaInstalled() || isAlexaInstalled();
+    }
+
+    @Override
+    public boolean getSupportsFeed() {
+        return false;
+    }
+
+    @Override
+    public boolean getSupportsVoiceSearch() {
+        return true;
+    }
+
+    @Override
+    public void startSearch(@NotNull Function1<? super Intent, Unit> callback) {
+        Intent intent = (new Intent()).setClassName(PACKAGE, "com.microsoft.clients.bing.widget.WidgetSearchActivity").setPackage(PACKAGE);
+        callback.invoke(intent);
+    }
+
+    @Override
+    public void startVoiceSearch(@NotNull Function1<? super Intent, Unit> callback) {
+        Intent intent = (new Intent(Intent.ACTION_SEARCH_LONG_PRESS)).setPackage(PACKAGE);
+        callback.invoke(intent);
+    }
+
+    public void startAssistant(@NotNull Function1<? super Intent, Unit> callback) {
+        Intent intent = new Intent();
+        if (isCortanaInstalled()) {
+            intent = new Intent()
+                    .setClassName(PACKAGE_CORTANA, "com.microsoft.bing.dss.assist.AssistProxyActivity")
+                    .setPackage(PACKAGE_CORTANA);
+        } else {
+            intent = new Intent(Intent.ACTION_ASSIST).setPackage(PACKAGE_ALEXA);
+        }
+        callback.invoke(intent);
+
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return PackageManagerHelper.isAppEnabled(getContext().getPackageManager(), PACKAGE, 0);
+    }
+
+    @Override
+    public Drawable getAssistantIcon() {
+        return (isCortanaInstalled() ?
+                getContext().getDrawable(R.drawable.ic_cortana) : getContext().getDrawable(R.drawable.ic_alexa));
+    }
+
+    @Override
+    public Drawable getVoiceIcon() {
+        Drawable voiceIcon = getContext().getDrawable(R.drawable.ic_qsb_mic);
+        Objects.requireNonNull(voiceIcon).mutate().setTint(Color.parseColor("#00897B"));
+        return voiceIcon;
+    }
+
+    @Override
+    public Drawable getShadowAssistantIcon() {
+        if (isCortanaInstalled()) {
+            return wrapInShadowDrawable(getContext().getDrawable(R.drawable.ic_cortana));
+        }
+        return super.getShadowAssistantIcon();
+    }
+
+    private Boolean isCortanaInstalled() {
+        return PackageManagerHelper.isAppEnabled(getContext().getPackageManager(), PACKAGE_CORTANA, 0);
+    }
+
+    private Boolean isAlexaInstalled() {
+        return PackageManagerHelper.isAppEnabled(getContext().getPackageManager(), PACKAGE_ALEXA, 0);
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/search/providers/CoolSearchSearchProvider.kt b/Omega/src/com/saggitt/omega/search/providers/CoolSearchSearchProvider.kt
new file mode 100644
index 0000000000..0300815a95
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/search/providers/CoolSearchSearchProvider.kt
@@ -0,0 +1,65 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.search.providers
+
+import android.content.Context
+import android.content.Intent
+import android.graphics.drawable.Drawable
+import androidx.annotation.Keep
+import com.android.launcher3.R
+import com.android.launcher3.util.PackageManagerHelper
+import com.saggitt.omega.search.SearchProvider
+
+@Keep
+class CoolSearchSearchProvider(context: Context) : SearchProvider(context) {
+
+    val PACKAGE = "com.coolapk.searchbox"
+
+    override val name = context.getString(R.string.search_provider_cool_search)
+    override val supportsVoiceSearch: Boolean
+        get() = false
+    override val supportsAssistant: Boolean
+        get() = false
+    override val supportsFeed = false
+    override val isAvailable: Boolean
+        get() = PackageManagerHelper.isAppEnabled(context.packageManager, PACKAGE, 0)
+
+    override fun startSearch(callback: (intent: Intent) -> Unit) = callback(Intent(Intent.ACTION_SEARCH_LONG_PRESS).setPackage(PACKAGE))
+
+    override fun getIcon(): Drawable = context.getDrawable(R.drawable.ic_search)!!.mutate().apply {
+        //setTint(ColorEngine.getInstance(context).accent)
+    }
+
+}
diff --git a/Omega/src/com/saggitt/omega/search/providers/DuckDuckGoSearchProvider.kt b/Omega/src/com/saggitt/omega/search/providers/DuckDuckGoSearchProvider.kt
new file mode 100644
index 0000000000..56d7ffa157
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/search/providers/DuckDuckGoSearchProvider.kt
@@ -0,0 +1,31 @@
+package com.saggitt.omega.search.providers
+
+import android.content.Context
+import android.content.Intent
+import android.graphics.drawable.Drawable
+import androidx.annotation.Keep
+import com.android.launcher3.R
+import com.android.launcher3.util.PackageManagerHelper
+import com.saggitt.omega.search.SearchProvider
+
+@Keep
+class DuckDuckGoSearchProvider(context: Context) : SearchProvider(context) {
+
+    override val name = context.getString(R.string.search_provider_ddg)
+    override val supportsVoiceSearch: Boolean
+        get() = false
+    override val supportsAssistant: Boolean
+        get() = false
+    override val supportsFeed = false
+
+    override val isAvailable: Boolean
+        get() = PackageManagerHelper.isAppEnabled(context.packageManager, PACKAGE, 0)
+
+    override fun startSearch(callback: (intent: Intent) -> Unit) = callback(Intent(Intent.ACTION_ASSIST).setPackage(PACKAGE))
+
+    override fun getIcon(): Drawable = context.resources.getDrawable(R.drawable.ic_ddg)
+
+    companion object {
+        private const val PACKAGE = "com.duckduckgo.mobile.android"
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/search/providers/EdgeSearchProvider.kt b/Omega/src/com/saggitt/omega/search/providers/EdgeSearchProvider.kt
new file mode 100644
index 0000000000..9602d49804
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/search/providers/EdgeSearchProvider.kt
@@ -0,0 +1,48 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.search.providers
+
+import android.content.Context
+import android.content.Intent
+import android.graphics.drawable.Drawable
+import androidx.annotation.Keep
+import com.android.launcher3.R
+import com.android.launcher3.util.PackageManagerHelper
+import com.saggitt.omega.search.SearchProvider
+
+@Keep
+open class EdgeSearchProvider(context: Context) : SearchProvider(context) {
+    override val name: String = context.getString(R.string.search_provider_edge)
+    override val supportsVoiceSearch = false
+    override val supportsAssistant = false
+    override val supportsFeed = false
+
+    override val isAvailable: Boolean
+        get() = PackageManagerHelper.isAppEnabled(context.packageManager, PACKAGE, 0)
+
+    override fun startSearch(callback: (intent: Intent) -> Unit) {
+        callback(Intent(Intent.ACTION_MAIN)
+                .setClassName(PACKAGE, "com.microsoft.bingsearchsdk.api.ui.activities.RubyBingSearchActivity"))
+    }
+
+    override fun getIcon(): Drawable = context.getDrawable(R.drawable.ic_edge)!!
+
+    companion object {
+        private const val PACKAGE = "com.microsoft.emmx"
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/search/providers/FirefoxSearchProvider.kt b/Omega/src/com/saggitt/omega/search/providers/FirefoxSearchProvider.kt
new file mode 100644
index 0000000000..d482165d11
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/search/providers/FirefoxSearchProvider.kt
@@ -0,0 +1,53 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.search.providers
+
+import android.content.Context
+import android.content.Intent
+import android.graphics.drawable.Drawable
+import androidx.annotation.Keep
+import com.android.launcher3.R
+import com.android.launcher3.util.PackageManagerHelper
+import com.saggitt.omega.search.SearchProvider
+
+@Keep
+open class FirefoxSearchProvider(context: Context) : SearchProvider(context) {
+
+
+    override val name = context.getString(R.string.search_provider_firefox)
+    override val supportsVoiceSearch = false
+    override val supportsAssistant = false
+    override val supportsFeed = true
+
+    override val isAvailable: Boolean
+        get() = getPackage(context) != null
+
+    override fun startSearch(callback: (intent: Intent) -> Unit) = callback(Intent(Intent.ACTION_ASSIST).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK).setPackage(getPackage(context)))
+    override fun startFeed(callback: (intent: Intent) -> Unit) = callback(Intent().addFlags(Intent.FLAG_ACTIVITY_NEW_TASK).setPackage(getPackage(context)))
+
+    override fun getIcon(): Drawable = context.getDrawable(R.drawable.ic_firefox)!!
+
+    open fun getPackage(context: Context) = listOf(
+            "org.mozilla.firefox",
+            "org.mozilla.fennec_fdroid",
+            "org.mozilla.firefox_beta",
+            "org.mozilla.fennec_aurora",
+            "org.mozilla.focus",
+            "org.mozilla.fenix"
+    ).firstOrNull { PackageManagerHelper.isAppEnabled(context.packageManager, it, 0) }
+}
diff --git a/Omega/src/com/saggitt/omega/search/providers/GoogleGoSearchProvider.kt b/Omega/src/com/saggitt/omega/search/providers/GoogleGoSearchProvider.kt
new file mode 100644
index 0000000000..eeba5eb85b
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/search/providers/GoogleGoSearchProvider.kt
@@ -0,0 +1,32 @@
+package com.saggitt.omega.search.providers
+
+import android.content.Context
+import android.content.Intent
+import android.graphics.drawable.Drawable
+import androidx.annotation.Keep
+import com.android.launcher3.R
+import com.android.launcher3.util.PackageManagerHelper
+import com.saggitt.omega.search.SearchProvider
+
+@Keep
+class GoogleGoSearchProvider(context: Context) : SearchProvider(context) {
+
+    override val name = context.getString(R.string.search_provider_google_go)
+    override val supportsVoiceSearch = true
+    override val supportsAssistant = false
+    override val supportsFeed = true
+    override val isAvailable: Boolean
+        get() = PackageManagerHelper.isAppEnabled(context.packageManager, PACKAGE, 0)
+
+    override fun startSearch(callback: (intent: Intent) -> Unit) = callback(Intent("$PACKAGE.SEARCH").putExtra("showKeyboard", true).putExtra("$PACKAGE.SKIP_BYPASS_AND_ONBOARDING", true).setPackage(PACKAGE))
+    override fun startVoiceSearch(callback: (intent: Intent) -> Unit) = callback(Intent("$PACKAGE.SEARCH").putExtra("openMic", true).putExtra("$PACKAGE.SKIP_BYPASS_AND_ONBOARDING", true).setPackage(PACKAGE))
+    override fun startFeed(callback: (intent: Intent) -> Unit) = callback(Intent("$PACKAGE.SEARCH").putExtra("$PACKAGE.SKIP_BYPASS_AND_ONBOARDING", true).setPackage(PACKAGE))
+
+    override fun getIcon(): Drawable = context.getDrawable(R.drawable.ic_qsb_logo)!!
+
+    override fun getVoiceIcon(): Drawable = context.getDrawable(R.drawable.ic_qsb_mic)!!
+
+    companion object {
+        private const val PACKAGE = "com.google.android.apps.searchlite"
+    }
+}
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/search/providers/GoogleSearchProvider.kt b/Omega/src/com/saggitt/omega/search/providers/GoogleSearchProvider.kt
new file mode 100644
index 0000000000..1e6e3ca03b
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/search/providers/GoogleSearchProvider.kt
@@ -0,0 +1,51 @@
+package com.saggitt.omega.search.providers
+
+import android.content.Context
+import android.content.Intent
+import android.graphics.drawable.Drawable
+import androidx.annotation.Keep
+import com.android.launcher3.R
+import com.saggitt.omega.OmegaLauncher
+import com.saggitt.omega.search.SearchProvider
+import com.saggitt.omega.util.Config
+
+
+@Keep
+class GoogleSearchProvider(context: Context) : SearchProvider(context) {
+
+    override val name = context.getString(R.string.google_app)
+    override val supportsVoiceSearch = true
+    override val supportsAssistant = true
+    override val supportsFeed = true
+    override val settingsIntent: Intent
+        get() = Intent("com.google.android.googlequicksearchbox.TEXT_ASSIST")
+                .setPackage(Config.GOOGLE_QSB).addFlags(268435456)
+    override val isBroadcast: Boolean
+        get() = true
+
+
+    override fun startSearch(callback: (intent: Intent) -> Unit) =
+            callback(Intent().setClassName(Config.GOOGLE_QSB, Config.GOOGLE_QSB + "SearchActivity"))
+
+    override fun startVoiceSearch(callback: (intent: Intent) -> Unit) =
+            callback(Intent("android.intent.action.VOICE_ASSIST").setPackage(Config.GOOGLE_QSB))
+
+    override fun startAssistant(callback: (intent: Intent) -> Unit) =
+            callback(Intent(Intent.ACTION_VOICE_COMMAND).setPackage(Config.GOOGLE_QSB))
+
+    override fun startFeed(callback: (intent: Intent) -> Unit) {
+        val launcher = OmegaLauncher.getLauncher(context)
+        if (launcher.googleNow != null) {
+            //TODO OPEN GOOGLE FEED.
+            launcher.googleNow!!.showOverlay(true)
+        } else {
+            callback(Intent(Intent.ACTION_MAIN).setClassName(Config.GOOGLE_QSB, Config.GOOGLE_QSB + ".SearchActivity"))
+        }
+    }
+
+    override fun getIcon(): Drawable = context.getDrawable(R.drawable.ic_qsb_logo)!!
+
+    override fun getVoiceIcon(): Drawable = context.getDrawable(R.drawable.ic_qsb_mic)!!
+
+    override fun getAssistantIcon(): Drawable = context.getDrawable(R.drawable.ic_qsb_assist)!!
+}
diff --git a/Omega/src/com/saggitt/omega/search/providers/QwantSearchProvider.kt b/Omega/src/com/saggitt/omega/search/providers/QwantSearchProvider.kt
new file mode 100644
index 0000000000..2ca84c3778
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/search/providers/QwantSearchProvider.kt
@@ -0,0 +1,40 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.search.providers
+
+import android.content.Context
+import android.graphics.drawable.Drawable
+import androidx.annotation.Keep
+import com.android.launcher3.R
+import com.android.launcher3.util.PackageManagerHelper
+
+@Keep
+class QwantSearchProvider(context: Context) : FirefoxSearchProvider(context) {
+
+
+    override val name = context.getString(R.string.search_provider_qwant)
+
+    override fun getIcon(): Drawable = context.getDrawable(R.drawable.ic_qwant)!!
+    override fun getPackage(context: Context) = listOf(
+            "com.qwant.liberty"
+    ).firstOrNull { PackageManagerHelper.isAppEnabled(context.packageManager, it, 0) }
+
+    companion object {
+        const val PACKAGE = "com.qwant.liberty"
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/search/providers/SFinderSearchProvider.kt b/Omega/src/com/saggitt/omega/search/providers/SFinderSearchProvider.kt
new file mode 100644
index 0000000000..6cd7858567
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/search/providers/SFinderSearchProvider.kt
@@ -0,0 +1,67 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.search.providers
+
+import android.content.Context
+import android.content.Intent
+import android.graphics.drawable.Drawable
+import androidx.annotation.Keep
+import com.android.launcher3.R
+import com.android.launcher3.Utilities
+import com.android.launcher3.util.PackageManagerHelper
+import com.saggitt.omega.search.SearchProvider
+
+@Keep
+class SFinderSearchProvider(context: Context) : SearchProvider(context) {
+
+    override val name = context.getString(R.string.search_provider_s_finder)
+    override val supportsVoiceSearch: Boolean
+        get() = true
+
+    // TODO: Support bixby
+    override val supportsAssistant: Boolean
+        get() = false
+    override val supportsFeed = false
+
+    override val isAvailable: Boolean
+        get() = PackageManagerHelper.isAppEnabled(context.packageManager, PACKAGE, 0)
+
+    override fun startSearch(callback: (intent: Intent) -> Unit) {
+        callback(Intent(Intent.ACTION_MAIN)
+                .setClassName(PACKAGE, CLASS))
+    }
+
+    override fun startVoiceSearch(callback: (intent: Intent) -> Unit) {
+        callback(Intent(Intent.ACTION_MAIN)
+                .setClassName(PACKAGE, CLASS)
+                .putExtra("launch_mode", "voice_input"))
+    }
+
+    override fun getIcon(): Drawable = context.getDrawable(R.drawable.ic_search)!!.mutate().apply {
+        setTint(Utilities.getOmegaPrefs(context).accentColor)
+    }
+
+    override fun getVoiceIcon(): Drawable = context.getDrawable(R.drawable.ic_qsb_mic)!!.mutate().apply {
+        setTint(Utilities.getOmegaPrefs(context).accentColor)
+    }
+
+    companion object {
+        const val PACKAGE = "com.samsung.android.app.galaxyfinder"
+        const val CLASS = "$PACKAGE.GalaxyFinderActivity"
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/search/providers/SearchLiteSearchProvider.kt b/Omega/src/com/saggitt/omega/search/providers/SearchLiteSearchProvider.kt
new file mode 100644
index 0000000000..63ddef4485
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/search/providers/SearchLiteSearchProvider.kt
@@ -0,0 +1,49 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.search.providers
+
+import android.content.Context
+import android.content.Intent
+import android.graphics.drawable.Drawable
+import androidx.annotation.Keep
+import com.android.launcher3.R
+import com.android.launcher3.util.PackageManagerHelper
+import com.saggitt.omega.search.SearchProvider
+
+@Keep
+class SearchLiteSearchProvider(context: Context) : SearchProvider(context) {
+
+    override val name = context.getString(R.string.search_provider_search_lite)
+    override val supportsVoiceSearch: Boolean
+        get() = false
+    override val supportsAssistant: Boolean
+        get() = false
+    override val supportsFeed = false
+    override val isAvailable: Boolean
+        get() = PackageManagerHelper.isAppEnabled(context.packageManager, PACKAGE, 0)
+
+    override fun startSearch(callback: (intent: Intent) -> Unit) = callback(Intent(Intent.ACTION_SEARCH).setPackage(PACKAGE))
+
+    override fun getIcon(): Drawable = context.getDrawable(R.drawable.ic_search)!!.mutate().apply {
+        //setTint(ColorEngine.getInstance(context).accent)
+    }
+
+    companion object {
+        const val PACKAGE = "com.orekie.search"
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/search/providers/YandexSearchProvider.kt b/Omega/src/com/saggitt/omega/search/providers/YandexSearchProvider.kt
new file mode 100644
index 0000000000..2d5ae97598
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/search/providers/YandexSearchProvider.kt
@@ -0,0 +1,35 @@
+package com.saggitt.omega.search.providers
+
+import android.content.Context
+import android.content.Intent
+import android.graphics.drawable.Drawable
+import androidx.annotation.Keep
+import com.android.launcher3.R
+import com.android.launcher3.util.PackageManagerHelper
+import com.saggitt.omega.search.SearchProvider
+
+@Keep
+class YandexSearchProvider(context: Context) : SearchProvider(context) {
+
+    override val name = context.getString(R.string.search_provider_yandex)
+    override val supportsVoiceSearch = true
+    override val supportsAssistant = true
+    override val supportsFeed = true
+    override val isAvailable: Boolean
+        get() = PackageManagerHelper.isAppEnabled(context.packageManager, PACKAGE, 0)
+
+    override fun startSearch(callback: (intent: Intent) -> Unit) = callback(Intent(Intent.ACTION_WEB_SEARCH).setPackage(PACKAGE))
+    override fun startVoiceSearch(callback: (intent: Intent) -> Unit) = callback(Intent(Intent.ACTION_ASSIST).setPackage(PACKAGE))
+    override fun startAssistant(callback: (intent: Intent) -> Unit) = startVoiceSearch(callback)
+    override fun startFeed(callback: (intent: Intent) -> Unit) = callback(Intent().setClassName(PACKAGE, "$PACKAGE.MainActivity"))
+
+    override fun getIcon(): Drawable = context.getDrawable(R.drawable.ic_yandex)!!
+
+    override fun getVoiceIcon(): Drawable = context.getDrawable(R.drawable.ic_alisa_yandex)!!
+
+    override fun getAssistantIcon(): Drawable = getVoiceIcon()
+
+    companion object {
+        const val PACKAGE = "ru.yandex.searchplugin"
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/search/webproviders/BaiduWebSearchProvider.java b/Omega/src/com/saggitt/omega/search/webproviders/BaiduWebSearchProvider.java
new file mode 100644
index 0000000000..3762e89eaa
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/search/webproviders/BaiduWebSearchProvider.java
@@ -0,0 +1,56 @@
+/*
+ *  Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ *
+ */
+
+package com.saggitt.omega.search.webproviders;
+
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+
+import com.android.launcher3.R;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public class BaiduWebSearchProvider extends WebSearchProvider {
+    public BaiduWebSearchProvider(@NotNull Context context) {
+        super(context);
+    }
+
+    @NotNull
+    @Override
+    public Drawable getIcon() {
+        return getContext().getResources().getDrawable(R.drawable.ic_baidu);
+    }
+
+    @NotNull
+    @Override
+    protected String getSearchUrl() {
+        return "https://www.baidu.com/s?wd=%s";
+    }
+
+    @Nullable
+    @Override
+    protected String getSuggestionsUrl() {
+        return "http://suggestion.baidu.com/su?action=opensearch&ie=UTF-8&wd=%s";
+    }
+
+    @NotNull
+    @Override
+    public String getName() {
+        return getContext().getResources().getString(R.string.web_search_baidu);
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/search/webproviders/BingWebSearchProvider.java b/Omega/src/com/saggitt/omega/search/webproviders/BingWebSearchProvider.java
new file mode 100644
index 0000000000..697aea2588
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/search/webproviders/BingWebSearchProvider.java
@@ -0,0 +1,56 @@
+/*
+ *  Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ *
+ */
+
+package com.saggitt.omega.search.webproviders;
+
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+
+import com.android.launcher3.R;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public class BingWebSearchProvider extends WebSearchProvider {
+    public BingWebSearchProvider(@NotNull Context context) {
+        super(context);
+    }
+
+    @NotNull
+    @Override
+    public Drawable getIcon() {
+        return getContext().getResources().getDrawable(R.drawable.ic_bing);
+    }
+
+    @NotNull
+    @Override
+    protected String getSearchUrl() {
+        return "https://www.bing.com/search?q=%s";
+    }
+
+    @Nullable
+    @Override
+    protected String getSuggestionsUrl() {
+        return "https://www.bing.com/osjson.aspx?query=%s";
+    }
+
+    @NotNull
+    @Override
+    public String getName() {
+        return getContext().getString(R.string.web_search_bing);
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/search/webproviders/DDGWebSearchProvider.java b/Omega/src/com/saggitt/omega/search/webproviders/DDGWebSearchProvider.java
new file mode 100644
index 0000000000..b9e43e53ba
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/search/webproviders/DDGWebSearchProvider.java
@@ -0,0 +1,56 @@
+/*
+ *  Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ *
+ */
+
+package com.saggitt.omega.search.webproviders;
+
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+
+import com.android.launcher3.R;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public class DDGWebSearchProvider extends WebSearchProvider {
+    public DDGWebSearchProvider(@NotNull Context context) {
+        super(context);
+    }
+
+    @NotNull
+    @Override
+    public Drawable getIcon() {
+        return getContext().getResources().getDrawable(R.drawable.ic_ddg);
+    }
+
+    @NotNull
+    @Override
+    protected String getSearchUrl() {
+        return "https://duckduckgo.com/?q=%s";
+    }
+
+    @Nullable
+    @Override
+    protected String getSuggestionsUrl() {
+        return "https://ac.duckduckgo.com/ac/?q=%s&type=list";
+    }
+
+    @NotNull
+    @Override
+    public String getName() {
+        return getContext().getString(R.string.web_search_ddg);
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/search/webproviders/EcosiaWebSearchProvider.java b/Omega/src/com/saggitt/omega/search/webproviders/EcosiaWebSearchProvider.java
new file mode 100644
index 0000000000..648784083f
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/search/webproviders/EcosiaWebSearchProvider.java
@@ -0,0 +1,61 @@
+/*
+ *  Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ *
+ */
+
+package com.saggitt.omega.search.webproviders;
+
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+
+import com.android.launcher3.R;
+import com.saggitt.omega.util.OmegaUtilsKt;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public class EcosiaWebSearchProvider extends WebSearchProvider {
+
+    private Context mContext;
+
+    public EcosiaWebSearchProvider(@NotNull Context context) {
+        super(context);
+        mContext = context;
+    }
+
+    @NotNull
+    @Override
+    public Drawable getIcon() {
+        return getContext().getResources().getDrawable(R.drawable.ic_ecosia);
+    }
+
+    @NotNull
+    @Override
+    protected String getSearchUrl() {
+        return "https://www.ecosia.org/search?q=%s";
+    }
+
+    @Nullable
+    @Override
+    protected String getSuggestionsUrl() {
+        return "https://ac.ecosia.org/autocomplete?q=%s&type=list&mkt=" + OmegaUtilsKt.getLocale(mContext).getLanguage();
+    }
+
+    @NotNull
+    @Override
+    public String getName() {
+        return getContext().getString(R.string.web_search_ecosia);
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/search/webproviders/GoogleWebSearchProvider.java b/Omega/src/com/saggitt/omega/search/webproviders/GoogleWebSearchProvider.java
new file mode 100644
index 0000000000..516a289610
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/search/webproviders/GoogleWebSearchProvider.java
@@ -0,0 +1,59 @@
+/*
+ *  Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ *
+ */
+
+package com.saggitt.omega.search.webproviders;
+
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+
+import com.android.launcher3.R;
+import com.saggitt.omega.util.OmegaUtilsKt;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public class GoogleWebSearchProvider extends WebSearchProvider {
+    private Context mContext;
+    public GoogleWebSearchProvider(@NotNull Context context) {
+        super(context);
+        mContext = context;
+    }
+
+    @NotNull
+    @Override
+    public Drawable getIcon() {
+        return getContext().getResources().getDrawable(R.drawable.ic_qsb_logo);
+    }
+
+    @NotNull
+    @Override
+    protected String getSearchUrl() {
+        return "https://www.google.com/search?q=%s";
+    }
+
+    @Nullable
+    @Override
+    protected String getSuggestionsUrl() {
+        return "https://www.google.com/complete/search?client=chrome&q=%s&hl=" + OmegaUtilsKt.getLocale(mContext).getLanguage();
+    }
+
+    @NotNull
+    @Override
+    public String getName() {
+        return getContext().getResources().getString(R.string.web_search_google);
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/search/webproviders/QwantWebSearchProvider.java b/Omega/src/com/saggitt/omega/search/webproviders/QwantWebSearchProvider.java
new file mode 100644
index 0000000000..fb70d63120
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/search/webproviders/QwantWebSearchProvider.java
@@ -0,0 +1,61 @@
+/*
+ *  Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ *
+ */
+
+package com.saggitt.omega.search.webproviders;
+
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+
+import com.android.launcher3.R;
+import com.saggitt.omega.util.OmegaUtilsKt;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public class QwantWebSearchProvider extends WebSearchProvider {
+
+    private Context mContext;
+
+    public QwantWebSearchProvider(@NotNull Context context) {
+        super(context);
+        mContext = context;
+    }
+
+    @NotNull
+    @Override
+    public Drawable getIcon() {
+        return getContext().getResources().getDrawable(R.drawable.ic_qwant);
+    }
+
+    @NotNull
+    @Override
+    protected String getSearchUrl() {
+        return "https://www.qwant.com/?q=%s";
+    }
+
+    @Nullable
+    @Override
+    protected String getSuggestionsUrl() {
+        return "https://api.qwant.com/api/suggest/?q=%s&client=opensearch&lang=" + OmegaUtilsKt.getLocale(mContext).getLanguage();
+    }
+
+    @NotNull
+    @Override
+    public String getName() {
+        return getContext().getString(R.string.web_search_qwant);
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/search/webproviders/StartpageWebSearchProvider.java b/Omega/src/com/saggitt/omega/search/webproviders/StartpageWebSearchProvider.java
new file mode 100644
index 0000000000..419523e973
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/search/webproviders/StartpageWebSearchProvider.java
@@ -0,0 +1,56 @@
+/*
+ *  Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ *
+ */
+
+package com.saggitt.omega.search.webproviders;
+
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+
+import com.android.launcher3.R;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public class StartpageWebSearchProvider extends WebSearchProvider {
+    public StartpageWebSearchProvider(@NotNull Context context) {
+        super(context);
+    }
+
+    @NotNull
+    @Override
+    public Drawable getIcon() {
+        return getContext().getResources().getDrawable(R.drawable.ic_startpage_search);
+    }
+
+    @NotNull
+    @Override
+    protected String getSearchUrl() {
+        return "https://www.startpage.com/rvd/search?query=%s&language=auto";
+    }
+
+    @Nullable
+    @Override
+    protected String getSuggestionsUrl() {
+        return "https://www.startpage.com/cgi-bin/csuggest?query=%s&limit=$MAX_SUGGESTIONS&format=json";
+    }
+
+    @NotNull
+    @Override
+    public String getName() {
+        return getContext().getString(R.string.web_search_startpage);
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/search/webproviders/WebSearchProvider.kt b/Omega/src/com/saggitt/omega/search/webproviders/WebSearchProvider.kt
new file mode 100644
index 0000000000..fc0c696195
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/search/webproviders/WebSearchProvider.kt
@@ -0,0 +1,82 @@
+/*
+ *  Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ *
+ */
+
+package com.saggitt.omega.search.webproviders
+
+import android.content.Context
+import android.content.Intent
+import android.util.Log
+import com.android.launcher3.LauncherAppState
+import com.android.launcher3.LauncherState
+import com.android.launcher3.Utilities
+import com.saggitt.omega.search.SearchProvider
+import com.saggitt.omega.util.OkHttpClientBuilder
+import com.saggitt.omega.util.toArrayList
+import okhttp3.Request
+import org.json.JSONArray
+
+abstract class WebSearchProvider(context: Context) : SearchProvider(context) {
+    protected val client = OkHttpClientBuilder().build(context)
+
+    override val supportsVoiceSearch = false
+    override val supportsAssistant = false
+    override val supportsFeed = false
+
+    /**
+     * Web URL to the search results page. %s will be replaced with the search query.
+     */
+    protected abstract val searchUrl: String
+
+    /**
+     * Suggestions API URL. %s will be replaced with the search query.
+     */
+    protected abstract val suggestionsUrl: String?
+
+    override fun startSearch(callback: (intent: Intent) -> Unit) {
+        val launcher = LauncherAppState.getInstanceNoCreate().launcher
+        launcher.stateManager.goToState(LauncherState.ALL_APPS, true) {
+            launcher.appsView.searchUiManager.startSearch()
+        }
+    }
+
+    open fun getSuggestions(query: String): List<String> {
+        if (suggestionsUrl == null) return emptyList()
+        try {
+            val response = client.newCall(Request.Builder().url(suggestionsUrl!!.format(query)).build()).execute()
+            val result = JSONArray(response.body?.string())
+                    .getJSONArray(1)
+                    .toArrayList<String>()
+                    .take(MAX_SUGGESTIONS)
+            response.close();
+            return result;
+        } catch (ex: Exception) {
+            Log.e("WebSearchProvider", ex.message ?: "", ex)
+        }
+
+        return emptyList()
+    }
+
+    open fun openResults(query: String) {
+        Utilities.openURLinBrowser(context, getResultUrl(query))
+    }
+
+    protected open fun getResultUrl(query: String) = searchUrl.format(query)
+
+    companion object {
+        const val MAX_SUGGESTIONS = 5
+    }
+}
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/search/webproviders/YahooWebSearchProvider.java b/Omega/src/com/saggitt/omega/search/webproviders/YahooWebSearchProvider.java
new file mode 100644
index 0000000000..c100df5c11
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/search/webproviders/YahooWebSearchProvider.java
@@ -0,0 +1,56 @@
+/*
+ *  Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ *
+ */
+
+package com.saggitt.omega.search.webproviders;
+
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+
+import com.android.launcher3.R;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public class YahooWebSearchProvider extends WebSearchProvider {
+    public YahooWebSearchProvider(@NotNull Context context) {
+        super(context);
+    }
+
+    @NotNull
+    @Override
+    public Drawable getIcon() {
+        return getContext().getResources().getDrawable(R.drawable.ic_yahoo);
+    }
+
+    @NotNull
+    @Override
+    protected String getSearchUrl() {
+        return "https://search.yahoo.com/search?q=%s";
+    }
+
+    @Nullable
+    @Override
+    protected String getSuggestionsUrl() {
+        return "https://ff.search.yahoo.com/gossip?output=fxjson&command=%s";
+    }
+
+    @NotNull
+    @Override
+    public String getName() {
+        return getContext().getString(R.string.web_search_yahoo);
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/search/webproviders/YandexWebSearchProvider.java b/Omega/src/com/saggitt/omega/search/webproviders/YandexWebSearchProvider.java
new file mode 100644
index 0000000000..9cb79f20b0
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/search/webproviders/YandexWebSearchProvider.java
@@ -0,0 +1,61 @@
+/*
+ *  Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ *
+ */
+
+package com.saggitt.omega.search.webproviders;
+
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+
+import com.android.launcher3.R;
+import com.saggitt.omega.util.OmegaUtilsKt;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public class YandexWebSearchProvider extends WebSearchProvider {
+
+    private Context mContext;
+
+    public YandexWebSearchProvider(@NotNull Context context) {
+        super(context);
+        mContext = context;
+    }
+
+    @NotNull
+    @Override
+    public Drawable getIcon() {
+        return getContext().getResources().getDrawable(R.drawable.ic_yandex);
+    }
+
+    @NotNull
+    @Override
+    protected String getSearchUrl() {
+        return "https://yandex.com/search/?text=%s";
+    }
+
+    @Nullable
+    @Override
+    protected String getSuggestionsUrl() {
+        return "https://suggest.yandex.com/suggest-ff.cgi?part=%s&uil=" + OmegaUtilsKt.getLocale(mContext).getLanguage();
+    }
+
+    @NotNull
+    @Override
+    public String getName() {
+        return getContext().getString(R.string.web_search_yandex);
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/settings/HighlightablePreferenceGroupAdapter.java b/Omega/src/com/saggitt/omega/settings/HighlightablePreferenceGroupAdapter.java
index a9608649c1..10712e7589 100644
--- a/Omega/src/com/saggitt/omega/settings/HighlightablePreferenceGroupAdapter.java
+++ b/Omega/src/com/saggitt/omega/settings/HighlightablePreferenceGroupAdapter.java
@@ -41,7 +41,7 @@
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 
-import static com.android.launcher3.settings.SettingsActivity.EXTRA_FRAGMENT_ARG_KEY;
+import static com.saggitt.omega.settings.SettingsActivity.EXTRA_FRAGMENT_ARG_KEY;
 
 public class HighlightablePreferenceGroupAdapter extends PreferenceGroupAdapter {
 
diff --git a/Omega/src/com/saggitt/omega/settings/PreferenceScreenDialogFragment.kt b/Omega/src/com/saggitt/omega/settings/PreferenceScreenDialogFragment.kt
index 03be0fe369..7c103f04fd 100644
--- a/Omega/src/com/saggitt/omega/settings/PreferenceScreenDialogFragment.kt
+++ b/Omega/src/com/saggitt/omega/settings/PreferenceScreenDialogFragment.kt
@@ -35,7 +35,7 @@ class PreferenceScreenDialogFragment : DialogFragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        val content = arguments!!.getInt(KEY_CONTENT)
+        val content = requireArguments().getInt(KEY_CONTENT)
         val fragment = SettingsActivity.DialogSettingsFragment.newInstance("", content)
         childFragmentManager.beginTransaction()
                 .replace(R.id.fragment_content, fragment)
@@ -43,7 +43,7 @@ class PreferenceScreenDialogFragment : DialogFragment() {
     }
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        return Dialog(activity!!, activity!!.getThemeAttr(R.attr.alertDialogTheme))
+        return Dialog(requireActivity(), requireActivity().getThemeAttr(R.attr.alertDialogTheme))
     }
 
     companion object {
diff --git a/Omega/src/com/saggitt/omega/settings/SettingsActivity.java b/Omega/src/com/saggitt/omega/settings/SettingsActivity.java
index 78423292a0..9747e21971 100644
--- a/Omega/src/com/saggitt/omega/settings/SettingsActivity.java
+++ b/Omega/src/com/saggitt/omega/settings/SettingsActivity.java
@@ -57,34 +57,49 @@
 import androidx.preference.PreferenceGroup;
 import androidx.preference.PreferenceRecyclerViewAccessibilityDelegate;
 import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
 import androidx.preference.TwoStatePreference;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.RecyclerView.AdapterDataObserver;
 
 import com.android.launcher3.BuildConfig;
 import com.android.launcher3.LauncherFiles;
+import com.android.launcher3.LauncherSettings.Favorites;
 import com.android.launcher3.R;
 import com.android.launcher3.SessionCommitReceiver;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.notification.NotificationListener;
-import com.android.launcher3.settings.NotificationDotsPreference;
 import com.android.launcher3.settings.PreferenceHighlighter;
+import com.android.launcher3.util.ComponentKey;
+import com.android.launcher3.util.ContentWriter;
 import com.jaredrummler.android.colorpicker.ColorPickerDialog;
 import com.jaredrummler.android.colorpicker.ColorPickerDialogListener;
 import com.saggitt.omega.FakeLauncherKt;
-import com.saggitt.omega.OmegaLauncherCallbacks;
 import com.saggitt.omega.OmegaPreferences;
-import com.saggitt.omega.dash.DashActivity;
+import com.saggitt.omega.OmegaPreferencesChangeCallback;
+import com.saggitt.omega.adaptive.IconShapePreference;
+import com.saggitt.omega.gestures.ui.GesturePreference;
+import com.saggitt.omega.gestures.ui.SelectGestureHandlerFragment;
+import com.saggitt.omega.preferences.ButtonPreference;
 import com.saggitt.omega.preferences.ColorPreferenceCompat;
 import com.saggitt.omega.preferences.ControlledPreference;
+import com.saggitt.omega.preferences.GridSizeDialogFragmentCompat;
+import com.saggitt.omega.preferences.GridSizePreference;
 import com.saggitt.omega.preferences.PreferenceController;
 import com.saggitt.omega.preferences.ResumablePreference;
+import com.saggitt.omega.preferences.SearchProviderPreference;
+import com.saggitt.omega.preferences.SelectSearchProviderFragment;
+import com.saggitt.omega.preferences.SingleDimensionGridSizeDialogFragmentCompat;
+import com.saggitt.omega.preferences.SingleDimensionGridSizePreference;
+import com.saggitt.omega.preferences.SmartspaceEventProvidersFragment;
+import com.saggitt.omega.preferences.SmartspaceEventProvidersPreference;
 import com.saggitt.omega.preferences.StyledIconPreference;
 import com.saggitt.omega.preferences.SubPreference;
 import com.saggitt.omega.settings.search.SettingsSearchActivity;
+import com.saggitt.omega.smartspace.FeedBridge;
+import com.saggitt.omega.smartspace.OnboardingProvider;
 import com.saggitt.omega.theme.ThemeOverride;
-import com.saggitt.omega.util.AboutUtils;
-import com.saggitt.omega.util.Config;
+import com.saggitt.omega.util.ContextUtils;
 import com.saggitt.omega.util.OmegaUtilsKt;
 import com.saggitt.omega.util.SettingsObserver;
 import com.saggitt.omega.views.SpringRecyclerView;
@@ -96,6 +111,7 @@
 
 import java.io.IOException;
 import java.util.Objects;
+import java.util.Set;
 
 import static androidx.recyclerview.widget.RecyclerView.Adapter;
 
@@ -104,7 +120,7 @@ public class SettingsActivity extends SettingsBaseActivity
         OnBackStackChangedListener, View.OnClickListener {
 
     public static final String NOTIFICATION_BADGING = "notification_badging";
-    private static final String NOTIFICATION_DOTS_PREFERENCE_KEY = "pref_icon_badging";
+    private static final String ICON_BADGING_PREFERENCE_KEY = "pref_icon_badging";
     /**
      * Hidden field Settings.Secure.ENABLED_NOTIFICATION_LISTENERS
      */
@@ -112,9 +128,14 @@ public class SettingsActivity extends SettingsBaseActivity
 
     public final static String SHOW_PREDICTIONS_PREF = "pref_show_predictions";
     public final static String ENABLE_MINUS_ONE_PREF = "pref_enable_minus_one";
+    public final static String FEED_THEME_PREF = "pref_feed_theme";
+    public final static String SMARTSPACE_PREF = "pref_smartspace";
+    public final static String ALLOW_OVERLAP_PREF = "pref_allowOverlap";
 
     public static final String EXTRA_FRAGMENT_ARG_KEY = ":settings:fragment_args_key";
+    public static final String EXTRA_SHOW_FRAGMENT_ARGS = ":settings:show_fragment_args";
     private static final int DELAY_HIGHLIGHT_DURATION_MILLIS = 600;
+    public static final String GRID_OPTIONS_PREFERENCE_KEY = "pref_grid_options";
 
     public final static String EXTRA_TITLE = "title";
     public final static String EXTRA_FRAGMENT = "fragment";
@@ -160,8 +181,7 @@ protected void onCreate(Bundle savedInstanceState) {
         if (hasPreview) {
             overrideOpenAnim();
         }
-
-        //Utilities.getDevicePrefs(this).edit().putBoolean(OnboardingProvider.PREF_HAS_OPENED_SETTINGS, true).apply();
+        Utilities.getDevicePrefs(this).edit().putBoolean(OnboardingProvider.PREF_HAS_OPENED_SETTINGS, true).apply();
         defaultHome = resolveDefaultHome();
     }
 
@@ -197,11 +217,11 @@ protected boolean shouldShowSearch() {
     @NotNull
     @Override
     protected ThemeOverride.ThemeSet getThemeSet() {
-        //if (hasPreview) {
-        //    return new ThemeOverride.SettingsTransparent();
-        //} else {
-        return super.getThemeSet();
-        //}
+        if (hasPreview) {
+            return new ThemeOverride.SettingsTransparent();
+        } else {
+            return super.getThemeSet();
+        }
     }
 
     @Override
@@ -217,7 +237,6 @@ protected void onResume() {
         if (shouldShowSearch()) {
             Toolbar toolbar = findViewById(R.id.search_action_bar);
             toolbar.getMenu().clear();
-            OmegaPreferences prefs = Utilities.getOmegaPrefs(this);
 
             toolbar.inflateMenu(R.menu.menu_settings);
             ActionMenuView menuView = null;
@@ -229,6 +248,11 @@ protected void onResume() {
                     break;
                 }
             }
+            if (menuView != null) {
+                Objects.requireNonNull(menuView.getOverflowIcon())
+                        .setTint(Utilities.getOmegaPrefs(getApplicationContext()).getAccentColor());
+            }
+
             if (!BuildConfig.APPLICATION_ID.equals(resolveDefaultHome())) {
                 toolbar.inflateMenu(R.menu.menu_change_default_home);
             }
@@ -304,19 +328,22 @@ public static void startFragment(Context context, String fragment, int title) {
         startFragment(context, fragment, null, context.getString(title));
     }
 
-    public static void startFragment(Context context, String fragment, @Nullable Bundle args) {
-        startFragment(context, fragment, args, null);
+    public static void startFragment(Context context, String fragment, @Nullable Bundle args, @Nullable CharSequence title) {
+        context.startActivity(createFragmentIntent(context, fragment, args, title, false));
     }
 
-    public static void startFragment(Context context, String fragment, @Nullable Bundle args, @Nullable CharSequence title) {
-        context.startActivity(createFragmentIntent(context, fragment, args, title));
+    public static void startFragment(Context context, String fragment, @Nullable Bundle args,
+                                     @Nullable CharSequence title, boolean hasPreview) {
+        context.startActivity(createFragmentIntent(context, fragment, args, title, hasPreview));
     }
 
     @NotNull
-    private static Intent createFragmentIntent(Context context, String fragment, @Nullable Bundle args, @Nullable CharSequence title) {
+    private static Intent createFragmentIntent(Context context, String fragment, @Nullable Bundle args,
+                                               @Nullable CharSequence title, boolean hasPreview) {
         Intent intent = new Intent(context, SettingsActivity.class);
         intent.putExtra(EXTRA_FRAGMENT, fragment);
         intent.putExtra(EXTRA_FRAGMENT_ARGS, args);
+        intent.putExtra(SubSettingsFragment.HAS_PREVIEW, hasPreview);
         if (title != null) {
             intent.putExtra(EXTRA_TITLE, title);
         }
@@ -394,7 +421,7 @@ public void highlightPreferenceIfNeeded() {
                 return;
             }
             if (mAdapter != null) {
-                mAdapter.requestHighlight(Objects.requireNonNull(getView()), getListView());
+                mAdapter.requestHighlight(requireView(), getListView());
             }
         }
 
@@ -570,11 +597,11 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         @Override
         public void onResume() {
             super.onResume();
-            Objects.requireNonNull(getActivity()).setTitle(R.string.settings_button_text);
-            getActivity().setTitleColor(R.color.colorAccent);
+            requireActivity().setTitle(R.string.settings_button_text);
+            requireActivity().setTitleColor(R.color.colorAccent);
             boolean dev = Utilities.getOmegaPrefs(getActivity()).getDeveloperOptionsEnabled();
             if (dev != mShowDevOptions) {
-                getActivity().recreate();
+                requireActivity().recreate();
             }
         }
 
@@ -595,7 +622,7 @@ public void onCreateOptionsMenu(@NotNull Menu menu, MenuInflater inflater) {
         public boolean onOptionsItemSelected(MenuItem item) {
             switch (item.getItemId()) {
                 case R.id.action_change_default_home:
-                    FakeLauncherKt.changeDefaultHome(getContext());
+                    FakeLauncherKt.changeDefaultHome(requireContext());
                     break;
                 case R.id.action_restart_launcher:
                     Utilities.killLauncher();
@@ -612,7 +639,6 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 default:
                     return false;
             }
-
             return true;
         }
 
@@ -627,9 +653,10 @@ public static class SubSettingsFragment extends BaseFragment implements
             Preference.OnPreferenceChangeListener, Preference.OnPreferenceClickListener {
         public static final String TITLE = "title";
         public static final String CONTENT_RES_ID = "content_res_id";
-        public static final String HAS_PREVIEW = "has_preview";
+        public static final String HAS_PREVIEW = "has_peview";
 
         private SystemDisplayRotationLockObserver mRotationLockObserver;
+
         private IconBadgingObserver mIconBadgingObserver;
 
         @Override
@@ -639,7 +666,7 @@ public void onCreate(Bundle savedInstanceState) {
             Context mContext = getActivity();
             getPreferenceManager().setSharedPreferencesName(LauncherFiles.SHARED_PREFERENCES_KEY);
             int preference = getContent();
-            ContentResolver resolver = mContext.getContentResolver();
+            ContentResolver resolver = Objects.requireNonNull(mContext).getContentResolver();
             switch (preference) {
                 case R.xml.omega_preferences_desktop:
                     if (!Utilities.ATLEAST_OREO) {
@@ -666,23 +693,32 @@ public void onCreate(Bundle savedInstanceState) {
                 case R.xml.omega_preferences_drawer:
                     findPreference(SHOW_PREDICTIONS_PREF).setOnPreferenceChangeListener(this);
                     break;
+
+                case R.xml.omega_preferences_theme:
+                    Preference resetIconsPreference = findPreference("pref_reset_custom_icon");
+                    resetIconsPreference.setOnPreferenceClickListener(pref -> {
+                        new SettingsActivity.ResetIconsConfirmation()
+                                .show(getFragmentManager(), "reset_icons");
+                        return true;
+                    });
+                    break;
                 case R.xml.omega_preferences_notification:
                     if (getResources().getBoolean(R.bool.notification_dots_enabled)) {
-                        NotificationDotsPreference iconBadgingPref = (NotificationDotsPreference) findPreference(NOTIFICATION_DOTS_PREFERENCE_KEY);
+                        ButtonPreference iconBadgingPref = (ButtonPreference) findPreference(ICON_BADGING_PREFERENCE_KEY);
                         // Listen to system notification badge settings while this UI is active.
                         mIconBadgingObserver = new IconBadgingObserver(
                                 iconBadgingPref, getActivity().getContentResolver(), getFragmentManager());
                         mIconBadgingObserver.register(NOTIFICATION_BADGING, NOTIFICATION_ENABLED_LISTENERS);
+
                     }
                     break;
 
                 case R.xml.omega_preferences_developer:
                     findPreference("kill").setOnPreferenceClickListener(this);
-                    findPreference("dash_activity").setOnPreferenceClickListener(this);
                     break;
 
                 case R.xml.omega_preferences_about:
-                    AboutUtils au = new AboutUtils(getContext());
+                    ContextUtils au = new ContextUtils(getContext());
                     Preference appInfo = findPreference("pref_key__copy_build_information");
                     au.getAppInfoSummary(appInfo);
                     updateProjectTeam(au);
@@ -690,7 +726,7 @@ public void onCreate(Bundle savedInstanceState) {
             }
         }
 
-        private void updateProjectTeam(AboutUtils au) {
+        private void updateProjectTeam(ContextUtils au) {
             Preference pref;
             if ((pref = findPreference("pref_key__project_team")) != null && ((PreferenceGroup) pref).getPreferenceCount() == 0) {
                 String[] data = (au.readTextfileFromRawRes(R.raw.team, "", "").trim() + "\n\n").split("\n");
@@ -739,6 +775,13 @@ private int getContent() {
         public void onResume() {
             super.onResume();
             setActivityTitle();
+
+            if (getContent() == R.xml.omega_preferences_smartspace) {
+                SwitchPreference minusOne = findPreference(ENABLE_MINUS_ONE_PREF);
+                if (minusOne != null && !FeedBridge.Companion.getInstance(getActivity()).isInstalled()) {
+                    minusOne.setChecked(false);
+                }
+            }
         }
 
         protected void setActivityTitle() {
@@ -751,6 +794,10 @@ public void onDestroy() {
                 mRotationLockObserver.unregister();
                 mRotationLockObserver = null;
             }
+            if (mIconBadgingObserver != null) {
+                mIconBadgingObserver.unregister();
+                mIconBadgingObserver = null;
+            }
             super.onDestroy();
         }
 
@@ -765,28 +812,20 @@ public static SubSettingsFragment newInstance(String title, @XmlRes int content)
 
         @Override
         public boolean onPreferenceChange(Preference preference, Object newValue) {
-            switch (preference.getKey()) {
-                case SHOW_PREDICTIONS_PREF:
-                    if ((boolean) newValue) {
-                        return true;
-                    }
-                    SuggestionConfirmationFragment confirmationFragment = new SuggestionConfirmationFragment();
-                    confirmationFragment.setTargetFragment(this, 0);
-                    confirmationFragment.show(getFragmentManager(), preference.getKey());
-                    break;
-
-                case ENABLE_MINUS_ONE_PREF:
-                    if (Config.hasPackageInstalled(getActivity(), OmegaLauncherCallbacks.SEARCH_PACKAGE)) {
-                        return true;
-                    }
-                    break;
+            if (SHOW_PREDICTIONS_PREF.equals(preference.getKey())) {
+                if ((boolean) newValue) {
+                    return true;
+                }
+                SuggestionConfirmationFragment confirmationFragment = new SuggestionConfirmationFragment();
+                confirmationFragment.setTargetFragment(this, 0);
+                confirmationFragment.show(getFragmentManager(), preference.getKey());
             }
             return false;
         }
 
         @Override
         public boolean onPreferenceTreeClick(Preference preference) {
-            AboutUtils au = new AboutUtils(getContext());
+            ContextUtils au = new ContextUtils(getContext());
             if (preference.getKey() != null) {
                 switch (preference.getKey()) {
                     case "pref_key__donate":
@@ -850,11 +889,6 @@ public void onDialogDismissed(int dialogId) {
         public boolean onPreferenceClick(Preference preference) {
             if (preference.getKey().equals("kill"))
                 Utilities.killLauncher();
-            if (preference.getKey().equals("dash_activity")) {
-                Intent intent = new Intent(getContext(), DashActivity.class);
-                preference.getContext().startActivity(intent);
-            }
-
             return false;
         }
 
@@ -879,12 +913,27 @@ public static SubSettingsFragment newInstance(Intent intent) {
         @Override
         public void onDisplayPreferenceDialog(Preference preference) {
             final DialogFragment f;
-            if (preference instanceof ListPreference) {
+            if (preference instanceof GridSizePreference) {
+                f = GridSizeDialogFragmentCompat.newInstance(preference.getKey());
+            } else if (preference instanceof ListPreference) {
                 Log.d("success", "onDisplayPreferenceDialog: yay");
                 f = ThemedListPreferenceDialogFragment.Companion.newInstance(preference.getKey());
+            } else if (preference instanceof SingleDimensionGridSizePreference) {
+                f = SingleDimensionGridSizeDialogFragmentCompat.Companion
+                        .newInstance(preference.getKey());
+            } else if (preference instanceof GesturePreference) {
+                f = SelectGestureHandlerFragment.Companion
+                        .newInstance((GesturePreference) preference);
+            } else if (preference instanceof IconShapePreference) {
+                f = ((IconShapePreference) preference).createDialogFragment();
+            } else if (preference instanceof SmartspaceEventProvidersPreference) {
+                f = SmartspaceEventProvidersFragment.Companion.newInstance(preference.getKey());
             } else if (preference instanceof PreferenceDialogPreference) {
                 f = PreferenceScreenDialogFragment.Companion
                         .newInstance((PreferenceDialogPreference) preference);
+            } else if (preference instanceof SearchProviderPreference) {
+                f = SelectSearchProviderFragment.Companion
+                        .newInstance((SearchProviderPreference) preference);
             } else {
                 super.onDisplayPreferenceDialog(preference);
                 return;
@@ -919,7 +968,69 @@ protected int getRecyclerViewLayoutRes() {
         }
     }
 
-    public static class NotificationAccessConfirmation extends DialogFragment implements DialogInterface.OnClickListener {
+    /**
+     * Content observer which listens for system badging setting changes, and updates the launcher
+     * badging setting subtext accordingly.
+     */
+    private static class IconBadgingObserver extends SettingsObserver.Secure
+            implements Preference.OnPreferenceClickListener {
+
+        private final ButtonPreference mBadgingPref;
+        private final ContentResolver mResolver;
+        private final FragmentManager mFragmentManager;
+        private boolean serviceEnabled = true;
+
+        public IconBadgingObserver(ButtonPreference badgingPref, ContentResolver resolver,
+                                   FragmentManager fragmentManager) {
+            super(resolver);
+            mBadgingPref = badgingPref;
+            mResolver = resolver;
+            mFragmentManager = fragmentManager;
+        }
+
+        @Override
+        public void onSettingChanged(boolean enabled) {
+            int summary = enabled ? R.string.icon_badging_desc_on : R.string.icon_badging_desc_off;
+
+            if (enabled) {
+                // Check if the listener is enabled or not.
+                String enabledListeners =
+                        Settings.Secure.getString(mResolver, NOTIFICATION_ENABLED_LISTENERS);
+                ComponentName myListener =
+                        new ComponentName(mBadgingPref.getContext(), NotificationListener.class);
+                serviceEnabled = enabledListeners != null &&
+                        (enabledListeners.contains(myListener.flattenToString()) ||
+                                enabledListeners.contains(myListener.flattenToShortString()));
+                if (!serviceEnabled) {
+                    summary = R.string.title_missing_notification_access;
+                }
+            }
+            mBadgingPref.setWidgetFrameVisible(!serviceEnabled);
+            mBadgingPref.setOnPreferenceClickListener(
+                    serviceEnabled && Utilities.ATLEAST_OREO ? null : this);
+            mBadgingPref.setSummary(summary);
+
+        }
+
+        @Override
+        public boolean onPreferenceClick(Preference preference) {
+            if (!Utilities.ATLEAST_OREO && serviceEnabled) {
+                ComponentName cn = new ComponentName(preference.getContext(),
+                        NotificationListener.class);
+                Intent intent = new Intent(Settings.ACTION_NOTIFICATION_LISTENER_SETTINGS)
+                        .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                        .putExtra(":settings:fragment_args_key", cn.flattenToString());
+                preference.getContext().startActivity(intent);
+            } else {
+                new SettingsActivity.NotificationAccessConfirmation()
+                        .show(mFragmentManager, "notification_access");
+            }
+            return true;
+        }
+    }
+
+    public static class NotificationAccessConfirmation
+            extends DialogFragment implements DialogInterface.OnClickListener {
 
         @Override
         public Dialog onCreateDialog(Bundle savedInstanceState) {
@@ -937,6 +1048,7 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
         @Override
         public void onStart() {
             super.onStart();
+            OmegaUtilsKt.applyAccent(((AlertDialog) getDialog()));
         }
 
         @Override
@@ -949,29 +1061,55 @@ public void onClick(DialogInterface dialogInterface, int i) {
         }
     }
 
-    /**
-     * Content observer which listens for system auto-rotate setting changes, and enables/disables
-     * the launcher rotation setting accordingly.
-     */
-    private static class SystemDisplayRotationLockObserver extends SettingsObserver.System {
+    public static class ResetIconsConfirmation
+            extends DialogFragment implements DialogInterface.OnClickListener {
 
-        private final Preference mRotationPref;
+        @NotNull
+        @Override
+        public Dialog onCreateDialog(Bundle savedInstanceState) {
+            final Context context = getActivity();
+            return new AlertDialog.Builder(context)
+                    .setTitle(R.string.reset_custom_icons)
+                    .setMessage(R.string.reset_custom_icons_confirmation)
+                    .setNegativeButton(android.R.string.cancel, null)
+                    .setPositiveButton(android.R.string.ok, this)
+                    .create();
+        }
 
-        public SystemDisplayRotationLockObserver(
-                Preference rotationPref, ContentResolver resolver) {
-            super(resolver);
-            mRotationPref = rotationPref;
+        @Override
+        public void onStart() {
+            super.onStart();
+            OmegaUtilsKt.applyAccent(((AlertDialog) getDialog()));
         }
 
         @Override
-        public void onSettingChanged(boolean enabled) {
-            mRotationPref.setEnabled(enabled);
-            mRotationPref.setSummary(enabled
-                    ? R.string.allow_rotation_desc : R.string.allow_rotation_blocked_desc);
+        public void onClick(DialogInterface dialogInterface, int i) {
+            Context context = getContext();
+
+            // Clear custom app icons
+            OmegaPreferences prefs = Utilities.getOmegaPrefs(context);
+            Set<ComponentKey> toUpdateSet = prefs.getCustomAppIcon().toMap().keySet();
+            prefs.beginBlockingEdit();
+            prefs.getCustomAppIcon().clear();
+            prefs.endBlockingEdit();
+
+            // Clear custom shortcut icons
+            ContentWriter writer = new ContentWriter(context, new ContentWriter.CommitParams(null, null));
+            writer.put(Favorites.CUSTOM_ICON, (byte[]) null);
+            writer.put(Favorites.CUSTOM_ICON_ENTRY, (String) null);
+            writer.commit();
+
+            // Reload changes
+            OmegaUtilsKt.reloadIconsFromComponents(context, toUpdateSet);
+            OmegaPreferencesChangeCallback prefsCallback = prefs.getOnChangeCallback();
+            if (prefsCallback != null) {
+                prefsCallback.reloadAll();
+            }
         }
     }
 
-    public static class SuggestionConfirmationFragment extends DialogFragment implements DialogInterface.OnClickListener {
+    public static class SuggestionConfirmationFragment extends DialogFragment implements
+            DialogInterface.OnClickListener {
 
         public void onClick(final DialogInterface dialogInterface, final int n) {
             if (getTargetFragment() instanceof PreferenceFragmentCompat) {
@@ -1000,62 +1138,24 @@ public void onStart() {
     }
 
     /**
-     * Content observer which listens for system badging setting changes, and updates the launcher
-     * badging setting subtext accordingly.
+     * Content observer which listens for system auto-rotate setting changes, and enables/disables
+     * the launcher rotation setting accordingly.
      */
-    private static class IconBadgingObserver extends SettingsObserver.Secure implements Preference.OnPreferenceClickListener {
+    private static class SystemDisplayRotationLockObserver extends SettingsObserver.System {
 
-        private final NotificationDotsPreference mBadgingPref;
-        private final ContentResolver mResolver;
-        private final FragmentManager mFragmentManager;
-        private boolean serviceEnabled = true;
+        private final Preference mRotationPref;
 
-        public IconBadgingObserver(NotificationDotsPreference badgingPref, ContentResolver resolver,
-                                   FragmentManager fragmentManager) {
+        public SystemDisplayRotationLockObserver(
+                Preference rotationPref, ContentResolver resolver) {
             super(resolver);
-            mBadgingPref = badgingPref;
-            mResolver = resolver;
-            mFragmentManager = fragmentManager;
+            mRotationPref = rotationPref;
         }
 
         @Override
         public void onSettingChanged(boolean enabled) {
-            int summary = enabled ? R.string.icon_badging_desc_on : R.string.icon_badging_desc_off;
-
-            if (enabled) {
-                // Check if the listener is enabled or not.
-                String enabledListeners =
-                        Settings.Secure.getString(mResolver, NOTIFICATION_ENABLED_LISTENERS);
-                ComponentName myListener =
-                        new ComponentName(mBadgingPref.getContext(), NotificationListener.class);
-                serviceEnabled = enabledListeners != null &&
-                        (enabledListeners.contains(myListener.flattenToString()) ||
-                                enabledListeners.contains(myListener.flattenToShortString()));
-                if (!serviceEnabled) {
-                    summary = R.string.title_missing_notification_access;
-                }
-            }
-            mBadgingPref.setWidgetFrameVisible(!serviceEnabled);
-            mBadgingPref.setOnPreferenceClickListener(
-                    serviceEnabled && Utilities.ATLEAST_OREO ? null : this);
-            mBadgingPref.setSummary(summary);
-
-        }
-
-        @Override
-        public boolean onPreferenceClick(Preference preference) {
-            if (!Utilities.ATLEAST_OREO && serviceEnabled) {
-                ComponentName cn = new ComponentName(preference.getContext(),
-                        NotificationListener.class);
-                Intent intent = new Intent(Settings.ACTION_NOTIFICATION_LISTENER_SETTINGS)
-                        .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                        .putExtra(":settings:fragment_args_key", cn.flattenToString());
-                preference.getContext().startActivity(intent);
-            } else {
-                new SettingsActivity.NotificationAccessConfirmation()
-                        .show(mFragmentManager, "notification_access");
-            }
-            return true;
+            mRotationPref.setEnabled(enabled);
+            mRotationPref.setSummary(enabled
+                    ? R.string.allow_rotation_desc : R.string.allow_rotation_blocked_desc);
         }
     }
 }
diff --git a/Omega/src/com/saggitt/omega/settings/SettingsBottomSheet.kt b/Omega/src/com/saggitt/omega/settings/SettingsBottomSheet.kt
index 2cf3a0681e..c574697505 100644
--- a/Omega/src/com/saggitt/omega/settings/SettingsBottomSheet.kt
+++ b/Omega/src/com/saggitt/omega/settings/SettingsBottomSheet.kt
@@ -38,7 +38,8 @@ import com.android.launcher3.R
 import com.android.launcher3.Utilities
 import com.android.launcher3.anim.Interpolators
 import com.android.launcher3.anim.Interpolators.scrollInterpolatorForVelocity
-import com.android.launcher3.touch.SwipeDetector
+import com.android.launcher3.touch.BaseSwipeDetector
+import com.android.launcher3.touch.SingleAxisSwipeDetector
 import com.android.launcher3.util.TouchController
 import com.saggitt.omega.util.getColorAttr
 import com.saggitt.omega.views.ColorScrim
@@ -47,7 +48,7 @@ import com.saggitt.omega.views.ColorScrim
  * Base class for custom popups
  */
 class SettingsBottomSheet(context: Context, attrs: AttributeSet) : LinearLayout(context, attrs),
-        Insettable, TouchController, SwipeDetector.Listener {
+        Insettable, TouchController, SingleAxisSwipeDetector.Listener {
 
     private val activity = SettingsBaseActivity.getActivity(context)
 
@@ -64,7 +65,7 @@ class SettingsBottomSheet(context: Context, attrs: AttributeSet) : LinearLayout(
     private var isOpen = false
     private val openCloseAnimator: ObjectAnimator
     private var scrollInterpolator = Interpolators.SCROLL_CUBIC
-    private val mSwipeDetector = SwipeDetector(context, this, SwipeDetector.VERTICAL)
+    private val mSwipeDetector = SingleAxisSwipeDetector(context, this, SingleAxisSwipeDetector.VERTICAL)
     private val content = this
 
     init {
@@ -104,7 +105,7 @@ class SettingsBottomSheet(context: Context, attrs: AttributeSet) : LinearLayout(
 
     override fun onControllerInterceptTouchEvent(ev: MotionEvent): Boolean {
         val directionsToDetectScroll = if (mSwipeDetector.isIdleState)
-            SwipeDetector.DIRECTION_NEGATIVE
+            SingleAxisSwipeDetector.DIRECTION_NEGATIVE
         else
             0
         mSwipeDetector.setDetectableScrollConditions(
@@ -141,23 +142,24 @@ class SettingsBottomSheet(context: Context, attrs: AttributeSet) : LinearLayout(
 
     override fun onDragStart(start: Boolean) {}
 
-    override fun onDrag(displacement: Float, velocity: Float): Boolean {
+    override fun onDrag(displacement: Float): Boolean {
         val range = content.height.toFloat()
         val bounded = Utilities.boundToRange(displacement, 0f, range)
         translationShift = bounded / range
         return true
     }
 
-    override fun onDragEnd(velocity: Float, fling: Boolean) {
-        if (fling && velocity > 0 || translationShift > 0.5f) {
+    override fun onDragEnd(velocity: Float) {
+        //if (fling && velocity > 0 || translationShift > 0.5f) {
+        if (velocity > 0 || translationShift > 0.5f) {
             scrollInterpolator = scrollInterpolatorForVelocity(velocity)
-            openCloseAnimator.duration = SwipeDetector.calculateDuration(
+            openCloseAnimator.duration = BaseSwipeDetector.calculateDuration(
                     velocity, TRANSLATION_SHIFT_CLOSED - translationShift)
             close(true)
         } else {
             openCloseAnimator.setValues(PropertyValuesHolder.ofFloat(
                     TRANSLATION_SHIFT, TRANSLATION_SHIFT_OPENED))
-            openCloseAnimator.duration = SwipeDetector.calculateDuration(velocity, translationShift)
+            openCloseAnimator.duration = BaseSwipeDetector.calculateDuration(velocity, translationShift)
             openCloseAnimator.interpolator = Interpolators.DEACCEL
             openCloseAnimator.start()
         }
diff --git a/Omega/src/com/saggitt/omega/settings/controllers/GFeedBackgroundController.java b/Omega/src/com/saggitt/omega/settings/controllers/GFeedBackgroundController.java
new file mode 100644
index 0000000000..5e89e82e74
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/settings/controllers/GFeedBackgroundController.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ */
+
+package com.saggitt.omega.settings.controllers;
+
+import android.content.Context;
+
+import com.android.launcher3.Utilities;
+import com.saggitt.omega.preferences.PreferenceController;
+
+import org.jetbrains.annotations.NotNull;
+
+public class GFeedBackgroundController extends PreferenceController {
+    public GFeedBackgroundController(@NotNull Context context) {
+        super(context);
+    }
+
+    @Override
+    public boolean isVisible() {
+        return Utilities.ATLEAST_OREO;
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/settings/controllers/IconShapeOverrideController.kt b/Omega/src/com/saggitt/omega/settings/controllers/IconShapeOverrideController.kt
new file mode 100644
index 0000000000..0b0ef3e096
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/settings/controllers/IconShapeOverrideController.kt
@@ -0,0 +1,30 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.settings.controllers
+
+import android.content.Context
+import androidx.annotation.Keep
+import com.saggitt.omega.icons.IconShapeOverride
+import com.saggitt.omega.preferences.PreferenceController
+
+@Keep
+class IconShapeOverrideController(context: Context) : PreferenceController(context) {
+
+    override val isVisible = IconShapeOverride.isSupported()
+
+}
diff --git a/Omega/src/com/saggitt/omega/settings/controllers/MinusOneController.kt b/Omega/src/com/saggitt/omega/settings/controllers/MinusOneController.kt
index 0df477747e..9038c34765 100644
--- a/Omega/src/com/saggitt/omega/settings/controllers/MinusOneController.kt
+++ b/Omega/src/com/saggitt/omega/settings/controllers/MinusOneController.kt
@@ -22,24 +22,34 @@ import android.content.Context
 import android.content.pm.PackageManager
 import android.text.TextUtils
 import androidx.annotation.Keep
+import androidx.preference.Preference
 import com.android.launcher3.R
 import com.saggitt.omega.preferences.PreferenceController
+import com.saggitt.omega.smartspace.FeedBridge
+import com.saggitt.omega.util.Config
 
 @Keep
 class MinusOneController(context: Context) : PreferenceController(context) {
 
     override val title get() = getDisplayGoogleTitle()
 
-    /*override val onChange = Preference.OnPreferenceChangeListener { pref, newValue ->
-        newValue != true
-    }*/
+    override val onChange = Preference.OnPreferenceChangeListener { pref, newValue ->
+        if (newValue == true && !FeedBridge.getInstance(context).isInstalled()) {
+            pref.preferenceManager.showDialog(pref)
+            false
+        } else {
+            true
+        }
+    }
+
 
     @SuppressLint("StringFormatInvalid")
     private fun getDisplayGoogleTitle(): String {
         var charSequence: CharSequence? = null
         try {
-            val resourcesForApplication = context.packageManager.getResourcesForApplication("com.google.android.googlequicksearchbox")
-            val identifier = resourcesForApplication.getIdentifier("title_google_home_screen", "string", "com.google.android.googlequicksearchbox")
+            val resourcesForApplication = context.packageManager
+                    .getResourcesForApplication(Config.GOOGLE_QSB)
+            val identifier = resourcesForApplication.getIdentifier("title_google_home_screen", "string", Config.GOOGLE_QSB)
             if (identifier != 0) {
                 charSequence = resourcesForApplication.getString(identifier)
             }
diff --git a/Omega/src/com/saggitt/omega/settings/search/SettingsSearchActivity.kt b/Omega/src/com/saggitt/omega/settings/search/SettingsSearchActivity.kt
index 152705cd5a..39a114c18a 100644
--- a/Omega/src/com/saggitt/omega/settings/search/SettingsSearchActivity.kt
+++ b/Omega/src/com/saggitt/omega/settings/search/SettingsSearchActivity.kt
@@ -114,14 +114,14 @@ class SettingsSearchActivity : SettingsBaseActivity(), SearchView.OnQueryTextLis
         if (query == currentQuery) return
         currentQuery = query
         // Find any matching debug command and invoke it
-        if (query.startsWith("..")) {
+        /*if (query.startsWith("..")) {
             val debugCommand = query.substring(2)
-            /*if (debugCommand.hash("SHA-1").endsWith(BuildConfig.DEBUG_MENU_CODE_HASH)) {
+            if (debugCommand.hash("SHA-1").endsWith(BuildConfig.DEBUG_MENU_CODE_HASH)) {
                 startActivity(Intent(this, SettingsActivity::class.java)
                         .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP))
                 onBackPressed()
-            }*/
-        }
+            }
+        }*/
         val matches = if (query.isEmpty())
             emptyList()
         else
diff --git a/Omega/src/com/saggitt/omega/settings/search/SettingsSearchView.kt b/Omega/src/com/saggitt/omega/settings/search/SettingsSearchView.kt
index 374c260f49..f50084f8d9 100644
--- a/Omega/src/com/saggitt/omega/settings/search/SettingsSearchView.kt
+++ b/Omega/src/com/saggitt/omega/settings/search/SettingsSearchView.kt
@@ -31,7 +31,7 @@ class SettingsSearchView(context: Context, attrs: AttributeSet?) : SearchView(co
     private var customTypeface: Typeface? = null
 
     init {
-        isIconified = false;
+        isIconified = false
     }
 
     fun setTypeface(typeface: Typeface) {
diff --git a/Omega/src/com/saggitt/omega/smartspace/FeedBridge.kt b/Omega/src/com/saggitt/omega/smartspace/FeedBridge.kt
new file mode 100644
index 0000000000..5433dab586
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/smartspace/FeedBridge.kt
@@ -0,0 +1,109 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.smartspace
+
+import android.content.Context
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.net.Uri
+import android.os.Build
+import android.os.Process
+import com.android.launcher3.BuildConfig
+import com.android.launcher3.R
+import com.android.launcher3.config.FeatureFlags
+import com.saggitt.omega.util.Config
+import com.saggitt.omega.util.SingletonHolder
+import com.saggitt.omega.util.ensureOnMainThread
+import com.saggitt.omega.util.useApplicationContext
+
+class FeedBridge(private val context: Context) {
+
+    private val bridgePackages by lazy {
+        listOf(
+                PixelBridgeInfo("com.google.android.apps.nexuslauncher", R.integer.bridge_signature_hash))
+    }
+
+    fun resolveBridge(): BridgeInfo? {
+        if (!useBridge) return null
+        return bridgePackages.firstOrNull { it.isAvailable() }
+    }
+
+    fun isInstalled(): Boolean {
+        return !useBridge || bridgePackages.any { it.isAvailable() }
+    }
+
+    fun resolveSmartspace(): String {
+        return bridgePackages.firstOrNull { it.supportsSmartspace }?.packageName
+                ?: Config.GOOGLE_QSB
+    }
+
+    open inner class BridgeInfo(val packageName: String, signatureHashRes: Int) {
+
+        private val signatureHash = context.resources.getInteger(signatureHashRes)
+
+        open val supportsSmartspace = false
+
+        fun isAvailable(): Boolean {
+            val info = context.packageManager.resolveService(Intent(overlayAction)
+                    .setPackage(packageName)
+                    .setData(Uri.parse(StringBuilder(packageName.length + 18)
+                            .append("app://")
+                            .append(packageName)
+                            .append(":")
+                            .append(Process.myUid())
+                            .toString())
+                            .buildUpon()
+                            .appendQueryParameter("v", Integer.toString(7))
+                            .appendQueryParameter("cv", Integer.toString(9))
+                            .build()), 0)
+            return info != null && isSigned()
+        }
+
+        private fun isSigned(): Boolean {
+            //if (BuildConfig.FLAVOR_build.equals("dev"))
+            //    return true // Skip signature checks for dev builds
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+                val info = context.packageManager.getPackageInfo(packageName, PackageManager.GET_SIGNING_CERTIFICATES)
+                val signingInfo = info.signingInfo
+                if (signingInfo.hasMultipleSigners()) return false
+                return signingInfo.signingCertificateHistory.any { it.hashCode() == signatureHash }
+            } else {
+                val info = context.packageManager.getPackageInfo(packageName, PackageManager.GET_SIGNATURES)
+                info.signatures.forEach {
+                    if (it.hashCode() != signatureHash) return false
+                }
+                return info.signatures.isNotEmpty()
+            }
+        }
+    }
+
+    private inner class PixelBridgeInfo(packageName: String, signatureHashRes: Int) : BridgeInfo(packageName, signatureHashRes) {
+
+        override val supportsSmartspace get() = isAvailable()
+    }
+
+    companion object : SingletonHolder<FeedBridge, Context>(ensureOnMainThread(
+            useApplicationContext(::FeedBridge))) {
+
+        private const val TAG = "FeedBridge"
+        private const val overlayAction = "com.android.launcher3.WINDOW_OVERLAY"
+
+        @JvmStatic
+        val useBridge = FeatureFlags.FORCE_FEED_BRIDGE || !BuildConfig.DEBUG
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/smartspace/ISmartspace.java b/Omega/src/com/saggitt/omega/smartspace/ISmartspace.java
new file mode 100644
index 0000000000..24a12514b6
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/smartspace/ISmartspace.java
@@ -0,0 +1,7 @@
+package com.saggitt.omega.smartspace;
+
+public interface ISmartspace {
+    void onGsaChanged();
+
+    void postUpdate(final SmartspaceDataContainer p0);
+}
diff --git a/Omega/src/com/saggitt/omega/smartspace/NewCardInfo.java b/Omega/src/com/saggitt/omega/smartspace/NewCardInfo.java
new file mode 100644
index 0000000000..c6c806c0e5
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/smartspace/NewCardInfo.java
@@ -0,0 +1,68 @@
+package com.saggitt.omega.smartspace;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageInfo;
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.net.Uri;
+import android.provider.MediaStore;
+import android.text.TextUtils;
+import android.util.Log;
+
+import com.android.launcher3.LauncherAppState;
+import com.android.launcher3.icons.LauncherIcons;
+import com.saggitt.omega.util.Config;
+
+import static com.google.android.apps.nexuslauncher.smartspace.nano.SmartspaceProto.b;
+import static com.google.android.apps.nexuslauncher.smartspace.nano.SmartspaceProto.f;
+
+public class NewCardInfo {
+    public final b di;
+    public final boolean forWeather;
+    public final PackageInfo dk;
+    public final long dl;
+    public final Intent intent;
+
+    public NewCardInfo(b di, Intent intent, boolean forWeather, long dl, PackageInfo dk) {
+        this.di = di;
+        this.forWeather = forWeather;
+        this.intent = intent;
+        this.dl = dl;
+        this.dk = dk;
+    }
+
+    private static Object getParcelableExtra(String name, Intent intent) {
+        if (!TextUtils.isEmpty(name)) {
+            return intent.getParcelableExtra(name);
+        }
+        return null;
+    }
+
+    public Bitmap getBitmap(final Context context) {
+        f fVar = this.di.cx;
+        if (fVar == null) {
+            return null;
+        }
+        Bitmap bitmap = (Bitmap) getParcelableExtra(fVar.cV, this.intent);
+        if (bitmap != null) {
+            return bitmap;
+        }
+        try {
+            if (TextUtils.isEmpty(fVar.cW)) {
+                if (!TextUtils.isEmpty(fVar.cX)) {
+                    Resources resourcesForApplication = context.getPackageManager()
+                            .getResourcesForApplication(Config.GOOGLE_QSB);
+                    return LauncherIcons.obtain(context).createIconBitmap(
+                            resourcesForApplication.getDrawableForDensity(resourcesForApplication.getIdentifier(fVar.cX, null, null),
+                                    LauncherAppState.getIDP(context).fillResIconDpi), 1f);
+                }
+                return null;
+            }
+            return MediaStore.Images.Media.getBitmap(context.getContentResolver(), Uri.parse(fVar.cW));
+        } catch (Exception e) {
+            Log.e("NewCardInfo", "retrieving bitmap uri=" + fVar.cW + " gsaRes=" + fVar.cX);
+            return null;
+        }
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/smartspace/OmegaSmartspaceController.kt b/Omega/src/com/saggitt/omega/smartspace/OmegaSmartspaceController.kt
new file mode 100644
index 0000000000..8f9f1f223e
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/smartspace/OmegaSmartspaceController.kt
@@ -0,0 +1,578 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.smartspace
+
+import android.app.Notification
+import android.app.PendingIntent
+import android.content.ActivityNotFoundException
+import android.content.ComponentName
+import android.content.Context
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.content.pm.PackageManager.PERMISSION_GRANTED
+import android.graphics.Bitmap
+import android.net.Uri
+import android.os.Handler
+import android.os.HandlerThread
+import android.provider.Settings
+import android.service.notification.StatusBarNotification
+import android.text.TextUtils
+import android.util.Log
+import android.view.View
+import androidx.annotation.Keep
+import com.android.launcher3.Launcher
+import com.android.launcher3.R
+import com.android.launcher3.Utilities
+import com.android.launcher3.notification.NotificationListener
+import com.android.launcher3.util.PackageManagerHelper
+import com.saggitt.omega.BlankActivity
+import com.saggitt.omega.settings.SettingsActivity
+import com.saggitt.omega.settings.SettingsActivity.NOTIFICATION_BADGING
+import com.saggitt.omega.settings.SettingsActivity.SubSettingsFragment.CONTENT_RES_ID
+import com.saggitt.omega.settings.SettingsActivity.SubSettingsFragment.TITLE
+import com.saggitt.omega.smartspace.eventprovider.*
+import com.saggitt.omega.smartspace.weather.FakeDataProvider
+import com.saggitt.omega.smartspace.weather.OnePlusWeatherDataProvider
+import com.saggitt.omega.smartspace.weather.PEWeatherDataProvider
+import com.saggitt.omega.util.*
+import java.util.concurrent.TimeUnit
+
+class OmegaSmartspaceController(val context: Context) {
+
+    private var weatherData: WeatherData? = null
+    private var cardData: CardData? = null
+    private val listeners = ArrayList<Listener>()
+    private val weatherProviderPref = Utilities.getOmegaPrefs(context)::weatherProvider
+    private val eventProvidersPref = context.omegaPrefs.eventProviders
+    private var weatherDataProvider = BlankDataProvider(this) as DataProvider
+    private val eventDataProviders = mutableListOf<DataProvider>()
+    private val eventDataMap = mutableMapOf<DataProvider, CardData?>()
+
+    private val stockProviderClasses = listOf(
+            OnboardingProvider::class.java)
+    private val stockProviders = mutableListOf<DataProvider>()
+
+    var requiresSetup = false
+
+    init {
+        onProviderChanged()
+        initStockProviders()
+    }
+
+    fun startSetup(onFinish: () -> Unit) {
+        if (!requiresSetup) {
+            onFinish()
+            return
+        }
+
+        val provider = (listOf(weatherDataProvider) + eventDataProviders)
+                .firstOrNull { !it.listening && it.requiresSetup() }
+
+        if (provider != null) {
+            provider.startSetup { success ->
+                if (success) {
+                    provider.startListening()
+                    provider.forceUpdate()
+                    forceUpdate()
+                } else {
+                    if (weatherDataProvider == provider) {
+                        weatherProviderPref.set(BlankDataProvider::class.java.name)
+                    }
+                    if (eventDataProviders.contains(provider)) {
+                        eventProvidersPref.setAll(eventDataProviders
+                                .filter { it != provider }
+                                .map { it::class.java.name })
+                    }
+                    onProviderChanged()
+                }
+                startSetup(onFinish)
+            }
+        } else {
+            requiresSetup = false
+            onFinish()
+        }
+    }
+
+    private fun updateWeatherData(weather: WeatherData?) {
+        updateData(weather, cardData)
+    }
+
+    private fun updateCardData(provider: DataProvider, card: CardData?) {
+        eventDataMap[provider] = card
+        forceUpdate()
+    }
+
+    private fun updateData(weather: WeatherData?, card: CardData?) {
+        weatherData = weather
+        cardData = card
+        notifyListeners()
+    }
+
+    fun forceUpdate() {
+        val allProviders = stockProviders.asSequence() + eventDataProviders.asSequence()
+        val eventData = allProviders
+                .mapNotNull { eventDataMap[it] }
+                .firstOrNull()
+        updateData(weatherData, eventData)
+    }
+
+    fun forceUpdateWeather() {
+        weatherDataProvider.forceUpdate()
+    }
+
+    private fun notifyListeners() {
+        listeners.forEach { it.onDataUpdated(weatherData, cardData) }
+    }
+
+    fun requestUpdate(listener: Listener) {
+        listener.onDataUpdated(weatherData, cardData)
+    }
+
+    fun addListener(listener: Listener) {
+        listeners.add(listener)
+        listener.onDataUpdated(weatherData, cardData)
+    }
+
+    fun removeListener(listener: Listener) {
+        listeners.remove(listener)
+    }
+
+    fun onProviderChanged() {
+        val weatherClass = weatherProviderPref.get()
+        val eventClasses = eventProvidersPref.getAll()
+        if (weatherClass == weatherDataProvider::class.java.name
+                && eventClasses == eventDataProviders.map { it::class.java.name }) {
+            forceUpdate()
+            return
+        }
+
+        val activeProviders = eventDataProviders + weatherDataProvider
+        val providerCache = activeProviders
+                .associateByTo(mutableMapOf()) { it::class.java.name }
+        val getProvider = { name: String ->
+            providerCache.getOrPut(name) { createDataProvider(name) }
+        }
+
+        // Load all providers
+        weatherDataProvider = getProvider(weatherClass)
+        weatherDataProvider.weatherUpdateListener = ::updateWeatherData
+        eventDataProviders.clear()
+        eventClasses
+                .map { getProvider(it) }
+                .filterTo(eventDataProviders) { it !is BlankDataProvider }
+                .forEach { it.cardUpdateListener = ::updateCardData }
+
+        val allProviders = providerCache.values.toSet()
+        val newProviders = setOf(weatherDataProvider) + eventDataProviders
+        val needsDestroy = allProviders - newProviders
+        val needsUpdate = newProviders - activeProviders
+
+        needsDestroy.forEach {
+            eventDataMap.remove(it)
+            if (it.listening) {
+                it.stopListening()
+            }
+        }
+
+        weatherProviderPref.set(weatherDataProvider::class.java.name)
+        eventProvidersPref.setAll(eventDataProviders.map { it::class.java.name })
+
+        needsUpdate.forEach {
+            if (!it.requiresSetup()) {
+                it.startListening()
+                it.forceUpdate()
+            }
+        }
+        requiresSetup = newProviders.any { !it.listening && it.requiresSetup() }
+        forceUpdate()
+    }
+
+    private fun initStockProviders() {
+        val providers = mutableListOf<DataProvider>()
+        stockProviderClasses
+                .map { createDataProvider(it.name) }
+                .filterTo(providers) { it !is BlankDataProvider }
+                .forEach { it.cardUpdateListener = ::updateCardData }
+
+        stockProviders.addAll(providers)
+        providers.forEach { it.forceUpdate() }
+        forceUpdate()
+    }
+
+    fun updateWeatherData() {
+        weatherDataProvider.forceUpdate()
+    }
+
+    fun openWeather(v: View) {
+        val data = weatherData ?: return
+        val launcher = Launcher.getLauncher(v.context)
+        if (data.pendingIntent != null) {
+            val opts = launcher.getActivityLaunchOptionsAsBundle(v)
+            launcher.startIntentSender(
+                    data.pendingIntent.intentSender, null,
+                    Intent.FLAG_ACTIVITY_NEW_TASK,
+                    Intent.FLAG_ACTIVITY_NEW_TASK, 0, opts)
+        } else if (data.forecastIntent != null) {
+            launcher.startActivitySafely(v, data.forecastIntent, null, null)
+        } else if (PackageManagerHelper.isAppEnabled(launcher.packageManager, Config.GOOGLE_QSB, 0)) {
+            val intent = Intent(Intent.ACTION_VIEW)
+            intent.data = Uri.parse("dynact://velour/weather/ProxyActivity")
+            intent.component = ComponentName(Config.GOOGLE_QSB,
+                    "com.google.android.apps.gsa.velour.DynamicActivityTrampoline")
+            launcher.startActivitySafely(v, intent, null, null)
+        } else {
+            Utilities.openURLinBrowser(launcher, data.forecastUrl,
+                    launcher.getViewBounds(v), launcher.getActivityLaunchOptions(v).toBundle())
+        }
+    }
+
+    private fun createDataProvider(className: String): DataProvider {
+        return try {
+            (Class.forName(className).getConstructor(OmegaSmartspaceController::class.java)
+                    .newInstance(this) as DataProvider)
+        } catch (t: Throwable) {
+            Log.d("SmartspaceController", "couldn't create provider", t)
+            BlankDataProvider(this)
+        }
+    }
+
+    abstract class DataProvider(val controller: OmegaSmartspaceController) {
+        var listening = false
+            private set
+
+        var weatherUpdateListener: ((WeatherData?) -> Unit)? = null
+        var cardUpdateListener: ((DataProvider, CardData?) -> Unit)? = null
+
+        private var currentWeather: WeatherData? = null
+        private var currentCard: CardData? = null
+
+        protected val context = controller.context
+        protected val resources = context.resources
+
+        protected open val requiredPermissions = emptyList<String>()
+
+        open fun requiresSetup() = !checkPermissionGranted()
+
+        open fun startSetup(onFinish: (Boolean) -> Unit) {
+            if (checkPermissionGranted()) {
+                onFinish(true)
+                return
+            }
+
+            BlankActivity.requestPermissions(context, requiredPermissions.toTypedArray(), 1031) { _, _, results ->
+                onFinish(results.all { it == PERMISSION_GRANTED })
+            }
+        }
+
+        open fun startListening() {
+            listening = true
+        }
+
+        open fun stopListening() {
+            listening = false
+            weatherUpdateListener = null
+            cardUpdateListener = null
+        }
+
+        fun updateData(weather: WeatherData?, card: CardData?) {
+            currentWeather = weather
+            currentCard = card
+            weatherUpdateListener?.invoke(weather)
+            cardUpdateListener?.invoke(this, card)
+        }
+
+        open fun forceUpdate() {
+            if (currentWeather != null || currentCard != null) {
+                updateData(currentWeather, currentCard)
+            }
+        }
+
+        protected fun getApp(name: String): CharSequence {
+            val pm = controller.context.packageManager
+            try {
+                return pm.getApplicationLabel(
+                        pm.getApplicationInfo(name, PackageManager.GET_META_DATA))
+            } catch (ignored: PackageManager.NameNotFoundException) {
+            }
+
+            return name
+        }
+
+        protected fun getApp(sbn: StatusBarNotification): CharSequence {
+            val context = controller.context
+            val subName = sbn.notification.extras.getString(EXTRA_SUBSTITUTE_APP_NAME)
+            if (subName != null) {
+                if (context.checkPackagePermission(sbn.packageName, PERM_SUBSTITUTE_APP_NAME)) {
+                    return subName
+                }
+            }
+            return getApp(sbn.packageName)
+        }
+
+        private fun checkPermissionGranted(): Boolean {
+            val context = controller.context
+            return requiredPermissions.all { context.checkSelfPermission(it) == PERMISSION_GRANTED }
+        }
+
+        companion object {
+
+            private const val PERM_SUBSTITUTE_APP_NAME = "android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME"
+            private const val EXTRA_SUBSTITUTE_APP_NAME = "android.substName"
+        }
+    }
+
+    abstract class PeriodicDataProvider(controller: OmegaSmartspaceController) : DataProvider(controller) {
+
+        private val handlerThread = HandlerThread(this::class.java.simpleName).apply { if (!isAlive) start() }
+        private val handler = Handler(handlerThread.looper)
+        private val update = ::periodicUpdate
+
+        open val timeout = TimeUnit.MINUTES.toMillis(30)
+
+        override fun startListening() {
+            super.startListening()
+            handler.post(update)
+        }
+
+        private fun periodicUpdate() {
+            try {
+                updateData()
+            } catch (e: Exception) {
+                Log.d("PeriodicDataProvider", "failed to update data", e)
+            }
+            handler.postDelayed(update, timeout)
+        }
+
+        override fun stopListening() {
+            super.stopListening()
+            handlerThread.quit()
+        }
+
+        protected fun updateNow() {
+            handler.removeCallbacks(update)
+            handler.post(update)
+        }
+
+        open fun updateData() {
+            updateData(queryWeatherData(), queryCardData())
+        }
+
+        open fun queryWeatherData(): WeatherData? {
+            return null
+        }
+
+        open fun queryCardData(): CardData? {
+            return null
+        }
+
+        override fun forceUpdate() {
+            super.forceUpdate()
+            updateNow()
+        }
+    }
+
+    abstract class NotificationBasedDataProvider(controller: OmegaSmartspaceController) :
+            DataProvider(controller) {
+
+        override fun startSetup(onFinish: (Boolean) -> Unit) {
+            if (checkNotificationAccess()) {
+                super.startSetup(onFinish)
+                return
+            }
+
+            val context = controller.context
+            val providerName = getDisplayName(this::class.java.name)
+            val intent: Intent
+            val msg: String
+            if (Utilities.ATLEAST_OREO) {
+                intent = Intent(context, SettingsActivity::class.java)
+                        .putExtra(SettingsActivity.EXTRA_FRAGMENT_ARG_KEY, "pref_icon_badging")
+                        .putExtra(TITLE, context.getString(R.string.title__general_desktop))
+                        .putExtra(CONTENT_RES_ID, R.xml.omega_preferences_notification)
+                msg = context.getString(R.string.event_provider_missing_notification_dots,
+                        context.getString(providerName))
+            } else {
+                val cn = ComponentName(context, NotificationListener::class.java)
+                intent = Intent(Settings.ACTION_NOTIFICATION_LISTENER_SETTINGS)
+                        .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                        .putExtra(":settings:fragment_args_key", cn.flattenToString())
+                msg = context.getString(R.string.event_provider_missing_notification_access,
+                        context.getString(providerName),
+                        context.getString(R.string.derived_app_name))
+            }
+            BlankActivity.startActivityWithDialog(
+                    context, intent, 1030,
+                    context.getString(R.string.title_missing_notification_access),
+                    msg,
+                    context.getString(R.string.title_change_settings)) {
+                onFinish(checkNotificationAccess())
+            }
+        }
+
+        private fun checkNotificationAccess(): Boolean {
+            val context = controller.context
+            val enabledListeners = Settings.Secure.getString(
+                    context.contentResolver, "enabled_notification_listeners")
+            val myListener = ComponentName(context, NotificationListener::class.java)
+            val listenerEnabled = enabledListeners?.let {
+                it.contains(myListener.flattenToString()) || it.contains(myListener.flattenToString())
+            } ?: false
+            val badgingEnabled = Settings.Secure.getInt(context.contentResolver, NOTIFICATION_BADGING, 1) == 1
+            return listenerEnabled && badgingEnabled
+        }
+
+        override fun requiresSetup() = !checkNotificationAccess()
+    }
+
+    data class WeatherData(val icon: Bitmap,
+                           private val temperature: Temperature,
+                           val forecastUrl: String? = "https://www.google.com/search?q=weather",
+                           val forecastIntent: Intent? = null,
+                           val pendingIntent: PendingIntent? = null) {
+
+        fun getTitle(unit: Temperature.Unit): String {
+            return "${temperature.inUnit(unit)}${unit.suffix}"
+        }
+    }
+
+    data class CardData(val icon: Bitmap? = null,
+                        val lines: List<Line>,
+                        val onClickListener: View.OnClickListener? = null,
+                        val forceSingleLine: Boolean = false) {
+
+        constructor(icon: Bitmap? = null,
+                    lines: List<Line>,
+                    intent: PendingIntent? = null,
+                    forceSingleLine: Boolean = false) :
+                this(icon, lines, intent?.let { PendingIntentClickListener(it) }, forceSingleLine)
+
+        constructor(icon: Bitmap? = null,
+                    lines: List<Line>,
+                    forceSingleLine: Boolean = false) :
+                this(icon, lines, null as View.OnClickListener?, forceSingleLine)
+
+        constructor(icon: Bitmap?,
+                    title: CharSequence, titleEllipsize: TextUtils.TruncateAt? = TextUtils.TruncateAt.END,
+                    subtitle: CharSequence, subtitleEllipsize: TextUtils.TruncateAt? = TextUtils.TruncateAt.END,
+                    pendingIntent: PendingIntent? = null)
+                : this(icon, listOf(Line(title, titleEllipsize), Line(subtitle, subtitleEllipsize)), pendingIntent)
+
+        val isDoubleLine = !forceSingleLine && lines.size >= 2
+
+        val title: CharSequence?
+        val titleEllipsize: TextUtils.TruncateAt?
+
+        val subtitle: CharSequence?
+        val subtitleEllipsize: TextUtils.TruncateAt?
+
+        init {
+            if (lines.isEmpty()) {
+                error("Can't create card with zero lines")
+            }
+            if (forceSingleLine) {
+                title = TextUtils.join(" – ", lines.map { it.text })!!
+                titleEllipsize = if (lines.size == 1) lines.first().ellipsize else TextUtils.TruncateAt.END
+                subtitle = null
+                subtitleEllipsize = null
+            } else {
+                title = lines.first().text
+                titleEllipsize = lines.first().ellipsize
+                subtitle = TextUtils.join(" – ", lines.subList(1, lines.size).map { it.text })!!
+                subtitleEllipsize = if (lines.size == 2) lines[1].ellipsize else TextUtils.TruncateAt.END
+            }
+        }
+    }
+
+    open class PendingIntentClickListener(private val pendingIntent: PendingIntent?) : View.OnClickListener {
+
+        override fun onClick(v: View) {
+            if (pendingIntent == null) return
+            val launcher = Launcher.getLauncher(v.context)
+            val opts = launcher.getActivityLaunchOptionsAsBundle(v)
+            try {
+                launcher.startIntentSender(
+                        pendingIntent.intentSender, null,
+                        Intent.FLAG_ACTIVITY_NEW_TASK,
+                        Intent.FLAG_ACTIVITY_NEW_TASK, 0, opts)
+            } catch (e: ActivityNotFoundException) {
+                // ignored
+            }
+        }
+    }
+
+    class NotificationClickListener(sbn: StatusBarNotification)
+        : PendingIntentClickListener(sbn.notification.contentIntent) {
+
+        private val key = sbn.key
+        private val autoCancel = sbn.notification.flags.hasFlag(Notification.FLAG_AUTO_CANCEL)
+
+        override fun onClick(v: View) {
+            super.onClick(v)
+            if (autoCancel) {
+                Launcher.getLauncher(v.context).popupDataProvider.cancelNotification(key)
+            }
+        }
+    }
+
+    data class Line @JvmOverloads constructor(
+            val text: CharSequence,
+            val ellipsize: TextUtils.TruncateAt? = TextUtils.TruncateAt.END) {
+
+        constructor(context: Context, textRes: Int) : this(context.getString(textRes))
+    }
+
+    interface Listener {
+
+        fun onDataUpdated(weather: WeatherData?, card: CardData?)
+    }
+
+    companion object {
+
+        private val displayNames = mapOf(
+                Pair(BlankDataProvider::class.java.name, R.string.weather_provider_disabled),
+                Pair(SmartspaceDataWidget::class.java.name, R.string.google_app),
+                Pair(PEWeatherDataProvider::class.java.name, R.string.weather_provider_pe),
+                Pair(OnePlusWeatherDataProvider::class.java.name, R.string.weather_provider_oneplus_weather),
+                Pair(NowPlayingProvider::class.java.name, R.string.event_provider_now_playing),
+                Pair(NotificationUnreadProvider::class.java.name, R.string.event_provider_unread_notifications),
+                Pair(BatteryStatusProvider::class.java.name, R.string.battery_status),
+                Pair(AlarmEventProvider::class.java.name, R.string.name_provider_alarm_events),
+                Pair(PersonalityProvider::class.java.name, R.string.personality_provider),
+                Pair(OnboardingProvider::class.java.name, R.string.onbording),
+                Pair(CalendarEventProvider::class.java.name, R.string.smartspace_provider_calendar),
+                Pair(FakeDataProvider::class.java.name, R.string.weather_provider_testing))
+
+        fun getDisplayName(providerName: String): Int {
+            return displayNames[providerName] ?: error("No display name for provider $providerName")
+        }
+
+        fun getDisplayName(context: Context, providerName: String): String {
+            return context.getString(getDisplayName(providerName))
+        }
+    }
+}
+
+@Keep
+class BlankDataProvider(controller: OmegaSmartspaceController) : OmegaSmartspaceController.DataProvider(controller) {
+
+    override fun startListening() {
+        super.startListening()
+
+        updateData(null, null)
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/smartspace/OnboardingProvider.kt b/Omega/src/com/saggitt/omega/smartspace/OnboardingProvider.kt
new file mode 100644
index 0000000000..f23f4898a0
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/smartspace/OnboardingProvider.kt
@@ -0,0 +1,88 @@
+/*
+ *     Copyright (C) 2019 Lawnchair Team.
+ *
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.smartspace
+
+import android.app.PendingIntent
+import android.content.Intent
+import android.content.SharedPreferences
+import com.android.launcher3.R
+import com.android.launcher3.Utilities
+import com.android.launcher3.allapps.DiscoveryBounce
+import com.saggitt.omega.settings.SettingsActivity
+
+// TODO: add event for after installing a new Icon Pack with apply activity as intent
+class OnboardingProvider(controller: OmegaSmartspaceController) :
+        OmegaSmartspaceController.DataProvider(controller),
+        SharedPreferences.OnSharedPreferenceChangeListener {
+
+    private val deviceKeys = arrayOf(PREF_HAS_OPENED_SETTINGS)
+    private val prefKeys = arrayOf(DiscoveryBounce.HOME_BOUNCE_SEEN)
+
+    private val devicePrefs = Utilities.getDevicePrefs(context)
+    private val prefs = Utilities.getPrefs(context)
+
+    override fun startListening() {
+        super.startListening()
+        devicePrefs.registerOnSharedPreferenceChangeListener(this)
+        prefs.registerOnSharedPreferenceChangeListener(this)
+        update()
+    }
+
+    override fun stopListening() {
+        super.stopListening()
+        devicePrefs.unregisterOnSharedPreferenceChangeListener(this)
+        prefs.unregisterOnSharedPreferenceChangeListener(this)
+    }
+
+    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) {
+        val keys = when (sharedPreferences) {
+            devicePrefs -> deviceKeys
+            prefs -> prefKeys
+            else -> return
+        }
+        if (key in keys) {
+            update()
+        }
+    }
+
+    private fun update() {
+        val card = when {
+            !prefs.getBoolean(DiscoveryBounce.HOME_BOUNCE_SEEN, false) -> OmegaSmartspaceController.CardData(
+                    lines = listOf(OmegaSmartspaceController.Line(context, R.string.onboarding_swipe_up)))
+            !devicePrefs.getBoolean(PREF_HAS_OPENED_SETTINGS, false) -> OmegaSmartspaceController.CardData(
+                    icon = null,
+                    title = context.getString(
+                            R.string.onbording_settings_title,
+                            context.getString(R.string.derived_app_name)),
+                    subtitle = context.getString(R.string.onbording_settings_summary),
+                    pendingIntent = PendingIntent.getActivity(
+                            context,
+                            0,
+                            Intent(context, SettingsActivity::class.java),
+                            0))
+            else -> null
+        }
+        updateData(null, card)
+    }
+
+    companion object {
+        const val PREF_HAS_OPENED_SETTINGS = "pref_hasOpenedSettings"
+    }
+}
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/smartspace/ProtoStore.java b/Omega/src/com/saggitt/omega/smartspace/ProtoStore.java
new file mode 100644
index 0000000000..2f8af3c06d
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/smartspace/ProtoStore.java
@@ -0,0 +1,48 @@
+package com.saggitt.omega.smartspace;
+
+import android.content.Context;
+import android.util.Log;
+
+import com.android.launcher3.util.IOUtils;
+import com.google.protobuf.nano.MessageNano;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+
+public class ProtoStore {
+    private final Context mContext;
+
+    public ProtoStore(Context context) {
+        mContext = context.getApplicationContext();
+    }
+
+    public void dw(MessageNano p1, String name) {
+        try {
+            FileOutputStream fos = mContext.openFileOutput(name, 0);
+            if (p1 != null) {
+                fos.write(MessageNano.toByteArray(p1));
+            } else {
+                Log.d("ProtoStore", "deleting " + name);
+                mContext.deleteFile(name);
+            }
+        } catch (FileNotFoundException e) {
+            Log.d("ProtoStore", "file does not exist " + name);
+        } catch (Exception e) {
+            Log.e("ProtoStore", "unable to write file " + name, e);
+        }
+    }
+
+    public boolean dv(String name, MessageNano a) {
+        File fileStreamPath = mContext.getFileStreamPath(name);
+        try {
+            MessageNano.mergeFrom(a, IOUtils.toByteArray(fileStreamPath));
+            return true;
+        } catch (FileNotFoundException ex2) {
+            Log.d("ProtoStore", "no cached data");
+        } catch (Exception ex) {
+            Log.e("ProtoStore", "unable to load data", ex);
+        }
+        return false;
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/smartspace/SmartspaceBroadcastReceiver.java b/Omega/src/com/saggitt/omega/smartspace/SmartspaceBroadcastReceiver.java
new file mode 100644
index 0000000000..89751b3028
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/smartspace/SmartspaceBroadcastReceiver.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ */
+
+package com.saggitt.omega.smartspace;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.os.SystemClock;
+import android.util.Log;
+
+import com.google.android.apps.nexuslauncher.smartspace.nano.SmartspaceProto.b;
+import com.google.protobuf.nano.InvalidProtocolBufferNanoException;
+import com.saggitt.omega.util.Config;
+
+public class SmartspaceBroadcastReceiver extends BroadcastReceiver {
+    private void cg(b b, Context context, Intent intent, boolean b2) throws PackageManager.NameNotFoundException {
+        if (b.cy) {
+            SmartspaceController.get(context).updateData(null);
+            return;
+        }
+        try {
+            PackageInfo packageInfo = context.getPackageManager().getPackageInfo(Config.GOOGLE_QSB, 0);
+            SmartspaceController.get(context).updateData(new NewCardInfo(b, intent, b2, SystemClock.uptimeMillis(), packageInfo));
+        } catch (PackageManager.NameNotFoundException ignored) {
+        }
+    }
+
+    public void onReceive(Context context, Intent intent) {
+        byte[] byteArrayExtra = intent.getByteArrayExtra("com.google.android.apps.nexuslauncher.extra.SMARTSPACE_CARD");
+        if (byteArrayExtra != null) {
+            com.google.android.apps.nexuslauncher.smartspace.nano.SmartspaceProto.a a = new com.google.android.apps.nexuslauncher.smartspace.nano.SmartspaceProto.a();
+            try {
+                com.google.protobuf.nano.MessageNano.mergeFrom(a, byteArrayExtra);
+                b[] cw = a.cw;
+                int length = cw.length;
+                int i = 0;
+                while (i < length) {
+                    b b2 = cw[i];
+                    boolean b3 = b2.cz == 1;
+                    if (b3 || b2.cz == 2) {
+                        cg(b2, context, intent, b3);
+                    } else {
+                        Log.w("SmartspaceReceiver", "unrecognized card priority");
+                    }
+                    ++i;
+                }
+            } catch (InvalidProtocolBufferNanoException | PackageManager.NameNotFoundException ex) {
+                Log.e("SmartspaceReceiver", "proto", ex);
+            }
+        } else {
+            Log.e("SmartspaceReceiver", "receiving update with no proto: " + intent.getExtras());
+        }
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/smartspace/SmartspaceCard.java b/Omega/src/com/saggitt/omega/smartspace/SmartspaceCard.java
new file mode 100644
index 0000000000..1ce196bdea
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/smartspace/SmartspaceCard.java
@@ -0,0 +1,360 @@
+package com.saggitt.omega.smartspace;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.Bitmap.Config;
+import android.graphics.BitmapFactory;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.PorterDuff;
+import android.graphics.PorterDuffColorFilter;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.View;
+
+import com.android.launcher3.Launcher;
+import com.android.launcher3.R;
+import com.android.launcher3.ResourceUtils;
+import com.android.launcher3.icons.GraphicsUtils;
+import com.android.launcher3.icons.ShadowGenerator;
+import com.saggitt.omega.util.ColorManipulation;
+
+import static com.google.android.apps.nexuslauncher.smartspace.nano.SmartspaceProto.b;
+import static com.google.android.apps.nexuslauncher.smartspace.nano.SmartspaceProto.c;
+import static com.google.android.apps.nexuslauncher.smartspace.nano.SmartspaceProto.e;
+import static com.google.android.apps.nexuslauncher.smartspace.nano.SmartspaceProto.i;
+
+public class SmartspaceCard {
+    private final b dI;
+    private final long dJ;
+    private final int dK;
+    private final boolean dL;
+    private final boolean dM;
+    private final long dN;
+    private final Context mContext;
+    private Bitmap mIcon;
+    private final Intent mIntent;
+
+    public SmartspaceCard(final Context context, final b di, final Intent mIntent, final boolean dm, final Bitmap mIcon, final boolean dl, final long dn, final long dj, final int dk) {
+        this.mContext = context.getApplicationContext();
+        this.dI = di;
+        this.dM = dm;
+        this.mIntent = mIntent;
+        this.mIcon = mIcon;
+        this.dN = dn;
+        this.dJ = dj;
+        this.dK = dk;
+        this.dL = dl;
+    }
+
+    static SmartspaceCard cD(Context context, i iVar, boolean z) {
+        if (iVar != null) {
+            try {
+                Intent parseUri = TextUtils.isEmpty(iVar.de.cG.cZ) ?
+                        null :
+                        Intent.parseUri(iVar.de.cG.cZ, 0);
+
+                Bitmap bitmap = iVar.dd == null ?
+                        null :
+                        BitmapFactory.decodeByteArray(iVar.dd, 0, iVar.dd.length, null);
+
+                if (bitmap != null) {
+                    ShadowGenerator shadowGenerator = new ShadowGenerator(
+                            ResourceUtils.pxFromDp(48, context.getResources().getDisplayMetrics()));
+                    Bitmap newBitmap = Bitmap.createBitmap(bitmap.getWidth(), bitmap.getHeight(), Config.ARGB_8888);
+                    shadowGenerator.recreateIcon(bitmap, new Canvas(newBitmap));
+                    bitmap = newBitmap;
+                }
+
+                return new SmartspaceCard(context, iVar.de, parseUri, z, bitmap, iVar.dc, iVar.df, iVar.dh, iVar.dg);
+            } catch (Throwable e) {
+                Log.e("SmartspaceCard", "from proto", e);
+            }
+        }
+
+        return null;
+    }
+
+    private String cE(final e eVar) {
+        final Resources res = mContext.getResources();
+        int minutesToEvent = cJ(eVar);
+        if (minutesToEvent >= 60) {
+            int hours = minutesToEvent / 60;
+            int minutes = minutesToEvent % 60;
+            String hoursString = res.getQuantityString(R.plurals.smartspace_hours, hours, hours);
+            if (minutes <= 0) {
+                return hoursString;
+            }
+            String minutesString = res.getQuantityString(R.plurals.smartspace_minutes, minutes, minutes);
+            return res.getString(R.string.smartspace_hours_mins, hoursString, minutesString);
+        }
+        return res.getQuantityString(R.plurals.smartspace_minutes, minutesToEvent, minutesToEvent);
+    }
+
+    private com.google.android.apps.nexuslauncher.smartspace.nano.SmartspaceProto.d cG(final boolean b) {
+        final c ch = this.cH();
+        if (ch != null) {
+            com.google.android.apps.nexuslauncher.smartspace.nano.SmartspaceProto.d d;
+            if (b) {
+                d = ch.cL;
+            } else {
+                d = ch.cM;
+            }
+            return d;
+        }
+        return null;
+    }
+
+    private c cH() {
+        final long currentTimeMillis = System.currentTimeMillis();
+        final long cd = this.dI.cD;
+        final long n = this.dI.cD + this.dI.cE;
+        if (currentTimeMillis < cd && this.dI.cB != null) {
+            return this.dI.cB;
+        }
+        if (currentTimeMillis > n && this.dI.cH != null) {
+            return this.dI.cH;
+        }
+        if (this.dI.cC != null) {
+            return this.dI.cC;
+        }
+        return null;
+    }
+
+    private int cJ(final e e) {
+        return (int) Math.ceil(this.cI(e) / 60000.0);
+    }
+
+    private String[] cK(final e[] array, final String s) {
+        int i;
+        String[] array2;
+        String cr;
+        for (i = 0, array2 = new String[array.length]; i < array2.length; ++i) {
+            switch (array[i].cQ) {
+                default: {
+                    array2[i] = "";
+                    break;
+                }
+                case 3: {
+                    if (s != null && array[i].cS != 0) {
+                        array2[i] = s;
+                        break;
+                    }
+                    if (array[i].cR != null) {
+                        cr = array[i].cR;
+                    } else {
+                        cr = "";
+                    }
+                    array2[i] = cr;
+                    break;
+                }
+                case 1:
+                case 2: {
+                    array2[i] = this.cE(array[i]);
+                    break;
+                }
+            }
+        }
+        return array2;
+    }
+
+    private boolean cL(final com.google.android.apps.nexuslauncher.smartspace.nano.SmartspaceProto.d d) {
+        boolean b = false;
+        if (d != null && d.cN != null && d.cO != null && d.cO.length > 0) {
+            b = true;
+        }
+        return b;
+    }
+
+    private String cN(final boolean b) {
+        return this.cO(b, null);
+    }
+
+    private String cO(final boolean b, final String s) {
+        final com.google.android.apps.nexuslauncher.smartspace.nano.SmartspaceProto.d cg = this.cG(b);
+        if (cg == null || cg.cN == null) {
+            return "";
+        }
+        String cn = cg.cN;
+        if (this.cL(cg)) {
+            return String.format(cn, (Object[]) this.cK(cg.cO, s));
+        }
+        if (cn == null) {
+            cn = "";
+        }
+        return cn;
+    }
+
+    private static Bitmap cP(final Bitmap bitmap, final int n) {
+        final Paint paint = new Paint();
+        paint.setColorFilter(new PorterDuffColorFilter(n, PorterDuff.Mode.SRC_IN));
+        final Bitmap bitmap2 = Bitmap.createBitmap(bitmap.getWidth(), bitmap.getHeight(), Bitmap.Config.ARGB_8888);
+        new Canvas(bitmap2).drawBitmap(bitmap, 0.0f, 0.0f, paint);
+        return bitmap2;
+    }
+
+    static i cQ(final Context context, final NewCardInfo a) {
+        if (a == null) {
+            return null;
+        }
+        final i i = new i();
+        final Bitmap ci = a.getBitmap(context);
+        Bitmap cp;
+        if (ci != null && i.dc) {
+            if (a.forWeather) {
+                cp = cP(ci, -1);
+            } else {
+                cp = ci;
+            }
+        } else {
+            cp = ci;
+        }
+        byte[] flattenBitmap;
+        if (cp != null) {
+            flattenBitmap = GraphicsUtils.flattenBitmap(cp);
+        } else {
+            flattenBitmap = new byte[0];
+        }
+        i.dd = flattenBitmap;
+        i.dc = (cp != null && new ColorManipulation().dB(cp));
+        i.de = a.di;
+        i.df = a.dl;
+        if (a.dk != null) {
+            i.dg = a.dk.versionCode;
+            i.dh = a.dk.lastUpdateTime;
+        }
+        return i;
+    }
+
+    public String cA(final boolean b) {
+        return this.cO(b, "");
+    }
+
+    public String cB(final boolean b) {
+        int i = 0;
+        final e[] co = this.cG(b).cO;
+        if (co != null) {
+            while (i < co.length) {
+                if (co[i].cS != 0) {
+                    return co[i].cR;
+                }
+                ++i;
+            }
+        }
+        return "";
+    }
+
+    public String cC(final String s) {
+        return this.cO(true, s);
+    }
+
+    public long cF() {
+        return this.dI.cF.da;
+    }
+
+    long cI(final e e) {
+        long cd;
+        if (e.cQ == 2) {
+            cd = this.dI.cD + this.dI.cE;
+        } else {
+            cd = this.dI.cD;
+        }
+        return Math.abs(System.currentTimeMillis() - cd);
+    }
+
+    public boolean cM() {
+        return System.currentTimeMillis() > this.cF();
+    }
+
+    void click(View view) {
+        if (this.dI.cG == null) {
+            Log.e("SmartspaceCard", "no tap action available: " + this);
+            return;
+        }
+        Intent intent = new Intent(this.getIntent());
+        Launcher launcher = Launcher.getLauncher(view.getContext());
+        switch (this.dI.cG.cY) {
+            default: {
+                Log.w("SmartspaceCard", "unrecognized tap action: " + this);
+                break;
+            }
+            case 1: {
+                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                intent.setSourceBounds(launcher.getViewBounds(view));
+                intent.setPackage(FeedBridge.Companion.getInstance(mContext).resolveSmartspace());
+                view.getContext().sendBroadcast(intent);
+                break;
+            }
+            case 2: {
+                launcher.startActivitySafely(view, intent, null, null);
+                break;
+            }
+        }
+    }
+
+    public boolean cv() {
+        final c ch = this.cH();
+        return ch != null && (this.cL(ch.cL) || this.cL(ch.cM));
+    }
+
+    public long cw() {
+        final c ch = this.cH();
+        if (ch != null && this.cL(ch.cL)) {
+            final e[] co = ch.cL.cO;
+            for (int i = 0; i < co.length; ++i) {
+                final e e = co[i];
+                if (e.cQ == 1 || e.cQ == 2) {
+                    return this.cI(e);
+                }
+            }
+        }
+        return 0L;
+    }
+
+    public TextUtils.TruncateAt cx(final boolean b) {
+        final c ch = this.cH();
+        if (ch != null) {
+            int n = 0;
+            if (b && ch.cL != null) {
+                n = ch.cL.cP;
+            } else if (!b && ch.cM != null) {
+                n = ch.cM.cP;
+            }
+            switch (n) {
+                case 1: {
+                    return TextUtils.TruncateAt.START;
+                }
+                case 2: {
+                    return TextUtils.TruncateAt.MIDDLE;
+                }
+            }
+        }
+        return TextUtils.TruncateAt.END;
+    }
+
+    public String cy() {
+        return this.cN(false);
+    }
+
+    public boolean cz() {
+        return this.dL;
+    }
+
+    public Bitmap getIcon() {
+        return this.mIcon;
+    }
+
+    public Intent getIntent() {
+        return this.mIntent;
+    }
+
+    public String getTitle() {
+        return this.cN(true);
+    }
+
+    public String toString() {
+        return "title:" + this.getTitle() + " expires:" + this.cF() + " published:" + this.dN + " gsaVersion:" + this.dK + " gsaUpdateTime: " + this.dJ;
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/smartspace/SmartspaceController.java b/Omega/src/com/saggitt/omega/smartspace/SmartspaceController.java
new file mode 100644
index 0000000000..a583625bfb
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/smartspace/SmartspaceController.java
@@ -0,0 +1,193 @@
+package com.saggitt.omega.smartspace;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.Message;
+
+import com.android.launcher3.Alarm;
+import com.saggitt.omega.util.ActionIntentFilter;
+
+import java.io.PrintWriter;
+import java.util.List;
+
+import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
+import static com.google.android.apps.nexuslauncher.smartspace.nano.SmartspaceProto.i;
+
+public class SmartspaceController implements Handler.Callback {
+    enum Store {
+        WEATHER("smartspace_weather"),
+        CURRENT("smartspace_current");
+
+        final String filename;
+
+        Store(final String filename) {
+            this.filename = filename;
+        }
+    }
+
+    private static SmartspaceController INSTANCE;
+    private final SmartspaceDataContainer dataContainer;
+    private final Alarm refreshAlarm;
+    private ISmartspace mSmartspace;
+    private final ProtoStore protoStore;
+    private final Context mAppContext;
+    private final Handler mUiHandler;
+    private final Handler mWorker;
+
+    public SmartspaceController(final Context mAppContext) {
+        this.mWorker = new Handler(MODEL_EXECUTOR.getLooper(), this);
+        this.mUiHandler = new Handler(Looper.getMainLooper(), this);
+        this.mAppContext = mAppContext;
+        this.dataContainer = new SmartspaceDataContainer();
+        this.protoStore = new ProtoStore(mAppContext);
+        (this.refreshAlarm = new Alarm()).setOnAlarmListener(alarm -> refresh());
+        this.updateGsa();
+        mAppContext.registerReceiver(new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                updateGsa();
+            }
+        }, ActionIntentFilter.googleInstance(
+                Intent.ACTION_PACKAGE_ADDED,
+                Intent.ACTION_PACKAGE_CHANGED,
+                Intent.ACTION_PACKAGE_REMOVED,
+                Intent.ACTION_PACKAGE_DATA_CLEARED));
+    }
+
+    private Intent getSmartspaceOptionsIntent() {
+        return new Intent("com.google.android.apps.gsa.smartspace.SETTINGS")
+                .setPackage(FeedBridge.Companion.getInstance(mAppContext).resolveSmartspace())
+                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+    }
+
+    private void refresh() {
+        final boolean weatherAvailable = this.dataContainer.isWeatherAvailable();
+        final boolean dataAvailable = this.dataContainer.isDataAvailable();
+        dataContainer.clearAll();
+        if (weatherAvailable && !this.dataContainer.isWeatherAvailable()) {
+            this.updateSmartspaceStore(null, SmartspaceController.Store.WEATHER);
+        }
+        if (dataAvailable && !this.dataContainer.isDataAvailable()) {
+            updateSmartspaceStore(null, SmartspaceController.Store.CURRENT);
+            mAppContext.sendBroadcast(new Intent("com.google.android.apps.gsa.smartspace.EXPIRE_EVENT")
+                    .setPackage(FeedBridge.Companion.getInstance(mAppContext).resolveSmartspace())
+                    .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
+        }
+    }
+
+    private void updateGsa() {
+        if (this.mSmartspace != null) {
+            this.mSmartspace.onGsaChanged();
+        }
+        this.onPostGsaUpdate();
+    }
+
+    private void onPostGsaUpdate() {
+        mAppContext.sendBroadcast(new Intent("com.google.android.apps.gsa.smartspace.ENABLE_UPDATE")
+                .setPackage(FeedBridge.Companion.getInstance(mAppContext).resolveSmartspace())
+                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
+    }
+
+    private void updateSmartspaceStore(final NewCardInfo a, final SmartspaceController.Store SmartspaceControllerStore) {
+        Message.obtain(this.mWorker, 2, SmartspaceControllerStore.ordinal(), 0, a).sendToTarget();
+    }
+
+    public static SmartspaceController get(final Context context) {
+        if (SmartspaceController.INSTANCE == null) {
+            SmartspaceController.INSTANCE = new SmartspaceController(context.getApplicationContext());
+        }
+        return SmartspaceController.INSTANCE;
+    }
+
+    private void update() {
+        this.refreshAlarm.cancelAlarm();
+        final long ct = this.dataContainer.cT();
+        if (ct > 0L) {
+            this.refreshAlarm.setAlarm(ct);
+        }
+        if (this.mSmartspace != null) {
+            this.mSmartspace.postUpdate(this.dataContainer);
+        }
+    }
+
+    public void updateData(final NewCardInfo a) {
+        if (a != null && !a.forWeather) {
+            this.updateSmartspaceStore(a, SmartspaceController.Store.WEATHER);
+        } else {
+            this.updateSmartspaceStore(a, SmartspaceController.Store.CURRENT);
+        }
+    }
+
+    public void sendMessage() {
+        Message.obtain(this.mWorker, 1).sendToTarget();
+    }
+
+    public void dumpInfo(final String s, final PrintWriter printWriter) {
+        printWriter.println();
+        printWriter.println(s + "SmartspaceController");
+        printWriter.println(s + "  weather " + this.dataContainer.dO);
+        printWriter.println(s + "  current " + this.dataContainer.dP);
+    }
+
+    public boolean cY() {
+        boolean b = false;
+        final List queryBroadcastReceivers = this.mAppContext.getPackageManager()
+                .queryBroadcastReceivers(getSmartspaceOptionsIntent(), 0);
+        if (queryBroadcastReceivers != null) {
+            b = !queryBroadcastReceivers.isEmpty();
+        }
+        return b;
+    }
+
+    public void da(final ISmartspace ds) {
+        this.mSmartspace = ds;
+        if (this.mSmartspace != null && this.dataContainer != null) {
+            this.mSmartspace.postUpdate(this.dataContainer);
+            this.mSmartspace.onGsaChanged();
+        }
+    }
+
+    public boolean handleMessage(final Message message) {
+        SmartspaceCard dVar = null;
+        switch (message.what) {
+            case 1:
+                i data = new i();
+                SmartspaceCard weatherCard = this.protoStore.dv(SmartspaceController.Store.WEATHER.filename, data) ?
+                        SmartspaceCard.cD(this.mAppContext, data, true) :
+                        null;
+
+                data = new i();
+                SmartspaceCard eventCard = this.protoStore.dv(SmartspaceController.Store.CURRENT.filename, data) ?
+                        SmartspaceCard.cD(this.mAppContext, data, false) :
+                        null;
+
+                Message.obtain(this.mUiHandler, 101, new SmartspaceCard[]{weatherCard, eventCard}).sendToTarget();
+                break;
+            case 2:
+                this.protoStore.dw(SmartspaceCard.cQ(this.mAppContext, (NewCardInfo) message.obj), SmartspaceController.Store.values()[message.arg1].filename);
+                Message.obtain(this.mUiHandler, 1).sendToTarget();
+                break;
+            case 101:
+                SmartspaceCard[] dVarArr = (SmartspaceCard[]) message.obj;
+                if (dVarArr != null) {
+                    this.dataContainer.dO = dVarArr.length > 0 ?
+                            dVarArr[0] :
+                            null;
+
+                    SmartspaceDataContainer eVar = this.dataContainer;
+                    if (dVarArr.length > 1) {
+                        dVar = dVarArr[1];
+                    }
+
+                    eVar.dP = dVar;
+                }
+                this.dataContainer.clearAll();
+                update();
+                break;
+        }
+        return true;
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/smartspace/SmartspaceDataContainer.java b/Omega/src/com/saggitt/omega/smartspace/SmartspaceDataContainer.java
new file mode 100644
index 0000000000..f0b089a4c5
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/smartspace/SmartspaceDataContainer.java
@@ -0,0 +1,51 @@
+package com.saggitt.omega.smartspace;
+
+public class SmartspaceDataContainer {
+    public SmartspaceCard dO;
+    public SmartspaceCard dP;
+
+    public SmartspaceDataContainer() {
+        dO = null;
+        dP = null;
+    }
+
+    public boolean isWeatherAvailable() {
+        return dO != null;
+    }
+
+    public boolean isDataAvailable() {
+        return dP != null;
+    }
+
+    public long cT() {
+        final long currentTimeMillis = System.currentTimeMillis();
+        if (isDataAvailable() && isWeatherAvailable()) {
+            return Math.min(dP.cF(), dO.cF()) - currentTimeMillis;
+        }
+        if (isDataAvailable()) {
+            return dP.cF() - currentTimeMillis;
+        }
+        if (isWeatherAvailable()) {
+            return dO.cF() - currentTimeMillis;
+        }
+        return 0L;
+    }
+
+    public boolean clearAll() {
+        final boolean b = true;
+        boolean b2 = false;
+        if (isWeatherAvailable() && dO.cM()) {
+            dO = null;
+            b2 = b;
+        }
+        if (isDataAvailable() && dP.cM()) {
+            dP = null;
+            b2 = b;
+        }
+        return b2;
+    }
+
+    public String toString() {
+        return "{" + dP + "," + dO + "}";
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/smartspace/SmartspaceDataWidget.kt b/Omega/src/com/saggitt/omega/smartspace/SmartspaceDataWidget.kt
new file mode 100644
index 0000000000..60a1afb39f
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/smartspace/SmartspaceDataWidget.kt
@@ -0,0 +1,249 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.smartspace
+
+import android.app.Activity
+import android.app.PendingIntent
+import android.appwidget.AppWidgetHost
+import android.appwidget.AppWidgetHostView
+import android.appwidget.AppWidgetManager
+import android.appwidget.AppWidgetProviderInfo
+import android.content.ComponentName
+import android.content.Context
+import android.content.Intent
+import android.graphics.Bitmap
+import android.graphics.drawable.BitmapDrawable
+import android.text.TextUtils
+import android.util.Log
+import android.view.View
+import android.widget.ImageView
+import android.widget.RemoteViews
+import android.widget.TextView
+import androidx.annotation.Keep
+import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.app.AppCompatActivity
+import com.android.launcher3.R
+import com.android.launcher3.Utilities
+import com.saggitt.omega.BlankActivity
+import com.saggitt.omega.omegaApp
+import com.saggitt.omega.util.*
+
+@Keep
+class SmartspaceDataWidget(controller: OmegaSmartspaceController) : OmegaSmartspaceController.DataProvider(controller) {
+
+    private val prefs = Utilities.getOmegaPrefs(context)
+    private val smartspaceWidgetHost = SmartspaceWidgetHost()
+    private var smartspaceView: SmartspaceWidgetHostView? = null
+    private val widgetIdPref = prefs::smartspaceWidgetId
+    private val providerInfo = getSmartspaceWidgetProvider(context)
+    private var isWidgetBound = false
+    private val pendingIntentTagId = context.resources.getIdentifier("pending_intent_tag", "id", "android")
+
+    init {
+        bindWidget { }
+    }
+
+    private fun bindWidget(onSetupComplete: () -> Unit) {
+        val widgetManager = AppWidgetManager.getInstance(context)
+
+        var widgetId = widgetIdPref.get()
+        val widgetInfo = widgetManager.getAppWidgetInfo(widgetId)
+        isWidgetBound = widgetInfo != null && widgetInfo.provider == providerInfo.provider
+
+        val oldWidgetId = widgetId
+        if (!isWidgetBound) {
+            if (widgetId > -1) {
+                // widgetId is already bound and its not the correct provider. reset host.
+                smartspaceWidgetHost.deleteHost()
+            }
+
+            widgetId = smartspaceWidgetHost.allocateAppWidgetId()
+            isWidgetBound = widgetManager.bindAppWidgetIdIfAllowed(
+                    widgetId, providerInfo.profile, providerInfo.provider, null)
+        }
+
+        if (isWidgetBound) {
+            smartspaceView = smartspaceWidgetHost.createView(context, widgetId, providerInfo) as SmartspaceWidgetHostView
+            smartspaceWidgetHost.startListening()
+            onSetupComplete()
+        } else {
+            val bindIntent = Intent(AppWidgetManager.ACTION_APPWIDGET_BIND)
+                    .putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, widgetId)
+                    .putExtra(AppWidgetManager.EXTRA_APPWIDGET_PROVIDER, providerInfo.provider)
+            BlankActivity.startActivityForResult(context, bindIntent, 1028, 0) { resultCode, _ ->
+                if (resultCode == Activity.RESULT_OK) {
+                    bindWidget(onSetupComplete)
+                } else {
+                    smartspaceWidgetHost.deleteAppWidgetId(widgetId)
+                    widgetId = -1
+                    widgetIdPref.set(-1)
+                    onSetupComplete()
+                }
+            }
+        }
+
+        if (oldWidgetId != widgetId) {
+            widgetIdPref.set(widgetId)
+        }
+    }
+
+    override fun requiresSetup(): Boolean {
+        return !isWidgetBound
+    }
+
+    override fun startSetup(onFinish: (Boolean) -> Unit) {
+        bindWidget {
+            onFinish(isWidgetBound)
+        }
+    }
+
+    override fun stopListening() {
+        super.stopListening()
+
+        smartspaceWidgetHost.stopListening()
+    }
+
+    private fun updateData(weatherIcon: Bitmap?, temperature: TextView?, cardIcon: Bitmap?, title: TextView?, subtitle: TextView?, subtitle2: TextView?) {
+        val weather = parseWeatherData(weatherIcon, temperature)
+        val card = if (cardIcon != null && title != null && subtitle != null) {
+            val pendingIntent = getPendingIntent(title.parent.parent.parent as? View)
+            val ttl = title.text.toString() + if (subtitle2 != null) subtitle.text.toString() else ""
+            val sub = subtitle2 ?: subtitle
+            OmegaSmartspaceController.CardData(cardIcon, ttl, title.ellipsize,
+                    sub.text.toString(), sub.ellipsize,
+                    pendingIntent = pendingIntent)
+        } else {
+            null
+        }
+        updateData(weather, card)
+    }
+
+    private fun parseWeatherData(weatherIcon: Bitmap?, temperatureText: TextView?): OmegaSmartspaceController.WeatherData? {
+        val temperature = temperatureText?.text?.toString()
+        return parseWeatherData(weatherIcon, temperature, getPendingIntent(temperatureText))
+    }
+
+    private fun getPendingIntent(view: View?): PendingIntent? {
+        return view?.getTag(pendingIntentTagId) as? PendingIntent
+    }
+
+    inner class SmartspaceWidgetHost : AppWidgetHost(context, 1027) {
+
+        override fun onCreateView(context: Context, appWidgetId: Int, appWidget: AppWidgetProviderInfo?): AppWidgetHostView {
+            return SmartspaceWidgetHostView(context)
+        }
+    }
+
+    inner class SmartspaceWidgetHostView(context: Context) : AppWidgetHostView(context) {
+
+        @Suppress("UNCHECKED_CAST")
+        override fun updateAppWidget(remoteViews: RemoteViews?) {
+            super.updateAppWidget(remoteViews)
+
+            val childs = getAllChilds()
+            Log.d(TAG, "Child count " + childs.size);
+            val texts = (childs.filter { it is TextView } as List<TextView>).filter { !TextUtils.isEmpty(it.text) }
+
+            Log.d(TAG, "Texts size " + texts.size);
+
+            Log.d(TAG, "Texts size " + texts.get(0).text);
+
+            val images = childs.filter { it is ImageView } as List<ImageView>
+
+            var weatherIconView: ImageView? = null
+            var cardIconView: ImageView? = null
+            var title: TextView? = null
+            var subtitle: TextView? = null
+            var subtitle2: TextView? = null
+            var temperatureText: TextView? = null
+            if (texts.isEmpty()) return
+            if (images.size >= 2) {
+                weatherIconView = images.last()
+                temperatureText = texts.last()
+            }
+            if (images.isNotEmpty() && images.size != 2) {
+                cardIconView = images.first()
+                title = texts[0]
+                if (texts.size > 2) {
+                    subtitle = texts[1]
+                }
+                if (texts.size > 3) {
+                    subtitle2 = texts[2]
+                }
+            }
+            updateData(extractBitmap(weatherIconView), temperatureText, extractBitmap(cardIconView), title, subtitle, subtitle2)
+        }
+    }
+
+    private fun extractBitmap(imageView: ImageView?): Bitmap? {
+        return (imageView?.drawable as? BitmapDrawable)?.bitmap
+    }
+
+    companion object {
+
+        private const val TAG = "SmartspaceDataWidget"
+        private const val smartspaceComponent = "com.google.android.apps.gsa.staticplugins.smartspace.widget.SmartspaceWidgetProvider"
+
+        private val smartspaceProviderComponent = ComponentName(Config.GOOGLE_QSB, smartspaceComponent)
+
+        fun getSmartspaceWidgetProvider(context: Context): AppWidgetProviderInfo {
+            val appWidgetManager = AppWidgetManager.getInstance(context)
+            val providers = appWidgetManager.installedProviders.filter { it.provider == smartspaceProviderComponent }
+            val provider = providers.firstOrNull()
+            if (provider != null) {
+                return provider
+            } else {
+                runOnMainThread {
+                    val foreground = context.omegaApp.activityHandler.foregroundActivity
+                            ?: context
+                    if (foreground is AppCompatActivity) {
+                        AlertDialog.Builder(foreground)
+                                .setTitle(R.string.failed)
+                                .setMessage(R.string.smartspace_widget_provider_not_found)
+                                .setNegativeButton(android.R.string.cancel, null).create().apply {
+                                    show()
+                                    applyAccent()
+                                }
+
+                    }
+                }
+                throw RuntimeException("smartspace widget not found")
+            }
+        }
+
+        fun parseWeatherData(weatherIcon: Bitmap?, temperature: String?, intent: PendingIntent? = null): OmegaSmartspaceController.WeatherData? {
+            return if (weatherIcon != null && temperature != null) {
+                try {
+                    val value = temperature.substring(0, temperature.indexOfFirst { (it < '0' || it > '9') && it != '-' }).toInt()
+                    OmegaSmartspaceController.WeatherData(weatherIcon, Temperature(value, when {
+                        temperature.contains("C") -> Temperature.Unit.Celsius
+                        temperature.contains("F") -> Temperature.Unit.Fahrenheit
+                        temperature.contains("K") -> Temperature.Unit.Kelvin
+                        else -> throw IllegalArgumentException("only supports C, F and K")
+                    }), pendingIntent = intent)
+                } catch (e: NumberFormatException) {
+                    null
+                } catch (e: IllegalArgumentException) {
+                    null
+                }
+            } else {
+                null
+            }
+        }
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/smartspace/SmartspaceDividerView.kt b/Omega/src/com/saggitt/omega/smartspace/SmartspaceDividerView.kt
new file mode 100644
index 0000000000..dd51fc5aec
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/smartspace/SmartspaceDividerView.kt
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ */
+
+package com.saggitt.omega.smartspace
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.View
+import com.saggitt.omega.util.omegaPrefs
+
+class SmartspaceDividerView(context: Context, attrs: AttributeSet?) : View(context, attrs) {
+
+    init {
+        setBackgroundColor(context.omegaPrefs.accentColor)
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/smartspace/SmartspacePreferencesShortcut.java b/Omega/src/com/saggitt/omega/smartspace/SmartspacePreferencesShortcut.java
new file mode 100644
index 0000000000..7ef18ded53
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/smartspace/SmartspacePreferencesShortcut.java
@@ -0,0 +1,27 @@
+package com.saggitt.omega.smartspace;
+
+import android.content.Intent;
+import android.view.View;
+
+import com.android.launcher3.Launcher;
+import com.android.launcher3.R;
+import com.android.launcher3.userevent.nano.LauncherLogProto;
+import com.android.launcher3.views.OptionsPopupView;
+import com.saggitt.omega.settings.SettingsActivity;
+
+public class SmartspacePreferencesShortcut extends OptionsPopupView.OptionItem {
+
+    public SmartspacePreferencesShortcut() {
+        super(R.string.customize, R.drawable.ic_smartspace_preferences, LauncherLogProto.ControlType.SETTINGS_BUTTON,
+                SmartspacePreferencesShortcut::startSmartspacePreferences);
+    }
+
+    private static boolean startSmartspacePreferences(View view) {
+        Launcher launcher = Launcher.getLauncher(view.getContext());
+        launcher.startActivitySafely(view, new Intent(launcher, SettingsActivity.class)
+                .putExtra(SettingsActivity.SubSettingsFragment.TITLE, launcher.getString(R.string.home_widget))
+                .putExtra(SettingsActivity.SubSettingsFragment.CONTENT_RES_ID, R.xml.omega_preferences_smartspace)
+                .putExtra(SettingsActivity.SubSettingsFragment.HAS_PREVIEW, true), null, null);
+        return true;
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/smartspace/SmartspaceView.java b/Omega/src/com/saggitt/omega/smartspace/SmartspaceView.java
new file mode 100644
index 0000000000..4fd20871d8
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/smartspace/SmartspaceView.java
@@ -0,0 +1,498 @@
+package com.saggitt.omega.smartspace;
+
+import android.animation.ValueAnimator;
+import android.content.ActivityNotFoundException;
+import android.content.ComponentName;
+import android.content.ContentUris;
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.ColorStateList;
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.Bitmap.Config;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.Rect;
+import android.graphics.RectF;
+import android.net.Uri;
+import android.os.Handler;
+import android.os.Process;
+import android.provider.AlarmClock;
+import android.provider.CalendarContract;
+import android.text.TextPaint;
+import android.text.TextUtils;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.util.TypedValue;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.android.launcher3.BubbleTextView;
+import com.android.launcher3.ItemInfo;
+import com.android.launcher3.Launcher;
+import com.android.launcher3.R;
+import com.android.launcher3.ResourceUtils;
+import com.android.launcher3.Utilities;
+import com.android.launcher3.compat.LauncherAppsCompat;
+import com.android.launcher3.icons.ShadowGenerator;
+import com.android.launcher3.util.Themes;
+import com.saggitt.omega.OmegaAppKt;
+import com.saggitt.omega.OmegaLauncher;
+import com.saggitt.omega.OmegaPreferences;
+import com.saggitt.omega.graphics.DoubleShadowTextView;
+import com.saggitt.omega.graphics.IcuDateTextView;
+import com.saggitt.omega.icons.calendar.DynamicCalendar;
+import com.saggitt.omega.smartspace.OmegaSmartspaceController.CardData;
+import com.saggitt.omega.smartspace.OmegaSmartspaceController.Line;
+import com.saggitt.omega.smartspace.OmegaSmartspaceController.WeatherData;
+import com.saggitt.omega.util.OmegaUtilsKt;
+import com.saggitt.omega.views.SmartspacePreview;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class SmartspaceView extends FrameLayout implements ISmartspace, ValueAnimator.AnimatorUpdateListener,
+        View.OnClickListener, View.OnLongClickListener, Runnable, OmegaSmartspaceController.Listener {
+    private TextView mSubtitleWeatherText;
+    private final TextPaint dB;
+    private TextView mTitleText;
+    private ViewGroup mTitleWeatherContent;
+    private ImageView mTitleWeatherIcon;
+    private DoubleShadowTextView mTitleWeatherText;
+    private final ColorStateList dH;
+    private final int mSmartspaceBackgroundRes;
+    private IcuDateTextView mClockView;
+    private IcuDateTextView mClockAboveView;
+    private ViewGroup mSmartspaceContent;
+    private final SmartspaceController controller;
+    private SmartspaceDataContainer dq;
+    private BubbleTextView dr;
+    private boolean ds;
+    private boolean mDoubleLine;
+    private final OnClickListener mCalendarClickListener;
+    private final OnClickListener mClockClickListener;
+    private final OnClickListener mWeatherClickListener;
+    private OnClickListener mEventClickListener;
+    private View mSubtitleLine;
+    private ImageView mSubtitleIcon;
+    private TextView mSubtitleText;
+    private ViewGroup mSubtitleWeatherContent;
+    private ImageView mSubtitleWeatherIcon;
+    private boolean mEnableShadow;
+    private final Handler mHandler;
+
+    private OmegaSmartspaceController mController;
+    private boolean mFinishedInflate;
+    private boolean mWeatherAvailable;
+    private OmegaPreferences mPrefs;
+
+    private ShadowGenerator mShadowGenerator;
+
+    private int mTitleSize;
+    private int mTitleMinSize;
+    private int mHorizontalPadding;
+    private int mSeparatorWidth;
+    private int mWeatherIconSize;
+
+    private Paint mTextPaint = new Paint();
+    private Rect mTextBounds = new Rect();
+
+    private boolean mPerformingSetup = false;
+
+    public SmartspaceView(final Context context, AttributeSet set) {
+        super(context, set);
+
+        mController = OmegaAppKt.getOmegaApp(context).getSmartspace();
+        mPrefs = Utilities.getOmegaPrefs(context);
+
+        mShadowGenerator = new ShadowGenerator(ResourceUtils.pxFromDp(48, getResources().getDisplayMetrics()));
+
+        mCalendarClickListener = v -> {
+            final Uri content_URI = CalendarContract.CONTENT_URI;
+            final Uri.Builder appendPath = content_URI.buildUpon().appendPath("time");
+            ContentUris.appendId(appendPath, System.currentTimeMillis());
+            final Intent addFlags = new Intent(Intent.ACTION_VIEW)
+                    .setData(appendPath.build())
+                    .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);
+            try {
+                Launcher.getLauncher(getContext()).startActivitySafely(v, addFlags, null, null);
+            } catch (ActivityNotFoundException ex) {
+                LauncherAppsCompat.getInstance(getContext()).showAppDetailsForProfile(
+                        new ComponentName(DynamicCalendar.GOOGLE_CALENDAR, ""), Process.myUserHandle(), null, null);
+            }
+        };
+
+        mClockClickListener = v -> {
+            Launcher.getLauncher(getContext()).startActivitySafely(v,
+                    new Intent(AlarmClock.ACTION_SHOW_ALARMS).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK
+                            | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED), null, null);
+        };
+
+        mWeatherClickListener = v -> {
+            if (mController != null)
+                mController.openWeather(v);
+        };
+
+        controller = SmartspaceController.get(context);
+        mHandler = new Handler();
+        dH = ColorStateList.valueOf(Themes.getAttrColor(getContext(), R.attr.workspaceTextColor));
+        ds = controller.cY();
+        mSmartspaceBackgroundRes = R.drawable.bg_smartspace;
+        dB = new TextPaint();
+        dB.setTextSize((float) getResources().getDimensionPixelSize(R.dimen.smartspace_title_size));
+        mEnableShadow = !Themes.getAttrBoolean(context, R.attr.isWorkspaceDarkText);
+
+        Resources res = getResources();
+        mTitleSize = res.getDimensionPixelSize(R.dimen.smartspace_title_size);
+        mTitleMinSize = res.getDimensionPixelSize(R.dimen.smartspace_title_min_size);
+        mHorizontalPadding = res.getDimensionPixelSize(R.dimen.smartspace_horizontal_padding);
+        mSeparatorWidth = res.getDimensionPixelSize(R.dimen.smartspace_title_sep_width);
+        mWeatherIconSize = res.getDimensionPixelSize(R.dimen.smartspace_title_weather_icon_size);
+
+        setClipChildren(false);
+
+        try {
+            Launcher launcher = Launcher.getLauncher(getContext());
+            if (launcher instanceof OmegaLauncher) {
+                ((OmegaLauncher) launcher).registerSmartspaceView(this);
+            }
+        } catch (IllegalArgumentException ignored) {
+
+        }
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        int size = MeasureSpec.getSize(widthMeasureSpec) - mHorizontalPadding;
+        if (!mDoubleLine && mClockView != null && mTitleWeatherText != null && mTitleWeatherText.getVisibility() == View.VISIBLE) {
+            int textSize = mTitleSize;
+            String title = mClockView.getText().toString() + mTitleWeatherText.getText().toString();
+            mTextPaint.set(mClockView.getPaint());
+            while (true) {
+                mTextPaint.setTextSize(textSize);
+                mTextPaint.getTextBounds(title, 0, title.length(), mTextBounds);
+                int padding = getPaddingRight() + getPaddingLeft()
+                        + mClockView.getPaddingLeft() + mClockView.getPaddingRight()
+                        + mTitleWeatherText.getPaddingLeft() + mTitleWeatherText.getPaddingRight();
+                if (padding + mSeparatorWidth + mWeatherIconSize + mTextBounds.width() <= size) {
+                    break;
+                }
+                int newSize = textSize - 2;
+                if (newSize < mTitleMinSize) {
+                    break;
+                }
+                textSize = newSize;
+            }
+            setTitleSize(textSize);
+        } else {
+            setTitleSize(mTitleSize);
+        }
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+    }
+
+    public final void setTitleSize(int size) {
+        if (mClockView != null && ((int) mClockView.getTextSize()) != size) {
+            mClockView.setTextSize(TypedValue.COMPLEX_UNIT_PX, size);
+        }
+        if (mTitleWeatherText != null && ((int) mTitleWeatherText.getTextSize()) != size) {
+            mTitleWeatherText.setTextSize(TypedValue.COMPLEX_UNIT_PX, size);
+        }
+    }
+
+    private void setupIfNeeded() {
+        if (!mPerformingSetup && mController.getRequiresSetup()) {
+            mPerformingSetup = true;
+            mController.startSetup(() -> {
+                mPerformingSetup = false;
+                return null;
+            });
+        }
+    }
+
+    @Override
+    public void onDataUpdated(@Nullable WeatherData weather, @Nullable CardData card) {
+        if (mController.getRequiresSetup()) {
+            if (getParent() instanceof SmartspacePreview) {
+                setupIfNeeded();
+            } else {
+                List<Line> lines = new ArrayList<>();
+                lines.add(new Line(getContext().getString(R.string.smartspace_setup_text)));
+                card = new CardData(null, lines, v -> setupIfNeeded(), false);
+            }
+        }
+
+        mEventClickListener = card != null ? card.getOnClickListener() : null;
+        boolean doubleLine = card != null && card.isDoubleLine();
+        if (mDoubleLine != doubleLine) {
+            mDoubleLine = doubleLine;
+            cs();
+        }
+        setOnClickListener(this);
+        setOnLongClickListener(co());
+        mWeatherAvailable = weather != null;
+        if (mDoubleLine) {
+            loadDoubleLine(weather, card);
+        } else {
+            loadSingleLine(weather, card);
+        }
+    }
+
+    @SuppressWarnings("ConstantConditions")
+    private void loadDoubleLine(@Nullable WeatherData weather, @NotNull CardData card) {
+        setOnClickListener(mEventClickListener);
+        setBackgroundResource(mSmartspaceBackgroundRes);
+        mTitleText.setText(card.getTitle());
+        mTitleText.setEllipsize(card.getTitleEllipsize());
+        mSubtitleText.setText(card.getSubtitle());
+        mSubtitleText.setEllipsize(card.getSubtitleEllipsize());
+        mSubtitleIcon.setImageTintList(dH);
+        mSubtitleIcon.setImageBitmap(card.getIcon());
+        bindWeather(weather, mSubtitleWeatherContent, mSubtitleWeatherText, mSubtitleWeatherIcon);
+        bindClockAbove(false);
+    }
+
+    @SuppressWarnings("ConstantConditions")
+    private void loadSingleLine(@Nullable WeatherData weather, @Nullable CardData card) {
+        setOnClickListener(null);
+        setBackgroundResource(0);
+        bindWeather(weather, mTitleWeatherContent, mTitleWeatherText, mTitleWeatherIcon);
+        bindClockAndSeparator(false);
+        int clockAboveTextSize;
+        if (card != null) {
+            mSubtitleLine.setVisibility(View.VISIBLE);
+            mSubtitleText.setText(card.getTitle());
+            mSubtitleText.setEllipsize(card.getTitleEllipsize());
+            mSubtitleText.setOnClickListener(mEventClickListener);
+
+            Bitmap icon = card.getIcon();
+            if (icon != null) {
+                mSubtitleIcon.setVisibility(View.VISIBLE);
+                mSubtitleIcon.setImageTintList(dH);
+                mSubtitleIcon.setImageBitmap(icon);
+                mSubtitleIcon.setOnClickListener(mEventClickListener);
+            } else {
+                mSubtitleIcon.setVisibility(View.GONE);
+            }
+
+            clockAboveTextSize = R.dimen.smartspace_title_size;
+        } else {
+            mSubtitleLine.setVisibility(View.GONE);
+            mSubtitleText.setOnClickListener(null);
+            mSubtitleIcon.setOnClickListener(null);
+            clockAboveTextSize = R.dimen.smartspace_clock_above_size;
+        }
+        mClockAboveView.setTextSize(TypedValue.COMPLEX_UNIT_PX,
+                getResources().getDimensionPixelSize(clockAboveTextSize));
+    }
+
+    private void bindClockAndSeparator(boolean forced) {
+        if (mPrefs.getSmartspaceDate() || mPrefs.getSmartspaceTime()) {
+            mClockView.setVisibility(View.VISIBLE);
+            mClockView.setOnClickListener(mCalendarClickListener);
+            mClockView.setOnLongClickListener(co());
+            if (forced)
+                mClockView.reloadDateFormat(true);
+        } else {
+            mClockView.setVisibility(View.GONE);
+        }
+        bindClockAbove(forced);
+    }
+
+    private void bindClockAbove(boolean forced) {
+        if (mPrefs.getSmartspaceTime() && mPrefs.getSmartspaceTimeAbove()) {
+            mClockAboveView.setVisibility(View.VISIBLE);
+            mClockAboveView.setOnClickListener(mClockClickListener);
+            mClockAboveView.setOnLongClickListener(co());
+            if (forced)
+                mClockAboveView.reloadDateFormat(true);
+        } else {
+            mClockAboveView.setVisibility(GONE);
+        }
+    }
+
+    private void bindWeather(@Nullable WeatherData weather, View container, TextView title, ImageView icon) {
+        mWeatherAvailable = weather != null;
+        if (mWeatherAvailable) {
+            container.setVisibility(View.VISIBLE);
+            container.setOnClickListener(mWeatherClickListener);
+            container.setOnLongClickListener(co());
+            title.setText(weather.getTitle(
+                    Utilities.getOmegaPrefs(getContext()).getWeatherUnit()));
+            icon.setImageBitmap(addShadowToBitmap(weather.getIcon()));
+        } else {
+            container.setVisibility(View.GONE);
+        }
+    }
+
+    public void reloadCustomizations() {
+        if (!mDoubleLine) {
+            bindClockAndSeparator(true);
+        }
+        bindClockAbove(true);
+    }
+
+    private Bitmap addShadowToBitmap(Bitmap bitmap) {
+        if (mEnableShadow && !bitmap.isRecycled()) {
+            Bitmap newBitmap = Bitmap.createBitmap(bitmap.getWidth(), bitmap.getHeight(), Config.ARGB_8888);
+            Canvas canvas = new Canvas(newBitmap);
+            mShadowGenerator.recreateIcon(bitmap, canvas);
+            return newBitmap;
+        } else {
+            return bitmap;
+        }
+    }
+
+    private void loadViews() {
+        mTitleText = findViewById(R.id.title_text);
+        mSubtitleLine = findViewById(R.id.subtitle_line);
+        mSubtitleText = findViewById(R.id.subtitle_text);
+        mSubtitleIcon = findViewById(R.id.subtitle_icon);
+        mTitleWeatherIcon = findViewById(R.id.title_weather_icon);
+        mSubtitleWeatherIcon = findViewById(R.id.subtitle_weather_icon);
+        mSmartspaceContent = findViewById(R.id.smartspace_content);
+        mTitleWeatherContent = findViewById(R.id.title_weather_content);
+        mSubtitleWeatherContent = findViewById(R.id.subtitle_weather_content);
+        mTitleWeatherText = findViewById(R.id.title_weather_text);
+        mSubtitleWeatherText = findViewById(R.id.subtitle_weather_text);
+        mClockView = findViewById(R.id.clock);
+        mClockAboveView = findViewById(R.id.time_above);
+    }
+
+    private String cn() {
+        final boolean b = true;
+        final SmartspaceCard dp = dq.dP;
+        return dp.cC(TextUtils.ellipsize(dp.cB(b), dB, getWidth() - getPaddingLeft()
+                - getPaddingRight() - getResources().getDimensionPixelSize(R.dimen.smartspace_horizontal_padding) - dB.measureText(dp.cA(b)), TextUtils.TruncateAt.END).toString());
+    }
+
+    private OnLongClickListener co() {
+        return this;
+    }
+
+    private void cs() {
+        final int indexOfChild = indexOfChild(mSmartspaceContent);
+        removeView(mSmartspaceContent);
+        final LayoutInflater from = LayoutInflater.from(getContext());
+        addView(from.inflate(mDoubleLine ?
+                R.layout.smartspace_twolines :
+                R.layout.smartspace_singleline, this, false), indexOfChild);
+        loadViews();
+    }
+
+    public void onGsaChanged() {
+        ds = controller.cY();
+        if (dq != null) {
+            postUpdate(dq);
+        } else {
+            Log.d("SmartspaceView", "onGsaChanged but no data present");
+        }
+    }
+
+    public void postUpdate(final SmartspaceDataContainer dq2) {
+        dq = dq2;
+        boolean visible = mSmartspaceContent.getVisibility() == View.VISIBLE;
+        if (!visible) {
+            mSmartspaceContent.setVisibility(View.VISIBLE);
+            mSmartspaceContent.setAlpha(0f);
+            mSmartspaceContent.animate().setDuration(200L).alpha(1f);
+        }
+    }
+
+    public void onAnimationUpdate(final ValueAnimator valueAnimator) {
+        invalidate();
+    }
+
+    protected void onAttachedToWindow() {
+        super.onAttachedToWindow();
+        if (mController != null && mFinishedInflate)
+            mController.addListener(this);
+    }
+
+    public void onClick(final View view) {
+        if (dq != null && dq.isDataAvailable()) {
+            dq.dP.click(view);
+        }
+    }
+
+    protected void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+        if (mController != null)
+            mController.removeListener(this);
+    }
+
+    protected void onFinishInflate() {
+        super.onFinishInflate();
+        loadViews();
+        mFinishedInflate = true;
+        dr = findViewById(R.id.dummyBubbleTextView);
+        dr.setTag(new ItemInfo() {
+            @Override
+            public ComponentName getTargetComponent() {
+                return new ComponentName(getContext(), "");
+            }
+        });
+        dr.setContentDescription("");
+        if (isAttachedToWindow() && mController != null)
+            mController.addListener(this);
+        else if (mController != null)
+            mController.requestUpdate(this);
+    }
+
+    protected void onLayout(final boolean b, final int n, final int n2, final int n3, final int n4) {
+        super.onLayout(b, n, n2, n3, n4);
+        if (dq != null && dq.isDataAvailable() && dq.dP.cv()) {
+            final String cn = cn();
+            if (!cn.equals(mTitleText.getText())) {
+                mTitleText.setText(cn);
+            }
+        }
+    }
+
+    public boolean onLongClick(final View view) {
+        TextView textView;
+        if (mClockView == null || mClockView.getVisibility() != View.VISIBLE) {
+            textView = mTitleText;
+        } else {
+            textView = mClockView;
+        }
+        if (view == null) {
+            return false;
+        }
+        Rect rect = new Rect();
+        float tmp = 0f;
+        Launcher launcher = Launcher.getLauncher(getContext());
+        launcher.getDragLayer().getDescendantRectRelativeToSelf(view, rect);
+        if (textView != null) {
+            Paint.FontMetrics fontMetrics = textView.getPaint().getFontMetrics();
+            tmp = (((float) view.getHeight()) - (fontMetrics.bottom - fontMetrics.top)) / 2.0f;
+        }
+        RectF rectF = new RectF();
+        float exactCenterX = rect.exactCenterX();
+        rectF.right = exactCenterX;
+        rectF.left = exactCenterX;
+        rectF.top = 0.0f;
+        rectF.bottom = ((float) rect.bottom) - tmp;
+        OmegaUtilsKt.openPopupMenu(this, rectF, new SmartspacePreferencesShortcut());
+        return true;
+    }
+
+    public void onPause() {
+        mHandler.removeCallbacks(this);
+    }
+
+    @Override
+    public void run() {
+    }
+
+    @Override
+    public void setPadding(final int n, final int n2, final int n3, final int n4) {
+        super.setPadding(0, 0, 0, 0);
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/smartspace/eventprovider/AlarmEventProvider.kt b/Omega/src/com/saggitt/omega/smartspace/eventprovider/AlarmEventProvider.kt
new file mode 100644
index 0000000000..826d28838a
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/smartspace/eventprovider/AlarmEventProvider.kt
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ */
+
+package com.saggitt.omega.smartspace.eventprovider
+
+import android.app.AlarmManager
+import android.content.Context
+import android.os.Handler
+import android.os.HandlerThread
+import android.os.SystemClock
+import android.util.Log
+import androidx.annotation.Keep
+import com.android.launcher3.R
+import com.android.launcher3.Utilities.drawableToBitmap
+import com.saggitt.omega.smartspace.OmegaSmartspaceController
+import com.saggitt.omega.util.formatTime
+import com.saggitt.omega.util.runOnMainThread
+import java.util.*
+import java.util.concurrent.TimeUnit
+import kotlin.collections.ArrayList
+
+@Keep
+class AlarmEventProvider(controller: OmegaSmartspaceController) :
+        OmegaSmartspaceController.DataProvider(controller) {
+
+    private val handlerThread by lazy { HandlerThread("") }
+    private val handler by lazy { Handler(handlerThread.looper) }
+
+    init {
+        Log.d(javaClass.name, "class initializer: init")
+        handlerThread.start();
+        forceUpdate()
+    }
+
+    private fun updateInformation() = runOnMainThread {
+        val alarmManager =
+                controller.context.getSystemService(Context.ALARM_SERVICE) as AlarmManager;
+        if (alarmManager.nextAlarmClock != null &&
+                alarmManager.nextAlarmClock!!.triggerTime - System.currentTimeMillis() <= TimeUnit.MINUTES.toMillis(
+                        30)) {
+            val alarmClock = alarmManager.nextAlarmClock!!
+            val string: MutableList<OmegaSmartspaceController.Line> = ArrayList();
+            string.add(OmegaSmartspaceController.Line(
+                    controller.context.getString(R.string.resuable_text_alarm)));
+            string.add(OmegaSmartspaceController.Line(
+                    formatTime(Date(alarmClock.triggerTime), controller.context)))
+            updateData(null, OmegaSmartspaceController.CardData(
+                    drawableToBitmap(controller.context.getDrawable(R.drawable.ic_alarm_on_black_24dp)),
+                    string, true))
+        } else {
+            updateData(null, null)
+        }
+    }
+
+    override fun forceUpdate() {
+        updateInformation()
+        handler.postAtTime(this::forceUpdate, SystemClock.uptimeMillis() + TimeUnit.SECONDS.toMillis(5))
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/smartspace/eventprovider/BatteryStatusProvider.kt b/Omega/src/com/saggitt/omega/smartspace/eventprovider/BatteryStatusProvider.kt
new file mode 100644
index 0000000000..3dd35517be
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/smartspace/eventprovider/BatteryStatusProvider.kt
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ */
+
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.smartspace.eventprovider
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.os.BatteryManager
+import androidx.annotation.Keep
+import com.android.launcher3.R
+import com.saggitt.omega.smartspace.OmegaSmartspaceController
+import com.saggitt.omega.smartspace.OmegaSmartspaceController.*
+
+@Keep
+class BatteryStatusProvider(controller: OmegaSmartspaceController) :
+        DataProvider(controller) {
+
+    private val batteryReceiver = object : BroadcastReceiver() {
+
+        override fun onReceive(context: Context?, intent: Intent) {
+            val status = intent.getIntExtra(BatteryManager.EXTRA_STATUS, -1)
+            charging = status == BatteryManager.BATTERY_STATUS_CHARGING
+            full = status == BatteryManager.BATTERY_STATUS_FULL
+            level = (100f
+                    * intent.getIntExtra(BatteryManager.EXTRA_LEVEL, 0)
+                    / intent.getIntExtra(BatteryManager.EXTRA_SCALE, 100)).toInt()
+            updateData(null, getEventCard())
+        }
+    }
+    private var charging = false
+    private var full = false
+    private var level = 100
+
+    init {
+        context.registerReceiver(batteryReceiver, IntentFilter(Intent.ACTION_BATTERY_CHANGED))
+    }
+
+    private fun getEventCard(): CardData? {
+        val lines = mutableListOf<Line>()
+        when {
+            full -> lines.add(Line(context, R.string.battery_full))
+            charging -> lines.add(Line(context, R.string.battery_charging))
+            level <= 15 -> lines.add(Line(context, R.string.battery_low))
+            else -> return null
+        }
+        if (!full) {
+            lines.add(Line("$level%"))
+        }
+        return CardData(
+                lines = lines,
+                forceSingleLine = true)
+    }
+
+    override fun stopListening() {
+        super.stopListening()
+        context.unregisterReceiver(batteryReceiver)
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/smartspace/eventprovider/CalendarEventProvider.kt b/Omega/src/com/saggitt/omega/smartspace/eventprovider/CalendarEventProvider.kt
new file mode 100644
index 0000000000..489f474047
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/smartspace/eventprovider/CalendarEventProvider.kt
@@ -0,0 +1,139 @@
+/*
+ * Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ */
+
+package com.saggitt.omega.smartspace.eventprovider
+
+import android.annotation.SuppressLint
+import android.app.PendingIntent
+import android.content.Intent
+import android.net.Uri
+import android.provider.CalendarContract
+import android.text.TextUtils
+import android.text.format.DateFormat
+import androidx.core.graphics.drawable.toBitmap
+import com.android.launcher3.R
+import com.saggitt.omega.smartspace.OmegaSmartspaceController
+import com.saggitt.omega.smartspace.OmegaSmartspaceController.*
+import com.saggitt.omega.util.runOnMainThread
+import java.util.*
+import java.util.concurrent.TimeUnit
+import kotlin.math.ceil
+
+@SuppressLint("MissingPermission")
+class CalendarEventProvider(controller: OmegaSmartspaceController)
+    : PeriodicDataProvider(controller) {
+
+    override val requiredPermissions = listOf(android.Manifest.permission.READ_CALENDAR)
+    private val calendarProjection = arrayOf(
+            CalendarContract.Instances._ID,
+            CalendarContract.Instances.TITLE,
+            CalendarContract.Instances.DTSTART,
+            CalendarContract.Instances.DTEND,
+            CalendarContract.Instances.EVENT_LOCATION,
+            CalendarContract.Instances.CUSTOM_APP_PACKAGE)
+
+    private val oneMinute = TimeUnit.MINUTES.toMillis(1)
+
+    private val includeBehind = oneMinute * 5
+    private val includeAhead = oneMinute * 30
+
+    override val timeout = oneMinute
+
+    override fun updateData() {
+        val card = createEventCard(getNextEvent())
+        runOnMainThread {
+            updateData(null, card)
+        }
+    }
+
+    private fun createEventCard(event: CalendarEvent?): CardData? {
+        if (event == null) return null
+        val icon = context.getDrawable(R.drawable.ic_calendar)!!.toBitmap()
+        val lines = mutableListOf<Line>()
+        lines.add(Line("${event.title} ${formatTimeRelative(event.start)}", TextUtils.TruncateAt.MIDDLE))
+        val timeText = "${formatTime(event.start)} – ${formatTime(event.end)}"
+        if (event.location != null) {
+            lines.add(Line("${event.location} $timeText"))
+        } else {
+            lines.add(Line(timeText))
+        }
+        return CardData(icon, lines, getPendingIntent(event))
+    }
+
+    private fun getNextEvent(): CalendarEvent? {
+        val currentTime = System.currentTimeMillis()
+        context.contentResolver.query(
+                CalendarContract.Events.CONTENT_URI,
+                calendarProjection,
+                "${CalendarContract.Events.DTSTART} >= ? AND ${CalendarContract.Events.DTSTART} <= ?",
+                arrayOf("${currentTime - includeBehind}", "${currentTime + includeAhead}"),
+                "${CalendarContract.Events.DTSTART} ASC LIMIT 1")
+                ?.use { c ->
+                    while (c.moveToNext()) {
+                        return CalendarEvent(
+                                c.getLong(c.getColumnIndex(CalendarContract.Events._ID)),
+                                c.getString(c.getColumnIndex(CalendarContract.Events.TITLE)),
+                                c.getLong(c.getColumnIndex(CalendarContract.Events.DTSTART)),
+                                c.getLong(c.getColumnIndex(CalendarContract.Events.DTEND)),
+                                c.getString(c.getColumnIndex(CalendarContract.Events.EVENT_LOCATION)),
+                                c.getString(c.getColumnIndex(CalendarContract.Events.CUSTOM_APP_PACKAGE)))
+                    }
+                }
+        return null
+    }
+
+    private fun formatTime(time: Long) = DateFormat.getTimeFormat(context).format(Date(time))
+
+    private fun formatTimeRelative(time: Long): String {
+        val res = context.resources
+        val currentTime = System.currentTimeMillis()
+        if (time <= currentTime) {
+            return res.getString(R.string.smartspace_now)
+        }
+        val minutesToEvent = ceil((time - currentTime).toDouble() / oneMinute).toInt()
+        val timeString = if (minutesToEvent >= 60) {
+            val hours = minutesToEvent / 60
+            val minutes = minutesToEvent % 60
+            val hoursString = res.getQuantityString(R.plurals.smartspace_hours, hours, hours)
+            if (minutes <= 0) {
+                hoursString
+            } else {
+                val minutesString =
+                        res.getQuantityString(R.plurals.smartspace_minutes, minutes, minutes)
+                res.getString(R.string.smartspace_hours_mins, hoursString, minutesString)
+            }
+        } else {
+            res.getQuantityString(R.plurals.smartspace_minutes, minutesToEvent, minutesToEvent)
+        }
+        return res.getString(R.string.smartspace_in_time, timeString)
+    }
+
+    private fun getPendingIntent(event: CalendarEvent): PendingIntent? {
+        val intent = Intent(Intent.ACTION_VIEW).apply {
+            data = Uri.parse("content://com.android.calendar/events/${event.id}")
+            `package` = event.appPackage
+        }
+        return PendingIntent.getActivity(context, 0, intent, 0)
+    }
+
+    data class CalendarEvent(
+            val id: Long,
+            val title: String,
+            val start: Long,
+            val end: Long,
+            val location: String?,
+            val appPackage: String?)
+}
diff --git a/Omega/src/com/saggitt/omega/smartspace/eventprovider/MediaListener.java b/Omega/src/com/saggitt/omega/smartspace/eventprovider/MediaListener.java
new file mode 100644
index 0000000000..642953307b
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/smartspace/eventprovider/MediaListener.java
@@ -0,0 +1,294 @@
+/*
+ * Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ */
+
+package com.saggitt.omega.smartspace.eventprovider;
+
+import android.app.Notification;
+import android.content.ComponentName;
+import android.content.Context;
+import android.media.MediaMetadata;
+import android.media.session.MediaController;
+import android.media.session.MediaSession;
+import android.media.session.MediaSessionManager;
+import android.media.session.MediaSessionManager.OnActiveSessionsChangedListener;
+import android.media.session.PlaybackState;
+import android.os.Bundle;
+import android.os.Handler;
+import android.service.notification.StatusBarNotification;
+import android.util.Log;
+import android.view.KeyEvent;
+
+import androidx.annotation.Nullable;
+
+import com.android.launcher3.Utilities;
+import com.android.launcher3.notification.NotificationListener;
+import com.saggitt.omega.smartspace.eventprovider.NotificationsManager.OnChangeListener;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Paused mode is not supported on Marshmallow because the MediaSession is missing
+ * notifications. Without this information, it is impossible to hide on stop.
+ */
+
+public class MediaListener extends MediaController.Callback
+        implements OnActiveSessionsChangedListener, OnChangeListener {
+    private static final String TAG = "MediaListener";
+
+    private final ComponentName mComponent;
+    private final MediaSessionManager mManager;
+    private final Runnable mOnChange;
+    private final NotificationsManager mNotificationsManager;
+    private List<MediaController> mControllers = Collections.emptyList();
+    private MediaNotificationController mTracking;
+    private final Handler mHandler = new Handler();
+    private final Handler mWorkHandler;
+
+    public MediaListener(Context context, Runnable onChange, Handler handler) {
+        mComponent = new ComponentName(context, NotificationListener.class);
+        mManager = (MediaSessionManager) context.getSystemService(Context.MEDIA_SESSION_SERVICE);
+        mOnChange = onChange;
+        mNotificationsManager = NotificationsManager.INSTANCE;
+        mWorkHandler = handler;
+    }
+
+    public void onResume() {
+        try {
+            mManager.addOnActiveSessionsChangedListener(this, mComponent);
+        } catch (SecurityException ignored) {
+        }
+        onActiveSessionsChanged(null); // Bind all current controllers.
+        mNotificationsManager.addListener(this);
+    }
+
+    public void onPause() {
+        mManager.removeOnActiveSessionsChangedListener(this);
+        onActiveSessionsChanged(Collections.emptyList()); // Unbind all previous controllers.
+        mNotificationsManager.removeListener(this);
+    }
+
+    public MediaNotificationController getTracking() {
+        return mTracking;
+    }
+
+    public String getPackage() {
+        return mTracking.controller.getPackageName();
+    }
+
+    private void updateControllers(List<MediaController> controllers) {
+        for (MediaController mc : mControllers) {
+            mc.unregisterCallback(this);
+        }
+        for (MediaController mc : controllers) {
+            mc.registerCallback(this);
+        }
+        mControllers = controllers;
+    }
+
+    @Override
+    public void onActiveSessionsChanged(List<MediaController> controllers) {
+        mWorkHandler.post(() -> updateTracking(controllers));
+    }
+
+    private void updateTracking(List<MediaController> controllers) {
+        if (controllers == null) {
+            try {
+                controllers = mManager.getActiveSessions(mComponent);
+            } catch (SecurityException ignored) {
+                controllers = Collections.emptyList();
+            }
+        }
+        updateControllers(controllers);
+
+        if (mTracking != null) {
+            mTracking.reloadInfo();
+        }
+
+        // If the current controller is not paused or playing, stop tracking it.
+        if (mTracking != null
+                && (!controllers.contains(mTracking.controller) || !mTracking.isPausedOrPlaying())) {
+            mTracking = null;
+        }
+
+        for (MediaController mc : controllers) {
+            MediaNotificationController mnc = new MediaNotificationController(mc);
+            // Either we are not tracking a controller and this one is valid,
+            // or this one is playing while the one we track is not.
+            if ((mTracking == null && mnc.isPausedOrPlaying())
+                    || (mTracking != null && mnc.isPlaying() && !mTracking.isPlaying())) {
+                mTracking = mnc;
+            }
+        }
+
+        mHandler.removeCallbacks(mOnChange);
+        mHandler.post(mOnChange);
+    }
+
+    private void pressButton(int keyCode) {
+        if (mTracking != null) {
+            mTracking.pressButton(keyCode);
+        }
+    }
+
+    public void toggle(boolean finalClick) {
+        if (!finalClick) {
+            Log.d(TAG, "Toggle");
+            pressButton(KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE);
+        }
+    }
+
+    public void next(boolean finalClick) {
+        if (finalClick) {
+            Log.d(TAG, "Next");
+            pressButton(KeyEvent.KEYCODE_MEDIA_NEXT);
+            pressButton(KeyEvent.KEYCODE_MEDIA_PLAY);
+        }
+    }
+
+    public void previous(boolean finalClick) {
+        if (finalClick) {
+            Log.d(TAG, "Previous");
+            pressButton(KeyEvent.KEYCODE_MEDIA_PREVIOUS);
+            pressButton(KeyEvent.KEYCODE_MEDIA_PLAY);
+        }
+    }
+
+    // If there is no notification, consider the state to be stopped.
+    private boolean hasNotification(@Nullable MediaController mc) {
+        return findNotification(mc) != null;
+    }
+
+    private StatusBarNotification findNotification(@Nullable MediaController mc) {
+        if (mc == null) return null;
+        MediaSession.Token controllerToken = mc.getSessionToken();
+        for (StatusBarNotification notif : mNotificationsManager.getNotifications()) {
+            Bundle extras = notif.getNotification().extras;
+            MediaSession.Token notifToken = extras.getParcelable(Notification.EXTRA_MEDIA_SESSION);
+            if (controllerToken.equals(notifToken)) {
+                return notif;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Events that refresh the current handler.
+     */
+    public void onPlaybackStateChanged(PlaybackState state) {
+        super.onPlaybackStateChanged(state);
+        onActiveSessionsChanged(null);
+    }
+
+    public void onMetadataChanged(MediaMetadata metadata) {
+        super.onMetadataChanged(metadata);
+        onActiveSessionsChanged(null);
+    }
+
+    @Override
+    public void onNotificationsChanged() {
+        onActiveSessionsChanged(null);
+    }
+
+    public class MediaInfo {
+
+        private CharSequence title;
+        private CharSequence artist;
+        private CharSequence album;
+
+        public CharSequence getTitle() {
+            return title;
+        }
+
+        public CharSequence getArtist() {
+            return artist;
+        }
+
+        public CharSequence getAlbum() {
+            return album;
+        }
+    }
+
+    public class MediaNotificationController {
+
+        private MediaController controller;
+        private StatusBarNotification sbn;
+        private MediaInfo info;
+
+        private MediaNotificationController(MediaController controller) {
+            this.controller = controller;
+            this.sbn = findNotification(controller);
+            reloadInfo();
+        }
+
+        private boolean hasNotification() {
+            return sbn != null;
+        }
+
+        private boolean hasTitle() {
+            return info != null && info.title != null;
+        }
+
+        public boolean isPlaying() {
+            return (!Utilities.ATLEAST_NOUGAT || hasNotification())
+                    && hasTitle()
+                    && controller.getPlaybackState() != null
+                    && controller.getPlaybackState().getState() == PlaybackState.STATE_PLAYING;
+        }
+
+        private boolean isPausedOrPlaying() {
+            if (Utilities.ATLEAST_NOUGAT) {
+                if (!hasNotification() || !hasTitle() || controller.getPlaybackState() == null) {
+                    return false;
+                }
+                int state = controller.getPlaybackState().getState();
+                return state == PlaybackState.STATE_PAUSED
+                        || state == PlaybackState.STATE_PLAYING;
+            }
+            return isPlaying();
+        }
+
+        private void pressButton(int keyCode) {
+            controller.dispatchMediaButtonEvent(new KeyEvent(KeyEvent.ACTION_DOWN, keyCode));
+            controller.dispatchMediaButtonEvent(new KeyEvent(KeyEvent.ACTION_UP, keyCode));
+        }
+
+        private void reloadInfo() {
+            MediaMetadata metadata = controller.getMetadata();
+            if (metadata != null) {
+                info = new MediaInfo();
+                info.title = metadata.getText(MediaMetadata.METADATA_KEY_TITLE);
+                info.artist = metadata.getText(MediaMetadata.METADATA_KEY_ARTIST);
+                info.album = metadata.getText(MediaMetadata.METADATA_KEY_ALBUM);
+            } else if (sbn != null) {
+                info = new MediaInfo();
+                info.title = sbn.getNotification().extras.getCharSequence(Notification.EXTRA_TITLE);
+            }
+        }
+
+        public String getPackageName() {
+            return controller.getPackageName();
+        }
+
+        public StatusBarNotification getSbn() {
+            return sbn;
+        }
+
+        public MediaInfo getInfo() {
+            return info;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/smartspace/eventprovider/NotificationUnreadProvider.kt b/Omega/src/com/saggitt/omega/smartspace/eventprovider/NotificationUnreadProvider.kt
new file mode 100644
index 0000000000..a8d7e06135
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/smartspace/eventprovider/NotificationUnreadProvider.kt
@@ -0,0 +1,152 @@
+/*
+ * Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ */
+
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.smartspace.eventprovider
+
+import android.service.notification.StatusBarNotification
+import android.text.TextUtils
+import androidx.annotation.Keep
+import androidx.core.app.NotificationCompat.PRIORITY_DEFAULT
+import androidx.core.graphics.drawable.toBitmap
+import com.android.launcher3.R
+import com.android.launcher3.notification.NotificationInfo
+import com.android.launcher3.util.PackageUserKey
+import com.saggitt.omega.flowerpot.Flowerpot
+import com.saggitt.omega.flowerpot.FlowerpotApps
+import com.saggitt.omega.smartspace.OmegaSmartspaceController
+import com.saggitt.omega.smartspace.OmegaSmartspaceController.CardData
+import com.saggitt.omega.smartspace.OmegaSmartspaceController.Line
+import com.saggitt.omega.util.loadSmallIcon
+import com.saggitt.omega.util.runOnMainThread
+import com.saggitt.omega.util.runOnUiWorkerThread
+
+@Keep
+class NotificationUnreadProvider(controller: OmegaSmartspaceController) :
+        OmegaSmartspaceController.NotificationBasedDataProvider(controller),
+        NotificationsManager.OnChangeListener {
+
+    private val manager = NotificationsManager
+    private var flowerpotLoaded = false
+    private var flowerpotApps: FlowerpotApps? = null
+    private val tmpKey = PackageUserKey(null, null)
+    private var zenModeEnabled = false
+        set(value) {
+            if (field != value) {
+                field = value
+                onNotificationsChanged()
+            }
+        }
+    private val zenModeListener = ZenModeListener(controller.context.contentResolver) {
+        zenModeEnabled = it
+    }
+
+    override fun startListening() {
+        super.startListening()
+
+        manager.addListener(this)
+        zenModeListener.startListening()
+        runOnUiWorkerThread {
+            flowerpotApps = Flowerpot.Manager.getInstance(controller.context)
+                    .getPot("COMMUNICATION", true)?.apps
+            flowerpotLoaded = true
+            onNotificationsChanged()
+        }
+    }
+
+    override fun onNotificationsChanged() {
+        runOnMainThread {
+            updateData(null, getEventCard())
+        }
+    }
+
+    private fun isCommunicationApp(sbn: StatusBarNotification): Boolean {
+        return tmpKey.updateFromNotification(sbn)
+                && flowerpotApps?.packageMatches?.contains(tmpKey) != false
+    }
+
+    private fun getEventCard(): CardData? {
+        if (!flowerpotLoaded) return null
+
+        val sbn = manager.notifications
+                .asSequence()
+                .filter { !it.isOngoing }
+                .filter { it.notification.priority >= PRIORITY_DEFAULT }
+                .filter { isCommunicationApp(it) }
+                .maxWith(compareBy(
+                        { it.notification.priority },
+                        { it.notification.`when` })) ?: return null
+
+        if (zenModeEnabled) {
+            return CardData(
+                    context.getDrawable(R.drawable.ic_zen_mode)!!.toBitmap(),
+                    listOf(Line(context.getString(R.string.zen_mode_enabled))))
+        }
+
+        val context = controller.context
+        val notif = NotificationInfo(context, sbn)
+        val app = getApp(sbn).toString()
+        val title = notif.title?.toString() ?: ""
+        val splitted = splitTitle(title)
+        val body = notif.text?.toString()?.trim()?.split("\n")?.firstOrNull() ?: ""
+
+        val lines = mutableListOf<Line>()
+        if (!TextUtils.isEmpty(body)) {
+            lines.add(Line(body))
+        }
+        lines.addAll(splitted.reversed().map { Line(it) })
+
+        val appLine = Line(app)
+        if (!lines.contains(appLine)) {
+            lines.add(appLine)
+        }
+        return CardData(
+                sbn.loadSmallIcon(context)?.toBitmap(), lines,
+                OmegaSmartspaceController.NotificationClickListener(sbn))
+    }
+
+    private fun splitTitle(title: String): Array<String> {
+        val delimiters = arrayOf(": ", " - ", " • ")
+        for (del in delimiters) {
+            if (title.contains(del)) {
+                return title.split(del.toRegex(), 2).toTypedArray()
+            }
+        }
+        return arrayOf(title)
+    }
+
+    override fun stopListening() {
+        super.stopListening()
+        manager.removeListener(this)
+        zenModeListener.stopListening()
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/smartspace/eventprovider/NotificationsManager.kt b/Omega/src/com/saggitt/omega/smartspace/eventprovider/NotificationsManager.kt
new file mode 100644
index 0000000000..60f8c7f873
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/smartspace/eventprovider/NotificationsManager.kt
@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ */
+
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.smartspace.eventprovider
+
+import android.service.notification.StatusBarNotification
+import com.android.launcher3.notification.NotificationListener
+import com.saggitt.omega.util.runOnMainThread
+import com.saggitt.omega.util.runOnUiWorkerThread
+
+object NotificationsManager : NotificationListener.StatusBarNotificationsChangedListener {
+
+    private val notificationsMap = mutableMapOf<String, StatusBarNotification>()
+    private val listeners = mutableListOf<OnChangeListener>()
+
+    var notifications = emptyList<StatusBarNotification>()
+        private set
+
+    init {
+        NotificationListener.setStatusBarNotificationsChangedListener(this)
+    }
+
+    fun addListener(listener: OnChangeListener) {
+        listeners.add(listener)
+    }
+
+    fun removeListener(listener: OnChangeListener) {
+        listeners.remove(listener)
+    }
+
+    override fun onNotificationPosted(sbn: StatusBarNotification) {
+        notificationsMap[sbn.key] = sbn
+        onChange()
+    }
+
+    override fun onNotificationRemoved(sbn: StatusBarNotification) {
+        notificationsMap.remove(sbn.key)
+        onChange()
+    }
+
+    override fun onNotificationFullRefresh() {
+        runOnUiWorkerThread {
+            val tmpMap = NotificationListener.getInstanceIfConnected()
+                    ?.activeNotifications?.associateBy { it.key }
+            runOnMainThread {
+                notificationsMap.clear()
+                if (tmpMap != null) {
+                    notificationsMap.putAll(tmpMap)
+                }
+                onChange()
+            }
+        }
+    }
+
+    private fun onChange() {
+        val notifications = notificationsMap.values.toList()
+        NotificationsManager.notifications = notifications
+        listeners.forEach(OnChangeListener::onNotificationsChanged)
+    }
+
+    interface OnChangeListener {
+
+        fun onNotificationsChanged()
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/smartspace/eventprovider/NowPlayingProvider.kt b/Omega/src/com/saggitt/omega/smartspace/eventprovider/NowPlayingProvider.kt
new file mode 100644
index 0000000000..fd45cfde69
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/smartspace/eventprovider/NowPlayingProvider.kt
@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ */
+
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.smartspace.eventprovider
+
+import android.os.Handler
+import android.text.TextUtils
+import android.view.View
+import androidx.annotation.Keep
+import androidx.core.graphics.drawable.toBitmap
+import com.android.launcher3.R
+import com.android.launcher3.util.Executors.MAIN_EXECUTOR
+import com.saggitt.omega.smartspace.OmegaSmartspaceController
+import com.saggitt.omega.smartspace.OmegaSmartspaceController.CardData
+import com.saggitt.omega.smartspace.OmegaSmartspaceController.Line
+import com.saggitt.omega.util.loadSmallIcon
+
+@Keep
+class NowPlayingProvider(controller: OmegaSmartspaceController) :
+        OmegaSmartspaceController.NotificationBasedDataProvider(controller) {
+
+    private val media = MediaListener(context, this::reload, Handler(MAIN_EXECUTOR.looper))
+    private val defaultIcon = context.getDrawable(R.drawable.ic_music_note)!!.toBitmap()
+
+    init {
+        startListening()
+    }
+
+    override fun startListening() {
+        super.startListening()
+
+        media.onResume()
+    }
+
+    private fun getEventCard(): CardData? {
+        val tracking = media.tracking ?: return null
+        val title = tracking.info.title ?: return null
+
+        val sbn = tracking.sbn
+        val icon = sbn?.loadSmallIcon(context)?.toBitmap() ?: defaultIcon
+
+        val mediaInfo = tracking.info
+        val lines = mutableListOf<Line>()
+        lines.add(Line(title))
+        if (!TextUtils.isEmpty(mediaInfo.artist)) {
+            lines.add(Line(mediaInfo.artist.toString()))
+        } else if (sbn != null) {
+            lines.add(Line(getApp(sbn).toString()))
+        } else {
+            lines.add(Line(getApp(tracking.packageName)))
+        }
+        val intent = sbn?.notification?.contentIntent
+        return if (intent != null) {
+            CardData(icon, lines, intent, true)
+        } else {
+            CardData(icon, lines, View.OnClickListener {
+                media.toggle(true)
+            }, true)
+        }
+    }
+
+    private fun reload() {
+        updateData(null, getEventCard())
+    }
+
+    override fun stopListening() {
+        super.stopListening()
+        media.onPause()
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/smartspace/eventprovider/PersonalityProvider.kt b/Omega/src/com/saggitt/omega/smartspace/eventprovider/PersonalityProvider.kt
new file mode 100644
index 0000000000..98ce3152fa
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/smartspace/eventprovider/PersonalityProvider.kt
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ */
+
+package com.saggitt.omega.smartspace.eventprovider
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.os.Handler
+import android.os.Looper
+import androidx.annotation.Keep
+import com.android.launcher3.R
+import com.saggitt.omega.smartspace.OmegaSmartspaceController
+import com.saggitt.omega.util.dayOfYear
+import com.saggitt.omega.util.hourOfDay
+import java.util.*
+import kotlin.math.abs
+import kotlin.random.Random
+
+@Keep
+class PersonalityProvider(controller: OmegaSmartspaceController) :
+        OmegaSmartspaceController.DataProvider(controller) {
+    private val updateInterval = 60 * 1000
+    private val timeReceiver = object : BroadcastReceiver() {
+        override fun onReceive(context: Context?, intent: Intent) {
+            onUpdate()
+        }
+    }
+
+    var time = currentTime()
+    var randomIndex = 0
+    val isMorning get() = time.hourOfDay in 5 until 9
+    val isEvening get() = time.hourOfDay in 19 until 21
+    val isNight get() = time.hourOfDay in 22 until 24 || time.hourOfDay in 0 until 4
+    val morningGreeting get() = morningStrings[randomIndex % morningStrings.size]
+    val eveningGreeting get() = eveningStrings[randomIndex % eveningStrings.size]
+    val nightGreeting get() = nightStrings[randomIndex % nightStrings.size]
+
+    private val morningStrings = controller.context.resources.getStringArray(R.array.greetings_morning)
+    private val eveningStrings = controller.context.resources.getStringArray(R.array.greetings_evening)
+    private val nightStrings = controller.context.resources.getStringArray(R.array.greetings_night)
+
+    private val handler = Handler(Looper.getMainLooper())
+    private val onUpdateRunnable = ::onUpdate
+
+    private fun currentTime() = Calendar.getInstance()
+
+    override fun startListening() {
+        super.startListening()
+        context.registerReceiver(
+                timeReceiver,
+                IntentFilter().apply {
+                    addAction(Intent.ACTION_DATE_CHANGED)
+                    addAction(Intent.ACTION_TIME_CHANGED)
+                    addAction(Intent.ACTION_TIMEZONE_CHANGED)
+                })
+        onUpdate()
+    }
+
+    private fun onUpdate() {
+        time = currentTime()
+        randomIndex = abs(Random(time.dayOfYear).nextInt())
+        updateData(null, getEventCard())
+
+        val now = System.currentTimeMillis()
+        handler.removeCallbacks(onUpdateRunnable)
+        handler.postDelayed(onUpdateRunnable, updateInterval - now % updateInterval)
+    }
+
+    override fun stopListening() {
+        super.stopListening()
+        handler.removeCallbacks(onUpdateRunnable)
+    }
+
+    private fun getEventCard(): OmegaSmartspaceController.CardData? {
+        val lines = mutableListOf<OmegaSmartspaceController.Line>()
+        when {
+            isMorning -> lines.add(OmegaSmartspaceController.Line(morningGreeting))
+            isEvening -> lines.add(OmegaSmartspaceController.Line(eveningGreeting))
+            isNight -> lines.add(OmegaSmartspaceController.Line(nightGreeting))
+            else -> return null
+        }
+        return OmegaSmartspaceController.CardData(
+                lines = lines,
+                forceSingleLine = true)
+    }
+}
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/smartspace/eventprovider/ZenModeListener.kt b/Omega/src/com/saggitt/omega/smartspace/eventprovider/ZenModeListener.kt
new file mode 100644
index 0000000000..c552a715be
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/smartspace/eventprovider/ZenModeListener.kt
@@ -0,0 +1,49 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.smartspace.eventprovider
+
+import android.content.ContentResolver
+import android.database.ContentObserver
+import android.os.Handler
+import android.provider.Settings
+
+class ZenModeListener(
+        private val contentResolver: ContentResolver,
+        private val listener: (Boolean) -> Unit) : ContentObserver(Handler()) {
+
+    fun startListening() {
+        contentResolver.registerContentObserver(Settings.Global.getUriFor(ZEN_MODE), false, this)
+        onChange(false)
+    }
+
+    fun stopListening() {
+        contentResolver.unregisterContentObserver(this)
+    }
+
+    override fun onChange(selfChange: Boolean) {
+        try {
+            listener(Settings.Global.getInt(contentResolver, ZEN_MODE) != 0)
+        } catch (ignored: Settings.SettingNotFoundException) {
+            listener(false)
+        }
+    }
+
+    companion object {
+        private const val ZEN_MODE = "zen_mode"
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/smartspace/weather/FakeDataProvider.kt b/Omega/src/com/saggitt/omega/smartspace/weather/FakeDataProvider.kt
new file mode 100644
index 0000000000..ff56828819
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/smartspace/weather/FakeDataProvider.kt
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ */
+
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.smartspace.weather
+
+import android.text.TextUtils
+import androidx.annotation.Keep
+import com.saggitt.omega.smartspace.OmegaSmartspaceController
+import com.saggitt.omega.smartspace.weather.icons.WeatherIconProvider
+import com.saggitt.omega.util.Temperature
+
+@Keep
+class FakeDataProvider(controller: OmegaSmartspaceController) : OmegaSmartspaceController.DataProvider(controller) {
+
+    private val iconProvider = WeatherIconProvider(controller.context)
+    private val weather = OmegaSmartspaceController.WeatherData(iconProvider.getIcon("-1"),
+            Temperature(0, Temperature.Unit.Celsius), "")
+    private val card = OmegaSmartspaceController.CardData(iconProvider.getIcon("-1"),
+            "Title", TextUtils.TruncateAt.END, "Subtitle", TextUtils.TruncateAt.END)
+
+    init {
+        updateData(weather, card)
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/smartspace/weather/OnePlusWeatherDataProvider.kt b/Omega/src/com/saggitt/omega/smartspace/weather/OnePlusWeatherDataProvider.kt
new file mode 100644
index 0000000000..a3dcd9bd43
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/smartspace/weather/OnePlusWeatherDataProvider.kt
@@ -0,0 +1,160 @@
+/*
+ * Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ */
+
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.saggitt.omega.smartspace.weather
+
+import android.Manifest
+import android.content.Context
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.graphics.Bitmap
+import android.location.Criteria
+import android.location.LocationManager
+import androidx.annotation.Keep
+import androidx.core.app.ActivityCompat
+import com.android.launcher3.R
+import com.android.launcher3.util.PackageManagerHelper
+import com.saggitt.omega.perms.CustomPermissionManager
+import com.saggitt.omega.smartspace.OmegaSmartspaceController
+import com.saggitt.omega.smartspace.weather.icons.WeatherIconManager
+import com.saggitt.omega.twilight.TwilightManager
+import com.saggitt.omega.util.*
+import net.oneplus.launcher.OPWeatherProvider
+import java.util.*
+import java.util.Calendar.HOUR_OF_DAY
+import java.util.concurrent.TimeUnit
+
+@Keep
+class OnePlusWeatherDataProvider(controller: OmegaSmartspaceController) :
+        OmegaSmartspaceController.DataProvider(controller), OPWeatherProvider.IWeatherCallback {
+
+    private val provider by lazy { OPWeatherProvider(context) }
+    private val locationAccess by lazy { context.checkLocationAccess() }
+    private val locationManager: LocationManager? by lazy {
+        if (locationAccess) {
+            context.getSystemService(Context.LOCATION_SERVICE) as LocationManager?
+        } else null
+    }
+    private val ipLocation = IPLocation(context)
+
+    init {
+        if (!OnePlusWeatherDataProvider.isAvailable(context)) {
+            throw RuntimeException("OP provider is not available")
+        }
+    }
+
+    override fun startListening() {
+        provider.registerContentObserver(context.contentResolver)
+        provider.subscribeCallback(this)
+        super.startListening()
+    }
+
+    override fun forceUpdate() {
+        super.forceUpdate()
+        provider.getCurrentWeatherInformation(this)
+    }
+
+    override fun onWeatherUpdated(weatherData: OPWeatherProvider.WeatherData) {
+        if (locationAccess) {
+            update(weatherData)
+        } else {
+            CustomPermissionManager.getInstance(context).checkOrRequestPermission(CustomPermissionManager.PERMISSION_IPLOCATE, R.string.permission_iplocate_twilight_explanation) {
+                // update regardless of the result
+                update(weatherData)
+            }
+        }
+    }
+
+    private fun update(weatherData: OPWeatherProvider.WeatherData) {
+        runOnUiWorkerThread {
+            val weather = OmegaSmartspaceController.WeatherData(
+                    getConditionIcon(weatherData),
+                    Temperature(weatherData.temperature, getTemperatureUnit(weatherData)),
+                    forecastIntent = Intent().setClassName(OPWeatherProvider.WEATHER_PACKAGE_NAME, OPWeatherProvider.WEATHER_LAUNCH_ACTIVITY)
+            )
+            runOnMainThread { updateData(weather, null) }
+        }
+    }
+
+    private fun getConditionIcon(data: OPWeatherProvider.WeatherData): Bitmap {
+        // let's never again forget that unix timestamps is seconds, not millis
+        val c = Calendar.getInstance().apply { timeInMillis = TimeUnit.SECONDS.toMillis(data.timestamp) }
+        var isDay = c.get(HOUR_OF_DAY) in 6 until 20
+        if (locationAccess) {
+            locationManager?.getBestProvider(Criteria(), true)?.let { provider ->
+                if (ActivityCompat.checkSelfPermission(context, Manifest.permission.ACCESS_FINE_LOCATION)
+                        != PackageManager.PERMISSION_GRANTED
+                        && ActivityCompat.checkSelfPermission(context, Manifest.permission.ACCESS_COARSE_LOCATION)
+                        != PackageManager.PERMISSION_GRANTED) {
+                    // TODO: Consider calling
+                    //    ActivityCompat#requestPermissions
+                    // here to request the missing permissions, and then overriding
+                    //   public void onRequestPermissionsResult(int requestCode, String[] permissions,
+                    //                                          int[] grantResults)
+                    // to handle the case where the user grants the permission. See the documentation
+                    // for ActivityCompat#requestPermissions for more details.
+                    //return
+                }
+                locationManager?.getLastKnownLocation(provider)?.let { location ->
+                    isDay = TwilightManager.calculateTwilightState(location.latitude, location.longitude, c.timeInMillis)?.isNight != true
+                }
+            }
+        } else {
+            val res = ipLocation.get()
+            if (res.success) {
+                isDay = TwilightManager.calculateTwilightState(res.lat, res.lon, c.timeInMillis)?.isNight != true
+            }
+        }
+
+        return WeatherIconManager.getInstance(context).getIcon(data.icon, !isDay)
+    }
+
+    private fun getTemperatureUnit(data: OPWeatherProvider.WeatherData): Temperature.Unit {
+        return if (data.temperatureUnit == OPWeatherProvider.TEMP_UNIT_FAHRENHEIT) {
+            Temperature.Unit.Fahrenheit
+        } else Temperature.Unit.Celsius
+    }
+
+
+    override fun stopListening() {
+        super.stopListening()
+        provider.unregisterContentObserver(context.contentResolver)
+        provider.unsubscribeCallback(this)
+    }
+
+    companion object {
+
+        fun isAvailable(context: Context): Boolean {
+            return PackageManagerHelper.isAppEnabled(context.packageManager, OPWeatherProvider.WEATHER_PACKAGE_NAME, 0)
+        }
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/smartspace/weather/PEWeatherDataProvider.kt b/Omega/src/com/saggitt/omega/smartspace/weather/PEWeatherDataProvider.kt
new file mode 100644
index 0000000000..9eff693c6b
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/smartspace/weather/PEWeatherDataProvider.kt
@@ -0,0 +1,121 @@
+/*
+ * Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ */
+
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.smartspace.weather
+
+import android.content.Context
+import android.content.pm.PackageManager
+import android.graphics.Bitmap
+import android.net.Uri
+import androidx.annotation.Keep
+import androidx.core.content.ContextCompat
+import com.android.launcher3.Utilities
+import com.saggitt.omega.smartspace.OmegaSmartspaceController
+import com.saggitt.omega.util.Temperature
+
+@Keep
+class PEWeatherDataProvider(controller: OmegaSmartspaceController) :
+        OmegaSmartspaceController.PeriodicDataProvider(controller) {
+
+    private val contentResolver = context.contentResolver
+
+    init {
+        if (!isAvailable(context)) {
+            throw RuntimeException("PE provider is not available")
+        }
+    }
+
+    override fun queryWeatherData(): OmegaSmartspaceController.WeatherData? {
+        contentResolver.query(weatherUri, PROJECTION_DEFAULT_WEATHER, null, null, null)?.use { cursor ->
+            val count = cursor.count
+            if (count > 0) {
+                cursor.moveToPosition(0)
+                val status = cursor.getInt(0)
+                if (status == 0) {
+                    val conditions = cursor.getString(1)
+                    val temperature = cursor.getInt(2)
+                    return OmegaSmartspaceController.WeatherData(getConditionIcon(conditions),
+                            Temperature(temperature, Temperature.Unit.Celsius), "")
+                }
+            }
+        }
+        return null
+    }
+
+    private fun getConditionIcon(condition: String): Bitmap {
+        val resName = when (condition) {
+            "partly-cloudy" -> "weather_partly_cloudy"
+            "partly-cloudy-night" -> "weather_partly_cloudy_night"
+            "mostly-cloudy" -> "weather_mostly_cloudy"
+            "mostly-cloudy-night" -> "weather_mostly_cloudy_night"
+            "cloudy" -> "weather_cloudy"
+            "clear-night" -> "weather_clear_night"
+            "mostly-clear-night" -> "weather_mostly_clear_night"
+            "sunny" -> "weather_sunny"
+            "mostly-sunny" -> "weather_mostly_sunny"
+            "scattered-showers" -> "weather_scattered_showers"
+            "scattered-showers-night" -> "weather_scattered_showers_night"
+            "rain" -> "weather_rain"
+            "windy" -> "weather_windy"
+            "snow" -> "weather_snow"
+            "scattered-thunderstorms" -> "weather_isolated_scattered_thunderstorms"
+            "scattered-thunderstorms-night" -> "weather_isolated_scattered_thunderstorms_night"
+            "isolated-thunderstorms" -> "weather_isolated_scattered_thunderstorms"
+            "isolated-thunderstorms-night" -> "weather_isolated_scattered_thunderstorms_night"
+            "thunderstorms" -> "weather_thunderstorms"
+            "foggy" -> "weather_foggy"
+            else -> null
+        }
+        val res = context.resources
+        val resId = res.getIdentifier(resName, "drawable", "android")
+        return Utilities.drawableToBitmap(context.resources.getDrawable(resId))!!
+    }
+
+    companion object {
+
+        private const val authority = "org.pixelexperience.weather.client.provider"
+        private val weatherUri = Uri.parse("content://$authority/weather")!!
+
+        private const val statusColumn = "status"
+        private const val conditionsColumn = "conditions"
+        private const val metricTemperatureColumn = "temperatureMetric"
+        private const val imperialTemperatureColumn = "temperatureImperial"
+        private val PROJECTION_DEFAULT_WEATHER = arrayOf(statusColumn, conditionsColumn, metricTemperatureColumn, imperialTemperatureColumn)
+
+        fun isAvailable(context: Context): Boolean {
+            val providerInfo = context.packageManager.resolveContentProvider(authority, 0)
+                    ?: return false
+            return ContextCompat.checkSelfPermission(context, providerInfo.readPermission) == PackageManager.PERMISSION_GRANTED
+        }
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/smartspace/weather/SmartspacePixelBridge.kt b/Omega/src/com/saggitt/omega/smartspace/weather/SmartspacePixelBridge.kt
new file mode 100644
index 0000000000..4599469cba
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/smartspace/weather/SmartspacePixelBridge.kt
@@ -0,0 +1,86 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.smartspace.weather
+
+import android.os.Handler
+import android.util.Log
+import com.saggitt.omega.smartspace.*
+
+class SmartspacePixelBridge(controller: OmegaSmartspaceController) :
+        OmegaSmartspaceController.DataProvider(controller), ISmartspace, Runnable {
+
+    private val smartspaceController = SmartspaceController.get(controller.context)
+    private val handler = Handler()
+    private var data: SmartspaceDataContainer? = null
+    private var ds = false
+
+    override fun startListening() {
+        super.startListening()
+
+        updateData(null, null)
+        smartspaceController.da(this)
+    }
+
+    override fun stopListening() {
+        super.stopListening()
+        smartspaceController.da(null)
+    }
+
+    override fun onGsaChanged() {
+        ds = smartspaceController.cY()
+        if (data != null) {
+            postUpdate(data)
+        } else {
+            Log.d("SmartspacePixelBridge", "onGsaChanged but no data present")
+        }
+    }
+
+    override fun postUpdate(data: SmartspaceDataContainer?) {
+        this.data = data?.also { initListeners(it) }
+    }
+
+    private fun initListeners(e: SmartspaceDataContainer) {
+        val weatherData: OmegaSmartspaceController.WeatherData? = if (e.isWeatherAvailable) {
+            SmartspaceDataWidget.parseWeatherData(e.dO.icon, e.dO.title)
+        } else {
+            null
+        }
+        val cardData: OmegaSmartspaceController.CardData? = if (e.isDataAvailable) {
+            val dp = e.dP
+            OmegaSmartspaceController.CardData(dp.icon, dp.title, dp.cx(true), dp.cy(), dp.cx(false))
+        } else {
+            null
+        }
+
+        handler.removeCallbacks(this)
+        if (e.isDataAvailable && e.dP.cv()) {
+            val cw = e.dP.cw()
+            var min = 61000L - System.currentTimeMillis() % 60000L
+            if (cw > 0L) {
+                min = Math.min(min, cw)
+            }
+            handler.postDelayed(this, min)
+        }
+
+        updateData(weatherData, cardData)
+    }
+
+    override fun run() {
+        data?.let { initListeners(it) }
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/smartspace/weather/icons/DefaultIconProvider.kt b/Omega/src/com/saggitt/omega/smartspace/weather/icons/DefaultIconProvider.kt
new file mode 100644
index 0000000000..8454f7d537
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/smartspace/weather/icons/DefaultIconProvider.kt
@@ -0,0 +1,96 @@
+/*
+ *     Copyright (C) 2019 Lawnchair Team.
+ *
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.smartspace.weather.icons
+
+import android.content.Context
+import android.graphics.Bitmap
+import androidx.core.graphics.drawable.toBitmap
+import com.android.launcher3.R
+
+class DefaultIconProvider(private val context: Context) : WeatherIconManager.IconProvider {
+    override fun getIcon(which: WeatherIconManager.Icon, night: Boolean): Bitmap {
+        return context.resources.getDrawable((if (night) NIGHT_MAP[which] else DAY_MAP[which])
+                ?: NA).toBitmap()!!
+    }
+
+    companion object {
+        private const val NA = R.drawable.weather_none_available
+        private val DAY_MAP = mapOf<WeatherIconManager.Icon, Int>(
+                WeatherIconManager.Icon.NA to R.drawable.weather_none_available,
+                WeatherIconManager.Icon.DUST to R.drawable.weather_50,
+                WeatherIconManager.Icon.SNOWSTORM to R.drawable.weather_13,
+                WeatherIconManager.Icon.HAIL to R.drawable.weather_10,
+                WeatherIconManager.Icon.CLEAR to R.drawable.weather_01,
+                WeatherIconManager.Icon.MOSTLY_CLEAR to R.drawable.weather_02,
+                WeatherIconManager.Icon.PARTLY_CLOUDY to R.drawable.weather_02,
+                WeatherIconManager.Icon.INTERMITTENT_CLOUDS to R.drawable.weather_03,
+                WeatherIconManager.Icon.HAZY to R.drawable.weather_50,
+                WeatherIconManager.Icon.MOSTLY_CLOUDY to R.drawable.weather_04,
+                WeatherIconManager.Icon.SHOWERS to R.drawable.weather_10,
+                WeatherIconManager.Icon.PARTLY_CLOUDY_W_SHOWERS to R.drawable.weather_10,
+                WeatherIconManager.Icon.MOSTLY_CLOUDY_W_SHOWERS to R.drawable.weather_09,
+                WeatherIconManager.Icon.PARTLY_CLOUDY_W_THUNDERSTORMS to R.drawable.weather_11,
+                WeatherIconManager.Icon.MOSTLY_CLOUDY_W_THUNDERSTORMS to R.drawable.weather_11,
+                WeatherIconManager.Icon.THUNDERSTORMS to R.drawable.weather_11,
+                WeatherIconManager.Icon.FLURRIES to R.drawable.weather_13,
+                WeatherIconManager.Icon.SNOW to R.drawable.weather_13,
+                WeatherIconManager.Icon.ICE to R.drawable.weather_13,
+                WeatherIconManager.Icon.RAIN_AND_SNOW to R.drawable.weather_13,
+                WeatherIconManager.Icon.FREEZING_RAIN to R.drawable.weather_10,
+                WeatherIconManager.Icon.SLEET to R.drawable.weather_13,
+                WeatherIconManager.Icon.MOSTLY_CLOUDY_W_SNOW to R.drawable.weather_13,
+                WeatherIconManager.Icon.PARTLY_CLOUDY_W_FLURRIES to R.drawable.weather_13,
+                WeatherIconManager.Icon.MOSTLY_CLOUDY_W_FLURRIES to R.drawable.weather_13,
+                WeatherIconManager.Icon.RAIN to R.drawable.weather_09,
+                WeatherIconManager.Icon.FOG to R.drawable.weather_50,
+                WeatherIconManager.Icon.OVERCAST to R.drawable.weather_04,
+                WeatherIconManager.Icon.CLOUDY to R.drawable.weather_04)
+        private val NIGHT_MAP = mapOf<WeatherIconManager.Icon, Int>(
+                WeatherIconManager.Icon.NA to R.drawable.weather_none_available,
+                WeatherIconManager.Icon.DUST to R.drawable.weather_50,
+                WeatherIconManager.Icon.SNOWSTORM to R.drawable.weather_13,
+                WeatherIconManager.Icon.HAIL to R.drawable.weather_10n,
+                WeatherIconManager.Icon.CLEAR to R.drawable.weather_01n,
+                WeatherIconManager.Icon.MOSTLY_CLEAR to R.drawable.weather_02n,
+                WeatherIconManager.Icon.PARTLY_CLOUDY to R.drawable.weather_02n,
+                WeatherIconManager.Icon.INTERMITTENT_CLOUDS to R.drawable.weather_03n,
+                WeatherIconManager.Icon.HAZY to R.drawable.weather_50,
+                WeatherIconManager.Icon.MOSTLY_CLOUDY to R.drawable.weather_04n,
+                WeatherIconManager.Icon.SHOWERS to R.drawable.weather_10n,
+                WeatherIconManager.Icon.PARTLY_CLOUDY_W_SHOWERS to R.drawable.weather_10n,
+                WeatherIconManager.Icon.MOSTLY_CLOUDY_W_SHOWERS to R.drawable.weather_09,
+                WeatherIconManager.Icon.PARTLY_CLOUDY_W_THUNDERSTORMS to R.drawable.weather_11,
+                WeatherIconManager.Icon.MOSTLY_CLOUDY_W_THUNDERSTORMS to R.drawable.weather_11,
+                WeatherIconManager.Icon.THUNDERSTORMS to R.drawable.weather_11,
+                WeatherIconManager.Icon.FLURRIES to R.drawable.weather_13,
+                WeatherIconManager.Icon.SNOW to R.drawable.weather_13,
+                WeatherIconManager.Icon.ICE to R.drawable.weather_13,
+                WeatherIconManager.Icon.RAIN_AND_SNOW to R.drawable.weather_13,
+                WeatherIconManager.Icon.FREEZING_RAIN to R.drawable.weather_10n,
+                WeatherIconManager.Icon.SLEET to R.drawable.weather_13,
+                WeatherIconManager.Icon.MOSTLY_CLOUDY_W_SNOW to R.drawable.weather_13,
+                WeatherIconManager.Icon.PARTLY_CLOUDY_W_FLURRIES to R.drawable.weather_13,
+                WeatherIconManager.Icon.MOSTLY_CLOUDY_W_FLURRIES to R.drawable.weather_13,
+                WeatherIconManager.Icon.RAIN to R.drawable.weather_09,
+                WeatherIconManager.Icon.FOG to R.drawable.weather_50,
+                WeatherIconManager.Icon.OVERCAST to R.drawable.weather_04n,
+                WeatherIconManager.Icon.CLOUDY to R.drawable.weather_04n)
+    }
+}
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/smartspace/weather/icons/WeatherIconManager.kt b/Omega/src/com/saggitt/omega/smartspace/weather/icons/WeatherIconManager.kt
new file mode 100644
index 0000000000..b7774353eb
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/smartspace/weather/icons/WeatherIconManager.kt
@@ -0,0 +1,141 @@
+/*
+ *     Copyright (C) 2019 Lawnchair Team.
+ *
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.smartspace.weather.icons
+
+import android.content.Context
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.graphics.Bitmap
+import com.android.launcher3.R
+import com.saggitt.omega.util.OmegaSingletonHolder
+import com.saggitt.omega.util.omegaPrefs
+
+class WeatherIconManager(private val context: Context) {
+    private val pm = context.packageManager
+    private val prefs = context.omegaPrefs
+
+    private val defaultPack =
+            object : WeatherIconPack(context, context.getString(R.string.weather_icons_default), "",
+                    RecoloringMode.NEVER) {
+                override val provider = DefaultIconProvider(context)
+                override val icon = context.getDrawable(R.drawable.weather_04)!!
+            }
+
+    fun getIconPacks(): List<WeatherIconPack> = mutableListOf<WeatherIconPack>(defaultPack).apply {
+        pm.queryIntentActivities(
+                Intent(Intent.ACTION_MAIN).addCategory(
+                        INTENT_CATEGORY), PackageManager.GET_META_DATA).map {
+            val recoloringMode =
+                    it.activityInfo.metaData?.getString(METADATA_KEY)?.let {
+                        RecoloringMode.fromName(it)
+                    } ?: RecoloringMode.NEVER
+            WeatherIconPack(
+                    context,
+                    it.loadLabel(pm).toString(),
+                    it.activityInfo.packageName,
+                    recoloringMode)
+        }.let { addAll(it) }
+    }
+
+    fun getIcon(which: Icon, night: Boolean) = getProvider().getIcon(which, night)
+
+    fun getPack(): WeatherIconPack = getIconPacks().firstOrNull { it.pkgName == prefs.weatherIconPack }
+            ?: defaultPack
+
+    fun getProvider(): IconProvider = if (prefs.weatherIconPack == "")
+        DefaultIconProvider(context)
+    else
+        getIconPacks().firstOrNull { it.pkgName == prefs.weatherIconPack }?.provider
+                ?: DefaultIconProvider(context)
+
+
+    companion object : OmegaSingletonHolder<WeatherIconManager>(::WeatherIconManager) {
+        const val INTENT_CATEGORY = "com.dvtonder.chronus.ICON_PACK"
+        const val METADATA_KEY = "recoloringMode"
+    }
+
+    enum class Icon {
+        NA,
+        TORNADO,
+        DUST,
+        HURRICANE,
+        SANDSTORM,
+        SNOWSTORM,
+        HAIL,
+        WINDY,
+        CLEAR,
+        MOSTLY_CLEAR,
+        PARTLY_CLOUDY,
+        INTERMITTENT_CLOUDS,
+        HAZY,
+        MOSTLY_CLOUDY,
+        SHOWERS,
+        PARTLY_CLOUDY_W_SHOWERS,
+        MOSTLY_CLOUDY_W_SHOWERS,
+        PARTLY_CLOUDY_W_THUNDERSTORMS,
+        MOSTLY_CLOUDY_W_THUNDERSTORMS,
+        THUNDERSTORMS,
+        FLURRIES,
+        SNOW,
+        ICE,
+        RAIN_AND_SNOW,
+        FREEZING_RAIN,
+        SLEET,
+        MOSTLY_CLOUDY_W_SNOW,
+        PARTLY_CLOUDY_W_FLURRIES,
+        MOSTLY_CLOUDY_W_FLURRIES,
+        RAIN,
+        FOG,
+        OVERCAST,
+        CLOUDY
+    }
+
+    enum class RecoloringMode {
+        ALWAYS("always"),
+        IF_NEEDED("ifNeeded"),
+        NEVER("never");
+
+        val metaName: String
+
+        constructor(name: String) {
+            metaName = name
+        }
+
+        companion object {
+            fun fromName(name: String) = when (name) {
+                ALWAYS.metaName -> ALWAYS
+                IF_NEEDED.metaName -> IF_NEEDED
+                NEVER.metaName -> NEVER
+                else -> throw RuntimeException()
+            }
+        }
+
+    }
+
+    open class WeatherIconPack(val context: Context, val name: String, val pkgName: String,
+                               val recoloringMode: RecoloringMode) {
+        open val provider: IconProvider by lazy { WeatherIconPackProviderImpl(context, pkgName, this) }
+        open val icon by lazy { context.packageManager.getApplicationIcon(pkgName) }
+    }
+
+    interface IconProvider {
+        fun getIcon(which: Icon, night: Boolean = false): Bitmap
+    }
+}
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/smartspace/weather/icons/WeatherIconPackProviderImpl.kt b/Omega/src/com/saggitt/omega/smartspace/weather/icons/WeatherIconPackProviderImpl.kt
new file mode 100644
index 0000000000..54ca99b83f
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/smartspace/weather/icons/WeatherIconPackProviderImpl.kt
@@ -0,0 +1,89 @@
+/*
+ *     Copyright (C) 2019 Lawnchair Team.
+ *
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.smartspace.weather.icons
+
+import android.content.Context
+import android.graphics.Bitmap
+import androidx.core.graphics.drawable.toBitmap
+import com.android.launcher3.R
+import com.saggitt.omega.util.getColorAccent
+
+// See: https://github.com/DvTonder/Sample_icon_set
+class WeatherIconPackProviderImpl(private val context: Context, private val pkgName: String, private val pack: WeatherIconManager.WeatherIconPack) : WeatherIconManager.IconProvider {
+    private val res = context.packageManager.getResourcesForApplication(pkgName)
+    private val tintColor get() = context.getColorAccent()
+
+    override fun getIcon(which: WeatherIconManager.Icon, night: Boolean): Bitmap {
+        val resId = res.getIdentifier(getResName(which, night), "drawable", pkgName)
+        return (if (resId > 0) res.getDrawable(resId) else context.getDrawable(R.drawable.weather_none_available)).apply {
+            if (pack.recoloringMode == WeatherIconManager.RecoloringMode.ALWAYS) {
+                this!!.setTint(tintColor)
+            }
+        }?.toBitmap()!!
+    }
+
+    companion object {
+        const val NA = "na"
+        const val PREFIX = "weather_"
+        val MAP = mapOf(
+                WeatherIconManager.Icon.NA to entry(NA),
+                WeatherIconManager.Icon.TORNADO to entry("0"),
+                WeatherIconManager.Icon.HURRICANE to entry("2"),
+                WeatherIconManager.Icon.WINDY to entry("24"),
+                WeatherIconManager.Icon.DUST to entry("19"),
+                WeatherIconManager.Icon.SNOWSTORM to entry("43"),
+                WeatherIconManager.Icon.HAIL to entry("17"),
+                WeatherIconManager.Icon.CLEAR to entry("32", "31"),
+                WeatherIconManager.Icon.MOSTLY_CLEAR to entry("34", "33"),
+                WeatherIconManager.Icon.PARTLY_CLOUDY to entry("30", "29"),
+                WeatherIconManager.Icon.INTERMITTENT_CLOUDS to entry("28", "27"),
+                WeatherIconManager.Icon.HAZY to entry("21"),
+                WeatherIconManager.Icon.MOSTLY_CLOUDY to entry("28", "27"),
+                WeatherIconManager.Icon.SHOWERS to entry("11"),
+                WeatherIconManager.Icon.PARTLY_CLOUDY_W_SHOWERS to entry("12"),
+                WeatherIconManager.Icon.MOSTLY_CLOUDY_W_SHOWERS to entry("12"),
+                WeatherIconManager.Icon.PARTLY_CLOUDY_W_THUNDERSTORMS to entry("37", "47"),
+                WeatherIconManager.Icon.MOSTLY_CLOUDY_W_THUNDERSTORMS to entry("39", "38"),
+                WeatherIconManager.Icon.THUNDERSTORMS to entry("4", "45"),
+                WeatherIconManager.Icon.FLURRIES to entry("13"),
+                WeatherIconManager.Icon.SNOW to entry("16"),
+                WeatherIconManager.Icon.ICE to entry("25"),
+                WeatherIconManager.Icon.RAIN_AND_SNOW to entry("5"),
+                WeatherIconManager.Icon.FREEZING_RAIN to entry("10"),
+                WeatherIconManager.Icon.SLEET to entry("18"),
+                // TODO: improve these few mappings
+                WeatherIconManager.Icon.MOSTLY_CLOUDY_W_SNOW to entry("16"),
+                WeatherIconManager.Icon.PARTLY_CLOUDY_W_FLURRIES to entry("16"),
+                WeatherIconManager.Icon.MOSTLY_CLOUDY_W_FLURRIES to entry("16"),
+                WeatherIconManager.Icon.RAIN to entry("12"),
+                WeatherIconManager.Icon.FOG to entry("20"),
+                WeatherIconManager.Icon.OVERCAST to entry("26"),
+                WeatherIconManager.Icon.CLOUDY to entry("26"))
+
+        private inline fun entry(day: String, night: String? = null) = IconMapEntry(day, night)
+
+        fun getResName(icon: WeatherIconManager.Icon, night: Boolean) = PREFIX + (MAP[icon]?.getEntry(night)
+                ?: NA)
+    }
+
+    data class IconMapEntry(private val day: String, private val night: String? = null) {
+        fun getEntry(night: Boolean) = if (night && this.night != null) this.night else day
+    }
+}
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/smartspace/weather/icons/WeatherIconProvider.kt b/Omega/src/com/saggitt/omega/smartspace/weather/icons/WeatherIconProvider.kt
new file mode 100644
index 0000000000..e656d2fa0b
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/smartspace/weather/icons/WeatherIconProvider.kt
@@ -0,0 +1,72 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.smartspace.weather.icons
+
+import android.content.Context
+import android.graphics.Bitmap
+import android.graphics.BitmapFactory
+import android.util.Log
+import com.android.launcher3.R
+
+class WeatherIconProvider(private val context: Context) {
+
+    fun getIcon(iconID: String?): Bitmap {
+        var resID = iconID
+        if (!ID_MAP.containsKey(resID)) {
+            Log.e("WeatherIconProvider", "No weather icon exists for condition: $resID")
+            resID = CONDITION_UNKNOWN
+        }
+
+        return BitmapFactory.decodeResource(context.resources, ID_MAP[resID]!!)
+    }
+
+    companion object {
+        const val CONDITION_UNKNOWN = "-1"
+        const val CONDITION_CLEAR = "01"
+        const val CONDITION_FEW_CLOUDS = "02"
+        const val CONDITION_CLOUDS = "03"
+        const val CONDITION_MOST_CLOUDS = "04"
+        const val CONDITION_SHOWERS = "09"
+        const val CONDITION_RAIN = "10"
+        const val CONDITION_STORM = "11"
+        const val CONDITION_SNOW = "13"
+        const val CONDITION_MIST = "50"
+
+        private val ID_MAP = mapOf(
+                "${CONDITION_CLEAR}d" to R.drawable.weather_01,
+                "${CONDITION_CLEAR}n" to R.drawable.weather_01n,
+                "${CONDITION_FEW_CLOUDS}d" to R.drawable.weather_02,
+                "${CONDITION_FEW_CLOUDS}n" to R.drawable.weather_02n,
+                "${CONDITION_CLOUDS}d" to R.drawable.weather_03,
+                "${CONDITION_CLOUDS}n" to R.drawable.weather_03n,
+                "${CONDITION_MOST_CLOUDS}d" to R.drawable.weather_04,
+                "${CONDITION_MOST_CLOUDS}n" to R.drawable.weather_04n,
+                "${CONDITION_SHOWERS}d" to R.drawable.weather_09,
+                "${CONDITION_SHOWERS}n" to R.drawable.weather_09,
+                "${CONDITION_RAIN}d" to R.drawable.weather_10,
+                "${CONDITION_RAIN}n" to R.drawable.weather_10n,
+                "${CONDITION_STORM}d" to R.drawable.weather_11,
+                "${CONDITION_STORM}n" to R.drawable.weather_11,
+                "${CONDITION_SNOW}d" to R.drawable.weather_13,
+                "${CONDITION_SNOW}n" to R.drawable.weather_13,
+                "${CONDITION_MIST}d" to R.drawable.weather_50,
+                "${CONDITION_MIST}n" to R.drawable.weather_50,
+                CONDITION_UNKNOWN to R.drawable.weather_none_available
+        )
+    }
+}
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/states/HomeState.kt b/Omega/src/com/saggitt/omega/states/HomeState.kt
new file mode 100644
index 0000000000..83e90be86d
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/states/HomeState.kt
@@ -0,0 +1,59 @@
+/*
+ *  Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ *
+ */
+
+package com.saggitt.omega.states
+
+import android.content.Context
+import com.android.launcher3.Launcher
+import com.android.launcher3.LauncherState
+import com.android.launcher3.R
+import com.android.launcher3.Utilities
+import com.saggitt.omega.util.SingletonHolder
+import com.saggitt.omega.util.omegaPrefs
+
+open class HomeState(id: Int, containerType: Int, transitionDuration: Int, flags: Int) :
+        LauncherState(id, containerType, transitionDuration, flags) {
+
+    override fun getScrimProgress(launcher: Launcher): Float {
+        if (!launcher.omegaPrefs.dockGradientStyle) {
+            return getNormalProgress(launcher)
+        }
+        return super.getScrimProgress(launcher)
+    }
+
+    companion object {
+
+        private val shelfOffset = SingletonHolder<Int, Context> { it.resources.getDimensionPixelSize(R.dimen.shelf_surface_offset) }
+
+        fun getNormalProgress(launcher: Launcher): Float {
+            return 1 - (getScrimHeight(launcher) / launcher.allAppsController.shiftRange)
+        }
+
+        private fun getScrimHeight(launcher: Launcher): Float {
+            val dp = launcher.deviceProfile
+            val prefs = Utilities.getOmegaPrefs(launcher)
+
+            return if (prefs.dockHide) {
+                dp.allAppsCellHeightPx - dp.allAppsIconTextSizePx
+            } else {
+                val rangeDelta = dp.heightPx - launcher.allAppsController.shiftRange
+                val lp = launcher.hotseat.layoutParams
+                -rangeDelta + lp.height + dp.insets.top - shelfOffset.getInstance(launcher)
+            }
+        }
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/states/OptionsState.kt b/Omega/src/com/saggitt/omega/states/OptionsState.kt
new file mode 100644
index 0000000000..bb0aa170c2
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/states/OptionsState.kt
@@ -0,0 +1,83 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.saggitt.omega.states
+
+import com.android.launcher3.Launcher
+import com.android.launcher3.LauncherAnimUtils.SPRING_LOADED_TRANSITION_MS
+import com.android.launcher3.LauncherState
+import com.android.launcher3.states.RotationHelper
+import com.android.launcher3.userevent.nano.LauncherLogProto
+import com.saggitt.omega.OmegaLauncher
+
+class OptionsState(id: Int) : LauncherState(id, LauncherLogProto.ContainerType.OVERVIEW,
+        SPRING_LOADED_TRANSITION_MS, STATE_FLAGS) {
+
+    override fun getWorkspaceScaleAndTranslation(launcher: Launcher): ScaleAndTranslation {
+        val grid = launcher.deviceProfile
+        val ws = launcher.workspace
+
+        if (grid.isVerticalBarLayout) {
+            val scale = grid.workspaceOptionsShrinkFactor
+            val optionsView = OmegaLauncher.getLauncher(launcher).optionsView
+
+            val wsHeightWithoutInsets = ws.height - grid.insets.top - grid.insets.bottom
+            val desiredCenter = wsHeightWithoutInsets * 0.5f * scale
+            val actualCenter = wsHeightWithoutInsets * 0.5f
+
+            val desiredBottom = grid.heightPx - optionsView.height
+            val actualBottom = ws.height * 0.5f + (ws.height * 0.5f * scale)
+
+            return ScaleAndTranslation(scale, 0f, Math.max(desiredCenter - actualCenter, desiredBottom - actualBottom))
+        }
+
+        val scale = grid.workspaceOptionsShrinkFactor
+        val insets = launcher.dragLayer.insets
+
+        val scaledHeight = scale * ws.normalChildHeight
+        val shrunkTop = (insets.top + grid.dropTargetBarSizePx).toFloat()
+        val shrunkBottom = (ws.measuredHeight - insets.bottom
+                - grid.workspacePadding.bottom
+                - grid.workspaceSpringLoadedBottomSpace).toFloat()
+        val totalShrunkSpace = shrunkBottom - shrunkTop
+
+        val desiredCellTop = shrunkTop + (totalShrunkSpace - scaledHeight) / 2
+
+        val halfHeight = (ws.height / 2).toFloat()
+        val myCenter = ws.top + halfHeight
+        val cellTopFromCenter = halfHeight - ws.getChildAt(0).top
+        val actualCellTop = myCenter - cellTopFromCenter * scale
+        return ScaleAndTranslation(scale, 0f, (desiredCellTop - actualCellTop) / scale)
+    }
+
+    override fun getWorkspaceScrimAlpha(launcher: Launcher?): Float {
+        return 0.6f
+    }
+
+    override fun getVisibleElements(launcher: Launcher): Int {
+        return OPTIONS_VIEW
+    }
+
+    override fun onStateEnabled(launcher: Launcher) {
+        super.onStateEnabled(launcher)
+        launcher.rotationHelper.setCurrentStateRequest(RotationHelper.REQUEST_LOCK)
+    }
+
+    companion object {
+        private const val STATE_FLAGS = FLAG_MULTI_PAGE or FLAG_DISABLE_RESTORE or
+                FLAG_DISABLE_PAGE_CLIPPING or FLAG_PAGE_BACKGROUNDS
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/superg/BaseGContainerView.java b/Omega/src/com/saggitt/omega/superg/BaseGContainerView.java
new file mode 100644
index 0000000000..6012fe30d5
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/superg/BaseGContainerView.java
@@ -0,0 +1,251 @@
+package com.saggitt.omega.superg;
+
+import android.animation.ArgbEvaluator;
+import android.animation.ObjectAnimator;
+import android.content.ActivityNotFoundException;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.graphics.Point;
+import android.graphics.Rect;
+import android.net.Uri;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.animation.AccelerateDecelerateInterpolator;
+import android.view.animation.Interpolator;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+
+import androidx.core.app.ActivityOptionsCompat;
+
+import com.android.launcher3.Launcher;
+import com.android.launcher3.R;
+import com.android.launcher3.Utilities;
+import com.saggitt.omega.search.SearchProvider;
+import com.saggitt.omega.search.SearchProviderController;
+import com.saggitt.omega.util.Config;
+
+public abstract class BaseGContainerView extends FrameLayout implements View.OnClickListener, SharedPreferences.OnSharedPreferenceChangeListener {
+    private static final String TEXT_ASSIST = "com.google.android.googlequicksearchbox.TEXT_ASSIST";
+
+    private final ArgbEvaluator mArgbEvaluator = new ArgbEvaluator(); //mArgbEvaluator
+    private ObjectAnimator mObjectAnimator;
+    protected View mQsbView;
+    private float mQsbButtonElevation;
+    protected QsbConnector mConnectorView;
+    private final Interpolator mADInterpolator = new AccelerateDecelerateInterpolator();
+    private ObjectAnimator mElevationAnimator; //bJ
+    protected boolean qsbHidden;
+    private int mQsbViewId = 0;
+    private boolean mWindowHasFocus;
+
+    protected abstract int getQsbView(boolean withMic);
+
+    public BaseGContainerView(Context paramContext, AttributeSet paramAttributeSet, int paramInt) {
+        super(paramContext, paramAttributeSet, paramInt);
+        Utilities.getPrefs(paramContext).registerOnSharedPreferenceChangeListener(this);
+    }
+
+    public void applyOpaPreference() {
+        int qsbViewId = getQsbView(false);
+        if (qsbViewId != mQsbViewId) {
+            mQsbViewId = qsbViewId;
+            if (mQsbView != null) {
+                removeView(mQsbView);
+            }
+            mQsbView = LayoutInflater.from(getContext()).inflate(mQsbViewId, this, false);
+            mQsbButtonElevation = (float) getResources().getDimensionPixelSize(R.dimen.qsb_button_elevation);
+            addView(mQsbView);
+            mObjectAnimator = ObjectAnimator.ofFloat(mQsbView, "elevation", 0f, mQsbButtonElevation).setDuration(200L);
+            mObjectAnimator.setInterpolator(mADInterpolator);
+            if (qsbHidden) {
+                hideQsbImmediately();
+            }
+            mQsbView.setOnClickListener(this);
+        }
+        loadIcon();
+        applyQsbColor();
+    }
+
+    protected void applyQsbColor() {
+
+    }
+
+    @Override
+    protected void onAttachedToWindow() {
+        super.onAttachedToWindow();
+        applyOpaPreference();
+        applyMinusOnePreference();
+        applyVisibility();
+    }
+
+    private void applyMinusOnePreference() { //bh
+        if (mConnectorView != null) {
+            removeView(mConnectorView);
+            mConnectorView = null;
+        }
+    }
+
+    public void onClick(View paramView) {
+        SearchProviderController controller = SearchProviderController.Companion.getInstance(getContext());
+        if (controller.isGoogle()) {
+            getContext().sendOrderedBroadcast(getPillAnimationIntent("com.google.nexuslauncher.FAST_TEXT_SEARCH"),
+                    null,
+                    new BroadcastReceiver() {
+                        @Override
+                        public void onReceive(Context context, Intent intent) {
+                            if (getResultCode() == 0) {
+                                startQsbActivity(BaseGContainerView.TEXT_ASSIST);
+                            } else {
+                                loadWindowFocus();
+                            }
+                        }
+                    },
+                    null,
+                    0,
+                    null,
+                    null);
+        } else {
+            SearchProvider provider = controller.getSearchProvider();
+            provider.startSearch(intent -> {
+                getContext().startActivity(intent, ActivityOptionsCompat.makeClipRevealAnimation(mQsbView, 0, 0, mQsbView.getWidth(), mQsbView.getWidth()).toBundle());
+                return null;
+            });
+        }
+    }
+
+    private Intent getPillAnimationIntent(String action) {
+        int[] qsbLocation = new int[2];
+        mQsbView.getLocationOnScreen(qsbLocation);
+
+        Rect rect = new Rect(qsbLocation[0],
+                qsbLocation[1],
+                qsbLocation[0] + mQsbView.getWidth(),
+                qsbLocation[1] + mQsbView.getHeight());
+
+        Intent intent = new Intent(action);
+        setGoogleAnimationStart(rect, intent);
+        intent.setSourceBounds(rect);
+        return intent.putExtra("source_round_left", true)
+                .putExtra("source_round_right", true)
+                .putExtra("source_logo_offset", midLocation(findViewById(R.id.g_icon), rect))
+                .setPackage(Config.GOOGLE_QSB)
+                .addFlags(Intent.FLAG_ACTIVITY_NO_HISTORY | Intent.FLAG_ACTIVITY_NEW_TASK);
+    }
+
+    private Point midLocation(View view, Rect rect) {
+        int[] location = new int[2];
+        view.getLocationOnScreen(location);
+        Point point = new Point();
+        point.x = (location[0] - rect.left) + (view.getWidth() / 2);
+        point.y = (location[1] - rect.top) + (view.getHeight() / 2);
+        return point;
+    }
+
+    protected void setGoogleAnimationStart(Rect rect, Intent intent) {
+    }
+
+    private void loadWindowFocus() {
+        if (hasWindowFocus()) {
+            mWindowHasFocus = true;
+        } else {
+            hideQsbImmediately();
+        }
+    }
+
+    @Override
+    public void onWindowFocusChanged(boolean newWindowHasFocus) {
+        super.onWindowFocusChanged(newWindowHasFocus);
+        if (!newWindowHasFocus && mWindowHasFocus) {
+            hideQsbImmediately();
+        } else if (newWindowHasFocus && !mWindowHasFocus) {
+            changeVisibility(true);
+        }
+    }
+
+    @Override
+    protected void onWindowVisibilityChanged(int paramInt) {
+        super.onWindowVisibilityChanged(paramInt);
+        changeVisibility(false);
+    }
+
+    private void hideQsbImmediately() { //bb
+        mWindowHasFocus = false;
+        qsbHidden = true;
+        if (mQsbView != null) {
+            mQsbView.setAlpha(0f);
+            if (mElevationAnimator != null && mElevationAnimator.isRunning()) {
+                mElevationAnimator.end();
+            }
+        }
+        if (mConnectorView != null) {
+            if (mObjectAnimator != null && mObjectAnimator.isRunning()) {
+                mObjectAnimator.end();
+            }
+            mConnectorView.setAlpha(0f);
+        }
+    }
+
+    private void changeVisibility(boolean makeVisible) { //bc
+        mWindowHasFocus = false;
+        if (qsbHidden) {
+            qsbHidden = false;
+            if (mQsbView != null) {
+                mQsbView.setAlpha(1f);
+                if (mElevationAnimator != null) {
+                    mElevationAnimator.start();
+                    if (!makeVisible) {
+                        mElevationAnimator.end();
+                    }
+                }
+            }
+            if (mConnectorView != null) {
+                mConnectorView.setAlpha(1f);
+                mConnectorView.changeVisibility(makeVisible);
+            }
+        }
+    }
+
+    private void startQsbActivity(String action) {
+        Context context = getContext();
+        try {
+            context.startActivity(new Intent(action).addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK)
+                    .setPackage(Config.GOOGLE_QSB));
+        } catch (ActivityNotFoundException ignored) {
+            try {
+                context.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://google.com")),
+                        Launcher.getLauncher(context).getActivityLaunchOptions(mQsbView).toBundle());
+            } catch (ActivityNotFoundException ignored2) {
+            }
+        }
+    }
+
+    private void applyVisibility() {
+        int visibility = View.VISIBLE;
+
+        if (mQsbView != null) {
+            mQsbView.setVisibility(visibility);
+        }
+        if (mConnectorView != null) {
+            mConnectorView.setVisibility(visibility);
+        }
+    }
+
+    @Override
+    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String s) {
+        if ("pref_globalSearchProvider".equals(s)) {
+            loadIcon();
+        }
+    }
+
+    private void loadIcon() {
+        if (mQsbView != null) {
+            SearchProvider provider = SearchProviderController.Companion.getInstance(getContext())
+                    .getSearchProvider();
+            ImageView gIcon = mQsbView.findViewById(R.id.g_icon);
+            gIcon.setImageDrawable(provider.getIcon(true));
+        }
+    }
+}
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/superg/DateWidgetView.java b/Omega/src/com/saggitt/omega/superg/DateWidgetView.java
new file mode 100644
index 0000000000..6cbaf2d4ae
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/superg/DateWidgetView.java
@@ -0,0 +1,123 @@
+package com.saggitt.omega.superg;
+
+import android.content.Context;
+import android.graphics.Paint;
+import android.graphics.Rect;
+import android.text.Editable;
+import android.text.TextPaint;
+import android.text.TextWatcher;
+import android.text.format.DateFormat;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.LinearLayout;
+
+import com.android.launcher3.DeviceProfile;
+import com.android.launcher3.Launcher;
+import com.android.launcher3.R;
+import com.saggitt.omega.util.OmegaUtilsKt;
+
+import java.util.Locale;
+
+public class DateWidgetView extends LinearLayout implements TextWatcher {
+    private String mText = "";
+    private float mDateText1TextSize;
+    private DoubleShadowTextClock mDateText1;
+    private DoubleShadowTextClock mDateText2;
+    private int mWidth = 0;
+
+    public DateWidgetView(Context context, AttributeSet attributeSet) {
+        super(context, attributeSet);
+    }
+
+    @Override
+    protected void onFinishInflate() {
+        super.onFinishInflate();
+        mDateText1 = findViewById(R.id.date_text1);
+        mDateText1TextSize = mDateText1.getTextSize();
+        mDateText1.addTextChangedListener(this);
+        mDateText1.setFormat(DateFormat.getBestDateTimePattern(Locale.getDefault(), "MMMMd"));
+        mDateText2 = findViewById(R.id.date_text2);
+        mDateText2.setFormat(getContext().getString(R.string.week_day_format, "EEEE", "yyyy"));
+        init();
+    }
+
+    private void init() {
+        Locale locale = Locale.getDefault();
+        if (locale != null && Locale.ENGLISH.getLanguage().equals(locale.getLanguage())) {
+            Paint paint = mDateText1.getPaint();
+            Rect rect = new Rect();
+            paint.getTextBounds("x", 0, 1, rect);
+            int height = rect.height();
+            mDateText2.setPadding(0, 0, 0, ((int) (Math.abs(paint.getFontMetrics().ascent) - ((float) height))) / 2);
+        }
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        Launcher launcher = OmegaUtilsKt.getLauncherOrNull(getContext());
+        int marginEnd;
+        if (launcher != null) {
+            DeviceProfile deviceProfile = Launcher.getLauncher(getContext()).getDeviceProfile();
+            int size = MeasureSpec.getSize(widthMeasureSpec) / deviceProfile.inv.numColumns;
+            marginEnd = (size - deviceProfile.iconSizePx) / 2;
+            mWidth = (deviceProfile.inv.numColumns - Math.max(1, (int) Math.ceil((double) (getResources().getDimension(R.dimen.qsb_min_width_with_mic) / ((float) size))))) * size;
+            mText = "";
+            update();
+        } else {
+            marginEnd = getResources().getDimensionPixelSize(R.dimen.smartspace_preview_widget_margin);
+        }
+        setMarginEnd(mDateText1, marginEnd);
+        setMarginEnd(mDateText2, marginEnd);
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+    }
+
+    private void setMarginEnd(View view, int marginEnd) {
+        LayoutParams layoutParams = (LayoutParams) view.getLayoutParams();
+        layoutParams.setMarginEnd(marginEnd);
+        layoutParams.resolveLayoutDirection(layoutParams.getLayoutDirection());
+    }
+
+
+    @Override
+    public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+    }
+
+    @Override
+    public void onTextChanged(CharSequence s, int start, int before, int count) {
+
+    }
+
+    @Override
+    public void afterTextChanged(Editable editable) {
+        update();
+    }
+
+    private void update() {
+        if (mWidth > 0) {
+            String dateText1Text = mDateText1.getText().toString();
+            if (!mText.equals(dateText1Text)) {
+                mText = dateText1Text;
+                if (!dateText1Text.isEmpty()) {
+                    TextPaint paint = mDateText1.getPaint();
+                    float textSize = paint.getTextSize();
+                    float size = mDateText1TextSize;
+                    for (int i = 0; i < 10; i++) {
+                        paint.setTextSize(size);
+                        float measureText = paint.measureText(dateText1Text);
+                        if (measureText <= ((float) mWidth)) {
+                            break;
+                        }
+                        size = (size * ((float) mWidth)) / measureText;
+                    }
+                    if (Float.compare(size, textSize) == 0) {
+                        paint.setTextSize(textSize);
+                    } else {
+                        mDateText1.setTextSize(0, size);
+                        init();
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/superg/DoubleShadowTextClock.java b/Omega/src/com/saggitt/omega/superg/DoubleShadowTextClock.java
new file mode 100644
index 0000000000..9776ec0063
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/superg/DoubleShadowTextClock.java
@@ -0,0 +1,59 @@
+package com.saggitt.omega.superg;
+
+import android.content.ActivityNotFoundException;
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.TypedArray;
+import android.graphics.Canvas;
+import android.provider.CalendarContract;
+import android.util.AttributeSet;
+import android.widget.TextClock;
+
+import com.android.launcher3.R;
+
+public class DoubleShadowTextClock extends TextClock {
+    private final float ambientShadowBlur;
+    private final int ambientShadowColor;
+    private final float keyShadowBlur;
+    private final int keyShadowColor;
+    private final float keyShadowOffset;
+
+    public DoubleShadowTextClock(Context context) {
+        this(context, null);
+    }
+
+    public DoubleShadowTextClock(Context context, AttributeSet attributeSet) {
+        this(context, attributeSet, 0);
+    }
+
+    public DoubleShadowTextClock(Context context, AttributeSet attributeSet, int i) {
+        super(context, attributeSet, i);
+        TypedArray ta = context.obtainStyledAttributes(attributeSet, new int[]{R.attr.ambientShadowColor, R.attr.keyShadowColor, R.attr.ambientShadowBlur, R.attr.keyShadowBlur, R.attr.keyShadowOffset}, i, 0);
+        ambientShadowColor = ta.getColor(0, 0);
+        keyShadowColor = ta.getColor(1, 0);
+        ambientShadowBlur = ta.getDimension(2, 0f);
+        keyShadowBlur = ta.getDimension(3, 0f);
+        keyShadowOffset = ta.getDimension(4, 0f);
+        ta.recycle();
+        setShadowLayer(Math.max(keyShadowBlur + keyShadowOffset, ambientShadowBlur), 0f, 0f, keyShadowColor);
+        setOnClickListener(view -> {
+            try {
+                view.getContext().startActivity(new Intent(Intent.ACTION_VIEW, CalendarContract.CONTENT_URI.buildUpon().appendPath("time").build()));
+            } catch (ActivityNotFoundException ignored) {
+            }
+        });
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        getPaint().setShadowLayer(keyShadowBlur, 0f, keyShadowOffset, keyShadowColor);
+        super.onDraw(canvas);
+        getPaint().setShadowLayer(ambientShadowBlur, 0f, 0f, ambientShadowColor);
+        super.onDraw(canvas);
+    }
+
+    public void setFormat(CharSequence charSequence) {
+        setFormat24Hour(charSequence);
+        setFormat12Hour(charSequence);
+    }
+}
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/superg/QsbBlockerView.java b/Omega/src/com/saggitt/omega/superg/QsbBlockerView.java
new file mode 100644
index 0000000000..568f2ff7d5
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/superg/QsbBlockerView.java
@@ -0,0 +1,203 @@
+package com.saggitt.omega.superg;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.util.AttributeSet;
+import android.util.Property;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.android.launcher3.BubbleTextView;
+import com.android.launcher3.DeviceProfile;
+import com.android.launcher3.ItemInfo;
+import com.android.launcher3.Launcher;
+import com.android.launcher3.R;
+import com.android.launcher3.Utilities;
+import com.android.launcher3.Workspace.OnStateChangeListener;
+import com.android.launcher3.anim.AnimatorSetBuilder;
+import com.saggitt.omega.OmegaAppKt;
+import com.saggitt.omega.smartspace.OmegaSmartspaceController;
+import com.saggitt.omega.smartspace.OmegaSmartspaceController.CardData;
+import com.saggitt.omega.smartspace.OmegaSmartspaceController.WeatherData;
+import com.saggitt.omega.smartspace.SmartspacePreferencesShortcut;
+import com.saggitt.omega.util.OmegaUtilsKt;
+
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * A simple view used to show the region blocked by QSB during drag and drop.
+ */
+public class QsbBlockerView extends FrameLayout implements
+        OnStateChangeListener, OmegaSmartspaceController.Listener,
+        View.OnLongClickListener, View.OnClickListener {
+    public static final Property<QsbBlockerView, Integer> QSB_BLOCKER_VIEW_ALPHA = new QsbBlockerViewAlpha(Integer.TYPE, "bgAlpha");
+    private final Paint mBgPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+    private OmegaSmartspaceController mController;
+    private int mState = 0;
+    private View mView;
+    private BubbleTextView mDummyBubbleTextView;
+
+    public QsbBlockerView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+
+        mBgPaint.setColor(Color.WHITE);
+        mBgPaint.setAlpha(0);
+
+        mController = OmegaAppKt.getOmegaApp(getContext()).getSmartspace();
+    }
+
+    @Override
+    protected void onFinishInflate() {
+        super.onFinishInflate();
+
+        mDummyBubbleTextView = findViewById(R.id.dummyBubbleTextView);
+        mDummyBubbleTextView.setTag(new ItemInfo() {
+            @Override
+            public ComponentName getTargetComponent() {
+                return new ComponentName(getContext(), "");
+            }
+        });
+        mDummyBubbleTextView.setContentDescription("");
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        if (mView != null && mState == 2) {
+            Launcher launcher = OmegaUtilsKt.getLauncherOrNull(getContext());
+            int size;
+            if (launcher != null) {
+                DeviceProfile deviceProfile = launcher.getDeviceProfile();
+                if (launcher.useVerticalBarLayout()) {
+                    size = ((MeasureSpec.getSize(widthMeasureSpec) / deviceProfile.inv.numColumns)
+                            - deviceProfile.iconSizePx) / 2;
+                } else {
+                    size = 0;
+                }
+            } else {
+                size = getResources().getDimensionPixelSize(R.dimen.smartspace_preview_widget_margin);
+            }
+            LayoutParams layoutParams = (LayoutParams) mView.getLayoutParams();
+            layoutParams.leftMargin = layoutParams.rightMargin = size;
+        }
+
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+    }
+
+    @Override
+    protected void onAttachedToWindow() {
+        super.onAttachedToWindow();
+
+        if (mController != null)
+            mController.addListener(this);
+    }
+
+    @Override
+    protected void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+
+        if (mController != null)
+            mController.removeListener(this);
+    }
+
+    @Override
+    public void prepareStateChange(AnimatorSetBuilder builder) {
+
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        canvas.drawPaint(mBgPaint);
+    }
+
+    @Override
+    public void onDataUpdated(@Nullable WeatherData weather, @Nullable CardData card) {
+        final int oldState = mState;
+        final View oldView = mView;
+
+        if (!Utilities.getOmegaPrefs(getContext()).getUsePillQsb()) {
+            return;
+        }
+
+        if (weather == null) {
+            mState = 1;
+            mView = oldView != null && oldState == 1 ?
+                    oldView :
+                    LayoutInflater.from(getContext()).inflate(R.layout.date_widget, this, false);
+        } else {
+            mState = 2;
+            mView = oldView != null && oldState == 2 ?
+                    oldView :
+                    LayoutInflater.from(getContext()).inflate(R.layout.weather_widget, this, false);
+            applyWeather(mView, weather);
+            mView.setOnClickListener(this);
+        }
+
+        if (oldState != mState) {
+            if (oldView != null) {
+                oldView.animate().setDuration(200L).alpha(0f).withEndAction(() -> removeView(oldView));
+            }
+            addView(mView);
+            mView.setAlpha(0f);
+            mView.animate().setDuration(200L).alpha(1f);
+        } else if (oldView != mView) {
+            if (oldView != null) {
+                removeView(oldView);
+            }
+            addView(mView);
+        }
+
+        mView.setOnLongClickListener(this);
+    }
+
+    private void applyWeather(View view, WeatherData weather) {
+        ImageView weatherIcon = view.findViewById(R.id.weather_widget_icon);
+        weatherIcon.setImageBitmap(weather.getIcon());
+        TextView weatherTemperature = view.findViewById(R.id.weather_widget_temperature);
+        weatherTemperature.setText(weather.getTitle(
+                Utilities.getOmegaPrefs(getContext()).getWeatherUnit()));
+    }
+
+    @Override
+    public void setPadding(int left, int top, int right, int bottom) {
+        super.setPadding(0, 0, 0, 0);
+    }
+
+    @Override
+    public void onClick(View v) {
+        if (mController != null)
+            mController.openWeather(v);
+    }
+
+    @Override
+    public boolean onLongClick(View v) {
+        // TODO: move it to below the widget view
+        OmegaUtilsKt.openPopupMenu(mView, null, new SmartspacePreferencesShortcut());
+        return true;
+    }
+
+    static class QsbBlockerViewAlpha extends Property<QsbBlockerView, Integer> {
+
+        public QsbBlockerViewAlpha(Class<Integer> type, String name) {
+            super(type, name);
+        }
+
+        @Override
+        public void set(QsbBlockerView qsbBlockerView, Integer num) {
+            qsbBlockerView.mBgPaint.setAlpha(num);
+            qsbBlockerView.setWillNotDraw(num == 0);
+            qsbBlockerView.invalidate();
+        }
+
+        @Override
+        public Integer get(QsbBlockerView obj) {
+            return obj.mBgPaint.getAlpha();
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/superg/QsbConnector.java b/Omega/src/com/saggitt/omega/superg/QsbConnector.java
new file mode 100644
index 0000000000..ec57575786
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/superg/QsbConnector.java
@@ -0,0 +1,89 @@
+package com.saggitt.omega.superg;
+
+import android.animation.ObjectAnimator;
+import android.content.Context;
+import android.graphics.Canvas;
+import android.util.AttributeSet;
+import android.util.Property;
+import android.view.View;
+import android.view.animation.AccelerateDecelerateInterpolator;
+
+import androidx.core.graphics.ColorUtils;
+
+import com.android.launcher3.R;
+
+public class QsbConnector extends View {
+    private static final Property sAlphaProperty = new Property<QsbConnector, Integer>(Integer.class, "overlayAlpha") {
+        @Override
+        public Integer get(QsbConnector qsbConnector) {
+            return qsbConnector.mForegroundAlpha;
+        }
+
+        @Override
+        public void set(QsbConnector qsbConnector, Integer newAlpha) {
+            qsbConnector.updateAlpha(newAlpha);
+        }
+    };
+
+    private int mForegroundAlpha;
+    private ObjectAnimator mRevealAnimator;
+    private final int mForegroundColor;
+
+    public QsbConnector(Context context) {
+        this(context, null);
+    }
+
+    public QsbConnector(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public QsbConnector(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+
+        mForegroundAlpha = 0;
+        mForegroundColor = getResources().getColor(R.color.qsb_background) & 0xFFFFFF;
+
+        setBackground(getResources().getDrawable(R.drawable.bg_pixel_qsb_connector, getContext().getTheme()));
+    }
+
+    private void stopRevealAnimation() {
+        if (mRevealAnimator != null) {
+            mRevealAnimator.end();
+            mRevealAnimator = null;
+        }
+    }
+
+    private void updateAlpha(int alpha) {
+        if (mForegroundAlpha != alpha) {
+            mForegroundAlpha = alpha;
+            invalidate();
+        }
+    }
+
+    public void changeVisibility(boolean makeVisible) {
+        if (makeVisible) {
+            stopRevealAnimation();
+            updateAlpha(255);
+            mRevealAnimator = ObjectAnimator.ofInt(this, QsbConnector.sAlphaProperty, 0);
+            mRevealAnimator.setInterpolator(new AccelerateDecelerateInterpolator());
+            mRevealAnimator.start();
+        } else {
+            updateAlpha(0);
+        }
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        if (mForegroundAlpha > 0) {
+            canvas.drawColor(ColorUtils.setAlphaComponent(mForegroundColor, mForegroundAlpha));
+        }
+    }
+
+    @Override
+    protected boolean onSetAlpha(final int alpha) {
+        if (alpha == 0) {
+            stopRevealAnimation();
+        }
+        return super.onSetAlpha(alpha);
+    }
+}
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/superg/SuperGContainerView.java b/Omega/src/com/saggitt/omega/superg/SuperGContainerView.java
new file mode 100644
index 0000000000..77d72562b2
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/superg/SuperGContainerView.java
@@ -0,0 +1,91 @@
+package com.saggitt.omega.superg;
+
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.Color;
+import android.graphics.Rect;
+import android.util.AttributeSet;
+import android.view.View;
+
+import com.android.launcher3.DeviceProfile;
+import com.android.launcher3.LauncherAppState;
+import com.android.launcher3.R;
+import com.saggitt.omega.util.OmegaUtilsKt;
+
+public class SuperGContainerView extends BaseGContainerView {
+
+    private int mQsbColor = Color.WHITE;
+
+    public SuperGContainerView(Context paramContext) {
+        this(paramContext, null);
+    }
+
+    public SuperGContainerView(Context paramContext, AttributeSet paramAttributeSet) {
+        this(paramContext, paramAttributeSet, 0);
+    }
+
+    public SuperGContainerView(Context paramContext, AttributeSet paramAttributeSet, int paramInt) {
+        super(paramContext, paramAttributeSet, paramInt);
+        View.inflate(paramContext, R.layout.qsb_blocker_view, this);
+    }
+
+    @Override
+    protected int getQsbView(boolean withMic) {
+        return R.layout.qsb_without_mic;
+    }
+
+    @Override
+    public void setPadding(int left, int top, int right, int bottom) {
+        super.setPadding(0, 0, 0, 0);
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        int qsbOverlapMargin = -getResources().getDimensionPixelSize(R.dimen.qsb_overlap_margin);
+        DeviceProfile deviceProfile = LauncherAppState.getIDP(getContext()).getDeviceProfile(getContext());
+        int size = MeasureSpec.getSize(widthMeasureSpec) - qsbOverlapMargin;
+
+        int qsbWidth;
+        int marginStart;
+        if (deviceProfile.isVerticalBarLayout()) {
+            qsbWidth = size;
+            marginStart = qsbOverlapMargin + getResources().getDimensionPixelSize(R.dimen.qsb_button_elevation);
+        } else {
+            Rect workspacePadding = deviceProfile.workspacePadding;
+            int fullWidth = size - workspacePadding.left - workspacePadding.right;
+            qsbWidth = DeviceProfile.calculateCellWidth(fullWidth, deviceProfile.inv.numColumns) * deviceProfile.inv.numColumns;
+            marginStart = 0;
+        }
+
+        if (mQsbView != null) {
+            LayoutParams layoutParams = (LayoutParams) mQsbView.getLayoutParams();
+            layoutParams.width = qsbWidth / deviceProfile.inv.numColumns;
+            if (deviceProfile.isVerticalBarLayout()) {
+                layoutParams.width = Math.max(layoutParams.width,
+                        getResources().getDimensionPixelSize(R.dimen.qsb_min_width_with_mic));
+            } else {
+                layoutParams.width = Math.max(layoutParams.width,
+                        getResources().getDimensionPixelSize(R.dimen.qsb_min_width_portrait));
+            }
+            layoutParams.setMarginStart(marginStart);
+            layoutParams.resolveLayoutDirection(layoutParams.getLayoutDirection());
+        }
+        if (mConnectorView != null) {
+            LayoutParams layoutParams = (LayoutParams) mConnectorView.getLayoutParams();
+            layoutParams.width = marginStart + layoutParams.height / 2;
+        }
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+    }
+
+    @Override
+    protected void setGoogleAnimationStart(Rect rect, Intent intent) {
+
+    }
+
+    @Override
+    protected void applyQsbColor() {
+        super.applyQsbColor();
+        float radius = OmegaUtilsKt.dpToPx(100);
+        mQsbView.setBackground(OmegaUtilsKt.createRipplePill(getContext(), mQsbColor, radius));
+    }
+}
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/theme/ThemeManager.kt b/Omega/src/com/saggitt/omega/theme/ThemeManager.kt
index fba0faa0ab..a1814e1d00 100644
--- a/Omega/src/com/saggitt/omega/theme/ThemeManager.kt
+++ b/Omega/src/com/saggitt/omega/theme/ThemeManager.kt
@@ -20,6 +20,8 @@ package com.saggitt.omega.theme
 import android.content.Context
 import android.content.res.Configuration
 import android.os.Handler
+import com.android.launcher3.R
+import com.android.launcher3.Utilities
 import com.android.launcher3.uioverrides.WallpaperColorInfo
 import com.saggitt.omega.BlankActivity
 import com.saggitt.omega.omegaApp
@@ -37,8 +39,22 @@ class ThemeManager(val context: Context) : WallpaperColorInfo.OnChangeListener,
     private val prefs = context.omegaPrefs
     private var themeFlags = 0
     private var usingNightMode = context.resources.configuration.usingNightMode
+        set(value) {
+            if (field != value) {
+                field = value
+                updateTheme()
+            }
+        }
+
     val isDark get() = themeFlags and THEME_DARK != 0
     val supportsDarkText get() = themeFlags and THEME_DARK_TEXT != 0
+    val displayName: String
+        get() {
+            val values = context.resources.getIntArray(R.array.themeValues)
+            val strings = context.resources.getStringArray(R.array.themes)
+            val index = values.indexOf(themeFlags)
+            return strings.getOrNull(index) ?: context.resources.getString(R.string.theme_auto)
+        }
     private val twilightManager by lazy { TwilightManager.getInstance(context) }
     private val handler = Handler()
     private var listenToTwilight = false
@@ -110,13 +126,16 @@ class ThemeManager(val context: Context) : WallpaperColorInfo.OnChangeListener,
         val supportsDarkText = when {
             theme.hasFlag(THEME_DARK_TEXT) -> true
             theme.hasFlag(THEME_FOLLOW_WALLPAPER) -> wallpaperColorInfo.supportsDarkText()
-            else -> false
+            else -> wallpaperColorInfo.supportsDarkText()
         }
 
+        val darkMainColor = wallpaperColorInfo.isMainColorDark
+
         var newFlags = 0
         if (supportsDarkText) newFlags = newFlags or THEME_DARK_TEXT
         if (isDark) newFlags = newFlags or THEME_DARK
         if (isBlack) newFlags = newFlags or THEME_USE_BLACK
+        if (darkMainColor) newFlags = newFlags or THEME_DARK_MAIN_COLOR
         if (newFlags == themeFlags) return
         themeFlags = newFlags
         reloadActivities()
@@ -178,6 +197,7 @@ class ThemeManager(val context: Context) : WallpaperColorInfo.OnChangeListener,
         const val THEME_USE_BLACK = 1 shl 3          // 001000 = 8
         const val THEME_FOLLOW_NIGHT_MODE = 1 shl 4  // 010000 = 16
         const val THEME_FOLLOW_DAYLIGHT = 1 shl 5    // 100000 = 32
+        const val THEME_DARK_MAIN_COLOR = 1 shl 6    // 1000000 = 64
 
         const val THEME_AUTO_MASK = THEME_FOLLOW_WALLPAPER or THEME_FOLLOW_NIGHT_MODE or THEME_FOLLOW_DAYLIGHT
         const val THEME_DARK_MASK = THEME_DARK or THEME_AUTO_MASK
@@ -185,5 +205,13 @@ class ThemeManager(val context: Context) : WallpaperColorInfo.OnChangeListener,
         fun isDarkText(flags: Int) = (flags and THEME_DARK_TEXT) != 0
         fun isDark(flags: Int) = (flags and THEME_DARK) != 0
         fun isBlack(flags: Int) = (flags and THEME_USE_BLACK) != 0
+
+        fun getDefaultTheme(): Int {
+            return if (Utilities.ATLEAST_Q) {
+                THEME_FOLLOW_NIGHT_MODE
+            } else {
+                THEME_FOLLOW_WALLPAPER
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/theme/ThemeOverride.kt b/Omega/src/com/saggitt/omega/theme/ThemeOverride.kt
index dba051974f..0dd3a8f083 100644
--- a/Omega/src/com/saggitt/omega/theme/ThemeOverride.kt
+++ b/Omega/src/com/saggitt/omega/theme/ThemeOverride.kt
@@ -46,6 +46,16 @@ class ThemeOverride (private val themeSet: ThemeSet, val listener: ThemeOverride
         listener?.reloadTheme()
     }
 
+    class Launcher : ThemeSet {
+
+        override val lightTheme = R.style.AppTheme
+        override val darkTextTheme = R.style.AppTheme_DarkText
+        override val darkTheme = R.style.AppTheme_Dark
+        override val darkDarkTextTheme = R.style.AppTheme_Dark_DarkText
+        override val blackTheme = R.style.AppTheme_Black
+        override val blackDarkTextTheme = R.style.AppTheme_Black_DarkText
+    }
+
     class Settings : ThemeSet {
         override val lightTheme = R.style.SettingsTheme_Light
         override val darkTextTheme = R.style.SettingsTheme_Light
@@ -55,6 +65,36 @@ class ThemeOverride (private val themeSet: ThemeSet, val listener: ThemeOverride
         override val blackDarkTextTheme = R.style.SettingsTheme_Black
     }
 
+    class SettingsTransparent : ThemeSet {
+
+        override val lightTheme = R.style.SettingsTheme_Light_Transparent
+        override val darkTextTheme = R.style.SettingsTheme_DarkText_Transparent
+        override val darkTheme = R.style.SettingsTheme_Dark_Transparent
+        override val darkDarkTextTheme = R.style.SettingsTheme_Dark_Transparent
+        override val blackTheme = R.style.SettingsTheme_Black_Transparent
+        override val blackDarkTextTheme = R.style.SettingsTheme_Black_Transparent
+    }
+
+    class AlertDialog : ThemeSet {
+
+        override val lightTheme = R.style.SettingsTheme_Light_Dialog
+        override val darkTextTheme = R.style.SettingsTheme_Light_Dialog
+        override val darkTheme = R.style.SettingsTheme_Dark_Dialog
+        override val darkDarkTextTheme = R.style.SettingsTheme_Dark_Dialog
+        override val blackTheme = R.style.SettingsTheme_Dark_Dialog
+        override val blackDarkTextTheme = R.style.SettingsTheme_Dark_Dialog
+    }
+
+    class LauncherDialog : ThemeSet {
+
+        override val lightTheme = android.R.style.Theme_Material_Light
+        override val darkTextTheme = android.R.style.Theme_Material_Light
+        override val darkTheme = android.R.style.Theme_Material
+        override val darkDarkTextTheme = android.R.style.Theme_Material
+        override val blackTheme = android.R.style.Theme_Material
+        override val blackDarkTextTheme = android.R.style.Theme_Material
+    }
+
     interface ThemeSet {
 
         val lightTheme: Int
diff --git a/Omega/src/com/saggitt/omega/theme/ThemedContextProvider.kt b/Omega/src/com/saggitt/omega/theme/ThemedContextProvider.kt
new file mode 100644
index 0000000000..edb5b425e9
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/theme/ThemedContextProvider.kt
@@ -0,0 +1,62 @@
+/*
+ *  Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ *
+ */
+
+package com.saggitt.omega.theme
+
+import android.content.Context
+import android.view.ContextThemeWrapper
+
+class ThemedContextProvider(private val base: Context, var listener: Listener?, themeSet: ThemeOverride.ThemeSet)
+    : ThemeOverride.ThemeOverrideListener {
+
+    override val isAlive = true
+
+    private val themeOverride = ThemeOverride(themeSet, this)
+
+    private var currentTheme = themeOverride.getTheme(base)
+        set(value) {
+            if (field != value) {
+                field = value
+                themedContext = ContextThemeWrapper(base, value)
+                listener?.onThemeChanged()
+            }
+        }
+    private var themedContext = ContextThemeWrapper(base, currentTheme)
+
+    fun startListening() {
+        ThemeManager.getInstance(base).addOverride(themeOverride)
+    }
+
+    fun stopListening() {
+        ThemeManager.getInstance(base).removeOverride(themeOverride)
+    }
+
+    override fun reloadTheme() {
+        currentTheme = themeOverride.getTheme(base)
+    }
+
+    override fun applyTheme(themeRes: Int) {
+        currentTheme = themeOverride.getTheme(base)
+    }
+
+    fun get() = themedContext
+
+    interface Listener {
+
+        fun onThemeChanged()
+    }
+}
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/theme/ui/ThemeBlackSwitchPreference.kt b/Omega/src/com/saggitt/omega/theme/ui/ThemeBlackSwitchPreference.kt
new file mode 100644
index 0000000000..45798fe595
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/theme/ui/ThemeBlackSwitchPreference.kt
@@ -0,0 +1,35 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.theme.ui
+
+import android.content.Context
+import android.util.AttributeSet
+import androidx.annotation.Keep
+import com.saggitt.omega.OmegaPreferences
+import com.saggitt.omega.theme.ThemeManager
+import com.saggitt.omega.util.hasFlag
+
+@Keep
+class ThemeBlackSwitchPreference(context: Context, attrs: AttributeSet) : ThemeFlagSwitchPreference(context, attrs) {
+
+    override fun onValueChanged(key: String, prefs: OmegaPreferences, force: Boolean) {
+        super.onValueChanged(key, prefs, force)
+
+        isEnabled = prefs.launcherTheme.hasFlag(ThemeManager.THEME_DARK_MASK)
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/theme/ui/ThemeDarkModeListPreference.kt b/Omega/src/com/saggitt/omega/theme/ui/ThemeDarkModeListPreference.kt
new file mode 100644
index 0000000000..f5ff3f21fd
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/theme/ui/ThemeDarkModeListPreference.kt
@@ -0,0 +1,74 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.theme.ui
+
+import android.content.Context
+import android.util.AttributeSet
+import androidx.annotation.Keep
+import androidx.preference.ListPreference
+import com.android.launcher3.R
+import com.saggitt.omega.OmegaPreferences
+import com.saggitt.omega.theme.ThemeManager
+import com.saggitt.omega.util.addFlag
+import com.saggitt.omega.util.buildEntries
+import com.saggitt.omega.util.omegaPrefs
+import com.saggitt.omega.util.removeFlag
+
+@Keep
+class ThemeDarkModeListPreference(context: Context, attrs: AttributeSet?) : ListPreference(context, attrs),
+        OmegaPreferences.OnPreferenceChangeListener {
+
+    private val prefs = context.omegaPrefs
+
+    init {
+        buildEntries {
+            addEntry(R.string.theme_dark_theme_mode_follow_wallpaper, ThemeManager.THEME_FOLLOW_WALLPAPER)
+            addEntry(R.string.theme_dark_theme_mode_follow_system, ThemeManager.THEME_FOLLOW_NIGHT_MODE)
+            addEntry(R.string.theme_dark_theme_mode_follow_daylight, ThemeManager.THEME_FOLLOW_DAYLIGHT)
+            addEntry(R.string.theme_dark_theme_mode_on, ThemeManager.THEME_DARK)
+            addEntry(R.string.theme_dark_theme_mode_off, 0)
+        }
+    }
+
+    override fun onAttached() {
+        super.onAttached()
+
+        prefs.addOnPreferenceChangeListener("pref_launcherTheme", this)
+    }
+
+    override fun onDetached() {
+        super.onDetached()
+
+        prefs.removeOnPreferenceChangeListener("pref_launcherTheme", this)
+    }
+
+    override fun onValueChanged(key: String, prefs: OmegaPreferences, force: Boolean) {
+        value = "${prefs.launcherTheme and ThemeManager.THEME_DARK_MASK}"
+    }
+
+    override fun persistString(value: String): Boolean {
+        val newFlag = prefs.launcherTheme
+                .removeFlag(ThemeManager.THEME_DARK_MASK)
+                .addFlag(value.toInt())
+        if (prefs.launcherTheme != newFlag) {
+            prefs.launcherTheme = newFlag
+        }
+        return true
+    }
+
+}
diff --git a/Omega/src/com/saggitt/omega/theme/ui/ThemeFlagSwitchPreference.kt b/Omega/src/com/saggitt/omega/theme/ui/ThemeFlagSwitchPreference.kt
new file mode 100644
index 0000000000..457abcc03b
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/theme/ui/ThemeFlagSwitchPreference.kt
@@ -0,0 +1,74 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.theme.ui
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.View
+import android.widget.Switch
+import androidx.annotation.Keep
+import androidx.preference.PreferenceViewHolder
+import androidx.preference.SwitchPreference
+import com.android.launcher3.R
+import com.saggitt.omega.OmegaPreferences
+import com.saggitt.omega.util.applyColor
+import com.saggitt.omega.util.hasFlag
+import com.saggitt.omega.util.omegaPrefs
+import com.saggitt.omega.util.setFlag
+
+@Keep
+open class ThemeFlagSwitchPreference(context: Context, attrs: AttributeSet) : SwitchPreference(context, attrs),
+        OmegaPreferences.OnPreferenceChangeListener {
+
+    protected val prefs = context.omegaPrefs
+    private var switchFlag = 0
+    private var checkableView: View? = null
+
+    init {
+        val a = context.obtainStyledAttributes(attrs, R.styleable.ThemeFlagSwitchPreference)
+        switchFlag = a.getInteger(R.styleable.ThemeFlagSwitchPreference_switchFlag, 0)
+        a.recycle()
+    }
+
+    override fun onBindViewHolder(holder: PreferenceViewHolder?) {
+        super.onBindViewHolder(holder)
+        checkableView = holder?.findViewById(android.R.id.switch_widget)
+        (checkableView as Switch).applyColor(prefs.accentColor)
+    }
+
+    override fun onAttached() {
+        super.onAttached()
+        prefs.addOnPreferenceChangeListener("pref_launcherTheme", this)
+    }
+
+    override fun onDetached() {
+        super.onDetached()
+        prefs.removeOnPreferenceChangeListener("pref_launcherTheme", this)
+    }
+
+    override fun onValueChanged(key: String, prefs: OmegaPreferences, force: Boolean) {
+        isChecked = prefs.launcherTheme.hasFlag(switchFlag)
+    }
+
+    override fun persistBoolean(value: Boolean): Boolean {
+        if (prefs.launcherTheme.hasFlag(switchFlag) != value) {
+            prefs.launcherTheme = prefs.launcherTheme.setFlag(switchFlag, value)
+        }
+        return true
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/theme/ui/ThemePreference.kt b/Omega/src/com/saggitt/omega/theme/ui/ThemePreference.kt
new file mode 100644
index 0000000000..ddd65ee2df
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/theme/ui/ThemePreference.kt
@@ -0,0 +1,90 @@
+/*
+ *  Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ *
+ */
+
+package com.saggitt.omega.theme.ui
+
+import android.content.Context
+import android.text.TextUtils
+import android.util.AttributeSet
+import androidx.annotation.Keep
+import com.android.launcher3.R
+import com.saggitt.omega.OmegaPreferences
+import com.saggitt.omega.settings.PreferenceDialogPreference
+import com.saggitt.omega.theme.ThemeManager
+import com.saggitt.omega.util.hasFlag
+import com.saggitt.omega.util.hasFlags
+import com.saggitt.omega.util.omegaPrefs
+
+@Keep
+class ThemePreference(context: Context, attrs: AttributeSet?) : PreferenceDialogPreference(context, attrs),
+        OmegaPreferences.OnPreferenceChangeListener {
+
+    private val prefs = context.omegaPrefs
+
+    override fun onAttached() {
+        super.onAttached()
+
+        prefs.addOnPreferenceChangeListener("pref_launcherTheme", this)
+    }
+
+    override fun onDetached() {
+        super.onDetached()
+
+        prefs.removeOnPreferenceChangeListener("pref_launcherTheme", this)
+    }
+
+    override fun onValueChanged(key: String, prefs: OmegaPreferences, force: Boolean) {
+        reloadSummary()
+    }
+
+    private fun reloadSummary() {
+        val theme = prefs.launcherTheme
+
+        val forceDark = theme.hasFlag(ThemeManager.THEME_DARK)
+        val forceDarkText = theme.hasFlag(ThemeManager.THEME_DARK_TEXT)
+        val followWallpaper = theme.hasFlag(ThemeManager.THEME_FOLLOW_WALLPAPER)
+        val followNightMode = theme.hasFlag(ThemeManager.THEME_FOLLOW_NIGHT_MODE)
+        val followDaylight = theme.hasFlag(ThemeManager.THEME_FOLLOW_DAYLIGHT)
+
+        val light = !theme.hasFlag(ThemeManager.THEME_DARK_MASK)
+        val useBlack = theme.hasFlags(ThemeManager.THEME_USE_BLACK, ThemeManager.THEME_DARK_MASK)
+
+        val themeDesc = ArrayList<Int>()
+        when {
+            forceDark && useBlack -> themeDesc.add(R.string.theme_black)
+            forceDark -> themeDesc.add(R.string.theme_dark)
+            followNightMode -> themeDesc.add(R.string.theme_dark_theme_mode_follow_system)
+            followDaylight -> themeDesc.add(R.string.theme_dark_theme_mode_follow_daylight)
+            followWallpaper -> themeDesc.add(R.string.theme_dark_theme_mode_follow_wallpaper)
+            light -> themeDesc.add(R.string.theme_light)
+        }
+        if (useBlack && !forceDark) {
+            themeDesc.add(R.string.theme_black)
+        }
+        if (forceDarkText) {
+            themeDesc.add(R.string.theme_with_dark_text)
+        }
+
+        val res = context.resources
+        val strings = ArrayList<String>()
+        themeDesc.mapTo(strings) { res.getString(it) }
+        for (i in (1 until strings.size)) {
+            strings[i] = strings[i].toLowerCase()
+        }
+        summary = TextUtils.join(", ", strings)
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/touch/PinchStateChangeTouchController.java b/Omega/src/com/saggitt/omega/touch/PinchStateChangeTouchController.java
new file mode 100644
index 0000000000..9496906b5a
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/touch/PinchStateChangeTouchController.java
@@ -0,0 +1,215 @@
+/*
+ * Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ */
+
+package com.saggitt.omega.touch;
+
+import android.animation.AnimatorListenerAdapter;
+import android.animation.TimeInterpolator;
+import android.animation.ValueAnimator;
+import android.util.Log;
+import android.view.MotionEvent;
+import android.view.ScaleGestureDetector;
+
+import com.android.launcher3.AbstractFloatingView;
+import com.android.launcher3.Launcher;
+import com.android.launcher3.LauncherState;
+import com.android.launcher3.LogAccelerateInterpolator;
+import com.android.launcher3.LogDecelerateInterpolator;
+import com.android.launcher3.Utilities;
+import com.android.launcher3.Workspace;
+import com.android.launcher3.anim.AnimatorPlaybackController;
+import com.android.launcher3.anim.Interpolators;
+import com.android.launcher3.touch.SingleAxisSwipeDetector;
+import com.android.launcher3.util.PendingAnimation;
+import com.android.launcher3.util.TouchController;
+
+public class PinchStateChangeTouchController extends AnimatorListenerAdapter implements
+        TouchController, ScaleGestureDetector.OnScaleGestureListener {
+    private static final float FLING_VELOCITY = 0.003f;
+    private static final float SUCCESS_TRANSITION_PROGRESS = 0.5f;
+    private static final String TAG = "PinchStateChangeTouchController";
+    private static final int THRESHOLD = 6;
+    private AnimatorPlaybackController mCurrentAnimation;
+    private final ScaleGestureDetector mDetector;
+    private LauncherState mFromState;
+    private TimeInterpolator mInterpolator;
+    private final Launcher mLauncher;
+    private PendingAnimation mPendingAnimation;
+    private boolean mPinchStarted;
+    private long mPreviousTimeMillis;
+    private float mProgressDelta;
+    private float mProgressMultiplier;
+    private long mTimeDelta;
+    private LauncherState mToState;
+    private final Workspace mWorkspace;
+
+    public PinchStateChangeTouchController(Launcher launcher) {
+        mLauncher = launcher;
+        mWorkspace = launcher.getWorkspace();
+        mDetector = new ScaleGestureDetector(mLauncher, this);
+    }
+
+    @Override
+    public boolean onControllerInterceptTouchEvent(MotionEvent motionEvent) {
+        mDetector.onTouchEvent(motionEvent);
+        return mPinchStarted;
+    }
+
+    @Override
+    public boolean onControllerTouchEvent(MotionEvent motionEvent) {
+        return mPinchStarted && motionEvent.getPointerCount() <= 2 && mDetector.onTouchEvent(motionEvent);
+    }
+
+    private LauncherState getTargetState(LauncherState launcherState) {
+        if (launcherState == LauncherState.NORMAL) {
+            return LauncherState.OPTIONS;
+        }
+        return launcherState == LauncherState.OPTIONS ? LauncherState.NORMAL : launcherState;
+    }
+
+    private float initCurrentAnimation() {
+        float height = (float) mLauncher.getDragLayer().getHeight();
+        mCurrentAnimation = mLauncher.getStateManager().createAnimationToNewWorkspace(mToState, (long) (2 * height));
+        return 1 / height;
+    }
+
+    private boolean reInitCurrentAnimation() {
+        LauncherState state = mFromState == null ? mLauncher.getStateManager().getState() : mFromState;
+        LauncherState targetState = getTargetState(state);
+        if ((state == mFromState && targetState == mToState) || state == targetState) {
+            return false;
+        }
+        mFromState = state;
+        mToState = targetState;
+        mPreviousTimeMillis = System.currentTimeMillis();
+        mInterpolator = mLauncher.isInState(LauncherState.OPTIONS) ?
+                new LogDecelerateInterpolator(100, 0) : new LogAccelerateInterpolator(100, 0);
+        mProgressMultiplier = initCurrentAnimation();
+        mCurrentAnimation.getTarget().addListener(this);
+        mCurrentAnimation.dispatchOnStart();
+        mPinchStarted = true;
+        return true;
+    }
+
+    public boolean onScaleBegin(ScaleGestureDetector r4) {
+        if (mCurrentAnimation != null) return true;
+
+        if (mLauncher.isInState(LauncherState.NORMAL) || mLauncher.isInState(LauncherState.OPTIONS)) {
+            if (mLauncher.isWorkspaceLocked()) return false;
+            if (mWorkspace.isSwitchingState()) return false;
+            if (mWorkspace.duringScrollInteraction()) return false;
+            if (AbstractFloatingView.getTopOpenView(mLauncher) != null) return false;
+
+            mToState = mFromState = null;
+            reInitCurrentAnimation();
+            return true;
+        }
+        return false;
+    }
+
+    public boolean onScale(ScaleGestureDetector scaleGestureDetector) {
+        if (mCurrentAnimation == null) {
+            Log.d(TAG, "onScale# No animation.");
+            return false;
+        }
+        float currentSpan = scaleGestureDetector.getCurrentSpan() - scaleGestureDetector.getPreviousSpan();
+        int width = mWorkspace.getWidth() * 6;
+        float f = LauncherState.OPTIONS.getWorkspaceScaleAndTranslation(mLauncher).scale;
+        currentSpan = mInterpolator.getInterpolation((Math.max(f,
+                Math.min(mFromState.getWorkspaceScaleAndTranslation(mLauncher).scale + currentSpan / width, 1)) - f) / (1 - f));
+        if (mToState == LauncherState.OPTIONS) {
+            currentSpan = 1.0f - currentSpan;
+        }
+        updateProgress(currentSpan);
+        mProgressDelta = currentSpan - mCurrentAnimation.getProgressFraction();
+        mTimeDelta = System.currentTimeMillis() - mPreviousTimeMillis;
+        mPreviousTimeMillis = System.currentTimeMillis();
+        return false;
+    }
+
+    private void updateProgress(float f) {
+        mCurrentAnimation.setPlayFraction(f);
+    }
+
+    public void onScaleEnd(ScaleGestureDetector scaleGestureDetector) {
+        if (mCurrentAnimation == null) {
+            Log.d(TAG, "onScaleEnd# No animation.");
+            clearState();
+            mPinchStarted = false;
+            return;
+        }
+        int i;
+        LauncherState launcherState;
+        float f;
+        float progressFraction = mCurrentAnimation.getProgressFraction();
+        float f2 = mProgressDelta / ((float) mTimeDelta);
+        boolean z = (mLauncher.isInState(LauncherState.OPTIONS) && f2 >= FLING_VELOCITY) || (!mLauncher.isInState(LauncherState.OPTIONS) && f2 <= -0.003f);
+        if (z) {
+            i = 4;
+            launcherState = Float.compare(Math.signum(f2), Math.signum(mProgressMultiplier)) == 0 ? mToState : mFromState;
+        } else {
+            i = 5;
+            launcherState = progressFraction > 0.5f ? mToState : mFromState;
+        }
+        LauncherState launcherState2 = launcherState;
+        long j = 0;
+        float f3 = 0;
+        if (launcherState2 == this.mToState) {
+            if (progressFraction >= 1) {
+                f = 1;
+                f3 = f;
+            } else {
+                f = Utilities.boundToRange(((16 * f2) * mProgressMultiplier) + progressFraction, 0, 1);
+                j = SingleAxisSwipeDetector.calculateDuration(f2, 1 - Math.max(progressFraction, 0));
+                f3 = 1;
+            }
+        } else if (progressFraction <= 0) {
+            f = 0;
+        } else {
+            f = Utilities.boundToRange(((16 * f2) * mProgressMultiplier) + progressFraction, 0, 1);
+            j = SingleAxisSwipeDetector.calculateDuration(f2, Math.min(progressFraction, 1) - 0);
+        }
+        mCurrentAnimation.setEndAction(() -> onPinchInteractionCompleted(launcherState2, i));
+        ValueAnimator animationPlayer = mCurrentAnimation.getAnimationPlayer();
+        animationPlayer.setFloatValues(f, f3);
+        animationPlayer
+                .setDuration(j).setInterpolator(Interpolators.scrollInterpolatorForVelocity(f2));
+        animationPlayer.start();
+        mPinchStarted = false;
+    }
+
+    private int getDirectionForLog() {
+        return mToState.ordinal > mFromState.ordinal ? 5 : 6;
+    }
+
+    private void onPinchInteractionCompleted(LauncherState launcherState, int i) {
+        clearState();
+        boolean i2 = true;
+        if (mPendingAnimation != null) {
+            boolean z = mToState == launcherState;
+            mPendingAnimation.finish(z, i);
+            mPendingAnimation = null;
+            i2 = !z;
+        }
+        if (i2) {
+            mLauncher.getStateManager().goToState(launcherState, false);
+        }
+    }
+
+    private void clearState() {
+        mCurrentAnimation = null;
+    }
+}
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/twilight/TwilightManager.kt b/Omega/src/com/saggitt/omega/twilight/TwilightManager.kt
index 0b0b1d992d..9caed4bff7 100644
--- a/Omega/src/com/saggitt/omega/twilight/TwilightManager.kt
+++ b/Omega/src/com/saggitt/omega/twilight/TwilightManager.kt
@@ -193,15 +193,11 @@ class TwilightManager(private val context: Context) : Handler.Callback, Location
         }
     }
 
-    override fun onLocationChanged(p0: Location) {
-        TODO("Not yet implemented")
-    }
-
-    /*override fun onLocationChanged(location: Location?) {
+    override fun onLocationChanged(location: Location) {
         // Location providers may erroneously return (0.0, 0.0) when they fail to determine the
         // device's location. These location updates can be safely ignored since the chance of a
         // user actually being at these coordinates is quite low.
-        if (location != null && !(location.longitude == 0.0 && location.latitude == 0.0)) {
+        if (!(location.longitude == 0.0 && location.latitude == 0.0)) {
             Log.d(TAG, "onLocationChanged:"
                     + " provider=" + location.provider
                     + " accuracy=" + location.accuracy
@@ -209,11 +205,19 @@ class TwilightManager(private val context: Context) : Handler.Callback, Location
             lastLocation = location
             updateTwilightState()
         }
-    }*/
+    }
 
     override fun onStatusChanged(provider: String?, status: Int, extras: Bundle?) {
     }
 
+    override fun onProviderEnabled(provider: String) {
+        TODO("Not yet implemented")
+    }
+
+    override fun onProviderDisabled(provider: String) {
+        TODO("Not yet implemented")
+    }
+
     companion object : SingletonHolder<TwilightManager, Context>(
             ensureOnMainThread(useApplicationContext(::TwilightManager))) {
 
diff --git a/Omega/src/com/saggitt/omega/util/ActionIntentFilter.java b/Omega/src/com/saggitt/omega/util/ActionIntentFilter.java
new file mode 100644
index 0000000000..f87bf89e88
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/util/ActionIntentFilter.java
@@ -0,0 +1,47 @@
+/*
+ *  Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ *
+ */
+
+package com.saggitt.omega.util;
+
+import android.content.Context;
+import android.content.IntentFilter;
+import android.content.pm.PackageManager;
+
+public class ActionIntentFilter {
+    public static IntentFilter googleInstance(String... array) {
+        return newInstance(Config.GOOGLE_QSB, array);
+    }
+
+    public static IntentFilter newInstance(String s, String... array) {
+        IntentFilter intentFilter = new IntentFilter();
+        for (int length = array.length, i = 0; i < length; ++i) {
+            intentFilter.addAction(array[i]);
+        }
+        intentFilter.addDataScheme("package");
+        intentFilter.addDataSchemeSpecificPart(s, 0);
+        return intentFilter;
+    }
+
+    public static boolean googleEnabled(final Context context) {
+        try {
+            return context.getPackageManager().getApplicationInfo(Config.GOOGLE_QSB, 0).enabled;
+        } catch (PackageManager.NameNotFoundException ex) {
+            return false;
+        }
+    }
+}
+
diff --git a/Omega/src/com/saggitt/omega/util/ApkAssets.kt b/Omega/src/com/saggitt/omega/util/ApkAssets.kt
new file mode 100644
index 0000000000..482a33d4ce
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/util/ApkAssets.kt
@@ -0,0 +1,38 @@
+/*
+ *     Copyright (C) 2019 Lawnchair Team.
+ *
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.util
+
+import android.content.res.XmlResourceParser
+
+class ApkAssets(apkPath: String) {
+    private val instance = loadFromPath(apkPath, false, true)
+
+    private fun loadFromPath(path: String, system: Boolean, forceSharedLibrary: Boolean): Any {
+        return loadFromPath.invoke(null, path, system, forceSharedLibrary)
+    }
+
+    fun openXml(filename: String) = getXml.invoke(instance, filename) as XmlResourceParser
+
+    companion object {
+        private val clazz by lazy { Class.forName("android.content.res.ApkAssets") }
+        private val loadFromPath by lazy { clazz.getDeclaredMethod("loadFromPath", String::class.java, Boolean::class.java, Boolean::class.java) }
+        private val getXml by lazy { clazz.getDeclaredMethod("openXml", String::class.java) }
+    }
+}
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/util/ColorManipulation.java b/Omega/src/com/saggitt/omega/util/ColorManipulation.java
new file mode 100644
index 0000000000..8a937c5a87
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/util/ColorManipulation.java
@@ -0,0 +1,78 @@
+package com.saggitt.omega.util;
+
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Matrix;
+import android.graphics.Paint;
+import android.graphics.PorterDuff;
+
+public class ColorManipulation {
+    private int[] mPixels;
+    private Bitmap mBitmap;
+    private Canvas mCanvas;
+    private Paint mPaint;
+    private final Matrix mMatrix;
+
+    public ColorManipulation() {
+        mMatrix = new Matrix();
+    }
+
+    public static boolean dC(int RGBA) {
+        int maxDiff = 20;
+        if ((RGBA >> 24 & 0xFF) < 50) {
+            return true;
+        }
+        int red = RGBA >> 16 & 0xFF;
+        int green = RGBA >> 8 & 0xFF;
+        int blue = RGBA & 0xFF;
+
+        boolean returnValue = true;
+        if (Math.abs(red - green) < maxDiff && Math.abs(red - blue) < maxDiff) {
+            if (Math.abs(green - blue) >= maxDiff) {
+                returnValue = false;
+            }
+        } else {
+            returnValue = false;
+        }
+        return returnValue;
+    }
+
+    public boolean dB(Bitmap ew) {
+        int height = ew.getHeight();
+        int width = ew.getWidth();
+        Bitmap bitmap;
+        if (height > 64 || width > 64) {
+            if (mBitmap == null) {
+                mBitmap = Bitmap.createBitmap(64, 64, Bitmap.Config.ARGB_8888);
+                mCanvas = new Canvas(mBitmap);
+                mPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+                mPaint.setFilterBitmap(true);
+            }
+            mMatrix.reset();
+            mMatrix.setScale(64f / width, 64f / height, 0f, 0f);
+            mCanvas.drawColor(0, PorterDuff.Mode.SRC);
+            mCanvas.drawBitmap(ew, mMatrix, mPaint);
+            ew = mBitmap;
+            width = 64;
+            height = 64;
+            bitmap = ew;
+        } else {
+            bitmap = ew;
+        }
+        int pixelCount = height * width;
+        resizeIfNecessary(pixelCount);
+        bitmap.getPixels(mPixels, 0, width, 0, 0, width, height);
+        for (int i = 0; i < pixelCount; ++i) {
+            if (!dC(mPixels[i])) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    private void resizeIfNecessary(int pixelCount) {
+        if (mPixels == null || mPixels.length < pixelCount) {
+            mPixels = new int[pixelCount];
+        }
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/util/Config.java b/Omega/src/com/saggitt/omega/util/Config.java
index 49f6d739bc..f2e9d98f88 100644
--- a/Omega/src/com/saggitt/omega/util/Config.java
+++ b/Omega/src/com/saggitt/omega/util/Config.java
@@ -25,8 +25,6 @@
 import com.android.launcher3.R;
 
 public class Config {
-    //private static final String TAG = "Config";
-
     //APP DRAWER SORT MODE
     public static final int SORT_AZ = 0;
     public static final int SORT_ZA = 1;
@@ -37,8 +35,9 @@ public class Config {
     //PERMISION FLAGS
     public static final int REQUEST_PERMISSION_STORAGE_ACCESS = 666;
     public static final int REQUEST_PERMISSION_LOCATION_ACCESS = 667;
-    public static final int REQUEST_PERMISSION_CALENDAR_READ_ACCESS = 668;
-    public static final int MY_PERMISSIONS_REQUEST_PACKAGE_USAGE_STATS = 669;
+    public static final int CODE_EDIT_ICON = 100;
+
+    public final static String GOOGLE_QSB = "com.google.android.googlequicksearchbox";
 
     public Context mContext;
 
@@ -50,6 +49,15 @@ public boolean defaultEnableBlur() {
         return mContext.getResources().getBoolean(R.bool.config_default_enable_blur);
     }
 
+    public String getDefaultSearchProvider() {
+        return mContext.getResources().getString(R.string.config_default_search_provider);
+    }
+
+    public String[] getDefaultIconPacks() {
+
+        return mContext.getResources().getStringArray(R.array.config_default_icon_packs);
+    }
+
     public float getDefaultBlurStrength() {
         TypedValue typedValue = new TypedValue();
         mContext.getResources().getValue(R.dimen.config_default_blur_strength, typedValue, true);
diff --git a/Omega/src/com/saggitt/omega/util/AboutUtils.java b/Omega/src/com/saggitt/omega/util/ContextUtils.java
similarity index 99%
rename from Omega/src/com/saggitt/omega/util/AboutUtils.java
rename to Omega/src/com/saggitt/omega/util/ContextUtils.java
index 68df4cb723..0f775e52e3 100644
--- a/Omega/src/com/saggitt/omega/util/AboutUtils.java
+++ b/Omega/src/com/saggitt/omega/util/ContextUtils.java
@@ -46,10 +46,10 @@
 
 import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
 
-public class AboutUtils {
+public class ContextUtils {
     public Context mContext;
 
-    public AboutUtils(Context context) {
+    public ContextUtils(Context context) {
         mContext = context;
     }
 
diff --git a/Omega/src/com/saggitt/omega/util/CustomLauncherClient.java b/Omega/src/com/saggitt/omega/util/CustomLauncherClient.java
new file mode 100644
index 0000000000..bd55c9a023
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/util/CustomLauncherClient.java
@@ -0,0 +1,42 @@
+/*
+ *  Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ *
+ */
+
+package com.saggitt.omega.util;
+
+import android.app.Activity;
+import android.os.RemoteException;
+
+import com.google.android.libraries.gsa.launcherclient.ClientOptions;
+import com.google.android.libraries.gsa.launcherclient.LauncherClient;
+import com.google.android.libraries.gsa.launcherclient.LauncherClientCallbacks;
+
+public class CustomLauncherClient extends LauncherClient {
+
+    public CustomLauncherClient(Activity activity, LauncherClientCallbacks callbacks, ClientOptions options) {
+        super(activity, callbacks, options);
+    }
+
+    // Only used for accessibility
+    public final void showOverlay(boolean feedRunning) {
+        if (mOverlay != null) {
+            try {
+                mOverlay.openOverlay(feedRunning ? 1 : 0);
+            } catch (RemoteException ignored) {
+            }
+        }
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/util/EntriesBuilder.kt b/Omega/src/com/saggitt/omega/util/EntriesBuilder.kt
new file mode 100644
index 0000000000..f08e18f588
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/util/EntriesBuilder.kt
@@ -0,0 +1,57 @@
+/*
+ *  Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ *
+ */
+
+package com.saggitt.omega.util
+
+import android.content.Context
+import androidx.preference.ListPreference
+
+class EntriesBuilder(private val context: Context) {
+
+    private val entries = ArrayList<String>()
+    private val entryValues = ArrayList<String>()
+
+    fun addEntry(entry: Int, value: String) {
+        addEntry(context.getString(entry), value)
+    }
+
+    fun addEntry(entry: String, value: Int) {
+        addEntry(entry, "$value")
+    }
+
+    fun addEntry(entry: Int, value: Int) {
+        addEntry(context.getString(entry), "$value")
+    }
+
+    fun addEntry(entry: String, value: String) {
+        entries.add(entry)
+        entryValues.add(value)
+    }
+
+    fun build(): Pair<Array<String>, Array<String>> {
+        return Pair(entries.toTypedArray(), entryValues.toTypedArray())
+    }
+
+    fun build(listPreference: ListPreference) {
+        listPreference.entries = entries.toTypedArray()
+        listPreference.entryValues = entryValues.toTypedArray()
+    }
+}
+
+inline fun ListPreference.buildEntries(edit: EntriesBuilder.() -> Unit) {
+    EntriesBuilder(context).apply(edit).build(this)
+}
diff --git a/Omega/src/com/saggitt/omega/util/IPLocation.kt b/Omega/src/com/saggitt/omega/util/IPLocation.kt
new file mode 100644
index 0000000000..00f07cc07d
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/util/IPLocation.kt
@@ -0,0 +1,84 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.util
+
+import android.content.Context
+import android.os.NetworkOnMainThreadException
+import android.os.SystemClock
+import com.saggitt.omega.perms.CustomPermissionManager
+import com.saggitt.omega.perms.checkCustomPermission
+import okhttp3.Request
+import org.json.JSONObject
+import java.util.concurrent.TimeUnit
+
+class IPLocation(private val context: Context, private val cacheValidityMs: Long = TimeUnit.MINUTES.toMillis(30)) {
+    private val permissionManager = CustomPermissionManager.getInstance(context)
+    private val client = OkHttpClientBuilder().build(context)
+
+    private val cacheValid get() = cache != null && timeLast + cacheValidityMs > SystemClock.uptimeMillis()
+    private var timeLast = 0L
+    private var cache: Result? = null
+        set(value) {
+            timeLast = SystemClock.uptimeMillis()
+            field = value
+        }
+
+    fun get(): Result {
+        var success = false
+        var lat = .0
+        var lon = .0
+
+        if (!context.checkCustomPermission(CustomPermissionManager.PERMISSION_IPLOCATE)) {
+            return Result(success, lat, lon)
+        }
+
+        if (!cacheValid) {
+            for (url in URLS) {
+                try {
+                    val response = client.newCall(getRequest(url)).execute()
+                    if (response.isSuccessful && response.body != null) {
+                        val json = JSONObject(response.body?.string())
+                        lat = json.getDouble("latitude")
+                        lon = json.getDouble("longitude")
+                        success = true
+                        break
+                    }
+                } catch (e: Exception) {
+                    if (e is NetworkOnMainThreadException)
+                        throw e
+                }
+            }
+
+            cache = Result(success, lat, lon)
+        }
+
+        return cache ?: Result(success, lat, lon).apply {
+            cache = this
+        }
+    }
+
+    private fun getRequest(url: String) = Request.Builder().url(url).get().build()
+
+    data class Result(val success: Boolean, val lat: Double, val lon: Double)
+
+    companion object {
+        private val URLS = arrayOf("https://freegeoip.app/json/",
+                "https://geoip-db.com/json/",
+                "https://api.iplocate.app/json/")
+    }
+}
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/util/InvertedMultiValueAlpha.java b/Omega/src/com/saggitt/omega/util/InvertedMultiValueAlpha.java
new file mode 100644
index 0000000000..64a26f2c94
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/util/InvertedMultiValueAlpha.java
@@ -0,0 +1,103 @@
+/*
+ * 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.
+ */
+
+package com.saggitt.omega.util;
+
+import android.util.Property;
+
+import java.util.function.Consumer;
+
+/**
+ * Utility class to handle separating a single value as a factor of multiple values
+ */
+public class InvertedMultiValueAlpha {
+
+    public static final Property<InvertedAlphaProperty, Float> VALUE =
+            new Property<InvertedAlphaProperty, Float>(Float.TYPE, "value") {
+
+                @Override
+                public Float get(InvertedAlphaProperty alphaProperty) {
+                    return 1 - alphaProperty.mValue;
+                }
+
+                @Override
+                public void set(InvertedAlphaProperty object, Float value) {
+                    object.setValue(value);
+                }
+            };
+
+    private final Consumer<Float> mConsumer;
+    private final InvertedAlphaProperty[] mMyProperties;
+
+    private int mValidMask;
+
+    public InvertedMultiValueAlpha(Consumer<Float> consumer, int size) {
+        mConsumer = consumer;
+        mMyProperties = new InvertedAlphaProperty[size];
+
+        mValidMask = 0;
+        for (int i = 0; i < size; i++) {
+            int myMask = 1 << i;
+            mValidMask |= myMask;
+            mMyProperties[i] = new InvertedAlphaProperty(myMask);
+        }
+    }
+
+    public InvertedAlphaProperty getProperty(int index) {
+        return mMyProperties[index];
+    }
+
+    public class InvertedAlphaProperty {
+
+        private final int mMyMask;
+
+        private float mValue = 1;
+        // Factor of all other alpha channels, only valid if mMyMask is present in mValidMask.
+        private float mOthers = 1;
+
+        InvertedAlphaProperty(int myMask) {
+            mMyMask = myMask;
+        }
+
+        public void setValue(float value) {
+            value = 1 - value;
+            if (mValue == value) {
+                return;
+            }
+
+            if ((mValidMask & mMyMask) == 0) {
+                // Our cache value is not correct, recompute it.
+                mOthers = 1;
+                for (InvertedAlphaProperty prop : mMyProperties) {
+                    if (prop != this) {
+                        mOthers *= prop.mValue;
+                    }
+                }
+            }
+
+            // Since we have changed our value, all other caches except our own need to be
+            // recomputed. Change mValidMask to indicate the new valid caches (only our own).
+            mValidMask = mMyMask;
+            mValue = value;
+
+            mConsumer.accept(1 - mOthers * mValue);
+        }
+
+        public float getValue() {
+            return 1 - mValue;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/util/JSONMap.kt b/Omega/src/com/saggitt/omega/util/JSONMap.kt
new file mode 100644
index 0000000000..5f545842cc
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/util/JSONMap.kt
@@ -0,0 +1,116 @@
+/*
+ *  Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ *
+ */
+
+package com.saggitt.omega.util
+
+import org.json.JSONObject
+
+class JSONMap(private val obj: JSONObject) : Map<String, Any> {
+
+    override val size get() = obj.length()
+
+    override fun isEmpty() = size != 0
+
+    override fun containsKey(key: String) = obj.has(key)
+
+    override fun containsValue(value: Any): Boolean {
+        return false
+    }
+
+    override fun get(key: String) = obj.getNullable(key)
+
+    override val entries = EntrySet()
+
+    override val keys = KeySet()
+
+    override val values = ValueCollection()
+
+    inner class Entry(override val key: String) : Map.Entry<String, Any> {
+
+        override val value: Any
+            get() = obj.get(key)
+    }
+
+    inner class EntrySet : Set<Entry> {
+
+        override val size = obj.length()
+
+        override fun contains(element: Entry): Boolean {
+            return obj.has(element.key)
+        }
+
+        override fun containsAll(elements: Collection<Entry>): Boolean {
+            return elements.all { obj.has(it.key) }
+        }
+
+        override fun isEmpty() = size != 0
+
+        override fun iterator() = TransformIterator(obj.keys()) { key -> Entry(key) }
+    }
+
+    inner class KeySet : Set<String> {
+
+        override val size = obj.length()
+
+        override fun contains(element: String): Boolean {
+            return obj.has(element)
+        }
+
+        override fun containsAll(elements: Collection<String>): Boolean {
+            return elements.all { obj.has(it) }
+        }
+
+        override fun isEmpty() = size != 0
+
+        override fun iterator(): Iterator<String> = obj.keys()
+    }
+
+    inner class ValueCollection : Collection<Any> {
+
+        override val size = obj.length()
+
+        override fun contains(element: Any): Boolean {
+            val it = iterator()
+            while (it.hasNext()) {
+                if (element == it.next()) return true
+            }
+            return false
+        }
+
+        override fun containsAll(elements: Collection<Any>): Boolean {
+            val set = HashSet<Any>()
+            val it = iterator()
+            while (it.hasNext()) {
+                set.add(it.next())
+            }
+            return set.containsAll(elements)
+        }
+
+        override fun isEmpty() = size != 0
+
+        override fun iterator() = TransformIterator(obj.keys()) { key -> obj.get(key) }
+    }
+
+    class TransformIterator<T1, T2>(private val base: Iterator<T1>, private val transform: (T1) -> T2) : Iterator<T2> {
+
+        override fun hasNext() = base.hasNext()
+
+        override fun next(): T2 {
+            return transform(base.next())
+        }
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/util/NavigationBarCompat.java b/Omega/src/com/saggitt/omega/util/NavigationBarCompat.java
new file mode 100644
index 0000000000..06252c827d
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/util/NavigationBarCompat.java
@@ -0,0 +1,81 @@
+/*
+ * 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
+ */
+
+package com.saggitt.omega.util;
+
+import android.content.res.Resources;
+
+import androidx.annotation.IntDef;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+public class NavigationBarCompat {
+    public static final int HIT_TARGET_NONE = 0;
+    public static final int HIT_TARGET_BACK = 1;
+    public static final int HIT_TARGET_HOME = 2;
+    public static final int HIT_TARGET_OVERVIEW = 3;
+    public static final int HIT_TARGET_ROTATION = 4;
+    public static final int HIT_TARGET_DEAD_ZONE = 5;
+    /**
+     * Interaction type: whether the gesture to swipe up from the navigation bar will trigger
+     * launcher to show overview
+     */
+    public static final int FLAG_DISABLE_SWIPE_UP = 0x1;
+    /**
+     * Interaction type: enable quick scrub interaction on the home button
+     */
+    public static final int FLAG_DISABLE_QUICK_SCRUB = 0x2;
+    /**
+     * Interaction type: show/hide the overview button while this service is connected to launcher
+     */
+    public static final int FLAG_SHOW_OVERVIEW_BUTTON = 0x4;
+
+    /**
+     * Touch slopes and thresholds for quick step operations. Drag slop is the point where the
+     * home button press/long press over are ignored and will start to drag when exceeded and the
+     * touch slop is when the respected operation will occur when exceeded. Touch slop must be
+     * larger than the drag slop.
+     */
+    public static int getQuickStepDragSlopPx() {
+        return convertDpToPixel(10);
+    }
+
+    public static int getQuickStepTouchSlopPx() {
+        return convertDpToPixel(24);
+    }
+
+    public static int getQuickScrubTouchSlopPx() {
+        return convertDpToPixel(24);
+    }
+
+    private static int convertDpToPixel(float dp) {
+        return (int) (dp * Resources.getSystem().getDisplayMetrics().density);
+    }
+
+    @Retention(RetentionPolicy.SOURCE)
+    @IntDef({HIT_TARGET_NONE, HIT_TARGET_BACK, HIT_TARGET_HOME, HIT_TARGET_OVERVIEW})
+    public @interface HitTarget {
+    }
+
+    @Retention(RetentionPolicy.SOURCE)
+    @IntDef({FLAG_DISABLE_SWIPE_UP,
+            FLAG_DISABLE_QUICK_SCRUB,
+            FLAG_SHOW_OVERVIEW_BUTTON
+    })
+    public @interface InteractionType {
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/util/NavigationModeCompat.kt b/Omega/src/com/saggitt/omega/util/NavigationModeCompat.kt
new file mode 100644
index 0000000000..dd42391b90
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/util/NavigationModeCompat.kt
@@ -0,0 +1,104 @@
+/*
+ *     Copyright (C) 2019 Lawnchair Team.
+ *
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.util
+
+import android.content.ContentResolver
+import android.content.Context
+import android.content.res.Resources
+import android.database.ContentObserver
+import android.os.Handler
+import android.provider.Settings
+import com.android.quickstep.SysUINavigationMode
+
+class NavigationModeCompat(context: Context) {
+
+    private var swipeUpEnabled = false
+        set(value) {
+            if (field != value) {
+                field = value
+                notifyChange()
+            }
+        }
+    private var fullGestureMode by context.omegaPrefs.BooleanPref("pref_fullGestureMode", false, ::notifyChange)
+
+    var listener: Listener? = null
+    val currentMode
+        get() = when {
+            !swipeUpEnabled -> SysUINavigationMode.Mode.THREE_BUTTONS
+            fullGestureMode -> SysUINavigationMode.Mode.NO_BUTTON
+            else -> SysUINavigationMode.Mode.TWO_BUTTONS
+        }
+
+    init {
+        SwipeUpGestureEnabledSettingObserver(context.contentResolver).register()
+    }
+
+    private fun notifyChange() {
+        listener?.onNavigationModeChange()
+    }
+
+    private inner class SwipeUpGestureEnabledSettingObserver(
+            private val resolver: ContentResolver) :
+            ContentObserver(Handler()) {
+
+        private val defaultValue: Int = if (getSystemBooleanRes(SWIPE_UP_ENABLED_DEFAULT_RES_NAME)) 1 else 0
+
+        private val value: Boolean
+            get() = Settings.Secure.getInt(resolver, SWIPE_UP_SETTING_NAME, defaultValue) == 1
+
+        fun register() {
+            resolver.registerContentObserver(Settings.Secure.getUriFor(SWIPE_UP_SETTING_NAME),
+                    false, this)
+            swipeUpEnabled = value
+        }
+
+        override fun onChange(selfChange: Boolean) {
+            super.onChange(selfChange)
+            swipeUpEnabled = value
+        }
+
+        override fun deliverSelfNotifications(): Boolean {
+            return true
+        }
+    }
+
+    interface Listener {
+
+        fun onNavigationModeChange()
+    }
+
+    companion object : OmegaSingletonHolder<NavigationModeCompat>(::NavigationModeCompat) {
+
+        private const val SWIPE_UP_ENABLED_DEFAULT_RES_NAME = "config_swipe_up_gesture_default"
+
+        private const val SWIPE_UP_SETTING_NAME = "swipe_up_to_switch_apps_enabled"
+
+        private fun getSystemBooleanRes(resName: String): Boolean {
+            val res = Resources.getSystem()
+            val resId = res.getIdentifier(resName, "bool", "android")
+
+            return if (resId != 0) {
+                res.getBoolean(resId)
+            } else {
+                false
+            }
+        }
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/util/OkHttpClientBuilder.kt b/Omega/src/com/saggitt/omega/util/OkHttpClientBuilder.kt
new file mode 100644
index 0000000000..138abe6e15
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/util/OkHttpClientBuilder.kt
@@ -0,0 +1,52 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.util
+
+import android.content.Context
+import okhttp3.OkHttpClient
+import okhttp3.logging.HttpLoggingInterceptor
+
+class OkHttpClientBuilder {
+    private val builder = OkHttpClient.Builder()
+    private val queryParams = mutableMapOf<String, String>()
+
+    fun addQueryParam(param: Pair<String, String>): OkHttpClientBuilder {
+        queryParams.putAll(arrayOf(param))
+        return this
+    }
+
+    fun build(context: Context?): OkHttpClient {
+        if (queryParams.isNotEmpty()) {
+            builder.addInterceptor {
+                val urlBuilder = it.request().url.newBuilder()
+                for (param in queryParams) {
+                    urlBuilder.addQueryParameter(param.key, param.value)
+                }
+                it.proceed(it.request().newBuilder().url(urlBuilder.build()).build())
+            }
+        }
+        builder.addInterceptor(HttpLoggingInterceptor().apply {
+            level = if (context?.omegaPrefs?.debugOkHttp == true) {
+                HttpLoggingInterceptor.Level.BODY
+            } else {
+                HttpLoggingInterceptor.Level.BASIC
+            }
+        })
+        return builder.build()
+    }
+}
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/util/OmegaUtils.kt b/Omega/src/com/saggitt/omega/util/OmegaUtils.kt
index 975c98063c..785a0e0c73 100644
--- a/Omega/src/com/saggitt/omega/util/OmegaUtils.kt
+++ b/Omega/src/com/saggitt/omega/util/OmegaUtils.kt
@@ -17,18 +17,28 @@
 
 package com.saggitt.omega.util
 
-import android.R
 import android.content.Context
+import android.content.pm.LauncherActivityInfo
+import android.content.pm.PackageInfo.REQUESTED_PERMISSION_GRANTED
 import android.content.pm.PackageManager
 import android.content.res.ColorStateList
 import android.content.res.Configuration
+import android.content.res.Resources
+import android.graphics.Color
+import android.graphics.RectF
+import android.graphics.drawable.Drawable
+import android.graphics.drawable.GradientDrawable
+import android.graphics.drawable.RippleDrawable
 import android.os.Handler
 import android.os.Looper
+import android.service.notification.StatusBarNotification
+import android.text.TextUtils
+import android.text.format.DateFormat
 import android.util.Property
+import android.util.TypedValue
 import android.view.View
 import android.view.ViewGroup
-import android.widget.ImageView
-import android.widget.Switch
+import android.widget.*
 import androidx.annotation.ColorInt
 import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContextCompat
@@ -37,22 +47,39 @@ import androidx.core.graphics.drawable.DrawableCompat
 import androidx.dynamicanimation.animation.FloatPropertyCompat
 import androidx.preference.Preference
 import androidx.preference.PreferenceGroup
-import com.android.launcher3.LauncherAppState
-import com.android.launcher3.Utilities
+import com.android.launcher3.*
+import com.android.launcher3.compat.LauncherAppsCompat
+import com.android.launcher3.compat.UserManagerCompat
 import com.android.launcher3.model.BgDataModel
-import com.android.launcher3.util.Executors
+import com.android.launcher3.shortcuts.DeepShortcutManager
+import com.android.launcher3.util.ComponentKey
+import com.android.launcher3.util.Executors.ICON_PACK_EXECUTOR
+import com.android.launcher3.util.Executors.MAIN_EXECUTOR
+import com.android.launcher3.util.PackageUserKey
 import com.android.launcher3.util.Themes
+import com.android.launcher3.views.OptionsPopupView
+import com.saggitt.omega.iconpack.CustomIconUtils
+import org.json.JSONArray
+import org.json.JSONObject
+import org.xmlpull.v1.XmlPullParser
+import java.lang.reflect.Field
+import java.util.*
 import java.util.concurrent.Callable
 import java.util.concurrent.ExecutionException
+import kotlin.collections.ArrayList
 import kotlin.math.ceil
+import kotlin.math.roundToInt
+import kotlin.random.Random
 import kotlin.reflect.KMutableProperty0
+import kotlin.reflect.KProperty
 
 val Context.launcherAppState get() = LauncherAppState.getInstance(this)
 val Context.omegaPrefs get() = Utilities.getOmegaPrefs(this)
 
 @ColorInt
 fun Context.getColorAccent(): Int {
-    return getColorAttr(android.R.attr.colorAccent)
+    //return getColorAttr(android.R.attr.colorAccent)
+    return omegaPrefs.accentColor
 }
 
 @ColorInt
@@ -84,6 +111,34 @@ fun Context.getDimenAttr(attr: Int): Int {
     return size
 }
 
+inline fun ViewGroup.forEachChildIndexed(action: (View, Int) -> Unit) {
+    val count = childCount
+    for (i in (0 until count)) {
+        action(getChildAt(i), i)
+    }
+}
+
+inline fun ViewGroup.forEachChild(action: (View) -> Unit) {
+    forEachChildIndexed { view, _ -> action(view) }
+}
+
+inline fun ViewGroup.forEachChildReversedIndexed(action: (View, Int) -> Unit) {
+    val count = childCount
+    for (i in (0 until count).reversed()) {
+        action(getChildAt(i), i)
+    }
+}
+
+inline fun ViewGroup.forEachChildReversed(action: (View) -> Unit) {
+    forEachChildReversedIndexed { view, _ -> action(view) }
+}
+
+fun CheckedTextView.applyAccent() {
+    val tintList = ColorStateList.valueOf(context.getColorAccent())
+    compoundDrawableTintList = tintList
+    backgroundTintList = tintList
+}
+
 fun ImageView.tintDrawable(color: Int) {
     val drawable = drawable.mutate()
     drawable.setTint(color)
@@ -96,7 +151,7 @@ fun <T, A> ensureOnMainThread(creator: (A) -> T): (A) -> T {
             creator(it)
         } else {
             try {
-                Executors.MAIN_EXECUTOR.submit(Callable { creator(it) }).get()
+                MAIN_EXECUTOR.submit(Callable { creator(it) }).get()
             } catch (e: InterruptedException) {
                 throw RuntimeException(e)
             } catch (e: ExecutionException) {
@@ -107,11 +162,22 @@ fun <T, A> ensureOnMainThread(creator: (A) -> T): (A) -> T {
     }
 }
 
+fun ComponentKey.getLauncherActivityInfo(context: Context): LauncherActivityInfo? {
+    return LauncherAppsCompat.getInstance(context).getActivityList(componentName.packageName, user)
+            .firstOrNull { it.componentName == componentName }
+}
+
 fun <T> useApplicationContext(creator: (Context) -> T): (Context) -> T {
     return { it -> creator(it.applicationContext) }
 }
 
 val mainHandler by lazy { Handler(Looper.getMainLooper()) }
+val uiWorkerHandler by lazy { Handler(LauncherModel.getUiWorkerLooper()) }
+val iconPackUiHandler by lazy { Handler(LauncherModel.getIconPackUiLooper()) }
+
+fun runOnUiWorkerThread(r: () -> Unit) {
+    runOnThread(uiWorkerHandler, r)
+}
 
 fun runOnMainThread(r: () -> Unit) {
     runOnThread(mainHandler, r)
@@ -125,8 +191,98 @@ fun runOnThread(handler: Handler, r: () -> Unit) {
     }
 }
 
+fun formatTime(dateTime: Date, context: Context? = null): String {
+    return when (context) {
+        null -> String.format("%d:%02d", dateTime.hours, dateTime.minutes)
+        else -> if (DateFormat.is24HourFormat(context)) String.format("%02d:%02d", dateTime.hours,
+                dateTime.minutes) else String.format(
+                "%d:%02d %s", if (dateTime.hours % 12 == 0) 12 else dateTime.hours % 12, dateTime.minutes,
+                if (dateTime.hours < 12) "am" else "pm")
+    }
+}
+
+fun formatTime(calendar: Calendar, context: Context? = null): String {
+    return when (context) {
+        null -> String.format("%02d:%02d", calendar.get(Calendar.HOUR_OF_DAY),
+                calendar.get(Calendar.HOUR_OF_DAY))
+        else -> if (DateFormat.is24HourFormat(context)) String.format("%02d:%02d", calendar.get(
+                Calendar.HOUR_OF_DAY), calendar.get(Calendar.MINUTE)) else String.format("%02d:%02d %s",
+                if (calendar.get(
+                                Calendar.HOUR_OF_DAY) % 12 == 0) 12 else calendar.get(
+                        Calendar.HOUR_OF_DAY) % 12,
+                calendar.get(
+                        Calendar.MINUTE),
+                if (calendar.get(
+                                Calendar.HOUR_OF_DAY) < 12) "AM" else "PM")
+    }
+}
+
+fun ViewGroup.getAllChilds() = ArrayList<View>().also { getAllChilds(it) }
+
+fun ViewGroup.getAllChilds(list: MutableList<View>) {
+    for (i in (0 until childCount)) {
+        val child = getChildAt(i)
+        if (child is ViewGroup) {
+            child.getAllChilds(list)
+        } else {
+            list.add(child)
+        }
+    }
+}
+
+fun StatusBarNotification.loadSmallIcon(context: Context): Drawable? {
+    return notification.smallIcon?.loadDrawable(context)
+}
+
+fun Context.checkPackagePermission(packageName: String, permissionName: String): Boolean {
+    try {
+        val info = packageManager.getPackageInfo(packageName, PackageManager.GET_PERMISSIONS)
+        info.requestedPermissions.forEachIndexed { index, s ->
+            if (s == permissionName) {
+                return info.requestedPermissionsFlags[index].hasFlag(REQUESTED_PERMISSION_GRANTED)
+            }
+        }
+    } catch (e: PackageManager.NameNotFoundException) {
+    }
+    return false
+}
+
+fun openPopupMenu(view: View, rect: RectF?, vararg items: OptionsPopupView.OptionItem) {
+    val launcher = Launcher.getLauncher(view.context)
+    OptionsPopupView.show(launcher, rect ?: RectF(launcher.getViewBounds(view)), items.toList())
+}
+
+fun Context.getLauncherOrNull(): Launcher? {
+    return try {
+        Launcher.getLauncher(this)
+    } catch (e: IllegalArgumentException) {
+        null
+    }
+}
+
+fun Context.getIcon(): Drawable = packageManager.getApplicationIcon(applicationInfo)
+
+@Suppress("UNCHECKED_CAST")
+fun <T> JSONArray.toArrayList(): ArrayList<T> {
+    val arrayList = ArrayList<T>()
+    for (i in (0 until length())) {
+        arrayList.add(get(i) as T)
+    }
+    return arrayList
+}
+
+fun Float.round() = roundToInt().toFloat()
+
 fun Float.ceilToInt() = ceil(this).toInt()
 
+fun dpToPx(size: Float): Float {
+    return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, size, Resources.getSystem().displayMetrics)
+}
+
+fun pxToDp(size: Float): Float {
+    return size / dpToPx(1f)
+}
+
 val Context.hasStoragePermission
     get() = PackageManager.PERMISSION_GRANTED == ContextCompat.checkSelfPermission(
             this, android.Manifest.permission.READ_EXTERNAL_STORAGE)
@@ -143,42 +299,6 @@ var View.isVisible: Boolean
         visibility = if (value) View.VISIBLE else View.GONE
     }
 
-inline fun ViewGroup.forEachChildReversed(action: (View) -> Unit) {
-    forEachChildReversedIndexed { view, _ -> action(view) }
-}
-
-inline fun ViewGroup.forEachChildReversedIndexed(action: (View, Int) -> Unit) {
-    val count = childCount
-    for (i in (0 until count).reversed()) {
-        action(getChildAt(i), i)
-    }
-}
-
-fun Switch.applyColor(color: Int) {
-    val colorForeground = Themes.getAttrColor(context, android.R.attr.colorForeground)
-    val alphaDisabled = Themes.getAlpha(context, android.R.attr.disabledAlpha)
-    val switchThumbNormal = context.resources.getColor(androidx.preference.R.color.switch_thumb_normal_material_light)
-    val switchThumbDisabled = context.resources.getColor(androidx.preference.R.color.switch_thumb_disabled_material_light)
-    val thstateList = ColorStateList(arrayOf(
-            intArrayOf(-R.attr.state_enabled),
-            intArrayOf(R.attr.state_checked),
-            intArrayOf()),
-            intArrayOf(
-                    switchThumbDisabled,
-                    color,
-                    switchThumbNormal))
-    val trstateList = ColorStateList(arrayOf(
-            intArrayOf(-android.R.attr.state_enabled),
-            intArrayOf(android.R.attr.state_checked),
-            intArrayOf()),
-            intArrayOf(
-                    ColorUtils.setAlphaComponent(colorForeground, alphaDisabled),
-                    color,
-                    colorForeground))
-    DrawableCompat.setTintList(thumbDrawable, thstateList)
-    DrawableCompat.setTintList(trackDrawable, trstateList)
-}
-
 operator fun PreferenceGroup.get(index: Int): Preference = getPreference(index)
 inline fun PreferenceGroup.forEachIndexed(action: (i: Int, pref: Preference) -> Unit) {
     for (i in 0 until preferenceCount) action(i, this[i])
@@ -204,19 +324,26 @@ class KFloatProperty(private val property: KMutableProperty0<Float>, name: Strin
 
 val Configuration.usingNightMode get() = uiMode and Configuration.UI_MODE_NIGHT_MASK == Configuration.UI_MODE_NIGHT_YES
 
+fun Int.hasFlags(vararg flags: Int): Boolean {
+    return flags.all { hasFlag(it) }
+}
 
 inline infix fun Int.hasFlag(flag: Int) = (this and flag) != 0
 
-fun Int.hasFlags(vararg flags: Int): Boolean {
-    return flags.all { hasFlag(it) }
+fun Int.removeFlag(flag: Int): Int {
+    return this and flag.inv()
 }
 
 fun Int.addFlag(flag: Int): Int {
     return this or flag
 }
 
-fun Int.removeFlag(flag: Int): Int {
-    return this and flag.inv()
+fun Int.setFlag(flag: Int, value: Boolean): Int {
+    return if (value) {
+        addFlag(flag)
+    } else {
+        removeFlag(flag)
+    }
 }
 
 fun Context.checkLocationAccess(): Boolean {
@@ -224,9 +351,61 @@ fun Context.checkLocationAccess(): Boolean {
             Utilities.hasPermission(this, android.Manifest.permission.ACCESS_FINE_LOCATION)
 }
 
+val Int.luminance get() = ColorUtils.calculateLuminance(this)
+
+val Int.isDark get() = luminance < 0.5f
+
+fun View.runOnAttached(runnable: Runnable) {
+    if (isAttachedToWindow) {
+        runnable.run()
+    } else {
+        addOnAttachStateChangeListener(object : View.OnAttachStateChangeListener {
+
+            override fun onViewAttachedToWindow(v: View?) {
+                runnable.run()
+                removeOnAttachStateChangeListener(this)
+            }
+
+            override fun onViewDetachedFromWindow(v: View?) {
+                removeOnAttachStateChangeListener(this)
+            }
+        })
+
+    }
+}
+
+val Context.locale: Locale
+    get() {
+        return if (Utilities.ATLEAST_NOUGAT) {
+            this.resources.configuration.locales[0] ?: this.resources.configuration.locale
+        } else {
+            this.resources.configuration.locale
+        }
+    }
+
+fun createRipplePill(context: Context, color: Int, radius: Float): Drawable {
+    return RippleDrawable(
+            ContextCompat.getColorStateList(context, R.color.focused_background)!!,
+            createPill(color, radius),
+            createPill(color, radius)
+    )
+}
+
+fun createPill(color: Int, radius: Float): Drawable {
+    return GradientDrawable().apply {
+        shape = GradientDrawable.RECTANGLE
+        setColor(color)
+        cornerRadius = radius
+    }
+}
+
+
+operator fun XmlPullParser.get(index: Int): String? = getAttributeValue(index)
+operator fun XmlPullParser.get(namespace: String?, key: String): String? = getAttributeValue(namespace, key)
+operator fun XmlPullParser.get(key: String): String? = this[null, key]
 
 fun AlertDialog.applyAccent() {
-    val color = Utilities.getOmegaPrefs(context).accentColor
+    val color = context.getColorAccent()
 
     getButton(AlertDialog.BUTTON_NEGATIVE)?.apply {
         setTextColor(color)
@@ -250,7 +429,205 @@ fun android.app.AlertDialog.applyAccent() {
     }
 }
 
+fun String.toTitleCase(): String = splitToSequence(" ").map { it.capitalize() }.joinToString(" ")
+
+inline fun <T> listWhileNotNull(generator: () -> T?): List<T> = mutableListOf<T>().apply {
+    while (true) {
+        add(generator() ?: break)
+    }
+}
 
 fun BgDataModel.workspaceContains(packageName: String): Boolean {
     return this.workspaceItems.any { it.targetComponent?.packageName == packageName }
-}
\ No newline at end of file
+}
+
+fun Switch.applyColor(color: Int) {
+    val colorForeground = Themes.getAttrColor(context, android.R.attr.colorForeground)
+    val alphaDisabled = Themes.getAlpha(context, android.R.attr.disabledAlpha)
+    val switchThumbNormal = context.resources.getColor(androidx.preference.R.color.switch_thumb_normal_material_light)
+    val switchThumbDisabled = context.resources.getColor(androidx.preference.R.color.switch_thumb_disabled_material_light)
+    val thstateList = ColorStateList(arrayOf(
+            intArrayOf(-android.R.attr.state_enabled),
+            intArrayOf(android.R.attr.state_checked),
+            intArrayOf()),
+            intArrayOf(
+                    switchThumbDisabled,
+                    color,
+                    switchThumbNormal))
+    val trstateList = ColorStateList(arrayOf(
+            intArrayOf(-android.R.attr.state_enabled),
+            intArrayOf(android.R.attr.state_checked),
+            intArrayOf()),
+            intArrayOf(
+                    ColorUtils.setAlphaComponent(colorForeground, alphaDisabled),
+                    color,
+                    colorForeground))
+    DrawableCompat.setTintList(thumbDrawable, thstateList)
+    DrawableCompat.setTintList(trackDrawable, trstateList)
+}
+
+fun Button.applyColor(color: Int) {
+    val rippleColor = ColorStateList.valueOf(ColorUtils.setAlphaComponent(color, 31))
+    (background as RippleDrawable).setColor(rippleColor)
+    DrawableCompat.setTint(background, color)
+    val tintList = ColorStateList.valueOf(color)
+    if (this is RadioButton) {
+        buttonTintList = tintList
+    }
+}
+
+fun reloadIconsFromComponents(context: Context, components: Collection<ComponentKey>) {
+    reloadIcons(context, components.map { PackageUserKey(it.componentName.packageName, it.user) })
+}
+
+fun reloadIcons(context: Context, packages: Collection<PackageUserKey>) {
+    ICON_PACK_EXECUTOR.execute {
+        val userManagerCompat = UserManagerCompat.getInstance(context)
+        val las = LauncherAppState.getInstance(context)
+        val model = las.model
+
+        for (user in userManagerCompat.userProfiles) {
+            model.onPackagesReload(user)
+        }
+
+        val shortcutManager = DeepShortcutManager.getInstance(context)
+        packages.forEach {
+            CustomIconUtils.reloadIcon(shortcutManager, model, it.mUser, it.mPackageName)
+        }
+    }
+}
+
+fun Context.createDisabledColor(color: Int): ColorStateList {
+    return ColorStateList(arrayOf(
+            intArrayOf(-android.R.attr.state_enabled),
+            intArrayOf()),
+            intArrayOf(
+                    getDisabled(getColorAttr(android.R.attr.colorForeground)),
+                    color))
+}
+
+@ColorInt
+fun Context.getDisabled(inputColor: Int): Int {
+    return applyAlphaAttr(android.R.attr.disabledAlpha, inputColor)
+}
+
+@ColorInt
+fun Context.applyAlphaAttr(attr: Int, inputColor: Int): Int {
+    val ta = obtainStyledAttributes(intArrayOf(attr))
+    val alpha = ta.getFloat(0, 0f)
+    ta.recycle()
+    return applyAlpha(alpha, inputColor)
+}
+
+@ColorInt
+fun applyAlpha(a: Float, inputColor: Int): Int {
+    var alpha = a
+    alpha *= Color.alpha(inputColor)
+    return Color.argb(alpha.toInt(), Color.red(inputColor), Color.green(inputColor),
+            Color.blue(inputColor))
+}
+
+fun JSONObject.asMap() = JSONMap(this)
+fun JSONObject.getNullable(key: String): Any? {
+    return opt(key)
+}
+
+fun String.asNonEmpty(): String? {
+    if (TextUtils.isEmpty(this)) return null
+    return this
+}
+
+fun <E> MutableSet<E>.addOrRemove(obj: E, exists: Boolean): Boolean {
+    if (contains(obj) != exists) {
+        if (exists) add(obj)
+        else remove(obj)
+        return true
+    }
+    return false
+}
+
+fun getTabRipple(context: Context, accent: Int): ColorStateList {
+    return ColorStateList(arrayOf(
+            intArrayOf(android.R.attr.state_selected),
+            intArrayOf()),
+            intArrayOf(
+                    ColorUtils.setAlphaComponent(accent, 31),
+                    context.getColorAttr(android.R.attr.colorControlHighlight)))
+}
+
+val Long.Companion.random get() = Random.nextLong()
+
+fun <T, U : Comparable<U>> comparing(extractKey: (T) -> U): Comparator<T> {
+    return Comparator { o1, o2 -> extractKey(o1).compareTo(extractKey(o2)) }
+}
+
+fun <T, U : Comparable<U>> Comparator<T>.then(extractKey: (T) -> U): Comparator<T> {
+    return kotlin.Comparator { o1, o2 ->
+        val res = compare(o1, o2)
+        if (res != 0) res else extractKey(o1).compareTo(extractKey(o2))
+    }
+}
+
+val ViewGroup.childs get() = ViewGroupChildList(this)
+
+class ViewGroupChildList(private val viewGroup: ViewGroup) : List<View> {
+
+    override val size get() = viewGroup.childCount
+
+    override fun isEmpty() = size == 0
+
+    override fun contains(element: View): Boolean {
+        return any { it === element }
+    }
+
+    override fun containsAll(elements: Collection<View>): Boolean {
+        return elements.all { contains(it) }
+    }
+
+    override fun get(index: Int) = viewGroup.getChildAt(index)!!
+
+    override fun indexOf(element: View) = indexOfFirst { it === element }
+
+    override fun lastIndexOf(element: View) = indexOfLast { it === element }
+
+    override fun iterator() = listIterator()
+
+    override fun listIterator() = listIterator(0)
+
+    override fun listIterator(index: Int) = ViewGroupChildIterator(viewGroup, index)
+
+    override fun subList(fromIndex: Int, toIndex: Int) = ArrayList(this).subList(fromIndex, toIndex)
+}
+
+class ViewGroupChildIterator(private val viewGroup: ViewGroup, private var current: Int) : ListIterator<View> {
+
+    override fun hasNext() = current < viewGroup.childCount
+
+    override fun next() = viewGroup.getChildAt(current++)!!
+
+    override fun nextIndex() = current
+
+    override fun hasPrevious() = current > 0
+
+    override fun previous() = viewGroup.getChildAt(current--)!!
+
+    override fun previousIndex() = current - 1
+}
+
+
+@Suppress("UNCHECKED_CAST")
+class JavaField<T>(private val targetObject: Any, fieldName: String, targetClass: Class<*> = targetObject::class.java) {
+
+    private val field: Field = targetClass.getDeclaredField(fieldName).apply { isAccessible = true }
+
+    operator fun getValue(thisRef: Any?, property: KProperty<*>): T {
+        return field.get(targetObject) as T
+    }
+
+    operator fun setValue(thisRef: Any?, property: KProperty<*>, value: T) {
+        field.set(targetObject, value)
+    }
+}
+
+inline val Calendar.hourOfDay get() = get(Calendar.HOUR_OF_DAY)
+inline val Calendar.dayOfYear get() = get(Calendar.DAY_OF_YEAR)
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/util/ResourceUtils.kt b/Omega/src/com/saggitt/omega/util/ResourceUtils.kt
new file mode 100644
index 0000000000..6aecde505b
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/util/ResourceUtils.kt
@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ */
+
+package com.saggitt.omega.util
+
+import android.content.res.AssetManager
+import android.content.res.Resources
+import android.os.Build
+import com.android.launcher3.Utilities
+
+val setConfigurationMethod by lazy {
+    if (Utilities.ATLEAST_OREO)
+        AssetManager::class.java.getDeclaredMethod("setConfiguration",
+                /* mcc */ Int::class.java, /* mnc */ Int::class.java, /* locale */ String::class.java,
+                /* orientation*/ Int::class.java, /* touchscreen*/ Int::class.java, /* density*/ Int::class.java,
+                /* keyboard */ Int::class.java, /* keyboardHidden */ Int::class.java, /* navigation */ Int::class.java,
+                /* screenWidth */ Int::class.java, /* screenHeight */ Int::class.java, /* smallestScreenWidthDp */ Int::class.java,
+                /* screenWidthDp */ Int::class.java, /* screenHeightDp */ Int::class.java, /* screenLayout */ Int::class.java,
+                /* uiMode */ Int::class.java, /* colorMode */ Int::class.java, /* majorVersion */ Int::class.java)
+    else
+        AssetManager::class.java.getDeclaredMethod("setConfiguration",
+                /* mcc */ Int::class.java, /* mnc */ Int::class.java, /* locale */ String::class.java,
+                /* orientation*/ Int::class.java, /* touchscreen*/ Int::class.java, /* density*/ Int::class.java,
+                /* keyboard */ Int::class.java, /* keyboardHidden */ Int::class.java, /* navigation */ Int::class.java,
+                /* screenWidth */ Int::class.java, /* screenHeight */ Int::class.java, /* smallestScreenWidthDp */ Int::class.java,
+                /* screenWidthDp */ Int::class.java, /* screenHeightDp */ Int::class.java, /* screenLayout */ Int::class.java,
+                /* uiMode */ Int::class.java, /* majorVersion */ Int::class.java)
+}
+
+inline fun <T> Resources.overrideSdk(sdk: Int, body: Resources.() -> T): T {
+    setResSdk(this, sdk)
+    val ret = body(this)
+    setResSdk(this, Build.VERSION.SDK_INT)
+    return ret
+}
+
+fun setResSdk(res: Resources, sdk: Int): Resources {
+    res.apply {
+        displayMetrics.scaledDensity = displayMetrics.density * if (configuration.fontScale != 0f) configuration.fontScale else 1.0f
+
+        val width: Int
+        val height: Int
+        if (displayMetrics.widthPixels >= displayMetrics.heightPixels) {
+            width = displayMetrics.widthPixels
+            height = displayMetrics.heightPixels
+        } else {
+            width = displayMetrics.heightPixels
+            height = displayMetrics.widthPixels
+        }
+
+        if (Utilities.ATLEAST_OREO)
+            setConfigurationMethod.invoke(assets, configuration.mcc, configuration.mnc,
+                    configuration.locale.toLanguageTag(),
+                    configuration.orientation,
+                    configuration.touchscreen,
+                    configuration.densityDpi, configuration.keyboard,
+                    configuration.keyboardHidden, configuration.navigation, width, height,
+                    configuration.smallestScreenWidthDp,
+                    configuration.screenWidthDp, configuration.screenHeightDp,
+                    configuration.screenLayout, configuration.uiMode,
+                    configuration.colorMode, sdk)
+        else
+            setConfigurationMethod.invoke(assets, configuration.mcc, configuration.mnc,
+                    configuration.locale.toLanguageTag(),
+                    configuration.orientation,
+                    configuration.touchscreen,
+                    configuration.densityDpi, configuration.keyboard,
+                    configuration.keyboardHidden, configuration.navigation, width, height,
+                    configuration.smallestScreenWidthDp,
+                    configuration.screenWidthDp, configuration.screenHeightDp,
+                    configuration.screenLayout, configuration.uiMode,
+                    sdk)
+    }
+    return res
+}
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/util/Temperature.kt b/Omega/src/com/saggitt/omega/util/Temperature.kt
new file mode 100644
index 0000000000..761f006810
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/util/Temperature.kt
@@ -0,0 +1,72 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.util
+
+import kotlin.math.roundToInt
+
+class Temperature(val value: Int, val unit: Unit) {
+
+    fun inUnit(other: Unit): Int {
+        if (other == unit) return value
+        return ((value.toFloat() - unit.freezingPoint) / unit.range * other.range + other.freezingPoint).roundToInt()
+    }
+
+    enum class Unit(val freezingPoint: Float, boilingPoint: Float, val suffix: String) {
+
+        Celsius(0f, 100f, "°C"),
+        Fahrenheit(32f, 212f, "°F"),
+        Kelvin(273f, 373f, "K"),
+        Rakine(491.67f, 671.64102f, "°R"),
+        Delisle(-100f, 50f, "°D"),
+        Newton(0f, 33f, "°N"),
+        Reaumur(0f, 80f, "°Ré"),
+        Romer(7.5f, 60f, "°Rø");
+
+        val range = boilingPoint - freezingPoint
+    }
+
+    companion object {
+
+        fun unitFromString(unit: String): Unit {
+            return when (unit) {
+                "metric" -> Unit.Celsius
+                "imperial" -> Unit.Fahrenheit
+                "kelvin" -> Unit.Kelvin
+                "rakine" -> Unit.Rakine
+                "delisle" -> Unit.Delisle
+                "newton" -> Unit.Newton
+                "reaumur" -> Unit.Reaumur
+                "romer" -> Unit.Romer
+                else -> throw IllegalArgumentException("unknown unit $unit")
+            }
+        }
+
+        fun unitToString(unit: Unit): String {
+            return when (unit) {
+                Unit.Celsius -> "metric"
+                Unit.Fahrenheit -> "imperial"
+                Unit.Kelvin -> "kelvin"
+                Unit.Rakine -> "rakine"
+                Unit.Delisle -> "delisle"
+                Unit.Newton -> "newton"
+                Unit.Reaumur -> "reaumur"
+                Unit.Romer -> "romer"
+            }
+        }
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/views/BaseBottomSheet.java b/Omega/src/com/saggitt/omega/views/BaseBottomSheet.java
new file mode 100644
index 0000000000..e2c3560613
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/views/BaseBottomSheet.java
@@ -0,0 +1,145 @@
+/*
+ *  Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ *
+ */
+
+package com.saggitt.omega.views;
+
+import android.animation.PropertyValuesHolder;
+import android.content.Context;
+import android.graphics.Rect;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.android.launcher3.Insettable;
+import com.android.launcher3.Launcher;
+import com.android.launcher3.R;
+import com.android.launcher3.Utilities;
+import com.android.launcher3.anim.Interpolators;
+import com.android.launcher3.util.SystemUiController;
+import com.android.launcher3.util.Themes;
+import com.android.launcher3.views.AbstractSlideInView;
+
+public class BaseBottomSheet extends AbstractSlideInView implements Insettable {
+
+    private static final int DEFAULT_CLOSE_DURATION = 200;
+    protected final ColorScrim mColorScrim;
+    private Rect mInsets;
+
+    public BaseBottomSheet(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public BaseBottomSheet(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        mColorScrim = ColorScrim.createExtractedColorScrim(this);
+        setWillNotDraw(false);
+        mInsets = new Rect();
+        mContent = this;
+    }
+
+    public static BaseBottomSheet inflate(Launcher launcher) {
+        return (BaseBottomSheet) launcher.getLayoutInflater()
+                .inflate(R.layout.base_bottom_sheet, launcher.getDragLayer(), false);
+    }
+
+    @Override
+    protected void onLayout(boolean changed, int l, int t, int r, int b) {
+        super.onLayout(changed, l, t, r, b);
+        setTranslationShift(mTranslationShift);
+    }
+
+    public void show(View view, boolean animate) {
+        ((ViewGroup) findViewById(R.id.sheet_contents)).addView(view);
+
+        mLauncher.getDragLayer().addView(this);
+        mIsOpen = false;
+        animateOpen(animate);
+    }
+
+    protected void setTranslationShift(float translationShift) {
+        super.setTranslationShift(translationShift);
+        mColorScrim.setProgress(1 - mTranslationShift);
+    }
+
+    protected void onCloseComplete() {
+        super.onCloseComplete();
+        clearNavBarColor();
+    }
+
+    protected void clearNavBarColor() {
+        mLauncher.getSystemUiController().updateUiState(
+                SystemUiController.UI_STATE_WIDGET_BOTTOM_SHEET, 0);
+    }
+
+    protected void setupNavBarColor() {
+        boolean isSheetDark = Themes.getAttrBoolean(mLauncher, R.attr.isMainColorDark);
+        mLauncher.getSystemUiController().updateUiState(
+                SystemUiController.UI_STATE_WIDGET_BOTTOM_SHEET,
+                isSheetDark ? SystemUiController.FLAG_DARK_NAV : SystemUiController.FLAG_LIGHT_NAV);
+    }
+
+    private void animateOpen(boolean animate) {
+        if (mIsOpen || mOpenCloseAnimator.isRunning()) {
+            return;
+        }
+        mIsOpen = true;
+        setupNavBarColor();
+        mOpenCloseAnimator.setValues(
+                PropertyValuesHolder.ofFloat(TRANSLATION_SHIFT, TRANSLATION_SHIFT_OPENED));
+        mOpenCloseAnimator.setInterpolator(Interpolators.FAST_OUT_SLOW_IN);
+        if (!animate) {
+            mOpenCloseAnimator.setDuration(0);
+        }
+        mOpenCloseAnimator.start();
+    }
+
+    @Override
+    protected void handleClose(boolean animate) {
+        handleClose(animate, DEFAULT_CLOSE_DURATION);
+    }
+
+    @Override
+    protected boolean isOfType(@FloatingViewType int type) {
+        return (type & TYPE_SETTINGS_SHEET) != 0;
+    }
+
+    @Override
+    public void setInsets(Rect insets) {
+        // Extend behind left, right, and bottom insets.
+        int leftInset = insets.left - mInsets.left;
+        int rightInset = insets.right - mInsets.right;
+        int bottomInset = insets.bottom - mInsets.bottom;
+        mInsets.set(insets);
+
+        if (!Utilities.ATLEAST_OREO && !mLauncher.getDeviceProfile().isVerticalBarLayout()) {
+            View navBarBg = findViewById(R.id.nav_bar_bg);
+            ViewGroup.LayoutParams navBarBgLp = navBarBg.getLayoutParams();
+            navBarBgLp.height = bottomInset;
+            navBarBg.setLayoutParams(navBarBgLp);
+            bottomInset = 0;
+        }
+
+        setPadding(getPaddingLeft() + leftInset, getPaddingTop(),
+                getPaddingRight() + rightInset, getPaddingBottom() + bottomInset);
+    }
+
+    @Override
+    public final void logActionCommand(int command) {
+
+    }
+
+}
diff --git a/Omega/src/com/saggitt/omega/views/BlankSearchLayout.kt b/Omega/src/com/saggitt/omega/views/BlankSearchLayout.kt
new file mode 100644
index 0000000000..eba618a12a
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/views/BlankSearchLayout.kt
@@ -0,0 +1,63 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.views
+
+import android.content.Context
+import android.graphics.Rect
+import android.util.AttributeSet
+import android.view.KeyEvent
+import android.view.View
+import android.view.animation.Interpolator
+import com.android.launcher3.allapps.AllAppsContainerView
+import com.android.launcher3.allapps.SearchUiManager
+import com.android.launcher3.anim.PropertySetter
+
+class BlankSearchLayout(context: Context, attrs: AttributeSet?) : View(context, attrs), SearchUiManager {
+
+    var topMargin = 0
+        set(value) {
+            if (value != field) {
+                field = value
+                layoutParams.height = value
+            }
+        }
+
+    override fun initialize(containerView: AllAppsContainerView) {
+        containerView.isVerticalFadingEdgeEnabled = false
+    }
+
+    override fun resetSearch() {
+
+    }
+
+    override fun preDispatchKeyEvent(keyEvent: KeyEvent?) {
+
+    }
+
+    override fun setContentVisibility(visibleElements: Int, setter: PropertySetter?, interpolator: Interpolator?) {
+        TODO("Not yet implemented")
+    }
+
+    override fun startSearch() {
+
+    }
+
+    override fun getScrollRangeDelta(insets: Rect?): Float {
+        TODO("Not yet implemented")
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/views/CenterFloatingView.java b/Omega/src/com/saggitt/omega/views/CenterFloatingView.java
new file mode 100644
index 0000000000..57cebf20af
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/views/CenterFloatingView.java
@@ -0,0 +1,100 @@
+/*
+ *  Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ *
+ */
+
+package com.saggitt.omega.views;
+
+import android.animation.PropertyValuesHolder;
+import android.content.Context;
+import android.graphics.Rect;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.android.launcher3.Insettable;
+import com.android.launcher3.Launcher;
+import com.android.launcher3.R;
+import com.android.launcher3.anim.Interpolators;
+import com.android.launcher3.views.AbstractSlideInView;
+
+public class CenterFloatingView extends AbstractSlideInView implements Insettable {
+    private static final int DEFAULT_CLOSE_DURATION = 200;
+    private final Rect mInsets;
+
+    public CenterFloatingView(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public CenterFloatingView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        setWillNotDraw(false);
+        mInsets = new Rect();
+        mContent = this;
+    }
+
+    public static CenterFloatingView inflate(Launcher launcher) {
+        return (CenterFloatingView) launcher.getLayoutInflater()
+                .inflate(R.layout.base_center_sheet, launcher.getDragLayer(), false);
+    }
+
+    public void show(View view, boolean animate) {
+        ((ViewGroup) findViewById(R.id.sheet_contents)).addView(view);
+
+        mLauncher.getDragLayer().addView(this);
+        mIsOpen = false;
+        animateOpen(animate);
+    }
+
+    @Override
+    public void setInsets(Rect insets) {
+        // Extend behind left, right, and bottom insets.
+        int leftInset = insets.left - mInsets.left;
+        int rightInset = insets.right - mInsets.right;
+        int bottomInset = insets.bottom - mInsets.bottom;
+        mInsets.set(insets);
+
+        setPadding(getPaddingLeft() + leftInset, getPaddingTop(),
+                getPaddingRight() + rightInset, getPaddingBottom() + bottomInset);
+    }
+
+    @Override
+    protected boolean isOfType(@FloatingViewType int type) {
+        return (type & TYPE_SETTINGS_SHEET) != 0;
+    }
+
+    private void animateOpen(boolean animate) {
+        if (mIsOpen || mOpenCloseAnimator.isRunning()) {
+            return;
+        }
+        mIsOpen = true;
+        mOpenCloseAnimator.setValues(
+                PropertyValuesHolder.ofFloat(TRANSLATION_SHIFT, TRANSLATION_SHIFT_OPENED));
+        mOpenCloseAnimator.setInterpolator(Interpolators.FAST_OUT_SLOW_IN);
+        if (!animate) {
+            mOpenCloseAnimator.setDuration(0);
+        }
+        mOpenCloseAnimator.start();
+    }
+
+    @Override
+    protected void handleClose(boolean animate) {
+        handleClose(animate, DEFAULT_CLOSE_DURATION);
+    }
+
+    @Override
+    public final void logActionCommand(int command) {
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/views/ColoredButton.kt b/Omega/src/com/saggitt/omega/views/ColoredButton.kt
new file mode 100644
index 0000000000..2b8e86ae6b
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/views/ColoredButton.kt
@@ -0,0 +1,53 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.views
+
+import android.content.Context
+import android.content.res.ColorStateList
+import android.graphics.drawable.RippleDrawable
+import android.util.AttributeSet
+import android.widget.Button
+import com.android.launcher3.Utilities
+import com.saggitt.omega.util.getTabRipple
+
+class ColoredButton(context: Context, attrs: AttributeSet) : Button(context, attrs) {
+
+    var color: Int = 0
+
+    private var defaultColor = currentTextColor
+
+    fun reset() {
+        color = Utilities.getOmegaPrefs(context).accentColor
+        setTextColor()
+        setRippleColor()
+    }
+
+    private fun setTextColor() {
+        val stateList = ColorStateList(arrayOf(
+                intArrayOf(android.R.attr.state_selected),
+                intArrayOf()),
+                intArrayOf(
+                        color,
+                        defaultColor))
+        setTextColor(stateList)
+    }
+
+    private fun setRippleColor() {
+        background = RippleDrawable(getTabRipple(context, color), null, null)
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/views/CustomBottomSheet.java b/Omega/src/com/saggitt/omega/views/CustomBottomSheet.java
new file mode 100644
index 0000000000..ab09ddd362
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/views/CustomBottomSheet.java
@@ -0,0 +1,394 @@
+/*
+ *  Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ *
+ */
+
+package com.saggitt.omega.views;
+
+import android.app.Activity;
+import android.app.Dialog;
+import android.app.Fragment;
+import android.app.FragmentManager;
+import android.content.ClipData;
+import android.content.ClipboardManager;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.preference.Preference;
+import android.preference.PreferenceFragment;
+import android.preference.PreferenceScreen;
+import android.preference.SwitchPreference;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.android.launcher3.AppInfo;
+import com.android.launcher3.FolderInfo;
+import com.android.launcher3.ItemInfo;
+import com.android.launcher3.ItemInfoWithIcon;
+import com.android.launcher3.Launcher;
+import com.android.launcher3.LauncherSettings;
+import com.android.launcher3.R;
+import com.android.launcher3.Utilities;
+import com.android.launcher3.WorkspaceItemInfo;
+import com.android.launcher3.util.ComponentKey;
+import com.android.launcher3.util.PackageManagerHelper;
+import com.android.launcher3.widget.WidgetsBottomSheet;
+import com.saggitt.omega.OmegaLauncher;
+import com.saggitt.omega.OmegaPreferences;
+import com.saggitt.omega.allapps.CustomAppFilter;
+import com.saggitt.omega.gestures.BlankGestureHandler;
+import com.saggitt.omega.gestures.GestureHandler;
+import com.saggitt.omega.gestures.ui.LauncherGesturePreference;
+import com.saggitt.omega.override.CustomInfoProvider;
+import com.saggitt.omega.predictions.OmegaAppPredictor;
+import com.saggitt.omega.preferences.MultiSelectTabPreference;
+
+public class CustomBottomSheet extends WidgetsBottomSheet {
+    private FragmentManager mFragmentManager;
+    private EditText mEditTitle;
+    private String mPreviousTitle;
+    private ItemInfo mItemInfo;
+    private CustomInfoProvider<ItemInfo> mInfoProvider;
+
+    private boolean mForceOpen;
+
+    public CustomBottomSheet(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public CustomBottomSheet(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        mFragmentManager = mLauncher.getFragmentManager();
+    }
+
+    public static void show(Launcher launcher, ItemInfo itemInfo) {
+        CustomBottomSheet cbs = (CustomBottomSheet) launcher.getLayoutInflater()
+                .inflate(R.layout.app_edit_bottom_sheet, launcher.getDragLayer(), false);
+        cbs.populateAndShow(itemInfo);
+    }
+
+    @Override
+    public void populateAndShow(ItemInfo itemInfo) {
+        super.populateAndShow(itemInfo);
+        mItemInfo = itemInfo;
+
+        mInfoProvider = CustomInfoProvider.Companion.forItem(getContext(), mItemInfo);
+
+        TextView title = findViewById(R.id.title);
+        title.setText(itemInfo.title);
+        ((PrefsFragment) mFragmentManager.findFragmentById(R.id.sheet_prefs)).loadForApp(itemInfo,
+                this::setForceOpen, this::unsetForceOpen, this::reopen);
+
+        boolean allowTitleEdit = true;
+
+        if (itemInfo instanceof ItemInfoWithIcon || mInfoProvider.supportsIcon()) {
+            ImageView icon = findViewById(R.id.icon);
+            if (itemInfo instanceof WorkspaceItemInfo && ((WorkspaceItemInfo) itemInfo).customIcon != null) {
+                icon.setImageBitmap(((WorkspaceItemInfo) itemInfo).customIcon);
+            } else if (itemInfo instanceof ItemInfoWithIcon) {
+                icon.setImageBitmap(((ItemInfoWithIcon) itemInfo).iconBitmap);
+            } else if (itemInfo instanceof FolderInfo) {
+                FolderInfo folderInfo = (FolderInfo) itemInfo;
+                icon.setImageDrawable(folderInfo.getIcon(mLauncher));
+                // Drawer folder
+                if (folderInfo.container == ItemInfo.NO_ID) {
+                    // TODO: Allow editing title for drawer folder & sync with group backend
+                    allowTitleEdit = false;
+                }
+            }
+            if (mInfoProvider != null) {
+                OmegaLauncher launcher = OmegaLauncher.getLauncher(getContext());
+                icon.setOnClickListener(v -> {
+                    ItemInfo editItem;
+                    if (mItemInfo instanceof FolderInfo && ((FolderInfo) mItemInfo).isCoverMode()) {
+                        editItem = ((FolderInfo) mItemInfo).getCoverInfo();
+                    } else {
+                        editItem = mItemInfo;
+                    }
+                    CustomInfoProvider editProvider
+                            = CustomInfoProvider.Companion.forItem(getContext(), editItem);
+                    if (editProvider != null) {
+                        launcher.startEditIcon(editItem, editProvider);
+                    }
+                });
+            }
+        }
+        if (mInfoProvider != null && allowTitleEdit) {
+            mPreviousTitle = mInfoProvider.getCustomTitle(mItemInfo);
+            if (mPreviousTitle == null)
+                mPreviousTitle = "";
+            mEditTitle = findViewById(R.id.edit_title);
+            mEditTitle.setHint(mInfoProvider.getDefaultTitle(mItemInfo));
+            mEditTitle.setText(mPreviousTitle);
+            mEditTitle.setVisibility(VISIBLE);
+            title.setVisibility(View.GONE);
+        }
+    }
+
+    @Override
+    public void onDetachedFromWindow() {
+        Fragment pf = mFragmentManager.findFragmentById(R.id.sheet_prefs);
+        if (pf != null) {
+            mFragmentManager.beginTransaction().remove(pf).commitAllowingStateLoss();
+        }
+        if (mEditTitle != null) {
+            String newTitle = mEditTitle.getText().toString();
+            if (!newTitle.equals(mPreviousTitle)) {
+                if (newTitle.equals(""))
+                    newTitle = null;
+                mInfoProvider.setTitle(mItemInfo, newTitle);
+            }
+        }
+        super.onDetachedFromWindow();
+    }
+
+    @Override
+    protected void handleClose(boolean animate, long defaultDuration) {
+        if (mForceOpen) return;
+        super.handleClose(animate, defaultDuration);
+    }
+
+    private void setForceOpen() {
+        mForceOpen = true;
+    }
+
+    private void unsetForceOpen() {
+        mForceOpen = false;
+    }
+
+    private void reopen() {
+        mForceOpen = false;
+        mIsOpen = true;
+        mLauncher.getDragLayer().onViewAdded(this);
+    }
+
+    @Override
+    public void onWidgetsBound() {
+    }
+
+    public static class PrefsFragment extends PreferenceFragment implements Preference.OnPreferenceChangeListener, Preference.OnPreferenceClickListener {
+        public final static int requestCode = "swipeUp".hashCode() & 65535;
+        private final static String PREF_HIDE = "pref_app_hide";
+        private final static String PREF_HIDE_FROM_PREDICTIONS = "pref_app_prediction_hide";
+        private final static boolean HIDE_PREDICTION_OPTION = true;
+        private SwitchPreference mPrefHidePredictions;
+        private LauncherGesturePreference mSwipeUpPref;
+        private MultiSelectTabPreference mTabsPref;
+        private SwitchPreference mPrefCoverMode;
+        private OmegaPreferences prefs;
+
+        private ComponentKey mKey;
+
+        private ItemInfo itemInfo;
+        private GestureHandler previousHandler;
+        private GestureHandler selectedHandler;
+        private Runnable setForceOpen;
+        private Runnable unsetForceOpen;
+        private Runnable reopen;
+
+        private CustomInfoProvider mProvider;
+
+        @Override
+        public void onCreate(Bundle savedInstanceState) {
+            super.onCreate(savedInstanceState);
+            addPreferencesFromResource(R.xml.app_edit_prefs);
+        }
+
+        public void loadForApp(ItemInfo info, Runnable setForceOpen, Runnable unsetForceOpen, Runnable reopen) {
+            itemInfo = info;
+            this.setForceOpen = setForceOpen;
+            this.unsetForceOpen = unsetForceOpen;
+            this.reopen = reopen;
+
+            mProvider = CustomInfoProvider.Companion.forItem(getActivity(), info);
+
+            Context context = getActivity();
+            boolean isApp = itemInfo instanceof AppInfo || itemInfo.itemType == LauncherSettings.Favorites.ITEM_TYPE_APPLICATION;
+
+            PreferenceScreen screen = getPreferenceScreen();
+            prefs = Utilities.getOmegaPrefs(getActivity());
+            mSwipeUpPref = (LauncherGesturePreference) screen.findPreference("pref_swipe_up_gesture");
+            mTabsPref = (MultiSelectTabPreference) screen.findPreference("pref_show_in_tabs");
+            if (!(itemInfo instanceof FolderInfo)) {
+                mKey = new ComponentKey(itemInfo.getTargetComponent(), itemInfo.user);
+            }
+            SwitchPreference mPrefHide = (SwitchPreference) findPreference(PREF_HIDE);
+            mPrefCoverMode = (SwitchPreference) findPreference("pref_cover_mode");
+
+            if (isApp) {
+                mPrefHide.setChecked(CustomAppFilter.isHiddenApp(context, mKey));
+                mPrefHide.setOnPreferenceChangeListener(this);
+            } else {
+                screen.removePreference(mPrefHide);
+            }
+
+            if (!isApp || !prefs.getDrawerTabs().isEnabled()) {
+                screen.removePreference(mTabsPref);
+            } else {
+                mTabsPref.setComponentKey(mKey);
+                mTabsPref.loadSummary();
+            }
+
+            if (mProvider != null && mProvider.supportsSwipeUp(itemInfo)) {
+                String previousSwipeUpAction = mProvider.getSwipeUpAction(itemInfo);
+                mSwipeUpPref.setValue(previousSwipeUpAction);
+                mSwipeUpPref.setOnSelectHandler(gestureHandler -> {
+                    onSelectHandler(gestureHandler);
+                    return null;
+                });
+            } else {
+                getPreferenceScreen().removePreference(mSwipeUpPref);
+            }
+
+            if (mPrefHidePredictions != null) {
+                mPrefHidePredictions.setChecked(OmegaAppPredictor.isHiddenApp(context, mKey));
+                mPrefHidePredictions.setOnPreferenceChangeListener(this);
+            }
+
+            if (prefs.getShowDebugInfo() && mKey != null && mKey.componentName != null) {
+                Preference componentPref = getPreferenceScreen().findPreference("componentName");
+                Preference versionPref = getPreferenceScreen().findPreference("versionName");
+
+                componentPref.setOnPreferenceClickListener(this);
+                versionPref.setOnPreferenceClickListener(this);
+                componentPref.setSummary(mKey.toString());
+                versionPref.setSummary(new PackageManagerHelper(context).getPackageVersion(mKey.componentName.getPackageName()));
+            } else {
+                getPreferenceScreen().removePreference(getPreferenceScreen().findPreference("debug"));
+            }
+
+            mPrefHidePredictions = (SwitchPreference) getPreferenceScreen()
+                    .findPreference(PREF_HIDE_FROM_PREDICTIONS);
+            if ((!prefs.getShowPredictions() || HIDE_PREDICTION_OPTION)
+                    && mPrefHidePredictions != null) {
+                getPreferenceScreen().removePreference(mPrefHidePredictions);
+            }
+
+            if (itemInfo instanceof FolderInfo) {
+                mPrefCoverMode.setChecked(((FolderInfo) itemInfo).isCoverMode());
+            } else {
+                getPreferenceScreen().removePreference(mPrefCoverMode);
+            }
+
+            // TODO: Add link to edit bottom sheet for drawer folder
+        }
+
+        private void onSelectHandler(GestureHandler handler) {
+            previousHandler = selectedHandler;
+            selectedHandler = handler;
+            if (handler.getConfigIntent() != null) {
+                setForceOpen.run();
+                startActivityForResult(handler.getConfigIntent(), PrefsFragment.requestCode);
+            } else {
+                updatePref();
+            }
+        }
+
+        @Override
+        public void onActivityResult(int requestCode, int resultCode, Intent data) {
+            if (requestCode == PrefsFragment.requestCode) {
+                if (resultCode == Activity.RESULT_OK) {
+                    selectedHandler.onConfigResult(data);
+                    updatePref();
+                } else {
+                    selectedHandler = previousHandler;
+                }
+                reopen.run();
+            } else {
+                unsetForceOpen.run();
+            }
+        }
+
+        private void updatePref() {
+            if (mProvider != null && selectedHandler != null) {
+                setForceOpen.run();
+                String stringValue;
+                if (selectedHandler instanceof BlankGestureHandler) {
+                    stringValue = null;
+                } else {
+                    stringValue = selectedHandler.toString();
+                }
+
+                Dialog dialog = mSwipeUpPref.getDialog();
+                if (dialog != null) {
+                    dialog.dismiss();
+                }
+                mSwipeUpPref.setValue(stringValue);
+                unsetForceOpen.run();
+            }
+        }
+
+        @SuppressWarnings({"ConstantConditions", "unchecked"})
+        @Override
+        public void onDetach() {
+            super.onDetach();
+
+            if (mProvider != null && selectedHandler != null) {
+                String stringValue = selectedHandler.toString();
+
+                CustomInfoProvider provider = CustomInfoProvider.Companion.forItem(getActivity(), itemInfo);
+                provider.setSwipeUpAction(itemInfo, stringValue);
+            }
+
+            if (mTabsPref.getEdited()) {
+                prefs.getDrawerTabs().saveToJson();
+            }
+
+            if (itemInfo instanceof FolderInfo) {
+                FolderInfo folderInfo = (FolderInfo) itemInfo;
+                boolean coverEnabled = mPrefCoverMode.isChecked();
+                if (folderInfo.isCoverMode() != coverEnabled) {
+                    Launcher launcher = Launcher.getLauncher(getActivity());
+                    folderInfo.setCoverMode(coverEnabled, launcher.getModelWriter());
+                    folderInfo.onIconChanged();
+                }
+            }
+        }
+
+        @Override
+        public boolean onPreferenceChange(Preference preference, Object newValue) {
+            boolean enabled = (boolean) newValue;
+            Launcher launcher = Launcher.getLauncher(getActivity());
+            switch (preference.getKey()) {
+                case PREF_HIDE:
+                    CustomAppFilter.setComponentNameState(launcher, mKey, enabled);
+                    break;
+                case PREF_HIDE_FROM_PREDICTIONS:
+                    OmegaAppPredictor.setComponentNameState(launcher, mKey, enabled);
+            }
+            return true;
+        }
+
+        @Override
+        public boolean onPreferenceClick(Preference preference) {
+            switch (preference.getKey()) {
+                case "componentName":
+                case "versionName":
+                    ClipboardManager clipboard = (ClipboardManager) getActivity().getSystemService(Context.CLIPBOARD_SERVICE);
+                    ClipData clip = ClipData.newPlainText(getString(R.string.debug_component_name), preference.getSummary());
+                    clipboard.setPrimaryClip(clip);
+                    Toast.makeText(getActivity(), R.string.debug_component_name_copied, Toast.LENGTH_SHORT).show();
+                    break;
+                default:
+                    break;
+            }
+            return true;
+        }
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/views/FadingImageView.kt b/Omega/src/com/saggitt/omega/views/FadingImageView.kt
new file mode 100644
index 0000000000..0cfc2bd6c4
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/views/FadingImageView.kt
@@ -0,0 +1,39 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.saggitt.omega.views
+
+import android.content.Context
+import android.graphics.drawable.Drawable
+import android.graphics.drawable.TransitionDrawable
+import android.util.AttributeSet
+import androidx.appcompat.widget.AppCompatImageView
+
+class FadingImageView(context: Context, attrs: AttributeSet?) : AppCompatImageView(context, attrs) {
+
+    private val transparentDrawable = resources.getDrawable(android.R.color.transparent, null)
+
+    var image: Drawable? = null
+        set(value) {
+            field = value
+            if (value != null) {
+                setImageDrawable(TransitionDrawable(arrayOf(transparentDrawable, value))
+                        .apply { startTransition(125) })
+            } else {
+                setImageDrawable(null)
+            }
+        }
+}
\ No newline at end of file
diff --git a/Omega/src/com/saggitt/omega/views/HomeWidgetSwitchLayout.kt b/Omega/src/com/saggitt/omega/views/HomeWidgetSwitchLayout.kt
new file mode 100644
index 0000000000..ebdf7bd6d9
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/views/HomeWidgetSwitchLayout.kt
@@ -0,0 +1,60 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggit.omega.views
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import android.widget.FrameLayout
+import com.android.launcher3.R
+import com.android.launcher3.Utilities
+import com.saggitt.omega.OmegaPreferences
+
+class HomeWidgetSwitchLayout(context: Context, attrs: AttributeSet?) :
+        FrameLayout(context, attrs), OmegaPreferences.OnPreferenceChangeListener {
+
+    private val prefs = Utilities.getOmegaPrefs(context)
+    private var currentLayout = 0
+        set(value) {
+            if (field != value) {
+                field = value
+                removeAllViews()
+                LayoutInflater.from(context).inflate(value, this, false).let {
+                    it.layoutParams.height = ViewGroup.LayoutParams.MATCH_PARENT
+                    addView(it)
+                }
+            }
+        }
+
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+
+        prefs.addOnPreferenceChangeListener(this, "pref_use_pill_qsb")
+    }
+
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+
+        prefs.removeOnPreferenceChangeListener(this, "pref_use_pill_qsb")
+    }
+
+    override fun onValueChanged(key: String, prefs: OmegaPreferences, force: Boolean) {
+        currentLayout = if (prefs.usePillQsb) R.layout.qsb_container else R.layout.search_container_workspace
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/views/InsettableLinearLayout.java b/Omega/src/com/saggitt/omega/views/InsettableLinearLayout.java
new file mode 100644
index 0000000000..9abab4f030
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/views/InsettableLinearLayout.java
@@ -0,0 +1,122 @@
+package com.saggitt.omega.views;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Rect;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewDebug;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
+
+import com.android.launcher3.Insettable;
+import com.android.launcher3.R;
+
+public class InsettableLinearLayout extends LinearLayout implements Insettable {
+
+    @ViewDebug.ExportedProperty(category = "launcher")
+    protected Rect mInsets = new Rect();
+
+    private boolean mInsetsSet = false;
+
+    public InsettableLinearLayout(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public Rect getInsets() {
+        return mInsets;
+    }
+
+    @Override
+    public void setInsets(Rect insets) {
+        if (getOrientation() != VERTICAL) {
+            throw new IllegalStateException("Doesn't support horizontal orientation");
+        }
+        mInsetsSet = true;
+        final int n = getChildCount();
+        for (int i = 0; i < n; i++) {
+            final View child = getChildAt(i);
+            setLinearLayoutChildInsets(child, insets, mInsets);
+        }
+        mInsets.set(insets);
+    }
+
+    public void setLinearLayoutChildInsets(View child, Rect newInsets, Rect oldInsets) {
+        final LayoutParams lp = (LayoutParams) child.getLayoutParams();
+
+        int childIndex = indexOfChild(child);
+        int newTop = childIndex == 0 ? newInsets.top : 0;
+        int oldTop = childIndex == 0 ? oldInsets.top : 0;
+        int newBottom = childIndex == getChildCount() - 1 ? newInsets.bottom : 0;
+        int oldBottom = childIndex == getChildCount() - 1 ? oldInsets.bottom : 0;
+
+        if (child instanceof Insettable) {
+            ((Insettable) child).setInsets(new Rect(newInsets.left, newTop, newInsets.right, newBottom));
+        } else if (!lp.ignoreInsets) {
+            lp.topMargin += (newTop - oldTop);
+            lp.leftMargin += (newInsets.left - oldInsets.left);
+            lp.rightMargin += (newInsets.right - oldInsets.right);
+            lp.bottomMargin += (newBottom - oldBottom);
+        }
+        child.setLayoutParams(lp);
+    }
+
+    @Override
+    public LayoutParams generateLayoutParams(AttributeSet attrs) {
+        return new InsettableLinearLayout.LayoutParams(getContext(), attrs);
+    }
+
+    @Override
+    protected LayoutParams generateDefaultLayoutParams() {
+        return new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
+    }
+
+    // Override to allow type-checking of LayoutParams.
+    @Override
+    protected boolean checkLayoutParams(ViewGroup.LayoutParams p) {
+        return p instanceof InsettableLinearLayout.LayoutParams;
+    }
+
+    @Override
+    protected LayoutParams generateLayoutParams(ViewGroup.LayoutParams p) {
+        return new LayoutParams(p);
+    }
+
+    @Override
+    public void onViewAdded(View child) {
+        super.onViewAdded(child);
+        if (mInsetsSet) {
+            throw new IllegalStateException("Cannot modify views after insets are set");
+        }
+    }
+
+    @Override
+    public void onViewRemoved(View child) {
+        super.onViewRemoved(child);
+        if (mInsetsSet) {
+            throw new IllegalStateException("Cannot modify views after insets are set");
+        }
+    }
+
+    public static class LayoutParams extends LinearLayout.LayoutParams {
+        boolean ignoreInsets = false;
+
+        public LayoutParams(Context c, AttributeSet attrs) {
+            super(c, attrs);
+            TypedArray a = c.obtainStyledAttributes(attrs,
+                    R.styleable.InsettableFrameLayout_Layout);
+            ignoreInsets = a.getBoolean(
+                    R.styleable.InsettableFrameLayout_Layout_layout_ignoreInsets, false);
+            a.recycle();
+        }
+
+        public LayoutParams(int width, int height) {
+            super(width, height);
+        }
+
+        public LayoutParams(ViewGroup.LayoutParams lp) {
+            super(lp);
+        }
+    }
+}
+
diff --git a/Omega/src/com/saggitt/omega/views/InsettableNestedScrollView.kt b/Omega/src/com/saggitt/omega/views/InsettableNestedScrollView.kt
new file mode 100644
index 0000000000..54f17382c0
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/views/InsettableNestedScrollView.kt
@@ -0,0 +1,42 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.views
+
+import android.content.Context
+import android.graphics.Rect
+import android.util.AttributeSet
+import android.view.View
+import com.android.launcher3.Insettable
+
+open class InsettableNestedScrollView @JvmOverloads constructor(
+        context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
+) : SpringNestedScrollView(context, attrs, defStyleAttr), Insettable {
+
+    private val currentInsets = Rect()
+
+    override fun setInsets(insets: Rect) {
+        currentInsets.set(insets)
+        (getChildAt(0) as Insettable).setInsets(insets)
+    }
+
+    override fun onViewAdded(child: View?) {
+        super.onViewAdded(child)
+        (child as Insettable).setInsets(currentInsets)
+    }
+}
+
diff --git a/Omega/src/com/saggitt/omega/views/OmegaBackgroundView.kt b/Omega/src/com/saggitt/omega/views/OmegaBackgroundView.kt
new file mode 100644
index 0000000000..7be1d816c6
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/views/OmegaBackgroundView.kt
@@ -0,0 +1,118 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.views
+
+import android.content.Context
+import android.graphics.Canvas
+import android.graphics.Rect
+import android.graphics.drawable.Drawable
+import android.util.AttributeSet
+import android.view.View
+import com.android.launcher3.Insettable
+import com.saggitt.omega.blur.BlurDrawable
+import com.saggitt.omega.blur.BlurWallpaperProvider
+import com.saggitt.omega.util.InvertedMultiValueAlpha
+import com.saggitt.omega.util.runOnMainThread
+
+class OmegaBackgroundView(context: Context, attrs: AttributeSet) : View(context, attrs),
+        Insettable, BlurWallpaperProvider.Listener {
+
+    private val blurProvider by lazy { BlurWallpaperProvider.getInstance(context) }
+    private var fullBlurDrawable: BlurDrawable? = null
+    val blurAlphas = InvertedMultiValueAlpha({ alpha ->
+        blurAlpha = Math.round(255 * alpha)
+        invalidate()
+    }, 4)
+    private var blurAlpha = 0
+
+    private val blurDrawableCallback by lazy {
+        object : Drawable.Callback {
+            override fun unscheduleDrawable(who: Drawable, what: Runnable) {
+
+            }
+
+            override fun invalidateDrawable(who: Drawable) {
+                runOnMainThread { invalidate() }
+            }
+
+            override fun scheduleDrawable(who: Drawable, what: Runnable, `when`: Long) {
+
+            }
+        }
+    }
+
+    init {
+        createFullBlurDrawable()
+    }
+
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+
+        BlurWallpaperProvider.getInstance(context).addListener(this)
+        fullBlurDrawable?.startListening()
+    }
+
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+
+        BlurWallpaperProvider.getInstance(context).removeListener(this)
+        fullBlurDrawable?.stopListening()
+    }
+
+    override fun onDraw(canvas: Canvas) {
+        fullBlurDrawable?.apply {
+            alpha = blurAlpha
+            draw(canvas)
+        }
+    }
+
+    override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {
+        if (changed) {
+            fullBlurDrawable?.setBounds(left, top, right, bottom)
+        }
+    }
+
+    private fun createFullBlurDrawable() {
+        fullBlurDrawable?.let { if (isAttachedToWindow) it.stopListening() }
+        fullBlurDrawable = if (BlurWallpaperProvider.isEnabled) {
+            blurProvider.createDrawable().apply {
+                callback = blurDrawableCallback
+                setBounds(left, top, right, bottom)
+                if (isAttachedToWindow) startListening()
+            }
+        } else {
+            null
+        }
+    }
+
+    override fun onEnabledChanged() {
+        createFullBlurDrawable()
+    }
+
+    override fun setInsets(insets: Rect) {
+
+    }
+
+    companion object {
+
+        const val ALPHA_INDEX_OVERLAY = 0
+        const val ALPHA_INDEX_STATE = 1
+        const val ALPHA_INDEX_TRANSITIONS = 2
+        const val ALPHA_INDEX_SCREEN = 3
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/views/OptionsPanel.kt b/Omega/src/com/saggitt/omega/views/OptionsPanel.kt
new file mode 100644
index 0000000000..b698875cb1
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/views/OptionsPanel.kt
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ */
+
+package com.saggitt.omega.views
+
+import android.content.Context
+import android.graphics.Rect
+import android.util.AttributeSet
+import android.view.View
+import android.widget.FrameLayout
+import android.widget.LinearLayout
+import com.android.launcher3.Insettable
+import com.android.launcher3.Launcher
+import com.android.launcher3.R
+import com.android.launcher3.views.OptionsPopupView
+import com.saggitt.omega.OmegaPreferences
+import com.saggitt.omega.util.forEachChild
+import com.saggitt.omega.util.isVisible
+import com.saggitt.omega.util.omegaPrefs
+import kotlinx.android.synthetic.omega.options_view.view.*
+
+class OptionsPanel(context: Context, attrs: AttributeSet) : LinearLayout(context, attrs),
+        Insettable, View.OnClickListener, OmegaPreferences.OnPreferenceChangeListener {
+
+    private val launcher = Launcher.getLauncher(context)
+
+    override fun onFinishInflate() {
+        super.onFinishInflate()
+
+        forEachChild { it.setOnClickListener(this) }
+    }
+
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+        context.omegaPrefs.addOnPreferenceChangeListener("pref_lockDesktop", this)
+    }
+
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+        context.omegaPrefs.removeOnPreferenceChangeListener("pref_lockDesktop", this)
+    }
+
+    override fun onValueChanged(key: String, prefs: OmegaPreferences, force: Boolean) {
+        widget_button.isVisible = !prefs.lockDesktop
+    }
+
+    override fun onClick(v: View) {
+        when (v.id) {
+            R.id.wallpaper_button -> OptionsPopupView.startWallpaperPicker(v)
+            R.id.widget_button -> OptionsPopupView.onWidgetsClicked(v)
+            R.id.settings_button -> OptionsPopupView.startSettings(v)
+        }
+    }
+
+    override fun setInsets(insets: Rect) {
+        val deviceProfile = launcher.deviceProfile
+
+        layoutParams = (layoutParams as FrameLayout.LayoutParams).also { lp ->
+            lp.width = deviceProfile.availableWidthPx
+            lp.height = (deviceProfile.availableHeightPx * .2f).toInt()
+            lp.bottomMargin = insets.bottom
+        }
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/views/OptionsTextView.kt b/Omega/src/com/saggitt/omega/views/OptionsTextView.kt
new file mode 100644
index 0000000000..7dad77ff49
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/views/OptionsTextView.kt
@@ -0,0 +1,34 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.views
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.HapticFeedbackConstants
+import android.view.MotionEvent
+import android.widget.TextView
+
+class OptionsTextView(context: Context, attrs: AttributeSet?) : TextView(context, attrs) {
+
+    override fun onTouchEvent(event: MotionEvent): Boolean {
+        if (event.action == MotionEvent.ACTION_DOWN) {
+            performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY)
+        }
+        return super.onTouchEvent(event)
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/views/PreferenceNestedScrollView.kt b/Omega/src/com/saggitt/omega/views/PreferenceNestedScrollView.kt
new file mode 100644
index 0000000000..b4897aed3b
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/views/PreferenceNestedScrollView.kt
@@ -0,0 +1,61 @@
+/*
+ *  Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ *
+ */
+
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.views
+
+import android.content.Context
+import android.util.AttributeSet
+import com.saggitt.omega.settings.DecorLayout
+
+class PreferenceNestedScrollView @JvmOverloads constructor(
+        context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
+) : InsettableNestedScrollView(context, attrs, defStyleAttr) {
+
+    private var elevationHelper: DecorLayout.ToolbarElevationHelper? = null
+        set(value) {
+            field?.destroy()
+            field = value
+        }
+
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+        elevationHelper = DecorLayout.ToolbarElevationHelper(this)
+    }
+
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+        elevationHelper = null
+    }
+}
+
diff --git a/Omega/src/com/saggitt/omega/views/PreviewFrame.kt b/Omega/src/com/saggitt/omega/views/PreviewFrame.kt
new file mode 100644
index 0000000000..46afc694ba
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/views/PreviewFrame.kt
@@ -0,0 +1,126 @@
+/*
+ * Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ */
+
+package com.saggitt.omega.views
+
+import android.app.ActivityOptions
+import android.content.ClipData
+import android.content.ClipDescription
+import android.content.Context
+import android.content.Intent
+import android.graphics.Canvas
+import android.graphics.Point
+import android.util.AttributeSet
+import android.view.MotionEvent
+import android.view.View
+import android.view.ViewTreeObserver
+import android.widget.FrameLayout
+import com.android.launcher3.LauncherAppWidgetProviderInfo
+import com.saggitt.omega.dragndrop.CustomWidgetDragListener
+import com.saggitt.omega.util.childs
+import com.saggitt.omega.wallpaper.WallpaperPreviewProvider
+
+class PreviewFrame(context: Context, attrs: AttributeSet?) :
+        FrameLayout(context, attrs), View.OnLongClickListener, ViewTreeObserver.OnScrollChangedListener {
+
+    private val viewLocation = IntArray(2)
+    private val wallpaper = WallpaperPreviewProvider.getInstance(context).wallpaper
+
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+        viewTreeObserver.addOnScrollChangedListener(this)
+    }
+
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+        viewTreeObserver.removeOnScrollChangedListener(this)
+    }
+
+    override fun onScrollChanged() {
+        invalidate()
+    }
+
+    override fun dispatchDraw(canvas: Canvas) {
+        val width = wallpaper.intrinsicWidth
+        val height = wallpaper.intrinsicHeight
+        if (width == 0 || height == 0) {
+            super.dispatchDraw(canvas)
+            return
+        }
+
+        getLocationInWindow(viewLocation)
+        val dm = resources.displayMetrics
+        val scaleX = dm.widthPixels.toFloat() / width
+        val scaleY = dm.heightPixels.toFloat() / height
+        val scale = kotlin.math.max(scaleX, scaleY)
+
+        canvas.save()
+        canvas.translate(0f, -viewLocation[1].toFloat())
+        canvas.scale(scale, scale)
+        wallpaper.setBounds(0, 0, width, height)
+        wallpaper.draw(canvas)
+        canvas.restore()
+
+        super.dispatchDraw(canvas)
+    }
+
+    override fun onLongClick(v: View): Boolean {
+        childs.filterIsInstance<CustomWidgetPreview>().firstOrNull()?.also {
+            val provider = it.provider
+            val bounds = clipBounds
+            val listener = CustomWidgetDragListener(provider, bounds,
+                    width, width)
+
+            val homeIntent = listener.addToIntent(
+                    Intent(Intent.ACTION_MAIN)
+                            .addCategory(Intent.CATEGORY_HOME)
+                            .setPackage(context.packageName)
+                            .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK))
+
+            listener.initWhenReady()
+            context.startActivity(
+                    homeIntent,
+                    ActivityOptions.makeCustomAnimation(
+                            context, 0, android.R.anim.fade_out).toBundle())
+
+            // Start a system drag and drop. We use a transparent bitmap as preview for system drag
+            // as the preview is handled internally by launcher.
+            val description = ClipDescription("", arrayOf(listener.mimeType))
+            val data = ClipData(description, ClipData.Item(""))
+            startDragAndDrop(data, object : DragShadowBuilder(this) {
+
+                override fun onDrawShadow(canvas: Canvas) {}
+
+                override fun onProvideShadowMetrics(
+                        outShadowSize: Point, outShadowTouchPoint: Point
+                ) {
+                    outShadowSize.set(10, 10)
+                    outShadowTouchPoint.set(5, 5)
+                }
+            }, null, View.DRAG_FLAG_GLOBAL)
+        }
+        return false
+    }
+
+    override fun onInterceptTouchEvent(ev: MotionEvent?): Boolean {
+        return true
+    }
+
+    interface CustomWidgetPreview {
+
+        val provider: LauncherAppWidgetProviderInfo
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/views/ScreenshotPreview.kt b/Omega/src/com/saggitt/omega/views/ScreenshotPreview.kt
new file mode 100644
index 0000000000..bfa92ed098
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/views/ScreenshotPreview.kt
@@ -0,0 +1,35 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.views
+
+import android.content.Context
+import android.util.AttributeSet
+import android.widget.FrameLayout
+import kotlinx.android.synthetic.omega.backup_item.view.*
+
+class ScreenshotPreview(context: Context, attrs: AttributeSet?) : FrameLayout(context, attrs) {
+
+    override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
+        super.measureChild(preview, widthMeasureSpec, heightMeasureSpec)
+        val measuredWidth = preview.measuredWidth
+        val measuredHeight = preview.measuredHeight
+        super.measureChild(wallpaper, MeasureSpec.makeMeasureSpec(measuredWidth, MeasureSpec.EXACTLY),
+                MeasureSpec.makeMeasureSpec(measuredHeight, MeasureSpec.EXACTLY))
+        setMeasuredDimension(measuredWidth, measuredHeight)
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/views/SmartspacePreview.kt b/Omega/src/com/saggitt/omega/views/SmartspacePreview.kt
new file mode 100644
index 0000000000..e4f9d74d9a
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/views/SmartspacePreview.kt
@@ -0,0 +1,79 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.views
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.ContextThemeWrapper
+import android.view.LayoutInflater
+import android.view.View
+import android.widget.FrameLayout
+import com.android.launcher3.R
+import com.android.launcher3.Utilities
+import com.android.launcher3.widget.custom.CustomWidgetParser
+import com.saggitt.omega.OmegaPreferences
+import com.saggitt.omega.smartspace.SmartspaceView
+import com.saggitt.omega.theme.ThemeOverride
+
+class SmartspacePreview(context: Context, attrs: AttributeSet?) :
+        FrameLayout(context, attrs), OmegaPreferences.OnPreferenceChangeListener,
+        PreviewFrame.CustomWidgetPreview {
+
+    private val prefs = Utilities.getOmegaPrefs(context)
+    private val usePillQsb = prefs::usePillQsb
+    private val prefsToWatch = arrayOf("pref_smartspace_time", "pref_smartspace_time_above",
+            "pref_smartspace_time_24_h", "pref_smartspace_date", "pref_use_pill_qsb")
+    private val needsReinflate = setOf("pref_use_pill_qsb")
+    private var currentView: SmartspaceView? = null
+    private val themedContext = ContextThemeWrapper(context, ThemeOverride.Launcher().getTheme(context))
+
+    override val provider = CustomWidgetParser.getCustomWidgets(context)[0]!!
+
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+
+        prefs.addOnPreferenceChangeListener(this, *prefsToWatch)
+    }
+
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+
+        prefs.removeOnPreferenceChangeListener(this, *prefsToWatch)
+    }
+
+    override fun onValueChanged(key: String, prefs: OmegaPreferences, force: Boolean) {
+        if (currentView == null || needsReinflate.contains(key)) {
+            removeAllViews()
+            inflateCurrentView()
+        } else {
+            currentView!!.reloadCustomizations()
+        }
+    }
+
+    private fun inflateCurrentView() {
+        val layout = if (usePillQsb.get()) R.layout.qsb_container_preview else R.layout.search_container_workspace
+        addView(inflateView(layout))
+    }
+
+    private fun inflateView(layout: Int): View {
+        val view = LayoutInflater.from(themedContext).inflate(layout, this, false)
+        view.layoutParams.height = resources.getDimensionPixelSize(R.dimen.smartspace_preview_height)
+        currentView = view as? SmartspaceView
+        return view
+    }
+}
diff --git a/Omega/src/com/saggitt/omega/views/SpringNestedScrollView.kt b/Omega/src/com/saggitt/omega/views/SpringNestedScrollView.kt
new file mode 100644
index 0000000000..6614152591
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/views/SpringNestedScrollView.kt
@@ -0,0 +1,74 @@
+/*
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.saggitt.omega.views
+
+import android.content.Context
+import android.graphics.Canvas
+import android.util.AttributeSet
+import android.view.View
+import androidx.core.widget.NestedScrollView
+import androidx.recyclerview.widget.RecyclerView.EdgeEffectFactory.DIRECTION_BOTTOM
+import com.saggitt.omega.util.getColorAttr
+import com.saggitt.omega.util.omegaPrefs
+import java.lang.reflect.Field
+
+open class SpringNestedScrollView @JvmOverloads constructor(
+        context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
+) : NestedScrollView(context, attrs, defStyleAttr) {
+
+    private val springManager = SpringEdgeEffect.Manager(this)
+    private val scrollBarColor by lazy {
+        val colorControlNormal = context.getColorAttr(android.R.attr.colorControlNormal)
+        val useAccentColor = colorControlNormal == context.omegaPrefs.accentColor
+        if (useAccentColor) context.omegaPrefs.accentColor else colorControlNormal
+    }
+
+    open var shouldTranslateSelf = true
+
+    var isTopFadingEdgeEnabled = true
+
+    init {
+        getField<NestedScrollView>("mEdgeGlowTop").set(this, springManager.createEdgeEffect(DIRECTION_BOTTOM, true))
+        getField<NestedScrollView>("mEdgeGlowBottom").set(this, springManager.createEdgeEffect(DIRECTION_BOTTOM))
+        overScrollMode = View.OVER_SCROLL_ALWAYS
+    }
+
+    override fun draw(canvas: Canvas) {
+        springManager.withSpring(canvas, shouldTranslateSelf) {
+            super.draw(canvas)
+            false
+        }
+    }
+
+    override fun dispatchDraw(canvas: Canvas) {
+        springManager.withSpring(canvas, !shouldTranslateSelf) {
+            super.dispatchDraw(canvas)
+            false
+        }
+    }
+
+    override fun getTopFadingEdgeStrength(): Float {
+        return if (isTopFadingEdgeEnabled) super.getTopFadingEdgeStrength() else 0f
+    }
+
+    inline fun <reified T> getField(name: String): Field {
+        return T::class.java.getDeclaredField(name).apply {
+            isAccessible = true
+        }
+    }
+}
+
diff --git a/Omega/src/com/saggitt/omega/wallpaper/WallpaperPreviewProvider.kt b/Omega/src/com/saggitt/omega/wallpaper/WallpaperPreviewProvider.kt
new file mode 100644
index 0000000000..fe21059a79
--- /dev/null
+++ b/Omega/src/com/saggitt/omega/wallpaper/WallpaperPreviewProvider.kt
@@ -0,0 +1,83 @@
+/*
+ *     Copyright (C) 2019 Lawnchair Team.
+ *
+ *     This file is part of Lawnchair Launcher.
+ *
+ *     Lawnchair Launcher is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Lawnchair Launcher is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.saggitt.omega.wallpaper
+
+import android.app.WallpaperManager
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.graphics.drawable.Drawable
+import android.view.ContextThemeWrapper
+import com.android.launcher3.util.Themes
+import com.saggitt.omega.theme.ThemeOverride
+import com.saggitt.omega.util.OmegaSingletonHolder
+import java.lang.ref.WeakReference
+
+class WallpaperPreviewProvider(private val context: Context) : BroadcastReceiver() {
+
+    private val wallpaperManager = WallpaperManager.getInstance(context)
+    private var loadedWallpaper: WeakReference<Drawable>? = null
+        set(value) {
+            field = value
+            registered = field != null
+        }
+    private var registered = false
+        set(value) {
+            if (field != value) {
+                field = value
+                if (value) {
+                    context.registerReceiver(this, IntentFilter(Intent.ACTION_WALLPAPER_CHANGED))
+                } else {
+                    context.unregisterReceiver(this)
+                }
+            }
+        }
+
+    val wallpaper: Drawable
+        get() = loadWallpaper()
+
+    private fun loadWallpaper(): Drawable {
+        val loaded = loadedWallpaper?.get()
+        if (loaded != null) {
+            return loaded
+        }
+
+        val info = wallpaperManager.wallpaperInfo
+        val drawable = if (info != null) {
+            info.loadThumbnail(context.packageManager)
+        } else {
+            wallpaperManager.drawable
+        }
+        loadedWallpaper = WeakReference(drawable)
+        return drawable ?: loadEmptyBackground()
+    }
+
+    private fun loadEmptyBackground(): Drawable {
+        val themedContext = ContextThemeWrapper(context, ThemeOverride.Launcher().getTheme(context))
+        return Themes.getAttrDrawable(themedContext, android.R.attr.windowBackground)
+    }
+
+    override fun onReceive(context: Context, intent: Intent?) {
+        loadedWallpaper = null
+    }
+
+    companion object : OmegaSingletonHolder<WallpaperPreviewProvider>(::WallpaperPreviewProvider)
+}
diff --git a/Omega/src/net/gsantner/opoc/preference/LanguagePreferenceCompat.java b/Omega/src/net/gsantner/opoc/preference/LanguagePreferenceCompat.java
index 62416c9bad..b43fcb2d43 100644
--- a/Omega/src/net/gsantner/opoc/preference/LanguagePreferenceCompat.java
+++ b/Omega/src/net/gsantner/opoc/preference/LanguagePreferenceCompat.java
@@ -54,7 +54,7 @@ static String getUsedAndroidLanguages() {
 import androidx.annotation.Nullable;
 import androidx.preference.ListPreference;
 
-import com.saggitt.omega.util.AboutUtils;
+import com.saggitt.omega.util.ContextUtils;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -98,7 +98,7 @@ public LanguagePreferenceCompat(Context context, AttributeSet attrs, int defStyl
     public boolean callChangeListener(Object newValue) {
         if (newValue instanceof String) {
             // Does not apply to existing UI, use recreate()
-            new AboutUtils(getContext()).setAppLanguage((String) newValue);
+            new ContextUtils(getContext()).setAppLanguage((String) newValue);
         }
         return super.callChangeListener(newValue);
     }
@@ -112,7 +112,7 @@ private void loadLangs(Context context, @Nullable AttributeSet attrs) {
         setDefaultValue(SYSTEM_LANGUAGE_CODE);
 
         // Fetch readable details
-        AboutUtils contextUtils = new AboutUtils(context);
+        ContextUtils contextUtils = new ContextUtils(context);
         List<String> languages = new ArrayList<>();
         Object bcof = contextUtils.getBuildConfigValue("DETECTED_ANDROID_LOCALES");
         if (bcof instanceof String[]) {
@@ -164,7 +164,7 @@ private String summarizeLocale(final Locale locale, final String localeAndroidCo
     // Add current language to summary
     @Override
     public CharSequence getSummary() {
-        Locale locale = new AboutUtils(getContext()).getLocaleByAndroidCode(getValue());
+        Locale locale = new ContextUtils(getContext()).getLocaleByAndroidCode(getValue());
         String prefix = TextUtils.isEmpty(super.getSummary())
                 ? "" : super.getSummary() + "\n\n";
         return prefix + summarizeLocale(locale, getValue());
diff --git a/Omega/src/net/oneplus/launcher/OPWeatherProvider.java b/Omega/src/net/oneplus/launcher/OPWeatherProvider.java
new file mode 100644
index 0000000000..a41cd17a18
--- /dev/null
+++ b/Omega/src/net/oneplus/launcher/OPWeatherProvider.java
@@ -0,0 +1,399 @@
+/*
+ * Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ */
+
+package net.oneplus.launcher;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.database.ContentObserver;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.Handler;
+import android.preference.PreferenceManager;
+import android.util.Log;
+
+import androidx.annotation.IntRange;
+import androidx.annotation.NonNull;
+
+import com.android.launcher3.util.PackageManagerHelper;
+import com.saggitt.omega.smartspace.weather.icons.WeatherIconManager;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Locale;
+
+import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
+
+public class OPWeatherProvider {
+
+    private static final String TAG = "OPWeatherProvider";
+    public static final int TEMPERATURE_NONE = -99;
+    public static final String TEMP_UNIT_CELSIUS = "℃";
+    // TIL these glyphs exist
+    public static final String TEMP_UNIT_DEGREE = "˚";
+    public static final String TEMP_UNIT_FAHRENHEIT = "℉";
+    public static final int WEATHER_CODE_NONE = 9999;
+    public static final String WEATHER_LAUNCH_ACTIVITY = "net.oneplus.weather.app.MainActivity";
+    public static final String WEATHER_NAME_NONE = "N/A";
+    public static final String WEATHER_PACKAGE_NAME = "net.oneplus.weather";
+    private final String KEY_CITY_NAME = "weather_city";
+    private final String KEY_TEMPERATURE = "weather_temp";
+    private final String KEY_TEMPERATURE_HIGH = "weather_temp_high";
+    private final String KEY_TEMPERATURE_LOW = "weather_temp_low";
+    private final String KEY_TEMPERATURE_UNIT = "weather_temp_unit";
+    private final String KEY_TIMESTAMP = "weather_timestamp";
+    private final String KEY_WEATHER_CODE = "weather_code";
+    private final String KEY_WEATHER_NAME = "weather_description";
+    private final Uri WEATHER_CONTENT_URI = Uri
+            .parse("content://com.oneplus.weather.ContentProvider/data");
+    private ArrayList<IWeatherCallback> mCallbacks;
+    private Context mContext;
+    private WeatherObserver mObserver;
+
+    private Handler mUiWorkerHandler = new Handler(MODEL_EXECUTOR.getLooper());
+
+    public interface IWeatherCallback {
+
+        void onWeatherUpdated(@NonNull WeatherData weatherData);
+    }
+
+    private enum WEATHER_COLUMNS {
+        TIMESTAMP(0),
+        CITY_NAME(1),
+        WEATHER_CODE(2),
+        WEATHER_NAME(6),
+        TEMP(3),
+        TEMP_HIGH(4),
+        TEMP_LOW(5),
+        TEMP_UNIT(7);
+
+        private int index;
+
+        WEATHER_COLUMNS(int i) {
+            this.index = i;
+        }
+    }
+
+    private enum WEATHER_TYPE {
+        SUNNY(1001, WeatherIconManager.Icon.CLEAR),
+        SUNNY_INTERVALS(1002, WeatherIconManager.Icon.MOSTLY_CLEAR),
+        CLOUDY(1003, WeatherIconManager.Icon.CLOUDY),
+        OVERCAST(1004, WeatherIconManager.Icon.OVERCAST),
+        DRIZZLE(1005, WeatherIconManager.Icon.PARTLY_CLOUDY_W_SHOWERS),
+        RAIN(1006, WeatherIconManager.Icon.RAIN),
+        SHOWER(1007, WeatherIconManager.Icon.SHOWERS),
+        DOWNPOUR(1008, WeatherIconManager.Icon.RAIN),
+        RAINSTORM(1009, WeatherIconManager.Icon.RAIN),
+        SLEET(1010, WeatherIconManager.Icon.SLEET),
+        FLURRY(1011, WeatherIconManager.Icon.FLURRIES),
+        SNOW(1012, WeatherIconManager.Icon.SNOW),
+        SNOWSTORM(1013, WeatherIconManager.Icon.SNOWSTORM),
+        HAIL(1014, WeatherIconManager.Icon.HAIL),
+        THUNDERSHOWER(1015, WeatherIconManager.Icon.THUNDERSTORMS),
+        SANDSTORM(1016, WeatherIconManager.Icon.SANDSTORM),
+        FOG(1017, WeatherIconManager.Icon.FOG),
+        HURRICANE(1018, WeatherIconManager.Icon.HURRICANE),
+        HAZE(1019, WeatherIconManager.Icon.HAZY),
+        NONE(9999, WeatherIconManager.Icon.NA);
+
+        int weatherCode;
+        WeatherIconManager.Icon icon;
+
+        WEATHER_TYPE(@IntRange(from = 1000, to = 9999) int i, WeatherIconManager.Icon icon) {
+            weatherCode = i;
+            this.icon = icon;
+        }
+
+        public static WEATHER_TYPE getWeather(int i) {
+            for (WEATHER_TYPE weather_type : values()) {
+                if (weather_type.weatherCode == i) {
+                    Log.d(TAG, "get weather: " + weather_type);
+                    return weather_type;
+                }
+            }
+            Log.d(TAG, "get weather: " + NONE);
+            return NONE;
+        }
+
+        public String toString() {
+            return String.valueOf(this.weatherCode);
+        }
+    }
+
+    public class WeatherData {
+
+        public String cityName = "";
+        public int temperature = TEMPERATURE_NONE;
+        public int temperatureHigh = TEMPERATURE_NONE;
+        public int temperatureLow = TEMPERATURE_NONE;
+        public String temperatureUnit = TEMP_UNIT_CELSIUS;
+        public long timestamp = 0;
+        public int weatherCode = WEATHER_CODE_NONE;
+        public String weatherName = WEATHER_NAME_NONE;
+        public WeatherIconManager.Icon icon = WeatherIconManager.Icon.NA;
+
+        public String toString() {
+            return "[timestamp] " + timestamp + "; "
+                    + "[cityName] " + cityName + "; "
+                    + "[weatherCode] " + weatherCode + "; "
+                    + "[weatherName] " + weatherName + "; "
+                    + "[temperature] " + temperature + "; "
+                    + "[temperatureHigh] " + temperatureHigh + "; "
+                    + "[temperatureLow] " + temperatureLow + "; "
+                    + "[temperatureUnit] " + temperatureUnit + "; ";
+        }
+    }
+
+    private class WeatherObserver extends ContentObserver {
+
+        public WeatherObserver() {
+            super(new Handler());
+        }
+
+        public void onChange(boolean z) {
+            super.onChange(z);
+            mUiWorkerHandler.post(OPWeatherProvider.this::queryWeatherInformation);
+        }
+    }
+
+    public OPWeatherProvider(Context context) {
+        mContext = context;
+        mObserver = new WeatherObserver();
+        mCallbacks = new ArrayList<>();
+    }
+
+    public WeatherData getOfflineWeatherInformation() {
+        SharedPreferences defaultSharedPreferences = PreferenceManager
+                .getDefaultSharedPreferences(mContext);
+        if (defaultSharedPreferences.contains(KEY_TIMESTAMP)) {
+            WeatherData weatherData = new WeatherData();
+            weatherData.timestamp = defaultSharedPreferences.getLong(KEY_TIMESTAMP, 0);
+            weatherData.cityName = defaultSharedPreferences.getString(KEY_CITY_NAME, "");
+            weatherData.weatherCode = defaultSharedPreferences.getInt(KEY_WEATHER_CODE, 9999);
+            weatherData.weatherName = defaultSharedPreferences
+                    .getString(KEY_WEATHER_NAME, WEATHER_NAME_NONE);
+            weatherData.temperature = defaultSharedPreferences.getInt(KEY_TEMPERATURE, -99);
+            weatherData.temperatureHigh = defaultSharedPreferences
+                    .getInt(KEY_TEMPERATURE_HIGH, -99);
+            weatherData.temperatureLow = defaultSharedPreferences.getInt(KEY_TEMPERATURE_LOW, -99);
+            weatherData.temperatureUnit = defaultSharedPreferences
+                    .getString(KEY_TEMPERATURE_UNIT, TEMP_UNIT_CELSIUS);
+            weatherData.icon = WEATHER_TYPE.getWeather(weatherData.weatherCode).icon;
+            return weatherData;
+        }
+        mUiWorkerHandler.post(this::queryWeatherInformation);
+        Log.d(TAG, "never get the weather information, querying... ");
+        return null;
+    }
+
+    public void getCurrentWeatherInformation() {
+        getCurrentWeatherInformation(null);
+    }
+
+    public void getCurrentWeatherInformation(IWeatherCallback iWeatherCallback) {
+        WeatherData offlineWeatherInformation = getOfflineWeatherInformation();
+        if (offlineWeatherInformation != null) {
+            updateWeatherCallbacks(offlineWeatherInformation, iWeatherCallback);
+        }
+    }
+
+    public void subscribeCallback(@NonNull IWeatherCallback iWeatherCallback) {
+        Log.i(TAG,
+                "subscribe new weather callback: " + iWeatherCallback.getClass().getSimpleName());
+        if (!isAppEnabled()) {
+            Log.w(TAG, "the weather application is not installed, may not receive the updates");
+        }
+        if (mCallbacks.contains(iWeatherCallback)) {
+            Log.d(TAG, "the callback is existed, remove the old one");
+            mCallbacks.remove(iWeatherCallback);
+        }
+        mCallbacks.add(iWeatherCallback);
+        getCurrentWeatherInformation(iWeatherCallback);
+    }
+
+    public void unsubscribeCallback(@NonNull IWeatherCallback iWeatherCallback) {
+        if (mCallbacks.contains(iWeatherCallback)) {
+            Log.i(TAG, "un-subscribe the weather callback: " + iWeatherCallback.getClass()
+                    .getSimpleName());
+            mCallbacks.remove(iWeatherCallback);
+            return;
+        }
+        Log.d(TAG, "the target callback is not found in the callback list");
+    }
+
+    public void registerContentObserver(ContentResolver contentResolver) {
+        if (isAppEnabled()) {
+            if (mObserver == null) {
+                mObserver = new WeatherObserver();
+            }
+            String str = TAG;
+            StringBuilder stringBuilder = new StringBuilder();
+            stringBuilder.append("registerContentObserver receiver = ");
+            stringBuilder.append(mObserver);
+            Log.d(str, stringBuilder.toString());
+            str = TAG;
+            stringBuilder = new StringBuilder();
+            stringBuilder.append("registerContentObserver mContext = ");
+            stringBuilder.append(mContext);
+            Log.d(str, stringBuilder.toString());
+            str = TAG;
+            stringBuilder = new StringBuilder();
+            stringBuilder.append("registerContentObserver obj = ");
+            stringBuilder.append(this);
+            Log.d(str, stringBuilder.toString());
+            try {
+                contentResolver
+                        .registerContentObserver(WEATHER_CONTENT_URI, true, mObserver);
+                mUiWorkerHandler.post(this::queryWeatherInformation);
+            } catch (SecurityException e) {
+                Log.e(TAG, "register with Weather provider failed: ", e);
+            }
+            return;
+        }
+        Log.w(TAG, "the weather application is not installed");
+    }
+
+    public void unregisterContentObserver(ContentResolver contentResolver) {
+        mCallbacks.clear();
+        if (mObserver != null) {
+            String str = TAG;
+            StringBuilder stringBuilder = new StringBuilder();
+            stringBuilder.append("unregisterContentObserver mContext = ");
+            stringBuilder.append(mContext);
+            Log.d(str, stringBuilder.toString());
+            str = TAG;
+            stringBuilder = new StringBuilder();
+            stringBuilder.append("unregisterContentObserver receiver = ");
+            stringBuilder.append(mObserver);
+            Log.d(str, stringBuilder.toString());
+            str = TAG;
+            stringBuilder = new StringBuilder();
+            stringBuilder.append("unregisterContentObserver obj = ");
+            stringBuilder.append(this);
+            Log.d(str, stringBuilder.toString());
+            contentResolver.unregisterContentObserver(mObserver);
+            mObserver = null;
+        }
+    }
+
+    private boolean isAppEnabled() {
+        return PackageManagerHelper
+                .isAppEnabled(mContext.getPackageManager(), WEATHER_PACKAGE_NAME, 0);
+    }
+
+    private void queryWeatherInformation() {
+        if (isAppEnabled()) {
+            processWeatherInformation(mContext.getContentResolver()
+                    .query(WEATHER_CONTENT_URI, null, null, null, null));
+        } else {
+            Log.w(TAG, "the weather application is not installed, stop querying...");
+        }
+    }
+
+    private void processWeatherInformation(Cursor cursor) {
+        StringBuilder stringBuilder;
+        if (cursor == null) {
+            Log.e(TAG, "cannot get weather information by querying content resolver");
+        } else if (cursor.moveToFirst()) {
+            if (cursor.getColumnCount() < WEATHER_COLUMNS.values().length) {
+                Log.e(TAG, "the column count is not met the spec, contact OPWeather owner.");
+                String stringBuilder2 = "expected columns: " + WEATHER_COLUMNS.values().length
+                        + ", actual columns: " + cursor.getColumnCount();
+                Log.e(TAG, stringBuilder2);
+            }
+            WeatherData weatherData = new WeatherData();
+            String string;
+            try {
+                String string2 = cursor.getString(WEATHER_COLUMNS.TIMESTAMP.index);
+                string = cursor.getString(WEATHER_COLUMNS.CITY_NAME.index);
+                String string3 = cursor.getString(WEATHER_COLUMNS.WEATHER_CODE.index);
+                String string4 = cursor.getString(WEATHER_COLUMNS.WEATHER_NAME.index);
+                String string5 = cursor.getString(WEATHER_COLUMNS.TEMP.index);
+                String string6 = cursor.getString(WEATHER_COLUMNS.TEMP_HIGH.index);
+                String string7 = cursor.getString(WEATHER_COLUMNS.TEMP_LOW.index);
+                String string8 = cursor.getString(WEATHER_COLUMNS.TEMP_UNIT.index);
+                Log.d(TAG, "[Raw Weather Data] timestamp: " + string2
+                        + ", city: " + string + ", code: " + string3 + ", name: " + string4
+                        + ", temp: " + string5 + ", high: " + string6 + ", low: " + string7
+                        + ", unit: " + string8);
+                weatherData.timestamp =
+                        new SimpleDateFormat("yyyyMMddkkmm", Locale.getDefault()).parse(string2)
+                                .getTime() / 1000;
+                weatherData.cityName = string;
+                WEATHER_TYPE weatherType = WEATHER_TYPE.getWeather(Integer.parseInt(string3));
+                weatherData.weatherCode = weatherType.weatherCode;
+                weatherData.icon = weatherType.icon;
+                weatherData.weatherName = string4;
+                weatherData.temperature = Integer.parseInt(string5);
+                weatherData.temperatureHigh = Integer.parseInt(string6);
+                weatherData.temperatureLow = Integer.parseInt(string7);
+                weatherData.temperatureUnit = string8;
+            } catch (IllegalStateException e) {
+                string = TAG;
+                stringBuilder = new StringBuilder();
+                stringBuilder.append("invalid Cursor data: ");
+                stringBuilder.append(e);
+                Log.e(string, stringBuilder.toString());
+            } catch (NullPointerException e2) {
+                string = TAG;
+                stringBuilder = new StringBuilder();
+                stringBuilder.append("got unexpected weather data: ");
+                stringBuilder.append(e2);
+                Log.e(string, stringBuilder.toString());
+            } catch (Throwable th) {
+                cursor.close();
+                Log.d(TAG, weatherData.toString());
+            }
+            cursor.close();
+            Log.d(TAG, weatherData.toString());
+            updateWeatherCallbacks(weatherData, null);
+            writePreferences(weatherData);
+        } else {
+            Log.e(TAG, "cannot move the cursor point to the first row, is the cursor empty?");
+            cursor.close();
+        }
+    }
+
+    private void updateWeatherCallbacks(WeatherData weatherData,
+                                        IWeatherCallback iWeatherCallback) {
+        if (iWeatherCallback == null) {
+            Log.d(TAG, "push the weather information to the callbacks");
+            for (IWeatherCallback callback : mCallbacks) {
+                if (callback == null) {
+                    Log.d(TAG, "updateWeatherCallbacks callback = null ");
+                } else {
+                    callback.onWeatherUpdated(weatherData);
+                }
+            }
+            return;
+        }
+        Log.d(TAG, "push the weather information to: " + iWeatherCallback.getClass().getSimpleName());
+        iWeatherCallback.onWeatherUpdated(weatherData);
+    }
+
+    private void writePreferences(WeatherData weatherData) {
+        PreferenceManager.getDefaultSharedPreferences(mContext).edit()
+                .putLong(KEY_TIMESTAMP, weatherData.timestamp)
+                .putString(KEY_CITY_NAME, weatherData.cityName)
+                .putInt(KEY_WEATHER_CODE, weatherData.weatherCode)
+                .putString(KEY_WEATHER_NAME, weatherData.weatherName)
+                .putInt(KEY_TEMPERATURE, weatherData.temperature)
+                .putInt(KEY_TEMPERATURE_HIGH, weatherData.temperatureHigh)
+                .putInt(KEY_TEMPERATURE_LOW, weatherData.temperatureLow)
+                .putString(KEY_TEMPERATURE_UNIT, weatherData.temperatureUnit).apply();
+    }
+}
\ No newline at end of file
diff --git a/Omega/src_ui_overrides/com/android/launcher3/graphics/ColorExtractor.java b/Omega/src_ui_overrides/com/android/launcher3/graphics/ColorExtractor.java
deleted file mode 100644
index ba0e8cd171..0000000000
--- a/Omega/src_ui_overrides/com/android/launcher3/graphics/ColorExtractor.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * 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.
- */
-package com.android.launcher3.graphics;
-
-import android.graphics.Bitmap;
-import android.graphics.Color;
-import android.util.SparseArray;
-
-/**
- * Utility class for extracting colors from a bitmap.
- */
-public class ColorExtractor {
-
-    public static int findDominantColorByHue(Bitmap bitmap) {
-        return findDominantColorByHue(bitmap, 20);
-    }
-
-    /**
-     * This picks a dominant color, looking for high-saturation, high-value, repeated hues.
-     *
-     * @param bitmap  The bitmap to scan
-     * @param samples The approximate max number of samples to use.
-     */
-    public static int findDominantColorByHue(Bitmap bitmap, int samples) {
-        final int height = bitmap.getHeight();
-        final int width = bitmap.getWidth();
-        int sampleStride = (int) Math.sqrt((height * width) / samples);
-        if (sampleStride < 1) {
-            sampleStride = 1;
-        }
-
-        // This is an out-param, for getting the hsv values for an rgb
-        float[] hsv = new float[3];
-
-        // First get the best hue, by creating a histogram over 360 hue buckets,
-        // where each pixel contributes a score weighted by saturation, value, and alpha.
-        float[] hueScoreHistogram = new float[360];
-        float highScore = -1;
-        int bestHue = -1;
-
-        int[] pixels = new int[samples];
-        int pixelCount = 0;
-
-        for (int y = 0; y < height; y += sampleStride) {
-            for (int x = 0; x < width; x += sampleStride) {
-                int argb = bitmap.getPixel(x, y);
-                int alpha = 0xFF & (argb >> 24);
-                if (alpha < 0x80) {
-                    // Drop mostly-transparent pixels.
-                    continue;
-                }
-                // Remove the alpha channel.
-                int rgb = argb | 0xFF000000;
-                Color.colorToHSV(rgb, hsv);
-                // Bucket colors by the 360 integer hues.
-                int hue = (int) hsv[0];
-                if (hue < 0 || hue >= hueScoreHistogram.length) {
-                    // Defensively avoid array bounds violations.
-                    continue;
-                }
-                if (pixelCount < samples) {
-                    pixels[pixelCount++] = rgb;
-                }
-                float score = hsv[1] * hsv[2];
-                hueScoreHistogram[hue] += score;
-                if (hueScoreHistogram[hue] > highScore) {
-                    highScore = hueScoreHistogram[hue];
-                    bestHue = hue;
-                }
-            }
-        }
-
-        SparseArray<Float> rgbScores = new SparseArray<>();
-        int bestColor = 0xff000000;
-        highScore = -1;
-        // Go back over the RGB colors that match the winning hue,
-        // creating a histogram of weighted s*v scores, for up to 100*100 [s,v] buckets.
-        // The highest-scoring RGB color wins.
-        for (int i = 0; i < pixelCount; i++) {
-            int rgb = pixels[i];
-            Color.colorToHSV(rgb, hsv);
-            int hue = (int) hsv[0];
-            if (hue == bestHue) {
-                float s = hsv[1];
-                float v = hsv[2];
-                int bucket = (int) (s * 100) + (int) (v * 10000);
-                // Score by cumulative saturation * value.
-                float score = s * v;
-                Float oldTotal = rgbScores.get(bucket);
-                float newTotal = oldTotal == null ? score : oldTotal + score;
-                rgbScores.put(bucket, newTotal);
-                if (newTotal > highScore) {
-                    highScore = newTotal;
-                    // All the colors in the winning bucket are very similar. Last in wins.
-                    bestColor = rgb;
-                }
-            }
-        }
-        return bestColor;
-    }
-
-    private static final int MAGIC_NUMBER = 25;
-
-    /*
-     * References:
-     * https://www.cs.umb.edu/~jreyes/csit114-fall-2007/project4/filters.html#posterize
-     * https://github.com/gitgraghu/image-processing/blob/master/src/Effects/Posterize.java
-     */
-    public static int posterize(int rgb) {
-        int red = (0xff & (rgb >> 16));
-        int green = (0xff & (rgb >> 8));
-        int blue = (0xff & rgb);
-        red -= red % MAGIC_NUMBER;
-        green -= green % MAGIC_NUMBER;
-        blue -= blue % MAGIC_NUMBER;
-        if (red < 0) {
-            red = 0;
-        }
-        if (green < 0) {
-            green = 0;
-        }
-        if (blue < 0) {
-            blue = 0;
-        }
-        return red << 16 | green << 8 | blue;
-    }
-}
diff --git a/Omega/src_ui_overrides/com/android/launcher3/shortcuts/DeepShortcutManagerBackport.java b/Omega/src_ui_overrides/com/android/launcher3/shortcuts/DeepShortcutManagerBackport.java
new file mode 100644
index 0000000000..9f1f85c671
--- /dev/null
+++ b/Omega/src_ui_overrides/com/android/launcher3/shortcuts/DeepShortcutManagerBackport.java
@@ -0,0 +1,133 @@
+/*
+ * 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.
+ */
+
+package com.android.launcher3.shortcuts;
+
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.pm.LauncherActivityInfo;
+import android.content.pm.LauncherApps;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.content.res.AssetManager;
+import android.content.res.Resources;
+import android.content.res.XmlResourceParser;
+import android.graphics.drawable.Drawable;
+
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class DeepShortcutManagerBackport {
+    static Drawable getShortcutIconDrawable(ShortcutInfoCompat shortcutInfo, int density) {
+        return ((ShortcutInfoCompatBackport) shortcutInfo).getIcon(density);
+    }
+
+    public static List<ShortcutInfoCompat> getForPackage(Context context, LauncherApps mLauncherApps, ComponentName activity, String packageName) {
+        List<ShortcutInfoCompat> shortcutInfoCompats = new ArrayList<>();
+        List<LauncherActivityInfo> infoList = mLauncherApps.getActivityList(packageName, android.os.Process.myUserHandle());
+        for (LauncherActivityInfo info : infoList) {
+            if (activity == null || activity.equals(info.getComponentName())) {
+                parsePackageXml(context, info.getComponentName().getPackageName(), info.getComponentName(), shortcutInfoCompats);
+            }
+        }
+
+        return shortcutInfoCompats;
+    }
+
+    private static void parsePackageXml(Context context, String packageName, ComponentName activity, List<ShortcutInfoCompat> shortcutInfoCompats) {
+        PackageManager pm = context.getPackageManager();
+
+        String resource = null;
+        String currActivity = "";
+        String searchActivity = activity.getClassName();
+
+        Map<String, String> parsedData = new HashMap<>();
+
+        try {
+            Resources resourcesForApplication = pm.getResourcesForApplication(packageName);
+            AssetManager assets = resourcesForApplication.getAssets();
+            XmlResourceParser parseXml = assets.openXmlResourceParser("AndroidManifest.xml");
+
+            int eventType;
+            while ((eventType = parseXml.nextToken()) != XmlPullParser.END_DOCUMENT) {
+                if (eventType == XmlPullParser.START_TAG) {
+                    String name = parseXml.getName();
+                    if ("activity".equals(name) || "activity-alias".equals(name)) {
+                        parsedData.clear();
+                        for (int i = 0; i < parseXml.getAttributeCount(); i++) {
+                            parsedData.put(parseXml.getAttributeName(i), parseXml.getAttributeValue(i));
+                        }
+                        if (parsedData.containsKey("name")) {
+                            currActivity = parsedData.get("name");
+                        }
+                    } else if (name.equals("meta-data") && currActivity.equals(searchActivity)) {
+                        parsedData.clear();
+                        for (int i = 0; i < parseXml.getAttributeCount(); i++) {
+                            parsedData.put(parseXml.getAttributeName(i), parseXml.getAttributeValue(i));
+                        }
+                        if (parsedData.containsKey("name") &&
+                                parsedData.get("name").equals("android.app.shortcuts") &&
+                                parsedData.containsKey("resource")) {
+                            resource = parsedData.get("resource");
+                        }
+                    }
+                }
+            }
+
+            if (resource != null) {
+                parseXml = resourcesForApplication.getXml(Integer.parseInt(resource.substring(1)));
+                while ((eventType = parseXml.nextToken()) != XmlPullParser.END_DOCUMENT) {
+                    if (eventType == XmlPullParser.START_TAG) {
+                        if (parseXml.getName().equals("shortcut")) {
+                            ShortcutInfoCompat info = parseShortcut(context,
+                                    activity,
+                                    resourcesForApplication,
+                                    packageName,
+                                    parseXml);
+
+                            if (info != null && info.getId() != null) {
+                                for (ResolveInfo ri : pm.queryIntentActivities(ShortcutInfoCompatBackport.stripPackage(info.makeIntent()), 0)) {
+                                    if (ri.isDefault || ri.activityInfo.exported) {
+                                        shortcutInfoCompats.add(info);
+                                        break;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        } catch (PackageManager.NameNotFoundException | Resources.NotFoundException | XmlPullParserException | IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private static ShortcutInfoCompat parseShortcut(Context context, ComponentName activity, Resources resourcesForApplication, String packageName, XmlResourceParser parseXml) {
+        try {
+            return new ShortcutInfoCompatBackport(context, resourcesForApplication, packageName, activity, parseXml);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+}
diff --git a/Omega/src_ui_overrides/com/android/launcher3/shortcuts/ShortcutInfoCompat.java b/Omega/src_ui_overrides/com/android/launcher3/shortcuts/ShortcutInfoCompat.java
new file mode 100644
index 0000000000..53c3184230
--- /dev/null
+++ b/Omega/src_ui_overrides/com/android/launcher3/shortcuts/ShortcutInfoCompat.java
@@ -0,0 +1,128 @@
+/*
+ * 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.
+ */
+
+package com.android.launcher3.shortcuts;
+
+import android.annotation.TargetApi;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ShortcutInfo;
+import android.os.Build;
+import android.os.UserHandle;
+
+import com.android.launcher3.R;
+
+/**
+ * Wrapper class for {@link android.content.pm.ShortcutInfo}, representing deep shortcuts into apps.
+ * <p>
+ * Not to be confused with {@link com.android.launcher3}.
+ */
+@TargetApi(Build.VERSION_CODES.N)
+public class ShortcutInfoCompat {
+    public static final String EXTRA_SHORTCUT_ID = "shortcut_id";
+    private static final String INTENT_CATEGORY = "com.android.launcher3.DEEP_SHORTCUT";
+    private static final String EXTRA_BADGEPKG = "badge_package";
+    private ShortcutInfo mShortcutInfo;
+
+    public ShortcutInfoCompat(ShortcutInfo shortcutInfo) {
+        mShortcutInfo = shortcutInfo;
+    }
+
+    @TargetApi(Build.VERSION_CODES.N)
+    public Intent makeIntent() {
+        return new Intent(Intent.ACTION_MAIN)
+                .addCategory(INTENT_CATEGORY)
+                .setComponent(getActivity())
+                .setPackage(getPackage())
+                .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED)
+                .putExtra(EXTRA_SHORTCUT_ID, getId());
+    }
+
+    public ShortcutInfo getShortcutInfo() {
+        return mShortcutInfo;
+    }
+
+    public String getPackage() {
+        return mShortcutInfo.getPackage();
+    }
+
+    public String getBadgePackage(Context context) {
+        String whitelistedPkg = context.getString(R.string.shortcutinfocompat_badgepkg_whitelist);
+        if (whitelistedPkg.equals(getPackage())
+                && mShortcutInfo.getExtras().containsKey(EXTRA_BADGEPKG)) {
+            return mShortcutInfo.getExtras().getString(EXTRA_BADGEPKG);
+        }
+        return getPackage();
+    }
+
+    public String getId() {
+        return mShortcutInfo.getId();
+    }
+
+    public CharSequence getShortLabel() {
+        return mShortcutInfo.getShortLabel();
+    }
+
+    public CharSequence getLongLabel() {
+        return mShortcutInfo.getLongLabel();
+    }
+
+    public long getLastChangedTimestamp() {
+        return mShortcutInfo.getLastChangedTimestamp();
+    }
+
+    public ComponentName getActivity() {
+        return mShortcutInfo.getActivity();
+    }
+
+    public UserHandle getUserHandle() {
+        return mShortcutInfo.getUserHandle();
+    }
+
+    public boolean hasKeyFieldsOnly() {
+        return mShortcutInfo.hasKeyFieldsOnly();
+    }
+
+    public boolean isPinned() {
+        return mShortcutInfo.isPinned();
+    }
+
+    public boolean isDeclaredInManifest() {
+        return mShortcutInfo.isDeclaredInManifest();
+    }
+
+    public boolean isEnabled() {
+        return mShortcutInfo.isEnabled();
+    }
+
+    public boolean isDynamic() {
+        return mShortcutInfo.isDynamic();
+    }
+
+    public int getRank() {
+        return mShortcutInfo.getRank();
+    }
+
+    public CharSequence getDisabledMessage() {
+        return mShortcutInfo.getDisabledMessage();
+    }
+
+    @Override
+    public String toString() {
+        return mShortcutInfo.toString();
+    }
+}
diff --git a/Omega/src_ui_overrides/com/android/launcher3/shortcuts/ShortcutInfoCompatBackport.java b/Omega/src_ui_overrides/com/android/launcher3/shortcuts/ShortcutInfoCompatBackport.java
new file mode 100644
index 0000000000..a3da52df54
--- /dev/null
+++ b/Omega/src_ui_overrides/com/android/launcher3/shortcuts/ShortcutInfoCompatBackport.java
@@ -0,0 +1,226 @@
+/*
+ * 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.
+ */
+
+package com.android.launcher3.shortcuts;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.res.Resources;
+import android.content.res.XmlResourceParser;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
+import android.os.Process;
+import android.os.UserHandle;
+
+import com.android.launcher3.R;
+
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+public class ShortcutInfoCompatBackport extends ShortcutInfoCompat {
+    private final static String USE_PACKAGE = "shortcut_backport_use_package";
+    private final Context mContext;
+    private final String mPackageName;
+    private final ComponentName mActivity;
+    private final String mId;
+    private final boolean mEnabled;
+    private final Integer mIcon;
+    private final String mShortLabel;
+    private final String mLongLabel;
+    private final String mDisabledMessage;
+    private final Intent mIntent;
+
+    public ShortcutInfoCompatBackport(Context context, Resources resources, String packageName, ComponentName activity, XmlResourceParser parseXml) throws XmlPullParserException, IOException {
+        super(null);
+        mContext = context;
+        mPackageName = packageName;
+        mActivity = activity;
+
+        HashMap<String, String> xmlData = new HashMap<>();
+        for (int i = 0; i < parseXml.getAttributeCount(); i++) {
+            xmlData.put(parseXml.getAttributeName(i), parseXml.getAttributeValue(i));
+        }
+
+        mId = xmlData.get("shortcutId");
+
+        mEnabled = !xmlData.containsKey("enabled") || xmlData.get("enabled").toLowerCase().equals("true");
+
+        mIcon = xmlData.containsKey("icon") ?
+                Integer.valueOf(xmlData.get("icon").substring(1)) :
+                0;
+
+        mShortLabel = xmlData.containsKey("shortcutShortLabel") ?
+                resources.getString(Integer.valueOf(xmlData.get("shortcutShortLabel").substring(1))) :
+                "";
+
+        mLongLabel = xmlData.containsKey("shortcutLongLabel") ?
+                resources.getString(Integer.valueOf(xmlData.get("shortcutLongLabel").substring(1))) :
+                mShortLabel;
+
+        mDisabledMessage = xmlData.containsKey("shortcutDisabledMessage") ?
+                resources.getString(Integer.valueOf(xmlData.get("shortcutDisabledMessage").substring(1))) :
+                "";
+
+        HashMap<String, String> xmlDataIntent = new HashMap<>();
+        HashMap<String, String> xmlDataExtras = new HashMap<>();
+        HashMap<String, String> extras = new HashMap<>();
+        int startDepth = parseXml.getDepth();
+        do {
+            if (parseXml.nextToken() == XmlPullParser.START_TAG) {
+                String xmlName = parseXml.getName();
+                if (xmlName.equals("intent")) {
+                    xmlDataIntent.clear();
+                    extras.clear();
+                    for (int i = 0; i < parseXml.getAttributeCount(); i++) {
+                        xmlDataIntent.put(parseXml.getAttributeName(i), parseXml.getAttributeValue(i));
+                    }
+                } else if (xmlName.equals("extra")) {
+                    xmlDataExtras.clear();
+                    for (int i = 0; i < parseXml.getAttributeCount(); i++) {
+                        xmlDataExtras.put(parseXml.getAttributeName(i), parseXml.getAttributeValue(i));
+                    }
+                    if (xmlDataExtras.containsKey("name") && xmlDataExtras.containsKey("value")) {
+                        extras.put(xmlDataExtras.get("name"), xmlDataExtras.get("value"));
+                    }
+                }
+            }
+        } while (parseXml.getDepth() > startDepth);
+
+        String action = xmlDataIntent.containsKey("action") ?
+                xmlDataIntent.get("action") :
+                Intent.ACTION_MAIN;
+
+        boolean useTargetPackage = xmlDataIntent.containsKey("targetPackage");
+        String targetPackage = useTargetPackage ?
+                xmlDataIntent.get("targetPackage") :
+                mPackageName;
+
+        mIntent = new Intent(action)
+                .setPackage(targetPackage)
+                .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_TASK_ON_HOME)
+                .putExtra(EXTRA_SHORTCUT_ID, mId);
+
+        if (xmlDataIntent.containsKey("targetClass")) {
+            mIntent.setComponent(new ComponentName(targetPackage, xmlDataIntent.get("targetClass")));
+        }
+
+        if (xmlDataIntent.containsKey("data")) {
+            mIntent.setData(Uri.parse(xmlDataIntent.get("data")));
+        }
+
+        for (Map.Entry<String, String> entry : extras.entrySet()) {
+            mIntent.putExtra(entry.getKey(), entry.getValue());
+        }
+
+        mIntent.putExtra(USE_PACKAGE, useTargetPackage);
+    }
+
+    static Intent stripPackage(Intent intent) {
+        intent = new Intent(intent);
+        if (!intent.getBooleanExtra(ShortcutInfoCompatBackport.USE_PACKAGE, true)) {
+            intent.setPackage(null);
+        }
+        intent.removeExtra(ShortcutInfoCompatBackport.USE_PACKAGE);
+        return intent;
+    }
+
+    public Drawable getIcon(int density) {
+        try {
+            return mContext.getPackageManager()
+                    .getResourcesForApplication(mPackageName)
+                    .getDrawableForDensity(mIcon, density);
+        } catch (PackageManager.NameNotFoundException | Resources.NotFoundException ignored) {
+            return mContext.getResources()
+                    .getDrawableForDensity(R.drawable.ic_default_shortcut, density);
+        }
+    }
+
+    @Override
+    public Intent makeIntent() {
+        return mIntent;
+    }
+
+    @Override
+    public String getPackage() {
+        return mIntent.getPackage();
+    }
+
+    @Override
+    public String getId() {
+        return mId;
+    }
+
+    @Override
+    public CharSequence getShortLabel() {
+        return mShortLabel;
+    }
+
+    @Override
+    public CharSequence getLongLabel() {
+        return mLongLabel;
+    }
+
+    @Override
+    public ComponentName getActivity() {
+        return mIntent.getComponent() == null ? mActivity : mIntent.getComponent();
+    }
+
+    @Override
+    public UserHandle getUserHandle() {
+        return Process.myUserHandle();
+    }
+
+    @Override
+    public boolean isPinned() {
+        return false;
+    }
+
+    @Override
+    public boolean isDeclaredInManifest() {
+        return true;
+    }
+
+    @Override
+    public boolean isEnabled() {
+        return mEnabled;
+    }
+
+    @Override
+    public boolean isDynamic() {
+        return false;
+    }
+
+    @Override
+    public int getRank() {
+        return 1;
+    }
+
+    @Override
+    public CharSequence getDisabledMessage() {
+        return mDisabledMessage;
+    }
+
+    @Override
+    public String toString() {
+        return "";
+    }
+}
diff --git a/Omega/src_ui_overrides/com/android/launcher3/touch/SwipeDetector.java b/Omega/src_ui_overrides/com/android/launcher3/touch/SwipeDetector.java
deleted file mode 100644
index 7aff7aa5a0..0000000000
--- a/Omega/src_ui_overrides/com/android/launcher3/touch/SwipeDetector.java
+++ /dev/null
@@ -1,356 +0,0 @@
-/*
- * 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.
- */
-package com.android.launcher3.touch;
-
-import android.content.Context;
-import android.graphics.PointF;
-import android.util.Log;
-import android.view.MotionEvent;
-import android.view.ViewConfiguration;
-
-import androidx.annotation.NonNull;
-
-import static android.view.MotionEvent.INVALID_POINTER_ID;
-
-/**
- * One dimensional scroll/drag/swipe gesture detector.
- * <p>
- * Definition of swipe is different from android system in that this detector handles
- * 'swipe to dismiss', 'swiping up/down a container' but also keeps scrolling state before
- * swipe action happens
- */
-public class SwipeDetector {
-
-    public static final int DIRECTION_POSITIVE = 1 << 0;
-    public static final int DIRECTION_NEGATIVE = 1 << 1;
-    public static final int DIRECTION_BOTH = DIRECTION_NEGATIVE | DIRECTION_POSITIVE;
-    /**
-     * The minimum release velocity in pixels per millisecond that triggers fling..
-     */
-    public static final float RELEASE_VELOCITY_PX_MS = 1.0f;
-    /**
-     * The time constant used to calculate dampening in the low-pass filter of scroll velocity.
-     * Cutoff frequency is set at 10 Hz.
-     */
-    public static final float SCROLL_VELOCITY_DAMPENING_RC = 1000f / (2f * (float) Math.PI * 10);
-    public static final Direction VERTICAL = new Direction() {
-
-        @Override
-        float getDisplacement(MotionEvent ev, int pointerIndex, PointF refPoint) {
-            return ev.getY(pointerIndex) - refPoint.y;
-        }
-
-        @Override
-        float getActiveTouchSlop(MotionEvent ev, int pointerIndex, PointF downPos) {
-            return Math.abs(ev.getX(pointerIndex) - downPos.x);
-        }
-    };
-    public static final Direction HORIZONTAL = new Direction() {
-
-        @Override
-        float getDisplacement(MotionEvent ev, int pointerIndex, PointF refPoint) {
-            return ev.getX(pointerIndex) - refPoint.x;
-        }
-
-        @Override
-        float getActiveTouchSlop(MotionEvent ev, int pointerIndex, PointF downPos) {
-            return Math.abs(ev.getY(pointerIndex) - downPos.y);
-        }
-    };
-    private static final boolean DBG = false;
-    private static final String TAG = "SwipeDetector";
-    private static final float ANIMATION_DURATION = 1200;
-    private final PointF mDownPos = new PointF();
-    private final PointF mLastPos = new PointF();
-    private final float mTouchSlop;
-    /* Client of this gesture detector can register a callback. */
-    private final Listener mListener;
-    protected int mActivePointerId = INVALID_POINTER_ID;
-
-    //------------------- ScrollState transition diagram -----------------------------------
-    //
-    // IDLE ->      (mDisplacement > mTouchSlop) -> DRAGGING
-    // DRAGGING -> (MotionEvent#ACTION_UP, MotionEvent#ACTION_CANCEL) -> SETTLING
-    // SETTLING -> (MotionEvent#ACTION_DOWN) -> DRAGGING
-    // SETTLING -> (View settled) -> IDLE
-    private int mScrollConditions;
-    /* Scroll state, this is set to true during dragging and animation. */
-    private ScrollState mState = ScrollState.IDLE;
-    private Direction mDir;
-    private long mCurrentMillis;
-    private float mVelocity;
-    private float mLastDisplacement;
-    private float mDisplacement;
-    private float mSubtractDisplacement;
-    private boolean mIgnoreSlopWhenSettling;
-
-    public SwipeDetector(@NonNull Context context, @NonNull Listener l, @NonNull Direction dir) {
-        this(ViewConfiguration.get(context).getScaledTouchSlop(), l, dir);
-    }
-
-    protected SwipeDetector(float touchSlope, @NonNull Listener l, @NonNull Direction dir) {
-        mTouchSlop = touchSlope;
-        mListener = l;
-        mDir = dir;
-    }
-
-    /**
-     * Returns a time-dependent dampening factor using delta time.
-     */
-    private static float computeDampeningFactor(float deltaTime) {
-        return deltaTime / (SCROLL_VELOCITY_DAMPENING_RC + deltaTime);
-    }
-
-    /**
-     * Returns the linear interpolation between two values
-     */
-    public static float interpolate(float from, float to, float alpha) {
-        return (1.0f - alpha) * from + alpha * to;
-    }
-
-    public static long calculateDuration(float velocity, float progressNeeded) {
-        // TODO: make these values constants after tuning.
-        float velocityDivisor = Math.max(2f, Math.abs(0.5f * velocity));
-        float travelDistance = Math.max(0.2f, progressNeeded);
-        long duration = (long) Math.max(100, ANIMATION_DURATION / velocityDivisor * travelDistance);
-        if (DBG) {
-            Log.d(TAG, String.format("calculateDuration=%d, v=%f, d=%f", duration, velocity, progressNeeded));
-        }
-        return duration;
-    }
-
-    private void setState(ScrollState newState) {
-        if (DBG) {
-            Log.d(TAG, "setState:" + mState + "->" + newState);
-        }
-        // onDragStart and onDragEnd is reported ONLY on state transition
-        if (newState == ScrollState.DRAGGING) {
-            initializeDragging();
-            if (mState == ScrollState.IDLE) {
-                reportDragStart(false /* recatch */);
-            } else if (mState == ScrollState.SETTLING) {
-                reportDragStart(true /* recatch */);
-            }
-        }
-        if (newState == ScrollState.SETTLING) {
-            reportDragEnd();
-        }
-
-        mState = newState;
-    }
-
-    public boolean isDraggingOrSettling() {
-        return mState == ScrollState.DRAGGING || mState == ScrollState.SETTLING;
-    }
-
-    /**
-     * There's no touch and there's no animation.
-     */
-    public boolean isIdleState() {
-        return mState == ScrollState.IDLE;
-    }
-
-    public boolean isSettlingState() {
-        return mState == ScrollState.SETTLING;
-    }
-
-    public boolean isDraggingState() {
-        return mState == ScrollState.DRAGGING;
-    }
-
-    public void updateDirection(Direction dir) {
-        mDir = dir;
-    }
-
-    public void setDetectableScrollConditions(int scrollDirectionFlags, boolean ignoreSlop) {
-        mScrollConditions = scrollDirectionFlags;
-        mIgnoreSlopWhenSettling = ignoreSlop;
-    }
-
-    public int getScrollDirections() {
-        return mScrollConditions;
-    }
-
-    private boolean shouldScrollStart(MotionEvent ev, int pointerIndex) {
-        // reject cases where the angle or slop condition is not met.
-        if (Math.max(mDir.getActiveTouchSlop(ev, pointerIndex, mDownPos), mTouchSlop)
-                > Math.abs(mDisplacement)) {
-            return false;
-        }
-
-        // Check if the client is interested in scroll in current direction.
-        if (((mScrollConditions & DIRECTION_NEGATIVE) > 0 && mDisplacement > 0) ||
-                ((mScrollConditions & DIRECTION_POSITIVE) > 0 && mDisplacement < 0)) {
-            return true;
-        }
-        return false;
-    }
-
-    public boolean onTouchEvent(MotionEvent ev) {
-        switch (ev.getActionMasked()) {
-            case MotionEvent.ACTION_DOWN:
-                mActivePointerId = ev.getPointerId(0);
-                mDownPos.set(ev.getX(), ev.getY());
-                mLastPos.set(mDownPos);
-                mLastDisplacement = 0;
-                mDisplacement = 0;
-                mVelocity = 0;
-
-                if (mState == ScrollState.SETTLING && mIgnoreSlopWhenSettling) {
-                    setState(ScrollState.DRAGGING);
-                }
-                break;
-            //case MotionEvent.ACTION_POINTER_DOWN:
-            case MotionEvent.ACTION_POINTER_UP:
-                int ptrIdx = ev.getActionIndex();
-                int ptrId = ev.getPointerId(ptrIdx);
-                if (ptrId == mActivePointerId) {
-                    final int newPointerIdx = ptrIdx == 0 ? 1 : 0;
-                    mDownPos.set(
-                            ev.getX(newPointerIdx) - (mLastPos.x - mDownPos.x),
-                            ev.getY(newPointerIdx) - (mLastPos.y - mDownPos.y));
-                    mLastPos.set(ev.getX(newPointerIdx), ev.getY(newPointerIdx));
-                    mActivePointerId = ev.getPointerId(newPointerIdx);
-                }
-                break;
-            case MotionEvent.ACTION_MOVE:
-                int pointerIndex = ev.findPointerIndex(mActivePointerId);
-                if (pointerIndex == INVALID_POINTER_ID) {
-                    break;
-                }
-                mDisplacement = mDir.getDisplacement(ev, pointerIndex, mDownPos);
-                computeVelocity(mDir.getDisplacement(ev, pointerIndex, mLastPos),
-                        ev.getEventTime());
-
-                // handle state and listener calls.
-                if (mState != ScrollState.DRAGGING && shouldScrollStart(ev, pointerIndex)) {
-                    setState(ScrollState.DRAGGING);
-                }
-                if (mState == ScrollState.DRAGGING) {
-                    reportDragging();
-                }
-                mLastPos.set(ev.getX(pointerIndex), ev.getY(pointerIndex));
-                break;
-            case MotionEvent.ACTION_CANCEL:
-            case MotionEvent.ACTION_UP:
-                // These are synthetic events and there is no need to update internal values.
-                if (mState == ScrollState.DRAGGING) {
-                    setState(ScrollState.SETTLING);
-                }
-                break;
-            default:
-                break;
-        }
-        return true;
-    }
-
-    public void finishedScrolling() {
-        setState(ScrollState.IDLE);
-    }
-
-    private boolean reportDragStart(boolean recatch) {
-        mListener.onDragStart(!recatch);
-        if (DBG) {
-            Log.d(TAG, "onDragStart recatch:" + recatch);
-        }
-        return true;
-    }
-
-    private void initializeDragging() {
-        if (mState == ScrollState.SETTLING && mIgnoreSlopWhenSettling) {
-            mSubtractDisplacement = 0;
-        }
-        if (mDisplacement > 0) {
-            mSubtractDisplacement = mTouchSlop;
-        } else {
-            mSubtractDisplacement = -mTouchSlop;
-        }
-    }
-
-    /**
-     * Returns if the start drag was towards the positive direction or negative.
-     *
-     * @see #setDetectableScrollConditions(int, boolean)
-     * @see #DIRECTION_BOTH
-     */
-    public boolean wasInitialTouchPositive() {
-        return mSubtractDisplacement < 0;
-    }
-
-    private boolean reportDragging() {
-        if (mDisplacement != mLastDisplacement) {
-            if (DBG) {
-                Log.d(TAG, String.format("onDrag disp=%.1f, velocity=%.1f",
-                        mDisplacement, mVelocity));
-            }
-
-            mLastDisplacement = mDisplacement;
-            return mListener.onDrag(mDisplacement - mSubtractDisplacement, mVelocity);
-        }
-        return true;
-    }
-
-    private void reportDragEnd() {
-        if (DBG) {
-            Log.d(TAG, String.format("onScrollEnd disp=%.1f, velocity=%.1f",
-                    mDisplacement, mVelocity));
-        }
-        mListener.onDragEnd(mVelocity, Math.abs(mVelocity) > RELEASE_VELOCITY_PX_MS);
-
-    }
-
-    /**
-     * Computes the damped velocity.
-     */
-    public float computeVelocity(float delta, long currentMillis) {
-        long previousMillis = mCurrentMillis;
-        mCurrentMillis = currentMillis;
-
-        float deltaTimeMillis = mCurrentMillis - previousMillis;
-        float velocity = (deltaTimeMillis > 0) ? (delta / deltaTimeMillis) : 0;
-        if (Math.abs(mVelocity) < 0.001f) {
-            mVelocity = velocity;
-        } else {
-            float alpha = computeDampeningFactor(deltaTimeMillis);
-            mVelocity = interpolate(mVelocity, velocity, alpha);
-        }
-        return mVelocity;
-    }
-
-    enum ScrollState {
-        IDLE,
-        DRAGGING,      // onDragStart, onDrag
-        SETTLING       // onDragEnd
-    }
-
-    public interface Listener {
-        void onDragStart(boolean start);
-
-        boolean onDrag(float displacement, float velocity);
-
-        void onDragEnd(float velocity, boolean fling);
-    }
-
-    public static abstract class Direction {
-
-        abstract float getDisplacement(MotionEvent ev, int pointerIndex, PointF refPoint);
-
-        /**
-         * Distance in pixels a touch can wander before we think the user is scrolling.
-         */
-        abstract float getActiveTouchSlop(MotionEvent ev, int pointerIndex, PointF downPos);
-    }
-}
diff --git a/Omega/src_ui_overrides/com/android/launcher3/uioverrides/WallpaperManagerCompat.java b/Omega/src_ui_overrides/com/android/launcher3/uioverrides/WallpaperManagerCompat.java
index 9a4bf49ae7..b44bbe6e3d 100644
--- a/Omega/src_ui_overrides/com/android/launcher3/uioverrides/WallpaperManagerCompat.java
+++ b/Omega/src_ui_overrides/com/android/launcher3/uioverrides/WallpaperManagerCompat.java
@@ -48,13 +48,13 @@
 
 import com.android.launcher3.Utilities;
 import com.android.launcher3.compat.WallpaperColorsCompat;
+import com.android.launcher3.icons.ColorExtractor;
 
 import java.io.IOException;
 import java.util.ArrayList;
 
 import static android.app.WallpaperManager.FLAG_SYSTEM;
 import static com.android.launcher3.Utilities.getDevicePrefs;
-import static com.android.launcher3.graphics.ColorExtractor.findDominantColorByHue;
 
 public class WallpaperManagerCompat {
 
@@ -311,7 +311,9 @@ public void run() {
 
             if (bitmap != null) {
                 int hints = calculateDarkHints(bitmap);
-                int color = findDominantColorByHue(bitmap, MAX_WALLPAPER_EXTRACTION_AREA);
+                ColorExtractor colorExtractor = new ColorExtractor();
+                int color = colorExtractor.findDominantColorByHue(bitmap, MAX_WALLPAPER_EXTRACTION_AREA);
+
                 value += "," + hints + "," + color;
             }
 
diff --git a/README.md b/README.md
index 6abc5f381f..ccefb51df4 100644
--- a/README.md
+++ b/README.md
@@ -1,23 +1,94 @@
 # Omega Launcher
-Free and Open Source Launcher. <br/>
+Libre software launcher. <br/>
+[![Travis](https://img.shields.io/travis/otakuhqz/Omega.svg?style=for-the-badge)](https://travis-ci.org/otakuhqz/Omega)
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg?style=for-the-badge)](https://opensource.org/licenses/Apache-2.0)
 [![GitHub release](https://img.shields.io/github/release/otakuhqz/Omega.svg?style=for-the-badge)](https://github.com/otakuhqz/Omega/releases)
-[![Donate on PayPal](https://img.shields.io/badge/PayPal-Donate%20Now-orange.svg?style=for-the-badge)](https://paypal.me/saulhenriquez)
-[![Donate on Liberapay](https://liberapay.com/assets/widgets/donate.svg)](https://liberapay.com/otakuhqz/donate)
 
-## Pre-Release
+## Installation
+APKs are available on GitHub and in the Telegram channel. Some nightly builds 
+are only available in the Telegram channel.<br/>
+[<img src="badge_github.png" alt="Get it on GitHub" height="80">](https://github.com/otakuhqz/omega/releases)
+
+## Community
+You can join the Telegram channel to get nightly builds. There is also a Telegram group 
+to discuss the development, issues and new features.<br/>
 [![Telegram](https://img.shields.io/badge/Telegram-channel-blue.svg?style=for-the-badge)](https://t.me/omegalauncher)
 
-## Features
--   Sort apps in the drawer by Alphabetical asc, Alphabetical desc, Install date, and Most used.
--   Google Feed integrated.
+##  Working Features
+-   [X] Five modes of sorting apps in the drawer.
+-   [X] Google feed integration.
+-   [X] Theme support.
+-   [X] Customize search engine.
+-   [X] Gesture support
+        - Partially supported.
+-   [X] Notification configuration.
+-   [X] Categorize apps in the drawer.
+-   [X] Icon Shape support.
+-   [X] Quick action shortcuts (dash).
+-   [X] Hide apps.
+-   [X] Dock search.
+-   [X] Drawer grid preference.
+-   [X] Customize app icons.
+-   [X] All apps icon scaling.
+-   [X] Dock icon scaling.
+-   [X] Workspace icon scaling.
+-   [X] Desktop grid preference.
+-   [X] App predictions (experimental).
+
+##  New Features and TODOs
+-   [ ] Icon pack support.
+-   [ ] Turn off "auto remove empty screen".
+-   [ ] Add desktop screen manually.
+-   [ ] Reorder empty screens.
+-   [ ] Back up and restore.
+-   [ ] Horizontal drawer.
+-   [ ] Add auto tab mode for drawer.
+-   [ ] Support for more news feeds (like Microsoft Bing).
+-   [ ] Animations.
+
+##  Screenshots
+<table>
+    <tr>
+        <td><img src="https://github.com/otakuhqz/omega/blob/master/snapshots/omega1.jpg" width="256" />
+        </td>
+        <td><img src="https://github.com/otakuhqz/omega/blob/master/snapshots/omega2.jpg" width="256" />
+        </td>
+        <td><img src="https://github.com/otakuhqz/omega/blob/master/snapshots/omega3.jpg" width="256" />
+        </td>
+    </tr>
+        <tr>
+        <td><img src="https://github.com/otakuhqz/omega/blob/master/snapshots/omega4.jpg" width="256" />
+        </td>
+        <td><img src="https://github.com/otakuhqz/omega/blob/master/snapshots/omega5.jpg" width="256" />
+        </td>
+        <td><img src="https://github.com/otakuhqz/omega/blob/master/snapshots/omega6.jpg" width="256" />
+        </td>
+    </tr>
+     <tr>
+        <td><img src="https://github.com/otakuhqz/omega/blob/master/snapshots/omega7.jpg" width="256" />
+        </td>
+        <td><img src="https://github.com/otakuhqz/omega/blob/master/snapshots/omega8.jpg" width="256" />
+        </td>
+        <td>
+        </td>
+    </tr>
+</table>
+
+## Donations <br/>
+[![Donate on Liberapay](https://liberapay.com/assets/widgets/donate.svg)](https://liberapay.com/otakuhqz/donate)<br/>
+<a href="https://www.buymeacoffee.com/2ulp4f5" target="_blank">
+    <img src="https://cdn.buymeacoffee.com/buttons/v2/default-blue.png" 
+    alt="Buy Me A Coffee" width="150" >
+</a><br/>
+[![Donate on PayPal](https://img.shields.io/badge/PayPal-Donate%20Now-red.svg?style=for-the-badge)](https://paypal.me/saulhenriquez)
+
+## Contributions
+If you know Java or Kotlin you can work on additional features!
+I will happily work on features you would like to have, just open an issue.
 
-## Donations
-Want to buy me a coffee? 
-**[Paypal](https://paypal.me/saulhenriquez)**
-**[Liberapay](https://liberapay.com/otakuhqz/donate)**
+## Translation
+Translations are handled via Weblate. If want to help, visit [Hosted Weblate](https://hosted.weblate.org/projects/omegalauncher/)
 
+[![Estado de la traducción](https://hosted.weblate.org/widgets/omegalauncher/-/287x66-white.png)](https://hosted.weblate.org/engage/omegalauncher/)
 
-## Want to contribute?
-If you have knowledge in Java or Kotlin you can work on additional features!
-I will be happy to work on features you would like to include, just open an issue.
\ No newline at end of file
+[![Estado de la traducción](https://hosted.weblate.org/widgets/omegalauncher/-/multi-red.svg)](https://hosted.weblate.org/engage/omegalauncher/)
diff --git a/SharedLibWrapper/build.gradle b/SharedLibWrapper/build.gradle
new file mode 100644
index 0000000000..0a6eb4e725
--- /dev/null
+++ b/SharedLibWrapper/build.gradle
@@ -0,0 +1,17 @@
+apply plugin: 'java'
+
+final String ANDROID_TOP = "${rootDir}/../../.."
+final String FRAMEWORK_PREBUILTS_DIR = "${ANDROID_TOP}/prebuilts/framework_intermediates/"
+
+sourceSets {
+    main {
+        java.srcDirs = ["${ANDROID_TOP}/frameworks/lib/systemui/SharedLibWrapper/src"]
+    }
+}
+
+sourceCompatibility = 1.8
+
+dependencies {
+    implementation fileTree(dir: "${FRAMEWORK_PREBUILTS_DIR}/quickstep/libs", include: 'sysui_shared.jar')
+    compileOnly fileTree(dir: "$ANDROID_TOP/prebuilts/fullsdk-${org.gradle.internal.os.OperatingSystem.current().isMacOsX() ? "darwin" : "linux"}/platforms/30", include: 'android.jar')
+}
diff --git a/SharedLibWrapper/src/main/AndroidManifest.xml b/SharedLibWrapper/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..2c0b125b41
--- /dev/null
+++ b/SharedLibWrapper/src/main/AndroidManifest.xml
@@ -0,0 +1 @@
+<manifest package="com.android.systemui.shared" />
diff --git a/_config.yml b/_config.yml
new file mode 100644
index 0000000000..c741881743
--- /dev/null
+++ b/_config.yml
@@ -0,0 +1 @@
+theme: jekyll-theme-slate
\ No newline at end of file
diff --git a/badge_github.png b/badge_github.png
new file mode 100644
index 0000000000..f8d91cc4e5
Binary files /dev/null and b/badge_github.png differ
diff --git a/build.gradle b/build.gradle
index bacc1024d7..c211ae5428 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,6 @@
 import java.text.SimpleDateFormat
+
 buildscript {
-    ext.kotlin_version = '1.3.72'
-    ext.version_plugin_kotlin = "1.3.31"
     ext.enable_plugin_kotlin = true
 
     ext.getGitHash = { ->
@@ -17,22 +16,53 @@ buildscript {
         }
     }
 
+    ext {
+        versions = [
+                dynamicanimation       : "1.0.0",
+                appcompat              : "1.2.0",
+                preferencev14          : "1.0.0",
+                recyclerview           : "1.1.0",
+                preference             : "1.1.1",
+                material               : "1.3.0-alpha02",
+                constraintlayout       : "2.0.0-rc1",
+                customactivityoncrash  : "2.2.0",
+                colorpicker            : "1.1.0",
+                hokolite               : "0e21db9ae5",
+                sunrisesunsetcalculator: "1.2",
+                okhttp                 : "4.8.0",
+                logginginterceptor     : "4.8.0",
+                fuzzywuzzy             : "1.2.0",
+                junit                  : "1.1.1",
+                mockito                : "1.9.5",
+                dexmaker               : "1.2",
+                testjunit              : "1.1.1",
+                testrules              : "1.2.0",
+                uiautomator            : "2.2.0",
+                annotation             : "1.1.0",
+
+                kotlin                 : "1.4.10",
+                protobuf               : "0.8.12"
+        ]
+    }
+
     repositories {
         google()
         jcenter()
         mavenCentral()
     }
     dependencies {
-        classpath GRADLE_CLASS_PATH
-        classpath PROTOBUF_CLASS_PATH
-        classpath KOTLIN_GRADLE_PLUGIN
+        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath "com.google.protobuf:protobuf-gradle-plugin:${versions.protobuf}"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
+        classpath 'com.google.gms:oss-licenses:0.9.2'
     }
 }
 
-String FRAMEWORK_PREBUILTS_DIR = "prebuilts"
+String PREBUILTS_DIR = "prebuilts"
 
 apply plugin: 'com.android.application'
 apply plugin: 'com.google.protobuf'
+
 if (enable_plugin_kotlin) {
     apply plugin: 'kotlin-android'
     apply plugin: 'kotlin-android-extensions'
@@ -40,18 +70,19 @@ if (enable_plugin_kotlin) {
 }
 android {
     compileSdkVersion 30
-    buildToolsVersion BUILD_TOOLS_VERSION
+    buildToolsVersion "30.0.2"
 
-    def name = "0.2.0"
-    def code = 7
+    def name = "0.5.6"
+    def code = 80
 
     defaultConfig {
         minSdkVersion 25
-        targetSdkVersion 30
+        targetSdkVersion 29
         applicationId "com.saggitt.omega"
         versionName name
         versionCode code
 
+        buildConfigField "String[]", "DETECTED_ANDROID_LOCALES", "${findAndroidLocales()}"
         buildConfigField "boolean", "FEATURE_SETTINGS_SEARCH", "true"
         buildConfigField "String", "BUILD_DATE", "\"${getBuildDate()}\""
         buildConfigField "String", "GITHASH", "\"${getGitHash()}\""
@@ -63,6 +94,9 @@ android {
         debug {
             minifyEnabled false
         }
+        release {
+            minifyEnabled false
+        }
     }
     kotlinOptions {
         jvmTarget = '1.8'
@@ -83,44 +117,27 @@ android {
             testApplicationId 'com.android.launcher3.tests'
         }
 
-        l3go {
-            dimension "app"
-            applicationId 'com.android.launcher3'
-            testApplicationId 'com.android.launcher3.tests'
-        }
-
         withQuickstep {
             dimension "recents"
-
             minSdkVersion 25
         }
 
-        withQuickstepIconRecents {
-            dimension "recents"
-            minSdkVersion 28
-        }
-
         withoutQuickstep {
             dimension "recents"
         }
 
-        omega{
+        omega {
             applicationId 'com.saggitt.omega'
             dimension "custom"
         }
     }
 
     // Disable release builds for now
-    android.variantFilter { variant ->
-        /*if (variant.buildType.name.endsWith('release')) {
-            variant.setIgnore(true)
-        }*/
-
-        // Icon recents is Go only
-        if (name.contains("WithQuickstepIconRecents") && !name.contains("l3go")) {
+    /*android.variantFilter { variant ->
+        if (variant.buildType.name.endsWith('release')) {
             variant.setIgnore(true)
         }
-    }
+    }*/
     lintOptions {
         disable 'MissingTranslation'
         disable 'ExtraTranslation'
@@ -131,6 +148,7 @@ android {
         main {
             res.srcDirs = ['res']
             java.srcDirs = ['src', 'src_plugins']
+            assets.srcDirs = ['assets']
             manifest.srcFile 'AndroidManifest-common.xml'
             proto {
                 srcDir 'protos/'
@@ -157,12 +175,6 @@ android {
             manifest.srcFile "AndroidManifest.xml"
         }
 
-        l3go {
-            res.srcDirs = ['go/res']
-            java.srcDirs = ['go/src']
-            manifest.srcFile "go/AndroidManifest.xml"
-        }
-
         withoutQuickstep {
             java.srcDirs = ['src_ui_overrides']
         }
@@ -173,21 +185,16 @@ android {
             manifest.srcFile "quickstep/AndroidManifest.xml"
         }
 
-        withQuickstepIconRecents {
-            res.srcDirs = ['quickstep/res', 'go/quickstep/res']
-            java.srcDirs = ['quickstep/src', 'go/quickstep/src']
-            manifest.srcFile "quickstep/AndroidManifest.xml"
-        }
-
-        omega{
+        omega {
             res.srcDirs = ['Omega/res']
-            java.srcDirs=['Omega/src','Omega/src_ui_overrides']
+            java.srcDirs = ['Omega/src', 'Omega/src_ui_overrides']
             manifest.srcFile 'Omega/AndroidManifest.xml'
         }
     }
+
     gradle.projectsEvaluated {
         tasks.withType(JavaCompile) {
-            options.compilerArgs.add("-Xbootclasspath/p:${FRAMEWORK_PREBUILTS_DIR}/libs/framework.jar")
+            options.compilerArgs.add("-Xbootclasspath/p:${PREBUILTS_DIR}/libs/framework.jar")
         }
     }
 }
@@ -201,55 +208,59 @@ afterEvaluate {
 apply from: 'Omega/smali.gradle'
 repositories {
     jcenter()
-    mavenCentral()
-    maven { url "https://maven.google.com" }
-    maven { url 'https://jitpack.io' }
+    google()
+    maven {
+        url 'https://jitpack.io'
+    }
 }
 
 dependencies {
-    implementation "androidx.dynamicanimation:dynamicanimation:${ANDROID_X_VERSION}"
-    implementation "androidx.appcompat:appcompat:1.1.0"
-    implementation "androidx.recyclerview:recyclerview:${ANDROID_X_VERSION}"
-    implementation "androidx.preference:preference:${ANDROID_X_VERSION}"
-
-    implementation "com.google.android.material:material:1.1.0"
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta7'
-    implementation 'cat.ereza:customactivityoncrash:2.2.0'
-    implementation 'com.jaredrummler:colorpicker:1.1.0'
-    implementation 'com.github.LawnchairLauncher:hoko-lite:0e21db9ae5'
-    implementation 'com.luckycatlabs:SunriseSunsetCalculator:1.2'
+    implementation "androidx.legacy:legacy-preference-v14:${versions.preferencev14}"
+    implementation "androidx.dynamicanimation:dynamicanimation:${versions.dynamicanimation}"
+    implementation "androidx.appcompat:appcompat:${versions.appcompat}"
+    implementation "androidx.recyclerview:recyclerview:${versions.recyclerview}"
+    implementation "androidx.preference:preference-ktx:${versions.preference}"
+
+    implementation "com.google.android.material:material:${versions.material}"
+    implementation "androidx.constraintlayout:constraintlayout:${versions.constraintlayout}"
+    implementation "cat.ereza:customactivityoncrash:${versions.customactivityoncrash}"
+    implementation "com.jaredrummler:colorpicker:${versions.colorpicker}"
+    implementation "com.github.LawnchairLauncher:hoko-lite:${versions.hokolite}"
+    implementation "com.luckycatlabs:SunriseSunsetCalculator:${versions.sunrisesunsetcalculator}"
+    implementation "com.squareup.okhttp3:okhttp:${versions.okhttp}"
+    implementation "com.squareup.okhttp3:logging-interceptor:${versions.logginginterceptor}"
+    implementation "me.xdrop:fuzzywuzzy:${versions.fuzzywuzzy}"
 
     implementation project(':IconLoader')
-    implementation fileTree(dir: "${FRAMEWORK_PREBUILTS_DIR}/libs", include: 'launcher_protos.jar')
-    implementation fileTree(dir: "${FRAMEWORK_PREBUILTS_DIR}/libs", include: 'libGoogleFeed.jar')
+    implementation fileTree(dir: "${PREBUILTS_DIR}/libs", include: 'launcher_protos.jar')
+    implementation fileTree(dir: "${PREBUILTS_DIR}/libs", include: 'libGoogleFeed.jar')
 
     // Recents lib dependency
-    withQuickstepImplementation fileTree(dir: "${FRAMEWORK_PREBUILTS_DIR}/libs", include: 'sysui_shared.jar')
-
-    // Recents lib dependency for Go
-    withQuickstepIconRecentsImplementation fileTree(dir: "${FRAMEWORK_PREBUILTS_DIR}/libs", include: 'sysui_shared.jar')
+    withQuickstepImplementation fileTree(dir: "${PREBUILTS_DIR}/libs", include: 'sysui_shared.jar')
+    //withQuickstepImplementation project(':SystemUISharedLib')
 
     // Required for AOSP to compile. This is already included in the sysui_shared.jar
-    withoutQuickstepImplementation fileTree(dir: "${FRAMEWORK_PREBUILTS_DIR}/libs", include: 'plugin_core.jar')
+    withoutQuickstepImplementation fileTree(dir: "${PREBUILTS_DIR}/libs", include: 'plugin_core.jar')
 
     // Tools
     if (enable_plugin_kotlin) {
-        implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$version_plugin_kotlin"
+        implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${versions.kotlin}"
     }
 
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation "org.mockito:mockito-core:1.9.5"
-    androidTestImplementation 'com.google.dexmaker:dexmaker:1.2'
-    androidTestImplementation 'com.google.dexmaker:dexmaker-mockito:1.2'
-    androidTestImplementation 'com.android.support.test:runner:1.0.0'
-    androidTestImplementation 'com.android.support.test:rules:1.0.0'
-    androidTestImplementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
-    androidTestImplementation "androidx.annotation:annotation:${ANDROID_X_VERSION}"
+    implementation "androidx.test.ext:junit:${versions.testjunit}"
+    androidTestImplementation "org.mockito:mockito-core:${versions.mockito}"
+    androidTestImplementation "com.google.dexmaker:dexmaker:${versions.dexmaker}"
+    androidTestImplementation "com.google.dexmaker:dexmaker-mockito:${versions.dexmaker}"
+    androidTestImplementation "androidx.test.ext:junit:${versions.testjunit}"
+    androidTestImplementation "androidx.test:rules:${versions.testrules}"
+    androidTestImplementation "androidx.test.uiautomator:uiautomator:${versions.uiautomator}"
+    androidTestImplementation "androidx.annotation:annotation:${versions.annotation}"
 }
 
 protobuf {
     // Configure the protoc executable
     protoc {
+        // later versions seems to miss on javanano support
         artifact = 'com.google.protobuf:protoc:3.0.0'
 
         generateProtoTasks {
@@ -260,6 +271,8 @@ protobuf {
                         option "java_package=launcher_log_extension.proto|com.android.launcher3.userevent.nano"
                         option "java_package=launcher_log.proto|com.android.launcher3.userevent.nano"
                         option "java_package=launcher_dump.proto|com.android.launcher3.model.nano"
+                        option "java_package=search.proto|com.google.android.apps.nexuslauncher.search.nano"
+                        option "java_package=smartspace.proto|com.google.android.apps.nexuslauncher.smartspace.nano"
                         option "enum_style=java"
                     }
                 }
@@ -268,6 +281,23 @@ protobuf {
     }
 }
 
+@SuppressWarnings(["UnnecessaryQualifiedReference", "SpellCheckingInspection", "GroovyUnusedDeclaration"])
+// Returns used android languages as a buildConfig array: {'de', 'it', ..}"
+static String findAndroidLocales() {
+    Set<String> langs = new HashSet<>()
+    new File('.').eachFileRecurse(groovy.io.FileType.DIRECTORIES) {
+        final foldername = it.name
+        if (foldername.startsWith('values-') && !it.canonicalPath.contains("build" + File.separator + "intermediates")) {
+            new File(it.toString()).eachFileRecurse(groovy.io.FileType.FILES) {
+                if (it.name.toLowerCase().endsWith(".xml") && it.getCanonicalFile().getText('UTF-8').contains("<string")) {
+                    langs.add(foldername.replace("values-", ""))
+                }
+            }
+        }
+    }
+    return '{' + langs.collect { "\"${it}\"" }.join(",") + '}'
+}
+
 @SuppressWarnings(["UnnecessaryQualifiedReference", "SpellCheckingInspection", "GroovyUnusedDeclaration"])
 // Returns the build date in a RFC3339 compatible format. TZ is always converted to UTC
 static String getBuildDate() {
diff --git a/go/AndroidManifest.xml b/go/AndroidManifest.xml
deleted file mode 100644
index fae1efffe0..0000000000
--- a/go/AndroidManifest.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 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.
-*/
--->
-<manifest
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.android.launcher3" >
-
-    <uses-sdk android:targetSdkVersion="28" android:minSdkVersion="25"/>
-
-    <application
-        android:backupAgent="com.android.launcher3.LauncherBackupAgent"
-        android:fullBackupOnly="true"
-        android:fullBackupContent="@xml/backupscheme"
-        android:hardwareAccelerated="true"
-        android:icon="@drawable/ic_launcher_home"
-        android:label="@string/derived_app_name"
-        android:theme="@style/AppTheme"
-        android:largeHeap="@bool/config_largeHeap"
-        android:restoreAnyVersion="true"
-        android:supportsRtl="true" >
-
-        <!-- Activity for handling PinItemRequest is disabled on Android Go. -->
-        <activity android:name="com.android.launcher3.dragndrop.AddItemActivity"
-            android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.Alert"
-            android:excludeFromRecents="true"
-            android:autoRemoveFromRecents="true"
-            android:label="@string/action_add_to_workspace"
-            android:enabled="false"
-            tools:node="replace" >
-        </activity>
-
-    </application>
-
-</manifest>
diff --git a/go/quickstep/res/layout/clear_all_button.xml b/go/quickstep/res/layout/clear_all_button.xml
deleted file mode 100644
index eef66add45..0000000000
--- a/go/quickstep/res/layout/clear_all_button.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2019 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.
--->
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/clear_all_item_view"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/clear_all_item_view_height">
-    <Button
-        android:id="@+id/clear_all_button"
-        android:layout_width="@dimen/clear_all_button_width"
-        android:layout_height="match_parent"
-        android:layout_gravity="center_horizontal"
-        android:background="@drawable/clear_all_button"
-        android:gravity="center"
-        android:text="@string/recents_clear_all"
-        android:textAllCaps="false"
-        android:textColor="@color/clear_all_button_text"
-        android:textSize="14sp"
-        style="@style/TextTitle"/>
-</FrameLayout>
diff --git a/go/quickstep/res/layout/fallback_recents_activity.xml b/go/quickstep/res/layout/fallback_recents_activity.xml
deleted file mode 100644
index 653f463c91..0000000000
--- a/go/quickstep/res/layout/fallback_recents_activity.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-     Copyright (C) 2019 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.
--->
-<com.android.quickstep.fallback.GoRecentsActivityRootView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/drag_layer"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fitsSystemWindows="true">
-
-    <include
-        android:id="@+id/overview_panel"
-        layout="@layout/overview_panel"
-        android:clipChildren="false"
-        android:clipToPadding="false"
-        android:outlineProvider="none"
-        android:theme="@style/HomeScreenElementTheme" />
-</com.android.quickstep.fallback.GoRecentsActivityRootView>
diff --git a/go/quickstep/res/layout/icon_recents_root_view.xml b/go/quickstep/res/layout/icon_recents_root_view.xml
deleted file mode 100644
index 8381ebc631..0000000000
--- a/go/quickstep/res/layout/icon_recents_root_view.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2019 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.
--->
-<com.android.quickstep.views.IconRecentsView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:clipChildren="false">
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/recent_task_recycler_view"
-        android:layout_width="@dimen/recents_list_width"
-        android:layout_height="match_parent"
-        android:layout_gravity="center_horizontal"
-        android:scrollbars="none"
-        android:clipToPadding="false"
-        android:clipChildren="false"/>
-    <TextView
-        android:id="@+id/recent_task_empty_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center"
-        android:text="@string/recents_empty_message"
-        android:textColor="@android:color/white"
-        android:textSize="25sp"
-        style="@style/TextTitle"
-        android:visibility="gone"/>
-</com.android.quickstep.views.IconRecentsView>
\ No newline at end of file
diff --git a/go/quickstep/res/layout/task_item_view.xml b/go/quickstep/res/layout/task_item_view.xml
deleted file mode 100644
index aeac47786a..0000000000
--- a/go/quickstep/res/layout/task_item_view.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2019 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.
--->
-<com.android.quickstep.views.TaskItemView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/task_item_height"
-    android:orientation="horizontal"
-    android:clipChildren="false">
-    <com.android.quickstep.views.TaskThumbnailIconView
-        android:id="@+id/task_icon_and_thumbnail"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginHorizontal="@dimen/task_thumbnail_icon_horiz_margin">
-        <ImageView
-            android:id="@+id/task_thumbnail"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"/>
-        <ImageView
-            android:id="@+id/task_icon"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"/>
-    </com.android.quickstep.views.TaskThumbnailIconView>
-    <TextView
-        android:id="@+id/task_label"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:singleLine="true"
-        android:textColor="@android:color/white"
-        android:textSize="24sp"
-        style="@style/TextTitle"/>
-</com.android.quickstep.views.TaskItemView>
diff --git a/go/quickstep/res/values-sw480dp/dimens.xml b/go/quickstep/res/values-sw480dp/dimens.xml
deleted file mode 100644
index 571b8a1b84..0000000000
--- a/go/quickstep/res/values-sw480dp/dimens.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2019 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>
-    <dimen name="recents_list_width">480dp</dimen>
-
-    <dimen name="task_item_height">90dp</dimen>
-    <dimen name="task_item_top_margin">24dp</dimen>
-    <dimen name="task_thumbnail_icon_horiz_margin">24dp</dimen>
-
-    <dimen name="task_thumbnail_corner_radius">4dp</dimen>
-
-    <dimen name="clear_all_item_view_height">52dp</dimen>
-    <dimen name="clear_all_item_view_top_margin">28dp</dimen>
-    <dimen name="clear_all_item_view_bottom_margin">28dp</dimen>
-    <dimen name="clear_all_button_width">160dp</dimen>
-</resources>
\ No newline at end of file
diff --git a/go/quickstep/res/values/dimens.xml b/go/quickstep/res/values/dimens.xml
deleted file mode 100644
index 91040f205f..0000000000
--- a/go/quickstep/res/values/dimens.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2019 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>
-    <dimen name="recents_list_width">320dp</dimen>
-
-    <dimen name="task_item_height">60dp</dimen>
-    <dimen name="task_item_top_margin">16dp</dimen>
-    <dimen name="task_thumbnail_icon_horiz_margin">16dp</dimen>
-
-    <dimen name="task_thumbnail_corner_radius">3dp</dimen>
-
-    <dimen name="clear_all_item_view_height">36dp</dimen>
-    <dimen name="clear_all_item_view_top_margin">20dp</dimen>
-    <dimen name="clear_all_item_view_bottom_margin">20dp</dimen>
-    <dimen name="clear_all_button_width">106dp</dimen>
-</resources>
\ No newline at end of file
diff --git a/go/quickstep/res/values/override.xml b/go/quickstep/res/values/override.xml
deleted file mode 100644
index bb267a3920..0000000000
--- a/go/quickstep/res/values/override.xml
+++ /dev/null
@@ -1,28 +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.
--->
-
-<!-- Class overrides for Go version of launcher with Go recents. -->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="app_transition_manager_class" translatable="false">com.android.launcher3.GoLauncherAppTransitionManagerImpl</string>
-
-  <string name="instant_app_resolver_class" translatable="false">com.android.quickstep.InstantAppResolverImpl</string>
-
-  <string name="main_process_initializer_class" translatable="false">com.android.quickstep.QuickstepProcessInitializer</string>
-
-  <string name="user_event_dispatcher_class" translatable="false">com.android.quickstep.logging.UserEventDispatcherExtension</string>
-</resources>
-
diff --git a/go/quickstep/src/com/android/launcher3/GoLauncherAppTransitionManagerImpl.java b/go/quickstep/src/com/android/launcher3/GoLauncherAppTransitionManagerImpl.java
deleted file mode 100644
index bcb1f5c3b4..0000000000
--- a/go/quickstep/src/com/android/launcher3/GoLauncherAppTransitionManagerImpl.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package com.android.launcher3;
-
-import static com.android.launcher3.Utilities.postAsyncCallback;
-import static com.android.launcher3.anim.Interpolators.AGGRESSIVE_EASE;
-import static com.android.launcher3.anim.Interpolators.LINEAR;
-import static com.android.quickstep.TaskUtils.taskIsATargetWithMode;
-import static com.android.quickstep.views.IconRecentsView.CONTENT_ALPHA;
-import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.MODE_OPENING;
-
-import android.animation.AnimatorSet;
-import android.animation.ObjectAnimator;
-import android.content.Context;
-import android.os.Handler;
-import android.view.View;
-
-import com.android.quickstep.views.IconRecentsView;
-import com.android.systemui.shared.system.RemoteAnimationRunnerCompat;
-import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
-
-/**
- * A {@link QuickstepAppTransitionManagerImpl} with recents-specific app transitions based off
- * {@link com.android.quickstep.views.IconRecentsView}.
- */
-public final class GoLauncherAppTransitionManagerImpl extends QuickstepAppTransitionManagerImpl {
-
-    public GoLauncherAppTransitionManagerImpl(Context context) {
-        super(context);
-    }
-
-    @Override
-    protected boolean isLaunchingFromRecents(View v, RemoteAnimationTargetCompat[] targets) {
-        return mLauncher.getStateManager().getState().overviewUi;
-    }
-
-    @Override
-    RemoteAnimationRunnerCompat getWallpaperOpenRunner(boolean fromUnlock) {
-        return new GoWallpaperOpenLauncherAnimationRunner(mHandler,
-                false /* startAtFrontOfQueue */, fromUnlock);
-    }
-
-    @Override
-    protected void composeRecentsLaunchAnimator(AnimatorSet anim, View v,
-            RemoteAnimationTargetCompat[] targets, boolean launcherClosing) {
-        // Stubbed. Recents launch animation will come from the recents view itself and will not
-        // use remote animations.
-    }
-
-    @Override
-    protected Runnable composeViewContentAnimator(AnimatorSet anim, float[] alphas, float[] trans) {
-        IconRecentsView overview = mLauncher.getOverviewPanel();
-        ObjectAnimator alpha = ObjectAnimator.ofFloat(overview,
-                CONTENT_ALPHA, alphas);
-        alpha.setDuration(CONTENT_ALPHA_DURATION);
-        alpha.setInterpolator(LINEAR);
-        anim.play(alpha);
-
-        ObjectAnimator transY = ObjectAnimator.ofFloat(overview, View.TRANSLATION_Y, trans);
-        transY.setInterpolator(AGGRESSIVE_EASE);
-        transY.setDuration(CONTENT_TRANSLATION_DURATION);
-        anim.play(transY);
-
-        return mLauncher.getStateManager()::reapplyState;
-    }
-
-    /**
-     * Remote animation runner for animation from app to Launcher. For Go, when going to recents,
-     * we need to ensure that the recents view is ready for remote animation before starting.
-     */
-    private final class GoWallpaperOpenLauncherAnimationRunner extends
-            WallpaperOpenLauncherAnimationRunner {
-        public GoWallpaperOpenLauncherAnimationRunner(Handler handler, boolean startAtFrontOfQueue,
-                boolean fromUnlock) {
-            super(handler, startAtFrontOfQueue, fromUnlock);
-        }
-
-        @Override
-        public void onCreateAnimation(RemoteAnimationTargetCompat[] targetCompats,
-                AnimationResult result) {
-            boolean isGoingToRecents =
-                    taskIsATargetWithMode(targetCompats, mLauncher.getTaskId(), MODE_OPENING)
-                    && (mLauncher.getStateManager().getState() == LauncherState.OVERVIEW);
-            if (isGoingToRecents) {
-                IconRecentsView recentsView = mLauncher.getOverviewPanel();
-                if (!recentsView.isReadyForRemoteAnim()) {
-                    recentsView.setOnReadyForRemoteAnimCallback(() ->
-                        postAsyncCallback(mHandler, () -> onCreateAnimation(targetCompats, result))
-                    );
-                    return;
-                }
-            }
-            super.onCreateAnimation(targetCompats, result);
-        }
-    }
-}
diff --git a/go/quickstep/src/com/android/launcher3/LauncherRecentsToActivityHelper.java b/go/quickstep/src/com/android/launcher3/LauncherRecentsToActivityHelper.java
deleted file mode 100644
index c12da946f8..0000000000
--- a/go/quickstep/src/com/android/launcher3/LauncherRecentsToActivityHelper.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2019 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.
- */
-package com.android.launcher3;
-
-import static com.android.launcher3.LauncherState.NORMAL;
-
-import com.android.quickstep.RecentsToActivityHelper;
-
-/**
- * {@link RecentsToActivityHelper} for when the recents implementation is contained in
- * {@link Launcher}.
- */
-public final class LauncherRecentsToActivityHelper implements RecentsToActivityHelper {
-
-    private final Launcher mLauncher;
-
-    public LauncherRecentsToActivityHelper(Launcher launcher) {
-        mLauncher = launcher;
-    }
-
-    @Override
-    public void leaveRecents() {
-        mLauncher.getStateManager().goToState(NORMAL);
-    }
-}
diff --git a/go/quickstep/src/com/android/launcher3/uioverrides/RecentsUiFactory.java b/go/quickstep/src/com/android/launcher3/uioverrides/RecentsUiFactory.java
deleted file mode 100644
index cbc77d2720..0000000000
--- a/go/quickstep/src/com/android/launcher3/uioverrides/RecentsUiFactory.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright (C) 2019 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.
- */
-
-package com.android.launcher3.uioverrides;
-
-import com.android.launcher3.DeviceProfile;
-import com.android.launcher3.Launcher;
-import com.android.launcher3.LauncherStateManager.StateHandler;
-import com.android.launcher3.Utilities;
-import com.android.launcher3.config.FeatureFlags;
-import com.android.launcher3.graphics.RotationMode;
-import com.android.launcher3.uioverrides.touchcontrollers.LandscapeEdgeSwipeController;
-import com.android.launcher3.uioverrides.touchcontrollers.LandscapeStatesTouchController;
-import com.android.launcher3.uioverrides.touchcontrollers.PortraitStatesTouchController;
-import com.android.launcher3.uioverrides.touchcontrollers.StatusBarTouchController;
-import com.android.launcher3.util.TouchController;
-import com.android.quickstep.SysUINavigationMode;
-import com.android.quickstep.views.IconRecentsView;
-
-import java.util.ArrayList;
-
-/**
- * Provides recents-related {@link UiFactory} logic and classes.
- */
-public abstract class RecentsUiFactory {
-
-    public static final boolean GO_LOW_RAM_RECENTS_ENABLED = true;
-
-    public static TouchController[] createTouchControllers(Launcher launcher) {
-        ArrayList<TouchController> list = new ArrayList<>();
-        list.add(launcher.getDragController());
-
-        if (launcher.getDeviceProfile().isVerticalBarLayout()) {
-            list.add(new LandscapeStatesTouchController(launcher));
-            list.add(new LandscapeEdgeSwipeController(launcher));
-        } else {
-            boolean allowDragToOverview = SysUINavigationMode.INSTANCE.get(launcher)
-                    .getMode().hasGestures;
-            list.add(new PortraitStatesTouchController(launcher, allowDragToOverview));
-        }
-        if (FeatureFlags.PULL_DOWN_STATUS_BAR && Utilities.IS_DEBUG_DEVICE
-                && !launcher.getDeviceProfile().isMultiWindowMode
-                && !launcher.getDeviceProfile().isVerticalBarLayout()) {
-            list.add(new StatusBarTouchController(launcher));
-        }
-        return list.toArray(new TouchController[list.size()]);
-    }
-
-    /**
-     * Creates and returns the controller responsible for recents view state transitions.
-     *
-     * @param launcher the launcher activity
-     * @return state handler for recents
-     */
-    public static StateHandler createRecentsViewStateController(Launcher launcher) {
-        return new RecentsViewStateController(launcher);
-    }
-
-    /**
-     * Clean-up logic that occurs when recents is no longer in use/visible.
-     *
-     * @param launcher the launcher activity
-     */
-    public static void resetOverview(Launcher launcher) {
-        IconRecentsView recentsView = launcher.getOverviewPanel();
-        recentsView.setTransitionedFromApp(false);
-    }
-
-    /**
-     * Recents logic that triggers when launcher state changes or launcher activity stops/resumes.
-     *
-     * @param launcher the launcher activity
-     */
-    public static void onLauncherStateOrResumeChanged(Launcher launcher) {}
-
-    public static RotationMode getRotationMode(DeviceProfile dp) {
-        return RotationMode.NORMAL;
-    }
-
-    public static void clearSwipeSharedState(boolean finishAnimation) {}
-}
diff --git a/go/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java b/go/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java
deleted file mode 100644
index 0b12ab052e..0000000000
--- a/go/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2019 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.
- */
-package com.android.launcher3.uioverrides;
-
-import static com.android.quickstep.views.IconRecentsView.CONTENT_ALPHA;
-
-import android.util.FloatProperty;
-
-import com.android.launcher3.Launcher;
-import com.android.launcher3.LauncherRecentsToActivityHelper;
-import com.android.quickstep.views.IconRecentsView;
-
-import androidx.annotation.NonNull;
-
-/**
- * State handler for Go's {@link IconRecentsView}.
- */
-public final class RecentsViewStateController extends
-        BaseRecentsViewStateController<IconRecentsView> {
-
-    public RecentsViewStateController(@NonNull Launcher launcher) {
-        super(launcher);
-        launcher.<IconRecentsView>getOverviewPanel().setRecentsToActivityHelper(
-                new LauncherRecentsToActivityHelper(launcher));
-    }
-
-    @Override
-    FloatProperty<IconRecentsView> getContentAlphaProperty() {
-        return CONTENT_ALPHA;
-    }
-}
diff --git a/go/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java b/go/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
deleted file mode 100644
index 212ce9bef6..0000000000
--- a/go/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Copyright (C) 2019 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.
- */
-
-package com.android.launcher3.uioverrides.states;
-
-import static android.view.View.VISIBLE;
-
-import static com.android.launcher3.LauncherAnimUtils.OVERVIEW_TRANSITION_MS;
-import static com.android.launcher3.LauncherAnimUtils.SCALE_PROPERTY;
-import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_OVERVIEW_FADE;
-import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_OVERVIEW_SCALE;
-import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_OVERVIEW_TRANSLATE_X;
-import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_WORKSPACE_FADE;
-import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_WORKSPACE_SCALE;
-import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_WORKSPACE_TRANSLATE;
-import static com.android.launcher3.anim.Interpolators.ACCEL;
-import static com.android.launcher3.anim.Interpolators.DEACCEL_2;
-import static com.android.launcher3.anim.Interpolators.OVERSHOOT_1_2;
-import static com.android.launcher3.anim.Interpolators.OVERSHOOT_1_7;
-import static com.android.launcher3.states.RotationHelper.REQUEST_ROTATE;
-
-import android.content.Context;
-import android.view.View;
-
-import com.android.launcher3.DeviceProfile;
-import com.android.launcher3.Launcher;
-import com.android.launcher3.LauncherState;
-import com.android.launcher3.R;
-import com.android.launcher3.anim.AnimatorSetBuilder;
-import com.android.launcher3.userevent.nano.LauncherLogProto;
-import com.android.quickstep.SysUINavigationMode;
-import com.android.quickstep.views.IconRecentsView;
-
-/**
- * Definition for overview state
- */
-public class OverviewState extends LauncherState {
-
-    // Scale recents takes before animating in
-    private static final float RECENTS_PREPARE_SCALE = 1.33f;
-
-    private static final int STATE_FLAGS = FLAG_WORKSPACE_ICONS_CAN_BE_DRAGGED
-            | FLAG_DISABLE_RESTORE | FLAG_OVERVIEW_UI | FLAG_DISABLE_ACCESSIBILITY;
-
-    public OverviewState(int id) {
-        this(id, OVERVIEW_TRANSITION_MS, STATE_FLAGS);
-    }
-
-    protected OverviewState(int id, int transitionDuration, int stateFlags) {
-        super(id, LauncherLogProto.ContainerType.TASKSWITCHER, transitionDuration, stateFlags);
-    }
-
-    @Override
-    public ScaleAndTranslation getOverviewScaleAndTranslation(Launcher launcher) {
-        return new ScaleAndTranslation(1f, 0f, 0f);
-    }
-
-    @Override
-    public void onStateEnabled(Launcher launcher) {
-        IconRecentsView recentsView = launcher.getOverviewPanel();
-        recentsView.onBeginTransitionToOverview();
-        recentsView.setShowStatusBarForegroundScrim(true);
-        // Request orientation be set to unspecified, letting the system decide the best
-        // orientation.
-        launcher.getRotationHelper().setCurrentStateRequest(REQUEST_ROTATE);
-    }
-
-    @Override
-    public void onStateDisabled(Launcher launcher) {
-        IconRecentsView recentsView = launcher.getOverviewPanel();
-        recentsView.setShowStatusBarForegroundScrim(false);
-    }
-
-    @Override
-    public PageAlphaProvider getWorkspacePageAlphaProvider(Launcher launcher) {
-        return new PageAlphaProvider(DEACCEL_2) {
-            @Override
-            public float getPageAlpha(int pageIndex) {
-                return 0;
-            }
-        };
-    }
-
-    @Override
-    public int getVisibleElements(Launcher launcher) {
-        return NONE;
-    }
-
-    @Override
-    public float getWorkspaceScrimAlpha(Launcher launcher) {
-        return 0.5f;
-    }
-
-    @Override
-    public String getDescription(Launcher launcher) {
-        return launcher.getString(R.string.accessibility_desc_recent_apps);
-    }
-
-    @Override
-    public void onBackPressed(Launcher launcher) {
-        // TODO: Add logic to go back to task if coming from a currently running task.
-        super.onBackPressed(launcher);
-    }
-
-    public static float getDefaultSwipeHeight(Launcher launcher) {
-        return getDefaultSwipeHeight(launcher, launcher.getDeviceProfile());
-    }
-
-    public static float getDefaultSwipeHeight(Context context, DeviceProfile dp) {
-        return dp.allAppsCellHeightPx - dp.allAppsIconTextSizePx;
-    }
-
-    @Override
-    public void prepareForAtomicAnimation(Launcher launcher, LauncherState fromState,
-            AnimatorSetBuilder builder) {
-        if (fromState == NORMAL && this == OVERVIEW) {
-            if (SysUINavigationMode.getMode(launcher) == SysUINavigationMode.Mode.NO_BUTTON) {
-                builder.setInterpolator(ANIM_WORKSPACE_SCALE, ACCEL);
-                builder.setInterpolator(ANIM_WORKSPACE_TRANSLATE, ACCEL);
-            } else {
-                builder.setInterpolator(ANIM_WORKSPACE_SCALE, OVERSHOOT_1_2);
-            }
-            builder.setInterpolator(ANIM_WORKSPACE_FADE, OVERSHOOT_1_2);
-            builder.setInterpolator(ANIM_OVERVIEW_SCALE, OVERSHOOT_1_2);
-            builder.setInterpolator(ANIM_OVERVIEW_TRANSLATE_X, OVERSHOOT_1_7);
-            builder.setInterpolator(ANIM_OVERVIEW_FADE, OVERSHOOT_1_2);
-
-            View overview = launcher.getOverviewPanel();
-            if (overview.getVisibility() != VISIBLE) {
-                SCALE_PROPERTY.set(overview, RECENTS_PREPARE_SCALE);
-            }
-        }
-    }
-
-    public static OverviewState newBackgroundState(int id) {
-        return new OverviewState(id);
-    }
-
-    public static OverviewState newPeekState(int id) {
-        return new OverviewState(id);
-    }
-
-    public static OverviewState newSwitchState(int id) {
-        return new OverviewState(id);
-    }
-}
diff --git a/go/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/LandscapeStatesTouchController.java b/go/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/LandscapeStatesTouchController.java
deleted file mode 100644
index 66aec40509..0000000000
--- a/go/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/LandscapeStatesTouchController.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (C) 2019 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.
- */
-package com.android.launcher3.uioverrides.touchcontrollers;
-
-import static com.android.launcher3.LauncherState.ALL_APPS;
-import static com.android.launcher3.LauncherState.NORMAL;
-
-import android.view.MotionEvent;
-
-import com.android.launcher3.AbstractFloatingView;
-import com.android.launcher3.Launcher;
-import com.android.launcher3.LauncherState;
-import com.android.launcher3.userevent.nano.LauncherLogProto;
-
-/**
- * Touch controller for landscape mode.
- */
-public final class LandscapeStatesTouchController extends PortraitStatesTouchController {
-
-    public LandscapeStatesTouchController(Launcher l) {
-        super(l, true /* allowDragToOverview */);
-    }
-
-    @Override
-    protected boolean canInterceptTouch(MotionEvent ev) {
-        if (mCurrentAnimation != null) {
-            // If we are already animating from a previous state, we can intercept.
-            return true;
-        }
-        if (AbstractFloatingView.getTopOpenView(mLauncher) != null) {
-            return false;
-        }
-        if (mLauncher.isInState(ALL_APPS)) {
-            // In all-apps only listen if the container cannot scroll itself
-            return mLauncher.getAppsView().shouldContainerScroll(ev);
-        } else if (mLauncher.isInState(NORMAL)) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    @Override
-    protected LauncherState getTargetState(LauncherState fromState, boolean isDragTowardPositive) {
-        if (fromState == ALL_APPS && !isDragTowardPositive) {
-            return NORMAL;
-        } else if (isDragTowardPositive) {
-            return ALL_APPS;
-        }
-        return fromState;
-    }
-
-    @Override
-    protected int getLogContainerTypeForNormalState(MotionEvent ev) {
-        return LauncherLogProto.ContainerType.WORKSPACE;
-    }
-}
diff --git a/go/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitOverviewStateTouchHelper.java b/go/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitOverviewStateTouchHelper.java
deleted file mode 100644
index 011a4e75bd..0000000000
--- a/go/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitOverviewStateTouchHelper.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2019 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.
- */
-
-package com.android.launcher3.uioverrides.touchcontrollers;
-
-import android.view.MotionEvent;
-
-import com.android.launcher3.Launcher;
-import com.android.launcher3.util.PendingAnimation;
-
-/**
- * Helper class for {@link PortraitStatesTouchController} that determines swipeable regions and
- * animations on the overview state that depend on the recents implementation.
- */
-public final class PortraitOverviewStateTouchHelper {
-
-    public PortraitOverviewStateTouchHelper(Launcher launcher) {}
-
-    /**
-     * Whether or not {@link PortraitStatesTouchController} should intercept the touch when on the
-     * overview state.
-     *
-     * @param ev the motion event
-     * @return true if we should intercept the motion event
-     */
-    boolean canInterceptTouch(MotionEvent ev) {
-        // Go does not support swiping to all-apps from recents.
-        return false;
-    }
-
-    /**
-     * Whether or not swiping down to leave overview state should return to the currently running
-     * task app.
-     *
-     * @return true if going back should take the user to the currently running task
-     */
-    boolean shouldSwipeDownReturnToApp() {
-        // Go does not support swiping tasks down to launch tasks from recents.
-        return false;
-    }
-
-    /**
-     * Create the animation for going from overview to the task app via swiping.
-     *
-     * @param duration how long the animation should be
-     * @return the animation
-     */
-    PendingAnimation createSwipeDownToTaskAppAnimation(long duration) {
-        // Go does not support swiping tasks down to launch tasks from recents.
-        return null;
-    }
-}
diff --git a/go/quickstep/src/com/android/quickstep/AppToOverviewAnimationProvider.java b/go/quickstep/src/com/android/quickstep/AppToOverviewAnimationProvider.java
deleted file mode 100644
index 92900f2168..0000000000
--- a/go/quickstep/src/com/android/quickstep/AppToOverviewAnimationProvider.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
- * Copyright (C) 2019 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.
- */
-package com.android.quickstep;
-
-import static com.android.launcher3.Utilities.postAsyncCallback;
-import static com.android.launcher3.anim.Interpolators.FAST_OUT_SLOW_IN;
-import static com.android.quickstep.views.IconRecentsView.REMOTE_APP_TO_OVERVIEW_DURATION;
-import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.ACTIVITY_TYPE_HOME;
-import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.MODE_CLOSING;
-import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.MODE_OPENING;
-
-import android.animation.AnimatorSet;
-import android.animation.ValueAnimator;
-import android.app.ActivityOptions;
-import android.content.Context;
-import android.os.Handler;
-import android.util.Log;
-
-import com.android.launcher3.BaseDraggingActivity;
-import com.android.launcher3.LauncherAnimationRunner;
-import com.android.quickstep.util.RemoteAnimationProvider;
-import com.android.quickstep.util.RemoteAnimationTargetSet;
-import com.android.quickstep.views.IconRecentsView;
-import com.android.systemui.shared.system.ActivityOptionsCompat;
-import com.android.systemui.shared.system.RemoteAnimationAdapterCompat;
-import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
-
-/**
- * Provider for the atomic remote window animation from the app to the overview.
- *
- * @param <T> activity that contains the overview
- */
-final class AppToOverviewAnimationProvider<T extends BaseDraggingActivity> implements
-        RemoteAnimationProvider {
-    private static final String TAG = "AppToOverviewAnimationProvider";
-
-    private final ActivityControlHelper<T> mHelper;
-    private final int mTargetTaskId;
-    private IconRecentsView mRecentsView;
-    private AppToOverviewAnimationListener mAnimationReadyListener;
-
-    AppToOverviewAnimationProvider(ActivityControlHelper<T> helper, int targetTaskId) {
-        mHelper = helper;
-        mTargetTaskId = targetTaskId;
-    }
-
-    /**
-     * Set listener to various points in the animation preparing to animate.
-     *
-     * @param listener listener
-     */
-    void setAnimationListener(AppToOverviewAnimationListener listener) {
-        mAnimationReadyListener = listener;
-    }
-
-    /**
-     * Callback for when the activity is ready/initialized.
-     *
-     * @param activity the activity that is ready
-     * @param wasVisible true if it was visible before
-     */
-    boolean onActivityReady(T activity, Boolean wasVisible) {
-        if (mAnimationReadyListener != null) {
-            mAnimationReadyListener.onActivityReady(activity);
-        }
-        ActivityControlHelper.AnimationFactory factory =
-                mHelper.prepareRecentsUI(activity, wasVisible,
-                        false /* animate activity */, (controller) -> {
-                            controller.dispatchOnStart();
-                            ValueAnimator anim = controller.getAnimationPlayer()
-                                    .setDuration(getRecentsLaunchDuration());
-                            anim.setInterpolator(FAST_OUT_SLOW_IN);
-                            anim.start();
-                        });
-        factory.onRemoteAnimationReceived(null);
-        factory.createActivityController(getRecentsLaunchDuration());
-        mRecentsView = activity.getOverviewPanel();
-        return false;
-    }
-
-    /**
-     * Create remote window animation from the currently running app to the overview panel. Should
-     * be called after {@link #onActivityReady}.
-     *
-     * @param targetCompats the target apps
-     * @return animation from app to overview
-     */
-    @Override
-    public AnimatorSet createWindowAnimation(RemoteAnimationTargetCompat[] targetCompats) {
-        if (mAnimationReadyListener != null) {
-            mAnimationReadyListener.onWindowAnimationCreated();
-        }
-        AnimatorSet anim = new AnimatorSet();
-        if (mRecentsView == null) {
-            if (Log.isLoggable(TAG, Log.WARN)) {
-                Log.w(TAG, "No recents view. Using stub animation.");
-            }
-            anim.play(ValueAnimator.ofInt(0, 1).setDuration(getRecentsLaunchDuration()));
-            return anim;
-        }
-
-        RemoteAnimationTargetSet targetSet =
-                new RemoteAnimationTargetSet(targetCompats, MODE_CLOSING);
-        mRecentsView.setTransitionedFromApp(!targetSet.isAnimatingHome());
-
-        RemoteAnimationTargetCompat recentsTarget = null;
-        RemoteAnimationTargetCompat closingAppTarget = null;
-
-        for (RemoteAnimationTargetCompat target : targetCompats) {
-            if (target.mode == MODE_OPENING) {
-                recentsTarget = target;
-            } else if (target.mode == MODE_CLOSING && target.taskId == mTargetTaskId) {
-                closingAppTarget = target;
-            }
-        }
-
-        if (closingAppTarget == null) {
-            if (Log.isLoggable(TAG, Log.WARN)) {
-                Log.w(TAG, "No closing app target. Using stub animation.");
-            }
-            anim.play(ValueAnimator.ofInt(0, 1).setDuration(getRecentsLaunchDuration()));
-            return anim;
-        }
-        if (recentsTarget == null) {
-            if (Log.isLoggable(TAG, Log.WARN)) {
-                Log.w(TAG, "No recents target. Using stub animation.");
-            }
-            anim.play(ValueAnimator.ofInt(0, 1).setDuration(getRecentsLaunchDuration()));
-            return anim;
-        }
-
-        if (closingAppTarget.activityType == ACTIVITY_TYPE_HOME) {
-            mRecentsView.playRemoteHomeToRecentsAnimation(anim, closingAppTarget, recentsTarget);
-        } else {
-            mRecentsView.playRemoteAppToRecentsAnimation(anim, closingAppTarget, recentsTarget);
-        }
-
-        return anim;
-    }
-
-    @Override
-    public ActivityOptions toActivityOptions(Handler handler, long duration, Context context) {
-        LauncherAnimationRunner runner = new LauncherAnimationRunner(handler,
-                false /* startAtFrontOfQueue */) {
-
-            @Override
-            public void onCreateAnimation(RemoteAnimationTargetCompat[] targetCompats,
-                    AnimationResult result) {
-                IconRecentsView recentsView = mRecentsView;
-                if (!recentsView.isReadyForRemoteAnim()) {
-                    recentsView.setOnReadyForRemoteAnimCallback(() -> postAsyncCallback(handler,
-                            () -> onCreateAnimation(targetCompats, result))
-                    );
-                    return;
-                }
-                result.setAnimation(createWindowAnimation(targetCompats), context);
-            }
-        };
-        return ActivityOptionsCompat.makeRemoteAnimation(
-                new RemoteAnimationAdapterCompat(runner, duration,
-                        0 /* statusBarTransitionDelay */));
-    }
-
-    /**
-     * Get duration of animation from app to overview.
-     *
-     * @return duration of animation
-     */
-    long getRecentsLaunchDuration() {
-        return REMOTE_APP_TO_OVERVIEW_DURATION;
-    }
-
-    /**
-     * Listener for various points in the app to overview animation preparing to animate.
-     */
-    interface AppToOverviewAnimationListener {
-        /**
-         * Logic for when activity we're animating to is ready
-         *
-         * @param activity activity to animate to
-         */
-        void onActivityReady(BaseDraggingActivity activity);
-
-        /**
-         * Logic for when we've created the app to recents animation.
-         */
-        void onWindowAnimationCreated();
-    }
-}
diff --git a/go/quickstep/src/com/android/quickstep/ClearAllHolder.java b/go/quickstep/src/com/android/quickstep/ClearAllHolder.java
deleted file mode 100644
index ce87171f4b..0000000000
--- a/go/quickstep/src/com/android/quickstep/ClearAllHolder.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (C) 2019 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.
- */
-package com.android.quickstep;
-
-import android.view.View;
-
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView.ViewHolder;
-
-/**
- * Holder for clear all button view in task recycler view.
- */
-final class ClearAllHolder extends ViewHolder {
-    public ClearAllHolder(@NonNull View itemView) {
-        super(itemView);
-    }
-}
diff --git a/go/quickstep/src/com/android/quickstep/ContentFillItemAnimator.java b/go/quickstep/src/com/android/quickstep/ContentFillItemAnimator.java
deleted file mode 100644
index 808cd7217a..0000000000
--- a/go/quickstep/src/com/android/quickstep/ContentFillItemAnimator.java
+++ /dev/null
@@ -1,281 +0,0 @@
-/*
- * Copyright (C) 2019 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.
- */
-package com.android.quickstep;
-
-import static android.view.View.ALPHA;
-
-import static com.android.quickstep.TaskAdapter.CHANGE_EVENT_TYPE_EMPTY_TO_CONTENT;
-import static com.android.quickstep.views.TaskItemView.CONTENT_TRANSITION_PROGRESS;
-
-import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
-import android.animation.ObjectAnimator;
-import android.view.View;
-
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView.ViewHolder;
-import androidx.recyclerview.widget.SimpleItemAnimator;
-
-import com.android.quickstep.views.TaskItemView;
-
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-
-/**
- * An item animator that is only set and used for the transition from the empty loading UI to
- * the filled task content UI. The animation starts from the bottom to top, changing all valid
- * empty item views to be filled and removing all extra empty views.
- */
-public final class ContentFillItemAnimator extends SimpleItemAnimator {
-
-    private static final class PendingAnimation {
-        ViewHolder viewHolder;
-        int animType;
-
-        PendingAnimation(ViewHolder vh, int type) {
-            viewHolder = vh;
-            animType = type;
-        }
-    }
-
-    private static final int ANIM_TYPE_REMOVE = 0;
-    private static final int ANIM_TYPE_CHANGE = 1;
-
-    private static final int ITEM_BETWEEN_DELAY = 40;
-    private static final int ITEM_CHANGE_DURATION = 150;
-    private static final int ITEM_REMOVE_DURATION = 150;
-
-    /**
-     * Animations that have been registered to occur together at the next call of
-     * {@link #runPendingAnimations()} but have not started.
-     */
-    private final ArrayList<PendingAnimation> mPendingAnims = new ArrayList<>();
-
-    /**
-     * Animations that have started and are running.
-     */
-    private final ArrayList<ObjectAnimator> mRunningAnims = new ArrayList<>();
-
-    private Runnable mOnFinishRunnable;
-
-    /**
-     * Set runnable to run after the content fill animation is fully completed.
-     *
-     * @param runnable runnable to run on end
-     */
-    public void setOnAnimationFinishedRunnable(Runnable runnable) {
-        mOnFinishRunnable = runnable;
-    }
-
-    @Override
-    public void setChangeDuration(long changeDuration) {
-        throw new UnsupportedOperationException("Cascading item animator cannot have animation "
-                + "duration changed.");
-    }
-
-    @Override
-    public void setRemoveDuration(long removeDuration) {
-        throw new UnsupportedOperationException("Cascading item animator cannot have animation "
-                + "duration changed.");
-    }
-
-    @Override
-    public boolean animateRemove(ViewHolder holder) {
-        PendingAnimation pendAnim = new PendingAnimation(holder, ANIM_TYPE_REMOVE);
-        mPendingAnims.add(pendAnim);
-        return true;
-    }
-
-    private void animateRemoveImpl(ViewHolder holder, long startDelay) {
-        final View view = holder.itemView;
-        if (holder.itemView.getAlpha() == 0) {
-            // View is already visually removed. We can just get rid of it now.
-            view.setAlpha(1.0f);
-            dispatchRemoveFinished(holder);
-            dispatchFinishedWhenDone();
-            return;
-        }
-        final ObjectAnimator anim = ObjectAnimator.ofFloat(
-                holder.itemView, ALPHA, holder.itemView.getAlpha(), 0.0f);
-        anim.setDuration(ITEM_REMOVE_DURATION).setStartDelay(startDelay);
-        anim.addListener(
-                new AnimatorListenerAdapter() {
-                    @Override
-                    public void onAnimationStart(Animator animation) {
-                        dispatchRemoveStarting(holder);
-                    }
-
-                    @Override
-                    public void onAnimationEnd(Animator animation) {
-                        view.setAlpha(1);
-                        dispatchRemoveFinished(holder);
-                        mRunningAnims.remove(anim);
-                        dispatchFinishedWhenDone();
-                    }
-                }
-        );
-        anim.start();
-        mRunningAnims.add(anim);
-    }
-
-    @Override
-    public boolean animateAdd(ViewHolder holder) {
-        dispatchAddFinished(holder);
-        return false;
-    }
-
-    @Override
-    public boolean animateMove(ViewHolder holder, int fromX, int fromY, int toX,
-            int toY) {
-        dispatchMoveFinished(holder);
-        return false;
-    }
-
-    @Override
-    public boolean animateChange(ViewHolder oldHolder,
-            ViewHolder newHolder, int fromLeft, int fromTop, int toLeft, int toTop) {
-        // Only support changes where the holders are the same
-        if (oldHolder == newHolder) {
-            PendingAnimation pendAnim = new PendingAnimation(oldHolder, ANIM_TYPE_CHANGE);
-            mPendingAnims.add(pendAnim);
-            return true;
-        }
-        dispatchChangeFinished(oldHolder, true /* oldItem */);
-        dispatchChangeFinished(newHolder, false /* oldItem */);
-        return false;
-    }
-
-    private void animateChangeImpl(ViewHolder viewHolder, long startDelay) {
-        TaskItemView itemView = (TaskItemView) viewHolder.itemView;
-        if (itemView.getAlpha() == 0) {
-            // View is still not visible, so we can finish the change immediately.
-            CONTENT_TRANSITION_PROGRESS.set(itemView, 1.0f);
-            dispatchChangeFinished(viewHolder, true /* oldItem */);
-            dispatchFinishedWhenDone();
-            return;
-        }
-        final ObjectAnimator anim =
-                ObjectAnimator.ofFloat(itemView, CONTENT_TRANSITION_PROGRESS, 0.0f, 1.0f);
-        anim.setDuration(ITEM_CHANGE_DURATION).setStartDelay(startDelay);
-        anim.addListener(
-                new AnimatorListenerAdapter() {
-                    @Override
-                    public void onAnimationStart(Animator animation) {
-                        dispatchChangeStarting(viewHolder, true /* oldItem */);
-                    }
-
-                    @Override
-                    public void onAnimationEnd(Animator animation) {
-                        CONTENT_TRANSITION_PROGRESS.set(itemView, 1.0f);
-                        dispatchChangeFinished(viewHolder, true /* oldItem */);
-                        mRunningAnims.remove(anim);
-                        dispatchFinishedWhenDone();
-                    }
-                }
-        );
-        anim.start();
-        mRunningAnims.add(anim);
-    }
-
-    @Override
-    public void runPendingAnimations() {
-        // Run animations bottom to top.
-        mPendingAnims.sort(Comparator.comparingInt(o -> -o.viewHolder.itemView.getBottom()));
-        int delay = 0;
-        while (!mPendingAnims.isEmpty()) {
-            PendingAnimation curAnim = mPendingAnims.remove(0);
-            ViewHolder vh = curAnim.viewHolder;
-            switch (curAnim.animType) {
-                case ANIM_TYPE_REMOVE:
-                    animateRemoveImpl(vh, delay);
-                    break;
-                case ANIM_TYPE_CHANGE:
-                    animateChangeImpl(vh, delay);
-                    break;
-                default:
-                    break;
-            }
-            delay += ITEM_BETWEEN_DELAY;
-        }
-    }
-
-    @Override
-    public void endAnimation(@NonNull ViewHolder item) {
-        for (int i = mPendingAnims.size() - 1; i >= 0; i--) {
-            endPendingAnimation(mPendingAnims.get(i));
-            mPendingAnims.remove(i);
-        }
-        dispatchFinishedWhenDone();
-    }
-
-    @Override
-    public void endAnimations() {
-        if (!isRunning()) {
-            return;
-        }
-        for (int i = mPendingAnims.size() - 1; i >= 0; i--) {
-            endPendingAnimation(mPendingAnims.get(i));
-            mPendingAnims.remove(i);
-        }
-        for (int i = mRunningAnims.size() - 1; i >= 0; i--) {
-            ObjectAnimator anim = mRunningAnims.get(i);
-            // This calls the on end animation callback which will set values to their end target.
-            anim.cancel();
-        }
-        dispatchFinishedWhenDone();
-    }
-
-    private void endPendingAnimation(PendingAnimation pendAnim) {
-        ViewHolder item = pendAnim.viewHolder;
-        switch (pendAnim.animType) {
-            case ANIM_TYPE_REMOVE:
-                item.itemView.setAlpha(1.0f);
-                dispatchRemoveFinished(item);
-                break;
-            case ANIM_TYPE_CHANGE:
-                CONTENT_TRANSITION_PROGRESS.set(item.itemView, 1.0f);
-                dispatchChangeFinished(item, true /* oldItem */);
-                break;
-            default:
-                break;
-        }
-    }
-
-    @Override
-    public boolean isRunning() {
-        return !mPendingAnims.isEmpty() || !mRunningAnims.isEmpty();
-    }
-
-    @Override
-    public boolean canReuseUpdatedViewHolder(@NonNull ViewHolder viewHolder,
-            @NonNull List<Object> payloads) {
-        if (!payloads.isEmpty()
-                && (int) payloads.get(0) == CHANGE_EVENT_TYPE_EMPTY_TO_CONTENT) {
-            return true;
-        }
-        return super.canReuseUpdatedViewHolder(viewHolder, payloads);
-    }
-
-    private void dispatchFinishedWhenDone() {
-        if (!isRunning()) {
-            dispatchAnimationsFinished();
-            if (mOnFinishRunnable != null) {
-                mOnFinishRunnable.run();
-            }
-        }
-    }
-}
diff --git a/go/quickstep/src/com/android/quickstep/FallbackActivityControllerHelper.java b/go/quickstep/src/com/android/quickstep/FallbackActivityControllerHelper.java
deleted file mode 100644
index 057b48bb2b..0000000000
--- a/go/quickstep/src/com/android/quickstep/FallbackActivityControllerHelper.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright (C) 2019 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.
- */
-package com.android.quickstep;
-
-import static com.android.launcher3.anim.Interpolators.LINEAR;
-import static com.android.quickstep.views.IconRecentsView.CONTENT_ALPHA;
-
-import android.animation.AnimatorSet;
-import android.animation.ObjectAnimator;
-import android.graphics.Rect;
-
-import androidx.annotation.Nullable;
-
-import com.android.launcher3.anim.AnimatorPlaybackController;
-import com.android.launcher3.userevent.nano.LauncherLogProto;
-import com.android.quickstep.util.RemoteAnimationTargetSet;
-import com.android.quickstep.views.IconRecentsView;
-
-import java.util.function.BiPredicate;
-import java.util.function.Consumer;
-
-/**
- * {@link ActivityControlHelper} for recents when the default launcher is different than the
- * currently running one and apps should interact with the {@link RecentsActivity} as opposed
- * to the in-launcher one.
- */
-public final class FallbackActivityControllerHelper extends
-        GoActivityControlHelper<RecentsActivity> {
-
-    public FallbackActivityControllerHelper() { }
-
-    @Override
-    public AnimationFactory prepareRecentsUI(RecentsActivity activity, boolean activityVisible,
-            boolean animateActivity, Consumer<AnimatorPlaybackController> callback) {
-        if (activityVisible) {
-            return (transitionLength) -> { };
-        }
-
-        IconRecentsView rv = activity.getOverviewPanel();
-        rv.setUsingRemoteAnimation(true);
-        rv.setAlpha(0);
-
-        return new AnimationFactory() {
-
-            boolean isAnimatingToRecents = false;
-
-            @Override
-            public void onRemoteAnimationReceived(RemoteAnimationTargetSet targets) {
-                isAnimatingToRecents = targets != null && targets.isAnimatingHome();
-                if (!isAnimatingToRecents) {
-                    rv.setAlpha(1);
-                }
-                createActivityController(getSwipeUpDestinationAndLength(
-                        activity.getDeviceProfile(), activity, new Rect()));
-            }
-
-            @Override
-            public void createActivityController(long transitionLength) {
-                if (!isAnimatingToRecents) {
-                    return;
-                }
-
-                ObjectAnimator anim = ObjectAnimator.ofFloat(rv, CONTENT_ALPHA, 0, 1);
-                anim.setDuration(transitionLength).setInterpolator(LINEAR);
-                AnimatorSet animatorSet = new AnimatorSet();
-                animatorSet.play(anim);
-                callback.accept(AnimatorPlaybackController.wrap(animatorSet, transitionLength));
-            }
-        };
-    }
-
-    @Override
-    public ActivityInitListener createActivityInitListener(
-            BiPredicate<RecentsActivity, Boolean> onInitListener) {
-        return new RecentsActivityTracker(onInitListener);
-    }
-
-    @Nullable
-    @Override
-    public RecentsActivity getCreatedActivity() {
-        return RecentsActivityTracker.getCurrentActivity();
-    }
-
-    @Nullable
-    @Override
-    public IconRecentsView getVisibleRecentsView() {
-        RecentsActivity activity = getCreatedActivity();
-        if (activity != null && activity.hasWindowFocus()) {
-            return activity.getOverviewPanel();
-        }
-        return null;
-    }
-
-    @Override
-    public boolean switchToRecentsIfVisible(Runnable onCompleteCallback) {
-        return false;
-    }
-
-    @Override
-    public int getContainerType() {
-        return LauncherLogProto.ContainerType.SIDELOADED_LAUNCHER;
-    }
-
-    @Override
-    public void onLaunchTaskSuccess(RecentsActivity activity) { }
-}
diff --git a/go/quickstep/src/com/android/quickstep/FallbackRecentsToActivityHelper.java b/go/quickstep/src/com/android/quickstep/FallbackRecentsToActivityHelper.java
deleted file mode 100644
index a845f93a9d..0000000000
--- a/go/quickstep/src/com/android/quickstep/FallbackRecentsToActivityHelper.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2019 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.
- */
-package com.android.quickstep;
-
-/**
- * {@link RecentsToActivityHelper} for when we are using the fallback recents in
- * {@link BaseRecentsActivity}.
- */
-public final class FallbackRecentsToActivityHelper implements RecentsToActivityHelper {
-
-    BaseRecentsActivity mActivity;
-
-    public FallbackRecentsToActivityHelper(BaseRecentsActivity activity) {
-        mActivity = activity;
-    }
-
-    @Override
-    public void leaveRecents() {
-        mActivity.startHome();
-    }
-}
diff --git a/go/quickstep/src/com/android/quickstep/GoActivityControlHelper.java b/go/quickstep/src/com/android/quickstep/GoActivityControlHelper.java
deleted file mode 100644
index 274a347cbb..0000000000
--- a/go/quickstep/src/com/android/quickstep/GoActivityControlHelper.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.android.quickstep;
-
-import android.content.Context;
-import android.graphics.Rect;
-
-import com.android.launcher3.BaseDraggingActivity;
-import com.android.launcher3.DeviceProfile;
-import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
-
-/**
- * Base activity control helper for Go that stubs out most of the functionality that is not needed
- * for Go.
- *
- * @param <T> activity that contains the overview
- */
-public abstract class GoActivityControlHelper<T extends BaseDraggingActivity> implements
-        ActivityControlHelper<T> {
-
-    @Override
-    public void onTransitionCancelled(T activity, boolean activityVisible) {
-        // Go transitions to overview are all atomic.
-    }
-
-    @Override
-    public int getSwipeUpDestinationAndLength(DeviceProfile dp, Context context, Rect outRect) {
-        // TODO Implement outRect depending on where the task should animate to.
-        // Go does not support swipe up gesture.
-        return 0;
-    }
-
-    @Override
-    public void onSwipeUpToRecentsComplete(T activity) {
-        // Go does not support swipe up gesture.
-    }
-
-    @Override
-    public void onAssistantVisibilityChanged(float visibility) {
-        // Go does not support assistant visibility transitions.
-    }
-
-    @Override
-    public HomeAnimationFactory prepareHomeUI(T activity) {
-        // Go does not support gestures from app to home.
-        return null;
-    }
-
-    @Override
-    public Rect getOverviewWindowBounds(Rect homeBounds, RemoteAnimationTargetCompat target) {
-        // Go does not support gestures to overview.
-        return null;
-    }
-
-    @Override
-    public boolean shouldMinimizeSplitScreen() {
-        // Go does not support split screen.
-        return true;
-    }
-
-    @Override
-    public boolean isInLiveTileMode() {
-        // Go does not support live tiles.
-        return false;
-    }
-
-    @Override
-    public void onLaunchTaskFailed(T activity) {
-        // Go does not support gestures from one task to another.
-    }
-}
diff --git a/go/quickstep/src/com/android/quickstep/IconRecentsFragment.java b/go/quickstep/src/com/android/quickstep/IconRecentsFragment.java
deleted file mode 100644
index facf0d22c2..0000000000
--- a/go/quickstep/src/com/android/quickstep/IconRecentsFragment.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2019 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.
- */
-
-package com.android.quickstep;
-
-import android.app.Fragment;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import com.android.launcher3.R;
-
-public class IconRecentsFragment extends Fragment {
-    @Nullable
-    @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
-            @Nullable Bundle savedInstanceState) {
-        return inflater.inflate(R.layout.icon_recents_root_view, container, false);
-    }
-}
\ No newline at end of file
diff --git a/go/quickstep/src/com/android/quickstep/LauncherActivityControllerHelper.java b/go/quickstep/src/com/android/quickstep/LauncherActivityControllerHelper.java
deleted file mode 100644
index b0d9cda6bc..0000000000
--- a/go/quickstep/src/com/android/quickstep/LauncherActivityControllerHelper.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright (C) 2019 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.
- */
-
-package com.android.quickstep;
-
-import static com.android.launcher3.LauncherState.OVERVIEW;
-
-import com.android.launcher3.Launcher;
-import com.android.launcher3.LauncherAppState;
-import com.android.launcher3.LauncherInitListener;
-import com.android.launcher3.LauncherState;
-import com.android.launcher3.anim.AnimatorPlaybackController;
-import com.android.launcher3.userevent.nano.LauncherLogProto;
-import com.android.quickstep.views.IconRecentsView;
-
-import java.util.function.BiPredicate;
-import java.util.function.Consumer;
-
-/**
- * {@link ActivityControlHelper} for the in-launcher recents.
- * TODO: Implement the app to overview animation functionality
- */
-public final class LauncherActivityControllerHelper extends GoActivityControlHelper<Launcher> {
-
-    @Override
-    public AnimationFactory prepareRecentsUI(Launcher activity,
-            boolean activityVisible, boolean animateActivity,
-            Consumer<AnimatorPlaybackController> callback) {
-        LauncherState fromState = activity.getStateManager().getState();
-        activity.<IconRecentsView>getOverviewPanel().setUsingRemoteAnimation(true);
-        //TODO: Implement this based off where the recents view needs to be for app => recents anim.
-        return new AnimationFactory() {
-            @Override
-            public void createActivityController(long transitionLength) {
-                callback.accept(activity.getStateManager().createAnimationToNewWorkspace(
-                        fromState, OVERVIEW, transitionLength));
-            }
-
-            @Override
-            public void onTransitionCancelled() {}
-        };
-    }
-
-    @Override
-    public ActivityInitListener createActivityInitListener(
-            BiPredicate<Launcher, Boolean> onInitListener) {
-        return new LauncherInitListener(onInitListener);
-    }
-
-    @Override
-    public Launcher getCreatedActivity() {
-        LauncherAppState app = LauncherAppState.getInstanceNoCreate();
-        if (app == null) {
-            return null;
-        }
-        return (Launcher) app.getModel().getCallback();
-    }
-
-    private Launcher getVisibleLauncher() {
-        Launcher launcher = getCreatedActivity();
-        return (launcher != null) && launcher.isStarted() && launcher.hasWindowFocus() ?
-                launcher : null;
-    }
-
-    @Override
-    public IconRecentsView getVisibleRecentsView() {
-        Launcher launcher = getVisibleLauncher();
-        return launcher != null && launcher.getStateManager().getState().overviewUi
-                ? launcher.getOverviewPanel() : null;
-    }
-
-    @Override
-    public boolean switchToRecentsIfVisible(Runnable onCompleteCallback) {
-        Launcher launcher = getVisibleLauncher();
-        if (launcher == null) {
-            return false;
-        }
-        launcher.<IconRecentsView>getOverviewPanel().setUsingRemoteAnimation(false);
-        launcher.getUserEventDispatcher().logActionCommand(
-                LauncherLogProto.Action.Command.RECENTS_BUTTON,
-                getContainerType(),
-                LauncherLogProto.ContainerType.TASKSWITCHER);
-        launcher.getStateManager().goToState(OVERVIEW,
-                launcher.getStateManager().shouldAnimateStateChange(), onCompleteCallback);
-        return true;
-    }
-
-    @Override
-    public int getContainerType() {
-        final Launcher launcher = getVisibleLauncher();
-        return launcher != null ? launcher.getStateManager().getState().containerType
-                : LauncherLogProto.ContainerType.APP;
-    }
-
-    @Override
-    public void onLaunchTaskSuccess(Launcher launcher) {
-        launcher.getStateManager().moveToRestState();
-    }
-}
diff --git a/go/quickstep/src/com/android/quickstep/OverviewCommandHelper.java b/go/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
deleted file mode 100644
index 216972cba2..0000000000
--- a/go/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * Copyright (C) 2019 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.
- */
-package com.android.quickstep;
-
-import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
-import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_RECENTS;
-
-import android.annotation.TargetApi;
-import android.content.Context;
-import android.os.Build;
-import android.os.SystemClock;
-import android.view.ViewConfiguration;
-
-import com.android.launcher3.BaseDraggingActivity;
-import com.android.launcher3.logging.UserEventDispatcher;
-import com.android.launcher3.userevent.nano.LauncherLogProto;
-import com.android.quickstep.ActivityControlHelper.ActivityInitListener;
-import com.android.quickstep.AppToOverviewAnimationProvider.AppToOverviewAnimationListener;
-import com.android.quickstep.views.IconRecentsView;
-import com.android.systemui.shared.system.ActivityManagerWrapper;
-import com.android.systemui.shared.system.LatencyTrackerCompat;
-
-/**
- * Helper class to handle various atomic commands for switching between Overview.
- */
-@TargetApi(Build.VERSION_CODES.P)
-public class OverviewCommandHelper {
-
-    private final Context mContext;
-    private final ActivityManagerWrapper mAM;
-    private final RecentsModel mRecentsModel;
-    private final OverviewComponentObserver mOverviewComponentObserver;
-
-    private long mLastToggleTime;
-
-    public OverviewCommandHelper(Context context, OverviewComponentObserver observer) {
-        mContext = context;
-        mAM = ActivityManagerWrapper.getInstance();
-        mRecentsModel = RecentsModel.INSTANCE.get(mContext);
-        mOverviewComponentObserver = observer;
-    }
-
-    public void onOverviewToggle() {
-        // If currently screen pinning, do not enter overview
-        if (mAM.isScreenPinningActive()) {
-            return;
-        }
-
-        mAM.closeSystemWindows(CLOSE_SYSTEM_WINDOWS_REASON_RECENTS);
-        MAIN_EXECUTOR.execute(new RecentsActivityCommand<>());
-    }
-
-    public void onOverviewShown(boolean triggeredFromAltTab) {
-        MAIN_EXECUTOR.execute(new ShowRecentsCommand());
-    }
-
-    public void onOverviewHidden() {
-        MAIN_EXECUTOR.execute(new HideRecentsCommand());
-    }
-
-    public void onTip(int actionType, int viewType) {
-        MAIN_EXECUTOR.execute(() ->
-                UserEventDispatcher.newInstance(mContext).logActionTip(actionType, viewType));
-    }
-
-    private class ShowRecentsCommand extends RecentsActivityCommand {
-
-        @Override
-        protected boolean handleCommand(long elapsedTime) {
-            return mHelper.getVisibleRecentsView() != null;
-        }
-    }
-
-    private class HideRecentsCommand extends RecentsActivityCommand {
-
-        @Override
-        protected boolean handleCommand(long elapsedTime) {
-            IconRecentsView recents = (IconRecentsView) mHelper.getVisibleRecentsView();
-            if (recents == null) {
-                return false;
-            }
-            recents.handleOverviewCommand();
-            return true;
-        }
-    }
-
-    private class RecentsActivityCommand<T extends BaseDraggingActivity> implements Runnable {
-
-        protected final ActivityControlHelper<T> mHelper;
-        private final long mCreateTime;
-
-        private final long mToggleClickedTime = SystemClock.uptimeMillis();
-        private boolean mUserEventLogged;
-        private ActivityInitListener mListener;
-
-        public RecentsActivityCommand() {
-            mHelper = mOverviewComponentObserver.getActivityControlHelper();
-            mCreateTime = SystemClock.elapsedRealtime();
-
-            // Preload the plan
-            mRecentsModel.getTasks(null);
-        }
-
-        @Override
-        public void run() {
-            long elapsedTime = mCreateTime - mLastToggleTime;
-            mLastToggleTime = mCreateTime;
-
-            if (handleCommand(elapsedTime)) {
-                // Command already handled.
-                return;
-            }
-
-            if (mHelper.switchToRecentsIfVisible(null /* onCompleteCallback */)) {
-                // If successfully switched, then return
-                return;
-            }
-
-            AppToOverviewAnimationProvider<T> provider =
-                    new AppToOverviewAnimationProvider<>(mHelper, RecentsModel.getRunningTaskId());
-            provider.setAnimationListener(
-                    new AppToOverviewAnimationListener() {
-                        @Override
-                        public void onActivityReady(BaseDraggingActivity activity) {
-                            if (!mUserEventLogged) {
-                                activity.getUserEventDispatcher().logActionCommand(
-                                        LauncherLogProto.Action.Command.RECENTS_BUTTON,
-                                        mHelper.getContainerType(),
-                                        LauncherLogProto.ContainerType.TASKSWITCHER);
-                                mUserEventLogged = true;
-                            }
-                        }
-
-                        @Override
-                        public void onWindowAnimationCreated() {
-                            if (LatencyTrackerCompat.isEnabled(mContext)) {
-                                LatencyTrackerCompat.logToggleRecents(
-                                        (int) (SystemClock.uptimeMillis() - mToggleClickedTime));
-                            }
-
-                            mListener.unregister();
-                        }
-                    });
-
-            // Otherwise, start overview.
-            mListener = mHelper.createActivityInitListener(provider::onActivityReady);
-            mListener.registerAndStartActivity(mOverviewComponentObserver.getOverviewIntent(),
-                    provider, mContext, MAIN_EXECUTOR.getHandler(),
-                    provider.getRecentsLaunchDuration());
-        }
-
-        protected boolean handleCommand(long elapsedTime) {
-            IconRecentsView recents = mHelper.getVisibleRecentsView();
-            if (recents != null) {
-                recents.handleOverviewCommand();
-                return true;
-            } else if (elapsedTime < ViewConfiguration.getDoubleTapTimeout()) {
-                // The user tried to launch back into overview too quickly, either after
-                // launching an app, or before overview has actually shown, just ignore for now
-                return true;
-            }
-            return false;
-        }
-    }
-}
diff --git a/go/quickstep/src/com/android/quickstep/RecentsActivity.java b/go/quickstep/src/com/android/quickstep/RecentsActivity.java
deleted file mode 100644
index 7f813ce2aa..0000000000
--- a/go/quickstep/src/com/android/quickstep/RecentsActivity.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (C) 2019 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.
- */
-package com.android.quickstep;
-
-import android.app.ActivityOptions;
-import android.view.View;
-
-import com.android.launcher3.R;
-import com.android.launcher3.views.BaseDragLayer;
-import com.android.quickstep.fallback.GoRecentsActivityRootView;
-import com.android.quickstep.views.IconRecentsView;
-
-/**
- * A recents activity that displays recent tasks with an icon and small snapshot.
- */
-public final class RecentsActivity extends BaseRecentsActivity {
-
-    private GoRecentsActivityRootView mRecentsRootView;
-    private IconRecentsView mIconRecentsView;
-
-    @Override
-    protected void initViews() {
-        setContentView(R.layout.fallback_recents_activity);
-        mRecentsRootView = findViewById(R.id.drag_layer);
-        mIconRecentsView = findViewById(R.id.overview_panel);
-        mIconRecentsView.setRecentsToActivityHelper(new FallbackRecentsToActivityHelper(this));
-        mIconRecentsView.setShowStatusBarForegroundScrim(true);
-    }
-
-    @Override
-    protected void reapplyUi() {
-        // No-op. Insets are automatically re-applied in the root view.
-    }
-
-    @Override
-    public BaseDragLayer getDragLayer() {
-        return mRecentsRootView;
-    }
-
-    @Override
-    public View getRootView() {
-        return mRecentsRootView;
-    }
-
-    @Override
-    public <T extends View> T getOverviewPanel() {
-        return (T) mIconRecentsView;
-    }
-
-    @Override
-    public ActivityOptions getActivityLaunchOptions(View v) {
-        // Stubbed. Recents launch animation will come from the recents view itself.
-        return null;
-    }
-
-    @Override
-    protected void onResume() {
-        mIconRecentsView.onBeginTransitionToOverview();
-        super.onResume();
-    }
-}
diff --git a/go/quickstep/src/com/android/quickstep/RecentsToActivityHelper.java b/go/quickstep/src/com/android/quickstep/RecentsToActivityHelper.java
deleted file mode 100644
index 8f3b707fe1..0000000000
--- a/go/quickstep/src/com/android/quickstep/RecentsToActivityHelper.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2019 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.
- */
-package com.android.quickstep;
-
-/**
- * Generic interface providing methods to the recents implementation that allow it to callback to
- * the containing activity.
- */
-public interface RecentsToActivityHelper {
-
-    /**
-     * The default action to take when leaving/closing recents. In general, this should be used to
-     * go to the appropriate home state.
-     */
-    void leaveRecents();
-}
diff --git a/go/quickstep/src/com/android/quickstep/TaskActionController.java b/go/quickstep/src/com/android/quickstep/TaskActionController.java
deleted file mode 100644
index f49fa3ef4f..0000000000
--- a/go/quickstep/src/com/android/quickstep/TaskActionController.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (C) 2019 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.
- */
-package com.android.quickstep;
-
-import static com.android.quickstep.TaskAdapter.TASKS_START_POSITION;
-import static com.android.quickstep.TaskUtils.getLaunchComponentKeyForTask;
-
-import android.app.ActivityOptions;
-import android.view.View;
-
-import androidx.annotation.NonNull;
-
-import com.android.launcher3.logging.StatsLogManager;
-import com.android.quickstep.views.TaskItemView;
-import com.android.systemui.shared.recents.model.Task;
-import com.android.systemui.shared.recents.model.Task.TaskKey;
-import com.android.systemui.shared.system.ActivityManagerWrapper;
-
-/**
- * Controller that provides logic for task-related commands on recents and updating the model/view
- * as appropriate.
- */
-public final class TaskActionController {
-
-    private final TaskListLoader mLoader;
-    private final TaskAdapter mAdapter;
-    private final StatsLogManager mStatsLogManager;
-
-    public TaskActionController(TaskListLoader loader, TaskAdapter adapter,
-            StatsLogManager logManager) {
-        mLoader = loader;
-        mAdapter = adapter;
-        mStatsLogManager = logManager;
-    }
-
-    /**
-     * Launch the task associated with the task holder, animating into the app from the task view.
-     *
-     * @param viewHolder the task view holder to launch
-     */
-    public void launchTaskFromView(@NonNull TaskHolder viewHolder) {
-        if (!viewHolder.getTask().isPresent()) {
-            return;
-        }
-        TaskItemView itemView = (TaskItemView) (viewHolder.itemView);
-        View v = itemView.getThumbnailView();
-        int left = 0;
-        int top = 0;
-        int width = v.getMeasuredWidth();
-        int height = v.getMeasuredHeight();
-
-        TaskKey key = viewHolder.getTask().get().key;
-        ActivityOptions opts = ActivityOptions.makeClipRevealAnimation(v, left, top, width, height);
-        ActivityManagerWrapper.getInstance().startActivityFromRecentsAsync(key, opts,
-                null /* resultCallback */, null /* resultCallbackHandler */);
-        mStatsLogManager.logTaskLaunch(null /* view */, getLaunchComponentKeyForTask(key));
-    }
-
-    /**
-     * Launch the task directly with a basic animation.
-     *
-     * @param task the task to launch
-     */
-    public void launchTask(@NonNull Task task) {
-        ActivityOptions opts = ActivityOptions.makeBasic();
-        ActivityManagerWrapper.getInstance().startActivityFromRecentsAsync(task.key, opts,
-                null /* resultCallback */, null /* resultCallbackHandler */);
-        mStatsLogManager.logTaskLaunch(null /* view */, getLaunchComponentKeyForTask(task.key));
-    }
-
-    /**
-     * Removes the task holder and the task, updating the model and the view.
-     *
-     * @param viewHolder the task view holder to remove
-     */
-    public void removeTask(TaskHolder viewHolder) {
-        if (!viewHolder.getTask().isPresent()) {
-            return;
-        }
-        int position = viewHolder.getAdapterPosition();
-        Task task = viewHolder.getTask().get();
-        ActivityManagerWrapper.getInstance().removeTask(task.key.id);
-        mLoader.removeTask(task);
-        mAdapter.notifyItemRemoved(position);
-        // TODO(b/131840601): Add logging point for removal.
-    }
-
-    /**
-     * Clears all tasks and updates the model and view.
-     */
-    public void clearAllTasks() {
-        int count = mAdapter.getItemCount();
-        ActivityManagerWrapper.getInstance().removeAllRecentTasks();
-        mLoader.clearAllTasks();
-        mAdapter.notifyItemRangeRemoved(TASKS_START_POSITION /* positionStart */, count);
-    }
-}
diff --git a/go/quickstep/src/com/android/quickstep/TaskAdapter.java b/go/quickstep/src/com/android/quickstep/TaskAdapter.java
deleted file mode 100644
index 509bf29a4e..0000000000
--- a/go/quickstep/src/com/android/quickstep/TaskAdapter.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * Copyright (C) 2019 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.
- */
-package com.android.quickstep;
-
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.ViewGroup;
-import android.widget.Button;
-
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView.Adapter;
-import androidx.recyclerview.widget.RecyclerView.ViewHolder;
-
-import com.android.launcher3.R;
-import com.android.quickstep.views.TaskItemView;
-import com.android.systemui.shared.recents.model.Task;
-
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-
-/**
- * Recycler view adapter that dynamically inflates and binds {@link TaskHolder} instances with the
- * appropriate {@link Task} from the recents task list.
- */
-public final class TaskAdapter extends Adapter<ViewHolder> {
-
-    public static final int CHANGE_EVENT_TYPE_EMPTY_TO_CONTENT = 0;
-    public static final int MAX_TASKS_TO_DISPLAY = 6;
-    public static final int TASKS_START_POSITION = 1;
-
-    public static final int ITEM_TYPE_TASK = 0;
-    public static final int ITEM_TYPE_CLEAR_ALL = 1;
-
-    private static final String TAG = "TaskAdapter";
-    private final TaskListLoader mLoader;
-    private TaskActionController mTaskActionController;
-    private OnClickListener mClearAllListener;
-    private boolean mIsShowingLoadingUi;
-
-    public TaskAdapter(@NonNull TaskListLoader loader) {
-        mLoader = loader;
-    }
-
-    public void setActionController(TaskActionController taskActionController) {
-        mTaskActionController = taskActionController;
-    }
-
-    public void setOnClearAllClickListener(OnClickListener listener) {
-        mClearAllListener = listener;
-    }
-
-    /**
-     * Sets all positions in the task adapter to loading views, binding new views if necessary.
-     * This changes the task adapter's view of the data, so the appropriate notify events should be
-     * called in addition to this method to reflect the changes.
-     *
-     * @param isShowingLoadingUi true to bind loading task views to all positions, false to return
-     *                           to the real data
-     */
-    public void setIsShowingLoadingUi(boolean isShowingLoadingUi) {
-        mIsShowingLoadingUi = isShowingLoadingUi;
-    }
-
-    @Override
-    public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        switch (viewType) {
-            case ITEM_TYPE_TASK:
-                TaskItemView itemView = (TaskItemView) LayoutInflater.from(parent.getContext())
-                        .inflate(R.layout.task_item_view, parent, false);
-                TaskHolder taskHolder = new TaskHolder(itemView);
-                itemView.setOnClickListener(
-                        view -> mTaskActionController.launchTaskFromView(taskHolder));
-                return taskHolder;
-            case ITEM_TYPE_CLEAR_ALL:
-                View clearView = LayoutInflater.from(parent.getContext())
-                        .inflate(R.layout.clear_all_button, parent, false);
-                ClearAllHolder clearAllHolder = new ClearAllHolder(clearView);
-                Button clearViewButton = clearView.findViewById(R.id.clear_all_button);
-                clearViewButton.setOnClickListener(mClearAllListener);
-                return clearAllHolder;
-            default:
-                throw new IllegalArgumentException("No known holder for item type: " + viewType);
-        }
-    }
-
-    @Override
-    public void onBindViewHolder(ViewHolder holder, int position) {
-        onBindViewHolderInternal(holder, position, false /* willAnimate */);
-    }
-
-    @Override
-    public void onBindViewHolder(@NonNull ViewHolder holder, int position,
-            @NonNull List<Object> payloads) {
-        if (payloads.isEmpty()) {
-            super.onBindViewHolder(holder, position, payloads);
-            return;
-        }
-        int changeType = (int) payloads.get(0);
-        if (changeType == CHANGE_EVENT_TYPE_EMPTY_TO_CONTENT) {
-            // Bind in preparation for animation
-            onBindViewHolderInternal(holder, position, true /* willAnimate */);
-        } else {
-            throw new IllegalArgumentException("Payload content is not a valid change event type: "
-                    + changeType);
-        }
-    }
-
-    private void onBindViewHolderInternal(@NonNull ViewHolder holder, int position,
-            boolean willAnimate) {
-        int itemType = getItemViewType(position);
-        switch (itemType) {
-            case ITEM_TYPE_TASK:
-                TaskHolder taskHolder = (TaskHolder) holder;
-                if (mIsShowingLoadingUi) {
-                    taskHolder.bindEmptyUi();
-                    return;
-                }
-                List<Task> tasks = mLoader.getCurrentTaskList();
-                int taskPos = position - TASKS_START_POSITION;
-                if (taskPos >= tasks.size()) {
-                    // Task list has updated.
-                    return;
-                }
-                Task task = tasks.get(taskPos);
-                taskHolder.bindTask(task, willAnimate /* willAnimate */);
-                mLoader.loadTaskIconAndLabel(task, () -> {
-                    // Ensure holder still has the same task.
-                    if (Objects.equals(Optional.of(task), taskHolder.getTask())) {
-                        taskHolder.getTaskItemView().setIcon(task.icon);
-                        taskHolder.getTaskItemView().setLabel(task.titleDescription);
-                    }
-                });
-                mLoader.loadTaskThumbnail(task, () -> {
-                    if (Objects.equals(Optional.of(task), taskHolder.getTask())) {
-                        taskHolder.getTaskItemView().setThumbnail(task.thumbnail);
-                    }
-                });
-                break;
-            case ITEM_TYPE_CLEAR_ALL:
-                // Nothing to bind.
-                break;
-            default:
-                throw new IllegalArgumentException("No known holder for item type: " + itemType);
-        }
-    }
-
-    @Override
-    public int getItemViewType(int position) {
-        // Bottom is always clear all button.
-        return (position == 0) ? ITEM_TYPE_CLEAR_ALL : ITEM_TYPE_TASK;
-    }
-
-    @Override
-    public int getItemCount() {
-        int itemCount = TASKS_START_POSITION;
-        if (mIsShowingLoadingUi) {
-            // Show loading version of all items.
-            itemCount += MAX_TASKS_TO_DISPLAY;
-        } else {
-            itemCount += Math.min(mLoader.getCurrentTaskList().size(), MAX_TASKS_TO_DISPLAY);
-        }
-        return itemCount;
-    }
-}
diff --git a/go/quickstep/src/com/android/quickstep/TaskHolder.java b/go/quickstep/src/com/android/quickstep/TaskHolder.java
deleted file mode 100644
index 49b6aaa996..0000000000
--- a/go/quickstep/src/com/android/quickstep/TaskHolder.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (C) 2019 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.
- */
-package com.android.quickstep;
-
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView.ViewHolder;
-
-import com.android.quickstep.views.TaskItemView;
-import com.android.systemui.shared.recents.model.Task;
-
-import java.util.Optional;
-
-/**
- * A recycler view holder that holds the task view and binds {@link Task} content (app title, icon,
- * etc.) to the view.
- */
-public final class TaskHolder extends ViewHolder {
-
-    private final TaskItemView mTaskItemView;
-    private Task mTask;
-
-    public TaskHolder(TaskItemView itemView) {
-        super(itemView);
-        mTaskItemView = itemView;
-    }
-
-    public TaskItemView getTaskItemView() {
-        return mTaskItemView;
-    }
-
-    /**
-     * Bind the task model to the holder. This will take the current task content in the task
-     * object (i.e. icon, thumbnail, label) and either apply the content immediately or simply bind
-     * the content to animate to at a later time. If the task does not have all its content loaded,
-     * the view will prepare appropriate default placeholders and it is the callers responsibility
-     * to change them at a later time.
-     *
-     * Regardless of whether it is animating, input handlers will be bound immediately (see
-     * {@link TaskActionController}).
-     *
-     * @param task the task to bind to the view
-     * @param willAnimate true if UI should animate in later, false if it should apply immediately
-     */
-    public void bindTask(@NonNull Task task, boolean willAnimate) {
-        mTask = task;
-        if (willAnimate) {
-            mTaskItemView.startContentAnimation(task.icon, task.thumbnail, task.titleDescription);
-        } else {
-            mTaskItemView.setIcon(task.icon);
-            mTaskItemView.setThumbnail(task.thumbnail);
-            mTaskItemView.setLabel(task.titleDescription);
-        }
-    }
-
-    /**
-     * Bind a generic empty UI to the holder to make it clear that the item is loading/unbound and
-     * should not be expected to react to user input.
-     */
-    public void bindEmptyUi() {
-        mTask = null;
-        mTaskItemView.resetToEmptyUi();
-    }
-
-    /**
-     * Gets the task currently bound to this view. May be null if task holder is in a loading state.
-     *
-     * @return the current task
-     */
-    public Optional<Task> getTask() {
-        return Optional.ofNullable(mTask);
-    }
-}
diff --git a/go/quickstep/src/com/android/quickstep/TaskListLoader.java b/go/quickstep/src/com/android/quickstep/TaskListLoader.java
deleted file mode 100644
index 1335cac535..0000000000
--- a/go/quickstep/src/com/android/quickstep/TaskListLoader.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright (C) 2019 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.
- */
-
-package com.android.quickstep;
-
-import android.content.Context;
-
-import androidx.annotation.Nullable;
-
-import com.android.systemui.shared.recents.model.Task;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.function.Consumer;
-
-/**
- * This class is responsible for maintaining the list of tasks and the task content. The list must
- * be updated explicitly with {@link #loadTaskList} whenever the list needs to be
- * up-to-date.
- */
-public final class TaskListLoader {
-
-    private final RecentsModel mRecentsModel;
-
-    private ArrayList<Task> mTaskList = new ArrayList<>();
-    private int mTaskListChangeId;
-
-    public TaskListLoader(Context context) {
-        mRecentsModel = RecentsModel.INSTANCE.get(context);
-    }
-
-    /**
-     * Returns the current task list as of the last completed load (see {@link #loadTaskList}) as a
-     * read-only list. This list of tasks is not guaranteed to have all content loaded.
-     *
-     * @return the current list of tasks
-     */
-    public List<Task> getCurrentTaskList() {
-        return Collections.unmodifiableList(mTaskList);
-    }
-
-    /**
-     * Whether or not the loader needs to load data to be up to date. This can return true if the
-     * task list is already up to date OR there is already a load in progress for the task list to
-     * become up to date.
-     *
-     * @return true if already up to date or load in progress, false otherwise
-     */
-    public boolean needsToLoad() {
-        return !mRecentsModel.isTaskListValid(mTaskListChangeId);
-    }
-
-    /**
-     * Fetches the most recent tasks and updates the task list asynchronously. This call does not
-     * provide guarantees the task content (icon, thumbnail, label) are loaded but will fill in
-     * what it has. May run the callback immediately if there have been no changes in the task
-     * list since the start of the last load.
-     *
-     * @param onLoadedCallback callback to run when task list is loaded
-     */
-    public void loadTaskList(@Nullable Consumer<ArrayList<Task>> onLoadedCallback) {
-        if (!needsToLoad()) {
-            if (onLoadedCallback != null) {
-                onLoadedCallback.accept(mTaskList);
-            }
-            return;
-        }
-        // TODO: Look into error checking / more robust handling for when things go wrong.
-        mTaskListChangeId = mRecentsModel.getTasks(loadedTasks -> {
-            ArrayList<Task> tasks = new ArrayList<>(loadedTasks);
-            // Reverse tasks to put most recent at the bottom of the view
-            Collections.reverse(tasks);
-            // Load task content
-            for (Task task : tasks) {
-                int loadedPos = mTaskList.indexOf(task);
-                if (loadedPos == -1) {
-                    continue;
-                }
-                Task loadedTask = mTaskList.get(loadedPos);
-                task.icon = loadedTask.icon;
-                task.titleDescription = loadedTask.titleDescription;
-                task.thumbnail = loadedTask.thumbnail;
-            }
-            mTaskList = tasks;
-            onLoadedCallback.accept(tasks);
-        });
-    }
-
-    /**
-     * Load task icon and label asynchronously if it is not already loaded in the task. If the task
-     * already has an icon, this calls the callback immediately.
-     *
-     * @param task task to update with icon + label
-     * @param onLoadedCallback callback to run when task has icon and label
-     */
-    public void loadTaskIconAndLabel(Task task, @Nullable Runnable onLoadedCallback) {
-        mRecentsModel.getIconCache().updateIconInBackground(task,
-                loadedTask -> onLoadedCallback.run());
-    }
-
-    /**
-     * Load thumbnail asynchronously if not already loaded in the task. If the task already has a
-     * thumbnail or if the thumbnail is cached, this calls the callback immediately.
-     *
-     * @param task task to update with the thumbnail
-     * @param onLoadedCallback callback to run when task has thumbnail
-     */
-    public void loadTaskThumbnail(Task task, @Nullable Runnable onLoadedCallback) {
-        mRecentsModel.getThumbnailCache().updateThumbnailInBackground(task,
-                thumbnail -> onLoadedCallback.run());
-    }
-
-    /**
-     * Removes the task from the current task list.
-     */
-    void removeTask(Task task) {
-        mTaskList.remove(task);
-    }
-
-    /**
-     * Clears the current task list.
-     */
-    void clearAllTasks() {
-        mTaskList.clear();
-    }
-}
diff --git a/go/quickstep/src/com/android/quickstep/TaskSwipeCallback.java b/go/quickstep/src/com/android/quickstep/TaskSwipeCallback.java
deleted file mode 100644
index 57f49d6532..0000000000
--- a/go/quickstep/src/com/android/quickstep/TaskSwipeCallback.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (C) 2019 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.
- */
-package com.android.quickstep;
-
-import static androidx.recyclerview.widget.ItemTouchHelper.RIGHT;
-
-import static com.android.quickstep.TaskAdapter.ITEM_TYPE_CLEAR_ALL;
-
-import android.graphics.Canvas;
-
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.ItemTouchHelper;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.recyclerview.widget.RecyclerView.ViewHolder;
-
-import java.util.function.Consumer;
-
-/**
- * Callback for swipe input on {@link TaskHolder} views in the recents view.
- */
-public final class TaskSwipeCallback extends ItemTouchHelper.SimpleCallback {
-
-    private final Consumer<TaskHolder> mOnTaskSwipeCallback;
-
-    public TaskSwipeCallback(Consumer<TaskHolder> onTaskSwipeCallback) {
-        super(0 /* dragDirs */, RIGHT);
-        mOnTaskSwipeCallback = onTaskSwipeCallback;
-    }
-
-    @Override
-    public boolean onMove(RecyclerView recyclerView, ViewHolder viewHolder,
-            ViewHolder target) {
-        return false;
-    }
-
-    @Override
-    public void onSwiped(ViewHolder viewHolder, int direction) {
-        if (direction == RIGHT) {
-            mOnTaskSwipeCallback.accept((TaskHolder) viewHolder);
-        }
-    }
-
-    @Override
-    public void onChildDraw(@NonNull Canvas c, @NonNull RecyclerView recyclerView,
-            @NonNull ViewHolder viewHolder, float dX, float dY, int actionState,
-            boolean isCurrentlyActive) {
-        if (actionState == ItemTouchHelper.ACTION_STATE_SWIPE) {
-            float alpha = 1.0f - dX / (float) viewHolder.itemView.getWidth();
-            viewHolder.itemView.setAlpha(alpha);
-        }
-        super.onChildDraw(c, recyclerView, viewHolder, dX, dY,
-                    actionState, isCurrentlyActive);
-    }
-
-    @Override
-    public int getSwipeDirs(@NonNull RecyclerView recyclerView,
-            @NonNull ViewHolder viewHolder) {
-        if (viewHolder.getItemViewType() == ITEM_TYPE_CLEAR_ALL) {
-            // Clear all button should not be swipable.
-            return 0;
-        }
-        return super.getSwipeDirs(recyclerView, viewHolder);
-    }
-}
diff --git a/go/quickstep/src/com/android/quickstep/ThumbnailDrawable.java b/go/quickstep/src/com/android/quickstep/ThumbnailDrawable.java
deleted file mode 100644
index 922e68a46d..0000000000
--- a/go/quickstep/src/com/android/quickstep/ThumbnailDrawable.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Copyright (C) 2019 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.
- */
-
-package com.android.quickstep;
-
-import static android.graphics.Shader.TileMode.CLAMP;
-
-import android.content.res.Resources;
-import android.graphics.Bitmap;
-import android.graphics.BitmapShader;
-import android.graphics.Canvas;
-import android.graphics.ColorFilter;
-import android.graphics.Matrix;
-import android.graphics.Paint;
-import android.graphics.PixelFormat;
-import android.graphics.Rect;
-import android.graphics.RectF;
-import android.graphics.drawable.Drawable;
-
-import androidx.annotation.NonNull;
-
-import com.android.launcher3.R;
-import com.android.systemui.shared.recents.model.ThumbnailData;
-
-/**
- * Bitmap backed drawable that supports rotating the thumbnail bitmap depending on if the
- * orientation the thumbnail was taken in matches the desired orientation. In addition, the
- * thumbnail always fills into the containing bounds.
- */
-public final class ThumbnailDrawable extends Drawable {
-
-    private final Paint mPaint = new Paint();
-    private final Matrix mMatrix = new Matrix();
-    private final ThumbnailData mThumbnailData;
-    private final BitmapShader mShader;
-    private final RectF mDestRect = new RectF();
-    private final int mCornerRadius;
-    private int mRequestedOrientation;
-
-    public ThumbnailDrawable(Resources res, @NonNull ThumbnailData thumbnailData,
-            int requestedOrientation) {
-        mThumbnailData = thumbnailData;
-        mRequestedOrientation = requestedOrientation;
-        mCornerRadius = (int) res.getDimension(R.dimen.task_thumbnail_corner_radius);
-        mShader = new BitmapShader(mThumbnailData.thumbnail, CLAMP, CLAMP);
-        mPaint.setShader(mShader);
-        mPaint.setAntiAlias(true);
-        updateMatrix();
-    }
-
-    /**
-     * Set the requested orientation.
-     *
-     * @param orientation the orientation we want the thumbnail to be in
-     */
-    public void setRequestedOrientation(int orientation) {
-        if (mRequestedOrientation != orientation) {
-            mRequestedOrientation = orientation;
-            updateMatrix();
-        }
-    }
-
-    @Override
-    public void draw(Canvas canvas) {
-        if (mThumbnailData.thumbnail == null) {
-            return;
-        }
-        canvas.drawRoundRect(mDestRect, mCornerRadius, mCornerRadius, mPaint);
-    }
-
-    @Override
-    protected void onBoundsChange(Rect bounds) {
-        super.onBoundsChange(bounds);
-        mDestRect.set(bounds);
-        updateMatrix();
-    }
-
-    @Override
-    public void setAlpha(int alpha) {
-        final int oldAlpha = mPaint.getAlpha();
-        if (alpha != oldAlpha) {
-            mPaint.setAlpha(alpha);
-            invalidateSelf();
-        }
-    }
-
-    @Override
-    public int getAlpha() {
-        return mPaint.getAlpha();
-    }
-
-    @Override
-    public void setColorFilter(ColorFilter colorFilter) {
-        mPaint.setColorFilter(colorFilter);
-        invalidateSelf();
-    }
-
-    @Override
-    public ColorFilter getColorFilter() {
-        return mPaint.getColorFilter();
-    }
-
-    @Override
-    public int getOpacity() {
-        return PixelFormat.TRANSLUCENT;
-    }
-
-    private void updateMatrix() {
-        if (mThumbnailData.thumbnail == null) {
-            return;
-        }
-        mMatrix.reset();
-        float scaleX;
-        float scaleY;
-        Rect bounds = getBounds();
-        Bitmap thumbnail = mThumbnailData.thumbnail;
-        if (mRequestedOrientation != mThumbnailData.orientation) {
-            // Rotate and translate so that top left is the same.
-            mMatrix.postRotate(90, 0, 0);
-            mMatrix.postTranslate(thumbnail.getHeight(), 0);
-
-            scaleX = (float) bounds.width() / thumbnail.getHeight();
-            scaleY = (float) bounds.height() / thumbnail.getWidth();
-        } else {
-            scaleX = (float) bounds.width() / thumbnail.getWidth();
-            scaleY = (float) bounds.height() / thumbnail.getHeight();
-        }
-        // Scale to fill.
-        mMatrix.postScale(scaleX, scaleY);
-        mShader.setLocalMatrix(mMatrix);
-    }
-}
diff --git a/go/quickstep/src/com/android/quickstep/TouchInteractionService.java b/go/quickstep/src/com/android/quickstep/TouchInteractionService.java
deleted file mode 100644
index 19dd82f7f7..0000000000
--- a/go/quickstep/src/com/android/quickstep/TouchInteractionService.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * Copyright (C) 2019 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.
- */
-package com.android.quickstep;
-
-import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_SYSUI_PROXY;
-
-import android.annotation.TargetApi;
-import android.app.Service;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.graphics.Region;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.IBinder;
-import android.os.Process;
-import android.os.RemoteException;
-import android.util.Log;
-import android.view.MotionEvent;
-
-import com.android.launcher3.Utilities;
-import com.android.launcher3.compat.UserManagerCompat;
-import com.android.systemui.shared.recents.IOverviewProxy;
-import com.android.systemui.shared.recents.ISystemUiProxy;
-
-/**
- * Service connected by system-UI for handling touch interaction.
- */
-@TargetApi(Build.VERSION_CODES.O)
-public class TouchInteractionService extends Service {
-
-    private static final String TAG = "GoTouchInteractionService";
-    private boolean mIsUserUnlocked;
-    private BroadcastReceiver mUserUnlockedReceiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            if (Intent.ACTION_USER_UNLOCKED.equals(intent.getAction())) {
-                initWhenUserUnlocked();
-            }
-        }
-    };
-
-    private final IBinder mMyBinder = new IOverviewProxy.Stub() {
-
-        @Override
-        public void onActiveNavBarRegionChanges(Region region) throws RemoteException { }
-
-        @Override
-        public void onInitialize(Bundle bundle) throws RemoteException {
-            ISystemUiProxy iSystemUiProxy = ISystemUiProxy.Stub
-                    .asInterface(bundle.getBinder(KEY_EXTRA_SYSUI_PROXY));
-            mRecentsModel.setSystemUiProxy(iSystemUiProxy);
-        }
-
-        @Override
-        public void onOverviewToggle() {
-            if (mIsUserUnlocked) {
-                mOverviewCommandHelper.onOverviewToggle();
-            }
-        }
-
-        @Override
-        public void onOverviewShown(boolean triggeredFromAltTab) {
-            if (mIsUserUnlocked) {
-                mOverviewCommandHelper.onOverviewShown(triggeredFromAltTab);
-            }
-        }
-
-        @Override
-        public void onOverviewHidden(boolean triggeredFromAltTab, boolean triggeredFromHomeKey) {
-            if (mIsUserUnlocked && triggeredFromAltTab && !triggeredFromHomeKey) {
-                // onOverviewShownFromAltTab hides the overview and ends at the target app
-                mOverviewCommandHelper.onOverviewHidden();
-            }
-        }
-
-        @Override
-        public void onTip(int actionType, int viewType) {
-            if (mIsUserUnlocked) {
-                mOverviewCommandHelper.onTip(actionType, viewType);
-            }
-        }
-
-        @Override
-        public void onAssistantAvailable(boolean available) {
-            // TODO handle assistant
-        }
-
-        @Override
-        public void onAssistantVisibilityChanged(float visibility) {
-            // TODO handle assistant
-        }
-
-        public void onBackAction(boolean completed, int downX, int downY, boolean isButton,
-                boolean gestureSwipeLeft) {
-        }
-
-        public void onSystemUiStateChanged(int stateFlags) {
-            // To be implemented
-        }
-
-        /** Deprecated methods **/
-        public void onQuickStep(MotionEvent motionEvent) { }
-
-        public void onQuickScrubEnd() { }
-
-        public void onQuickScrubProgress(float progress) { }
-
-        public void onQuickScrubStart() { }
-
-        public void onPreMotionEvent(int downHitTarget) { }
-
-        public void onMotionEvent(MotionEvent ev) { }
-
-        public void onBind(ISystemUiProxy iSystemUiProxy) {
-            mRecentsModel.setSystemUiProxy(iSystemUiProxy);
-        }
-    };
-
-    private static boolean sConnected = false;;
-
-    public static boolean isConnected() {
-        return sConnected;
-    }
-
-    private RecentsModel mRecentsModel;
-    private OverviewComponentObserver mOverviewComponentObserver;
-    private OverviewCommandHelper mOverviewCommandHelper;
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        if (UserManagerCompat.getInstance(this).isUserUnlocked(Process.myUserHandle())) {
-            initWhenUserUnlocked();
-        } else {
-            mIsUserUnlocked = false;
-            registerReceiver(mUserUnlockedReceiver, new IntentFilter(Intent.ACTION_USER_UNLOCKED));
-        }
-
-        sConnected = true;
-    }
-
-    private void initWhenUserUnlocked() {
-        mRecentsModel = RecentsModel.INSTANCE.get(this);
-        mOverviewComponentObserver = new OverviewComponentObserver(this);
-        mOverviewCommandHelper = new OverviewCommandHelper(this,
-                mOverviewComponentObserver);
-        mIsUserUnlocked = true;
-        Utilities.unregisterReceiverSafely(this, mUserUnlockedReceiver);
-    }
-
-    @Override
-    public void onDestroy() {
-        if (mIsUserUnlocked) {
-            mOverviewComponentObserver.onDestroy();
-        }
-        Utilities.unregisterReceiverSafely(this, mUserUnlockedReceiver);
-        sConnected = false;
-        super.onDestroy();
-    }
-
-    @Override
-    public IBinder onBind(Intent intent) {
-        if (Log.isLoggable(TAG, Log.DEBUG)) {
-            Log.d(TAG, "Touch service connected");
-        }
-        return mMyBinder;
-    }
-
-    public static boolean isInitialized() {
-        return true;
-    }
-}
diff --git a/go/quickstep/src/com/android/quickstep/fallback/GoRecentsActivityRootView.java b/go/quickstep/src/com/android/quickstep/fallback/GoRecentsActivityRootView.java
deleted file mode 100644
index b550011f50..0000000000
--- a/go/quickstep/src/com/android/quickstep/fallback/GoRecentsActivityRootView.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2019 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.
- */
-package com.android.quickstep.fallback;
-
-import android.content.Context;
-import android.graphics.Insets;
-import android.graphics.Rect;
-import android.util.AttributeSet;
-import android.view.WindowInsets;
-
-import com.android.launcher3.util.TouchController;
-import com.android.launcher3.views.BaseDragLayer;
-import com.android.quickstep.RecentsActivity;
-
-/**
- * Minimal implementation of {@link BaseDragLayer} for Go's fallback recents activity.
- */
-public final class GoRecentsActivityRootView extends BaseDragLayer<RecentsActivity> {
-    public GoRecentsActivityRootView(Context context, AttributeSet attrs) {
-        super(context, attrs, 1 /* alphaChannelCount */);
-        // Go leaves touch control to the view itself.
-        mControllers = new TouchController[0];
-        setSystemUiVisibility(SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
-                | SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
-                | SYSTEM_UI_FLAG_LAYOUT_STABLE);
-    }
-
-    @Override
-    public void setInsets(Rect insets) {
-        if (insets.equals(mInsets)) {
-            return;
-        }
-        super.setInsets(insets);
-    }
-
-    @Override
-    public WindowInsets onApplyWindowInsets(WindowInsets insets) {
-        Insets sysInsets = insets.getSystemWindowInsets();
-        setInsets(new Rect(sysInsets.left, sysInsets.top, sysInsets.right, sysInsets.bottom));
-        return insets.consumeSystemWindowInsets();
-    }
-}
diff --git a/go/quickstep/src/com/android/quickstep/util/ShelfPeekAnim.java b/go/quickstep/src/com/android/quickstep/util/ShelfPeekAnim.java
deleted file mode 100644
index fb8901388b..0000000000
--- a/go/quickstep/src/com/android/quickstep/util/ShelfPeekAnim.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (C) 2019 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.
- */
-package com.android.quickstep.util;
-
-import com.android.launcher3.Launcher;
-
-/** Empty class, only exists so that l3goWithQuickstepIconRecentsDebug compiles. */
-public class ShelfPeekAnim {
-    public ShelfPeekAnim(Launcher launcher) {
-    }
-
-    public enum ShelfAnimState {
-    }
-
-    public boolean isPeeking() {
-        return false;
-    }
-}
diff --git a/go/quickstep/src/com/android/quickstep/views/IconRecentsView.java b/go/quickstep/src/com/android/quickstep/views/IconRecentsView.java
deleted file mode 100644
index 87b4d4e2e5..0000000000
--- a/go/quickstep/src/com/android/quickstep/views/IconRecentsView.java
+++ /dev/null
@@ -1,942 +0,0 @@
-/*
- * Copyright (C) 2019 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.
- */
-package com.android.quickstep.views;
-
-import static android.content.res.Configuration.ORIENTATION_LANDSCAPE;
-
-import static androidx.recyclerview.widget.LinearLayoutManager.VERTICAL;
-
-import static com.android.launcher3.anim.Interpolators.ACCEL_2;
-import static com.android.quickstep.TaskAdapter.CHANGE_EVENT_TYPE_EMPTY_TO_CONTENT;
-import static com.android.quickstep.TaskAdapter.ITEM_TYPE_CLEAR_ALL;
-import static com.android.quickstep.TaskAdapter.ITEM_TYPE_TASK;
-import static com.android.quickstep.TaskAdapter.MAX_TASKS_TO_DISPLAY;
-import static com.android.quickstep.TaskAdapter.TASKS_START_POSITION;
-import static com.android.quickstep.util.RemoteAnimationProvider.getLayer;
-import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.MODE_CLOSING;
-
-import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
-import android.animation.AnimatorSet;
-import android.animation.ObjectAnimator;
-import android.animation.PropertyValuesHolder;
-import android.animation.ValueAnimator;
-import android.content.Context;
-import android.content.res.Resources;
-import android.graphics.Matrix;
-import android.graphics.Rect;
-import android.graphics.RectF;
-import android.graphics.drawable.Drawable;
-import android.util.ArraySet;
-import android.util.AttributeSet;
-import android.util.FloatProperty;
-import android.view.View;
-import android.view.ViewDebug;
-import android.view.ViewTreeObserver;
-import android.view.animation.PathInterpolator;
-import android.widget.FrameLayout;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.interpolator.view.animation.LinearOutSlowInInterpolator;
-import androidx.recyclerview.widget.DefaultItemAnimator;
-import androidx.recyclerview.widget.ItemTouchHelper;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.recyclerview.widget.RecyclerView.AdapterDataObserver;
-import androidx.recyclerview.widget.RecyclerView.ItemDecoration;
-import androidx.recyclerview.widget.RecyclerView.OnChildAttachStateChangeListener;
-
-import com.android.launcher3.BaseActivity;
-import com.android.launcher3.Insettable;
-import com.android.launcher3.R;
-import com.android.launcher3.util.Themes;
-import com.android.quickstep.ContentFillItemAnimator;
-import com.android.quickstep.RecentsModel;
-import com.android.quickstep.RecentsToActivityHelper;
-import com.android.quickstep.TaskActionController;
-import com.android.quickstep.TaskAdapter;
-import com.android.quickstep.TaskHolder;
-import com.android.quickstep.TaskListLoader;
-import com.android.quickstep.TaskSwipeCallback;
-import com.android.quickstep.util.MultiValueUpdateListener;
-import com.android.systemui.shared.recents.model.Task;
-import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
-import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat;
-import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat.SurfaceParams;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-
-/**
- * Root view for the icon recents view. Acts as the main interface to the rest of the Launcher code
- * base.
- */
-public final class IconRecentsView extends FrameLayout implements Insettable {
-
-    public static final FloatProperty<IconRecentsView> CONTENT_ALPHA =
-            new FloatProperty<IconRecentsView>("contentAlpha") {
-                @Override
-                public void setValue(IconRecentsView view, float v) {
-                    ALPHA.set(view, v);
-                    if (view.getVisibility() != VISIBLE && v > 0) {
-                        view.setVisibility(VISIBLE);
-                    } else if (view.getVisibility() != GONE && v == 0){
-                        view.setVisibility(GONE);
-                    }
-                }
-
-                @Override
-                public Float get(IconRecentsView view) {
-                    return ALPHA.get(view);
-                }
-            };
-    private static final long CROSSFADE_DURATION = 300;
-    private static final long LAYOUT_ITEM_ANIMATE_IN_DURATION = 150;
-    private static final long LAYOUT_ITEM_ANIMATE_IN_DELAY_BETWEEN = 40;
-    private static final long ITEM_ANIMATE_OUT_DURATION = 150;
-    private static final long ITEM_ANIMATE_OUT_DELAY_BETWEEN = 40;
-    private static final float ITEM_ANIMATE_OUT_TRANSLATION_X_RATIO = .25f;
-    private static final long CLEAR_ALL_FADE_DELAY = 120;
-
-    private static final long REMOTE_TO_RECENTS_APP_SCALE_DOWN_DURATION = 300;
-    private static final long REMOTE_TO_RECENTS_VERTICAL_EASE_IN_DURATION = 400;
-    private static final long REMOTE_TO_RECENTS_ITEM_FADE_START_DELAY = 200;
-    private static final long REMOTE_TO_RECENTS_ITEM_FADE_DURATION = 217;
-    private static final long REMOTE_TO_RECENTS_ITEM_FADE_BETWEEN_DELAY = 33;
-
-    private static final PathInterpolator FAST_OUT_SLOW_IN_1 =
-            new PathInterpolator(.4f, 0f, 0f, 1f);
-    private static final PathInterpolator FAST_OUT_SLOW_IN_2 =
-            new PathInterpolator(.5f, 0f, 0f, 1f);
-    private static final LinearOutSlowInInterpolator OUT_SLOW_IN =
-            new LinearOutSlowInInterpolator();
-
-    public static final long REMOTE_APP_TO_OVERVIEW_DURATION =
-            REMOTE_TO_RECENTS_VERTICAL_EASE_IN_DURATION;
-
-    /**
-     * A ratio representing the view's relative placement within its padded space. For example, 0
-     * is top aligned and 0.5 is centered vertically.
-     */
-    @ViewDebug.ExportedProperty(category = "launcher")
-
-    private final Context mContext;
-    private final TaskListLoader mTaskLoader;
-    private final TaskAdapter mTaskAdapter;
-    private final LinearLayoutManager mTaskLayoutManager;
-    private final TaskActionController mTaskActionController;
-    private final DefaultItemAnimator mDefaultItemAnimator = new DefaultItemAnimator();
-    private final ContentFillItemAnimator mLoadingContentItemAnimator =
-            new ContentFillItemAnimator();
-    private final BaseActivity mActivity;
-    private final Drawable mStatusBarForegroundScrim;
-
-    private RecentsToActivityHelper mActivityHelper;
-    private RecyclerView mTaskRecyclerView;
-    private View mShowingContentView;
-    private View mEmptyView;
-    private View mContentView;
-    private boolean mTransitionedFromApp;
-    private boolean mUsingRemoteAnimation;
-    private boolean mStartedEnterAnimation;
-    private boolean mShowStatusBarForegroundScrim;
-    private AnimatorSet mLayoutAnimation;
-    private final ArraySet<View> mLayingOutViews = new ArraySet<>();
-    private Rect mInsets;
-    private final RecentsModel.TaskThumbnailChangeListener listener = (taskId, thumbnailData) -> {
-        ArrayList<TaskItemView> itemViews = getTaskViews();
-        for (int i = 0, size = itemViews.size(); i < size; i++) {
-            TaskItemView taskView = itemViews.get(i);
-            TaskHolder taskHolder = (TaskHolder) mTaskRecyclerView.getChildViewHolder(taskView);
-            Optional<Task> optTask = taskHolder.getTask();
-            if (optTask.filter(task -> task.key.id == taskId).isPresent()) {
-                Task task = optTask.get();
-                // Update thumbnail on the task.
-                task.thumbnail = thumbnailData;
-                taskView.setThumbnail(thumbnailData);
-                return task;
-            }
-        }
-        return null;
-    };
-
-    public IconRecentsView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        mActivity = BaseActivity.fromContext(context);
-        mContext = context;
-        mStatusBarForegroundScrim  =
-                Themes.getAttrDrawable(mContext, R.attr.workspaceStatusBarScrim);
-        mTaskLoader = new TaskListLoader(mContext);
-        mTaskAdapter = new TaskAdapter(mTaskLoader);
-        mTaskAdapter.setOnClearAllClickListener(view -> animateClearAllTasks());
-        mTaskActionController = new TaskActionController(mTaskLoader, mTaskAdapter,
-                mActivity.getStatsLogManager());
-        mTaskAdapter.setActionController(mTaskActionController);
-        mTaskLayoutManager = new LinearLayoutManager(mContext, VERTICAL, true /* reverseLayout */);
-        RecentsModel.INSTANCE.get(context).addThumbnailChangeListener(listener);
-    }
-
-    @Override
-    protected void onFinishInflate() {
-        super.onFinishInflate();
-        if (mTaskRecyclerView == null) {
-            mTaskRecyclerView = findViewById(R.id.recent_task_recycler_view);
-            mTaskRecyclerView.setAdapter(mTaskAdapter);
-            mTaskRecyclerView.setLayoutManager(mTaskLayoutManager);
-            ItemTouchHelper helper = new ItemTouchHelper(
-                    new TaskSwipeCallback(holder -> {
-                        mTaskActionController.removeTask(holder);
-                        if (mTaskLoader.getCurrentTaskList().isEmpty()) {
-                            mActivityHelper.leaveRecents();
-                        }
-                    }));
-            helper.attachToRecyclerView(mTaskRecyclerView);
-            mTaskRecyclerView.addOnChildAttachStateChangeListener(
-                    new OnChildAttachStateChangeListener() {
-                        @Override
-                        public void onChildViewAttachedToWindow(@NonNull View view) {
-                            if (mLayoutAnimation != null && !mLayingOutViews.contains(view)) {
-                                // Child view was added that is not part of current layout animation
-                                // so restart the animation.
-                                animateFadeInLayoutAnimation();
-                            }
-                        }
-
-                        @Override
-                        public void onChildViewDetachedFromWindow(@NonNull View view) { }
-                    });
-            mTaskRecyclerView.setItemAnimator(mDefaultItemAnimator);
-            mLoadingContentItemAnimator.setOnAnimationFinishedRunnable(
-                    () -> mTaskRecyclerView.setItemAnimator(new DefaultItemAnimator()));
-            ItemDecoration marginDecorator = new ItemDecoration() {
-                @Override
-                public void getItemOffsets(@NonNull Rect outRect, @NonNull View view,
-                        @NonNull RecyclerView parent, @NonNull RecyclerView.State state) {
-                    // TODO: Determine if current margins cause off screen item to be fully off
-                    // screen and if so, modify them so that it is partially off screen.
-                    int itemType = parent.getChildViewHolder(view).getItemViewType();
-                    Resources res = getResources();
-                    switch (itemType) {
-                        case ITEM_TYPE_CLEAR_ALL:
-                            outRect.top = (int) res.getDimension(
-                                    R.dimen.clear_all_item_view_top_margin);
-                            outRect.bottom = (int) res.getDimension(
-                                    R.dimen.clear_all_item_view_bottom_margin);
-                            break;
-                        case ITEM_TYPE_TASK:
-                            int desiredTopMargin = (int) res.getDimension(
-                                    R.dimen.task_item_top_margin);
-                            if (mTaskRecyclerView.getChildAdapterPosition(view) ==
-                                    state.getItemCount() - 1) {
-                                // Only add top margin to top task view if insets aren't enough.
-                                if (mInsets.top < desiredTopMargin) {
-                                    outRect.top = desiredTopMargin - mInsets.bottom;
-                                }
-                                return;
-                            }
-                            outRect.top = desiredTopMargin;
-                            break;
-                        default:
-                    }
-                }
-            };
-            mTaskRecyclerView.addItemDecoration(marginDecorator);
-
-            mEmptyView = findViewById(R.id.recent_task_empty_view);
-            mContentView = mTaskRecyclerView;
-            mTaskAdapter.registerAdapterDataObserver(new AdapterDataObserver() {
-                @Override
-                public void onChanged() {
-                    updateContentViewVisibility();
-                }
-
-                @Override
-                public void onItemRangeRemoved(int positionStart, int itemCount) {
-                    updateContentViewVisibility();
-                }
-            });
-        }
-    }
-
-    @Override
-    public void setEnabled(boolean enabled) {
-        super.setEnabled(enabled);
-        int childCount = mTaskRecyclerView.getChildCount();
-        for (int i = 0; i < childCount; i++) {
-            mTaskRecyclerView.getChildAt(i).setEnabled(enabled);
-        }
-    }
-
-    /**
-     * Set activity helper for the view to callback to.
-     *
-     * @param helper the activity helper
-     */
-    public void setRecentsToActivityHelper(@NonNull RecentsToActivityHelper helper) {
-        mActivityHelper = helper;
-    }
-
-    /**
-     * Logic for when we know we are going to overview/recents and will be putting up the recents
-     * view. This should be used to prepare recents (e.g. load any task data, etc.) before it
-     * becomes visible.
-     */
-    public void onBeginTransitionToOverview() {
-        mStartedEnterAnimation = false;
-        if (mContext.getResources().getConfiguration().orientation == ORIENTATION_LANDSCAPE) {
-            // Scroll to bottom of task in landscape mode. This is a non-issue in portrait mode as
-            // all tasks should be visible to fill up the screen in portrait mode and the view will
-            // not be scrollable.
-            mTaskLayoutManager.scrollToPositionWithOffset(TASKS_START_POSITION, 0 /* offset */);
-        }
-        if (!mUsingRemoteAnimation) {
-            scheduleFadeInLayoutAnimation();
-        }
-        // Load any task changes
-        if (!mTaskLoader.needsToLoad()) {
-            return;
-        }
-        mTaskAdapter.setIsShowingLoadingUi(true);
-        mTaskAdapter.notifyDataSetChanged();
-        mTaskLoader.loadTaskList(tasks -> {
-            int numEmptyItems = mTaskAdapter.getItemCount() - TASKS_START_POSITION;
-            mTaskAdapter.setIsShowingLoadingUi(false);
-            int numActualItems = mTaskAdapter.getItemCount() - TASKS_START_POSITION;
-            if (numEmptyItems < numActualItems) {
-                throw new IllegalStateException("There are less empty item views than the number "
-                        + "of items to animate to.");
-            }
-            // Possible that task list loads faster than adapter changes propagate to layout so
-            // only start content fill animation if there aren't any pending adapter changes and
-            // we've started the on enter layout animation.
-            boolean needsContentFillAnimation =
-                    !mTaskRecyclerView.hasPendingAdapterUpdates() && mStartedEnterAnimation;
-            if (needsContentFillAnimation) {
-                // Set item animator for content filling animation. The item animator will switch
-                // back to the default on completion
-                mTaskRecyclerView.setItemAnimator(mLoadingContentItemAnimator);
-                mTaskAdapter.notifyItemRangeRemoved(TASKS_START_POSITION + numActualItems,
-                        numEmptyItems - numActualItems);
-                mTaskAdapter.notifyItemRangeChanged(TASKS_START_POSITION, numActualItems,
-                        CHANGE_EVENT_TYPE_EMPTY_TO_CONTENT);
-            } else {
-                // Notify change without animating.
-                mTaskAdapter.notifyDataSetChanged();
-            }
-        });
-    }
-
-    /**
-     * Set whether we transitioned to recents from the most recent app.
-     *
-     * @param transitionedFromApp true if transitioned from the most recent app, false otherwise
-     */
-    public void setTransitionedFromApp(boolean transitionedFromApp) {
-        mTransitionedFromApp = transitionedFromApp;
-    }
-
-    /**
-     * Set whether we're using a custom remote animation. If so, we will not do the default layout
-     * animation when entering recents and instead wait for the remote app surface to be ready to
-     * use.
-     *
-     * @param usingRemoteAnimation true if doing a remote animation, false o/w
-     */
-    public void setUsingRemoteAnimation(boolean usingRemoteAnimation) {
-        mUsingRemoteAnimation = usingRemoteAnimation;
-    }
-
-    /**
-     * Handles input from the overview button. Launch the most recent task unless we just came from
-     * the app. In that case, we launch the next most recent.
-     */
-    public void handleOverviewCommand() {
-        List<Task> tasks = mTaskLoader.getCurrentTaskList();
-        int tasksSize = tasks.size();
-        if (tasksSize == 0) {
-            // Do nothing
-            return;
-        }
-        Task taskToLaunch;
-        if (mTransitionedFromApp && tasksSize > 1) {
-            // Launch the next most recent app
-            taskToLaunch = tasks.get(1);
-        } else {
-            // Launch the most recent app
-            taskToLaunch = tasks.get(0);
-        }
-
-        // See if view for this task is attached, and if so, animate launch from that view.
-        ArrayList<TaskItemView> itemViews = getTaskViews();
-        for (int i = 0, size = itemViews.size(); i < size; i++) {
-            TaskItemView taskView = itemViews.get(i);
-            TaskHolder holder = (TaskHolder) mTaskRecyclerView.getChildViewHolder(taskView);
-            if (Objects.equals(holder.getTask(), Optional.of(taskToLaunch))) {
-                mTaskActionController.launchTaskFromView(holder);
-                return;
-            }
-        }
-
-        // Otherwise, just use a basic launch animation.
-        mTaskActionController.launchTask(taskToLaunch);
-    }
-
-    /**
-     * Set whether or not to show the scrim in between the view and the top insets. This only works
-     * if the view is being insetted in the first place.
-     *
-     * The scrim is added to the activity's root view to prevent animations on this view
-     * affecting the scrim. As a result, it is the activity's responsibility to show/hide this
-     * scrim as appropriate.
-     *
-     * @param showStatusBarForegroundScrim true to show the scrim, false to hide
-     */
-    public void setShowStatusBarForegroundScrim(boolean showStatusBarForegroundScrim) {
-        mShowStatusBarForegroundScrim = showStatusBarForegroundScrim;
-        if (mShowStatusBarForegroundScrim != showStatusBarForegroundScrim) {
-            updateStatusBarScrim();
-        }
-    }
-
-    private void updateStatusBarScrim() {
-        boolean shouldShow = mInsets.top != 0 && mShowStatusBarForegroundScrim;
-        mActivity.getDragLayer().setForeground(shouldShow ? mStatusBarForegroundScrim : null);
-    }
-
-    /**
-     * Get the bottom most task view to animate to.
-     *
-     * @return the task view
-     */
-    private @Nullable TaskItemView getBottomTaskView() {
-        int childCount = mTaskRecyclerView.getChildCount();
-        for (int i = 0; i < childCount; i++) {
-            View view = mTaskRecyclerView.getChildAt(i);
-            if (mTaskRecyclerView.getChildViewHolder(view).getItemViewType() == ITEM_TYPE_TASK) {
-                return (TaskItemView) view;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Whether this view has processed all data changes and is ready to animate from the app to
-     * the overview.
-     *
-     * @return true if ready to animate app to overview, false otherwise
-     */
-    public boolean isReadyForRemoteAnim() {
-        return !mTaskRecyclerView.hasPendingAdapterUpdates();
-    }
-
-    /**
-     * Set a callback for whenever this view is ready to do a remote animation from the app to
-     * overview. See {@link #isReadyForRemoteAnim()}.
-     *
-     * @param callback callback to run when view is ready to animate
-     */
-    public void setOnReadyForRemoteAnimCallback(onReadyForRemoteAnimCallback callback) {
-        mTaskRecyclerView.getViewTreeObserver().addOnGlobalLayoutListener(
-                new ViewTreeObserver.OnGlobalLayoutListener() {
-                    @Override
-                    public void onGlobalLayout() {
-                        if (isReadyForRemoteAnim()) {
-                            callback.onReadyForRemoteAnim();
-                            mTaskRecyclerView.getViewTreeObserver().
-                                    removeOnGlobalLayoutListener(this);
-                        }
-                    }
-                });
-    }
-
-    /**
-     * Clear all tasks and animate out.
-     */
-    private void animateClearAllTasks() {
-        setEnabled(false);
-        ArrayList<TaskItemView> itemViews = getTaskViews();
-
-        AnimatorSet clearAnim = new AnimatorSet();
-        long currentDelay = 0;
-
-        // Animate each item view to the right and fade out.
-        for (int i = 0, size = itemViews.size(); i < size; i++) {
-            TaskItemView itemView = itemViews.get(i);
-            PropertyValuesHolder transXproperty = PropertyValuesHolder.ofFloat(TRANSLATION_X,
-                    0, itemView.getWidth() * ITEM_ANIMATE_OUT_TRANSLATION_X_RATIO);
-            PropertyValuesHolder alphaProperty = PropertyValuesHolder.ofFloat(ALPHA, 1.0f, 0f);
-            ObjectAnimator itemAnim = ObjectAnimator.ofPropertyValuesHolder(itemView,
-                    transXproperty, alphaProperty);
-            itemAnim.setDuration(ITEM_ANIMATE_OUT_DURATION);
-            itemAnim.setStartDelay(currentDelay);
-
-            clearAnim.play(itemAnim);
-            currentDelay += ITEM_ANIMATE_OUT_DELAY_BETWEEN;
-        }
-
-        // Animate view fading and leave recents when faded enough.
-        ValueAnimator contentAlpha = ValueAnimator.ofFloat(1.0f, 0f)
-                .setDuration(CROSSFADE_DURATION);
-        contentAlpha.setStartDelay(CLEAR_ALL_FADE_DELAY);
-        contentAlpha.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
-            private boolean mLeftRecents = false;
-
-            @Override
-            public void onAnimationUpdate(ValueAnimator valueAnimator) {
-                mContentView.setAlpha((float) valueAnimator.getAnimatedValue());
-                // Leave recents while fading out.
-                if ((float) valueAnimator.getAnimatedValue() < .5f && !mLeftRecents) {
-                    mActivityHelper.leaveRecents();
-                    mLeftRecents = true;
-                }
-            }
-        });
-
-        clearAnim.play(contentAlpha);
-        clearAnim.addListener(new AnimatorListenerAdapter() {
-            @Override
-            public void onAnimationEnd(Animator animation) {
-                for (int i = 0, size = itemViews.size(); i < size; i++) {
-                    TaskItemView itemView = itemViews.get(i);
-                    itemView.setTranslationX(0);
-                    itemView.setAlpha(1.0f);
-                }
-                setEnabled(true);
-                mContentView.setVisibility(GONE);
-                mTaskActionController.clearAllTasks();
-            }
-        });
-        clearAnim.start();
-    }
-
-    /**
-     * Get attached task item views ordered by most recent.
-     *
-     * @return array list of attached task item views
-     */
-    private ArrayList<TaskItemView> getTaskViews() {
-        int taskCount = mTaskRecyclerView.getChildCount();
-        ArrayList<TaskItemView> itemViews = new ArrayList<>();
-        for (int i = 0; i < taskCount; i ++) {
-            View child = mTaskRecyclerView.getChildAt(i);
-            if (child instanceof TaskItemView) {
-                itemViews.add((TaskItemView) child);
-            }
-        }
-        return itemViews;
-    }
-
-    /**
-     * Update the content view so that the appropriate view is shown based off the current list
-     * of tasks.
-     */
-    private void updateContentViewVisibility() {
-        int taskListSize = mTaskAdapter.getItemCount() - TASKS_START_POSITION;
-        if (mShowingContentView != mEmptyView && taskListSize == 0) {
-            mShowingContentView = mEmptyView;
-            crossfadeViews(mEmptyView, mContentView);
-        }
-        if (mShowingContentView != mContentView && taskListSize > 0) {
-            mShowingContentView = mContentView;
-            crossfadeViews(mContentView, mEmptyView);
-        }
-    }
-
-    /**
-     * Animate views so that one view fades in while the other fades out.
-     *
-     * @param fadeInView view that should fade in
-     * @param fadeOutView view that should fade out
-     */
-    private void crossfadeViews(View fadeInView, View fadeOutView) {
-        fadeInView.animate().cancel();
-        fadeInView.setVisibility(VISIBLE);
-        fadeInView.setAlpha(0f);
-        fadeInView.animate()
-                .alpha(1f)
-                .setDuration(CROSSFADE_DURATION)
-                .setListener(null);
-
-        fadeOutView.animate().cancel();
-        fadeOutView.animate()
-                .alpha(0f)
-                .setDuration(CROSSFADE_DURATION)
-                .setListener(new AnimatorListenerAdapter() {
-                    @Override
-                    public void onAnimationEnd(Animator animation) {
-                        fadeOutView.setVisibility(GONE);
-                    }
-                });
-    }
-
-    /**
-     * Schedule a one-shot layout animation on the next layout. Separate from
-     * {@link #scheduleLayoutAnimation()} as the animation is {@link Animator} based and acts on the
-     * view properties themselves, allowing more controllable behavior and making it easier to
-     * manage when the animation conflicts with another animation.
-     */
-    private void scheduleFadeInLayoutAnimation() {
-        mTaskRecyclerView.getViewTreeObserver().addOnGlobalLayoutListener(
-                new ViewTreeObserver.OnGlobalLayoutListener() {
-                    @Override
-                    public void onGlobalLayout() {
-                        animateFadeInLayoutAnimation();
-                        mTaskRecyclerView.getViewTreeObserver().removeOnGlobalLayoutListener(this);
-                    }
-                });
-    }
-
-    /**
-     * Start animating the layout animation where items fade in.
-     */
-    private void animateFadeInLayoutAnimation() {
-        if (mLayoutAnimation != null) {
-            // If layout animation still in progress, cancel and restart.
-            mLayoutAnimation.cancel();
-        }
-        ArrayList<TaskItemView> views = getTaskViews();
-        int delay = 0;
-        mLayoutAnimation = new AnimatorSet();
-        for (int i = 0, size = views.size(); i < size; i++) {
-            TaskItemView view = views.get(i);
-            view.setAlpha(0.0f);
-            Animator alphaAnim = ObjectAnimator.ofFloat(view, ALPHA, 0.0f, 1.0f);
-            alphaAnim.setDuration(LAYOUT_ITEM_ANIMATE_IN_DURATION).setStartDelay(delay);
-            alphaAnim.addListener(new AnimatorListenerAdapter() {
-                @Override
-                public void onAnimationEnd(Animator animation) {
-                    view.setAlpha(1.0f);
-                    mLayingOutViews.remove(view);
-                }
-            });
-            delay += LAYOUT_ITEM_ANIMATE_IN_DELAY_BETWEEN;
-            mLayoutAnimation.play(alphaAnim);
-            mLayingOutViews.add(view);
-        }
-        mLayoutAnimation.addListener(new AnimatorListenerAdapter() {
-            @Override
-            public void onAnimationEnd(Animator animation) {
-                mLayoutAnimation = null;
-            }
-        });
-        mLayoutAnimation.start();
-        mStartedEnterAnimation = true;
-    }
-
-    /**
-     * Play remote app to recents animation when the app is the home activity. We use a simple
-     * cross-fade here. Note this is only used if the home activity is a separate app than the
-     * recents activity.
-     *
-     * @param anim animator set
-     * @param homeTarget the home surface thats closing
-     * @param recentsTarget the surface containing recents
-     */
-    public void playRemoteHomeToRecentsAnimation(@NonNull AnimatorSet anim,
-            @NonNull RemoteAnimationTargetCompat homeTarget,
-            @NonNull RemoteAnimationTargetCompat recentsTarget) {
-        SyncRtSurfaceTransactionApplierCompat surfaceApplier =
-                new SyncRtSurfaceTransactionApplierCompat(this);
-
-        SurfaceParams[] params = new SurfaceParams[2];
-        int boostedMode = MODE_CLOSING;
-
-        ValueAnimator remoteHomeAnim = ValueAnimator.ofFloat(0, 1);
-        remoteHomeAnim.setDuration(REMOTE_APP_TO_OVERVIEW_DURATION);
-
-        remoteHomeAnim.addUpdateListener(valueAnimator -> {
-            float val = (float) valueAnimator.getAnimatedValue();
-            float alpha;
-            RemoteAnimationTargetCompat visibleTarget;
-            RemoteAnimationTargetCompat invisibleTarget;
-            if (val < .5f) {
-                visibleTarget = homeTarget;
-                invisibleTarget = recentsTarget;
-                alpha = 1 - (val * 2);
-            } else {
-                visibleTarget = recentsTarget;
-                invisibleTarget = homeTarget;
-                alpha = (val - .5f) * 2;
-            }
-            params[0] = new SurfaceParams(visibleTarget.leash, alpha, null /* matrix */,
-                    null /* windowCrop */, getLayer(visibleTarget, boostedMode),
-                    0 /* cornerRadius */);
-            params[1] = new SurfaceParams(invisibleTarget.leash, 0.0f, null /* matrix */,
-                    null /* windowCrop */, getLayer(invisibleTarget, boostedMode),
-                    0 /* cornerRadius */);
-            surfaceApplier.scheduleApply(params);
-        });
-        anim.play(remoteHomeAnim);
-        animateFadeInLayoutAnimation();
-    }
-
-    /**
-     * Play remote animation from app to recents. This should scale the currently closing app down
-     * to the recents thumbnail.
-     *
-     * @param anim animator set
-     * @param appTarget the app surface thats closing
-     * @param recentsTarget the surface containing recents
-     */
-    public void playRemoteAppToRecentsAnimation(@NonNull AnimatorSet anim,
-            @NonNull RemoteAnimationTargetCompat appTarget,
-            @NonNull RemoteAnimationTargetCompat recentsTarget) {
-        TaskItemView bottomView = getBottomTaskView();
-        if (bottomView == null) {
-            // This can be null if there were previously 0 tasks and the recycler view has not had
-            // enough time to take in the data change, bind a new view, and lay out the new view.
-            // TODO: Have a fallback to animate to
-            anim.play(ValueAnimator.ofInt(0, 1).setDuration(REMOTE_APP_TO_OVERVIEW_DURATION));
-            return;
-        }
-        final Matrix appMatrix = new Matrix();
-        playRemoteTransYAnim(anim, appMatrix);
-        playRemoteAppScaleDownAnim(anim, appMatrix, appTarget, recentsTarget,
-                bottomView.getThumbnailView());
-        playRemoteTaskListFadeIn(anim, bottomView);
-        mStartedEnterAnimation = true;
-    }
-
-    /**
-     * Play translation Y animation for the remote app to recents animation. Animates over all task
-     * views as well as the closing app, easing them into their final vertical positions.
-     *
-     * @param anim animator set to play on
-     * @param appMatrix transformation matrix for the closing app surface
-     */
-    private void playRemoteTransYAnim(@NonNull AnimatorSet anim, @NonNull Matrix appMatrix) {
-        final ArrayList<TaskItemView> views = getTaskViews();
-
-        // Start Y translation from about halfway through the tasks list to the bottom thumbnail.
-        float taskHeight = getResources().getDimension(R.dimen.task_item_height);
-        float totalTransY = -(MAX_TASKS_TO_DISPLAY / 2.0f - 1) * taskHeight;
-        for (int i = 0, size = views.size(); i < size; i++) {
-            views.get(i).setTranslationY(totalTransY);
-        }
-
-        ValueAnimator transYAnim = ValueAnimator.ofFloat(totalTransY, 0);
-        transYAnim.setDuration(REMOTE_TO_RECENTS_VERTICAL_EASE_IN_DURATION);
-        transYAnim.setInterpolator(FAST_OUT_SLOW_IN_2);
-        transYAnim.addUpdateListener(valueAnimator -> {
-            float transY = (float) valueAnimator.getAnimatedValue();
-            for (int i = 0, size = views.size(); i < size; i++) {
-                views.get(i).setTranslationY(transY);
-            }
-            appMatrix.postTranslate(0, transY - totalTransY);
-        });
-        transYAnim.addListener(new AnimatorListenerAdapter() {
-            @Override
-            public void onAnimationEnd(Animator animation) {
-                for (int i = 0, size = views.size(); i < size; i++) {
-                    views.get(i).setTranslationY(0);
-                }
-            }
-        });
-        anim.play(transYAnim);
-    }
-
-    /**
-     * Play the scale down animation for the remote app to recents animation where the app surface
-     * scales down to where the thumbnail is.
-     *
-     * @param anim animator set to play on
-     * @param appMatrix transformation matrix for the app surface
-     * @param appTarget closing app target
-     * @param recentsTarget opening recents target
-     * @param thumbnailView thumbnail view to animate to
-     */
-    private void playRemoteAppScaleDownAnim(@NonNull AnimatorSet anim, @NonNull Matrix appMatrix,
-            @NonNull RemoteAnimationTargetCompat appTarget,
-            @NonNull RemoteAnimationTargetCompat recentsTarget,
-            @NonNull View thumbnailView) {
-        // Identify where the entering remote app should animate to.
-        Rect endRect = new Rect();
-        thumbnailView.getGlobalVisibleRect(endRect);
-        Rect appBounds = appTarget.sourceContainerBounds;
-        RectF currentAppRect = new RectF();
-
-        SyncRtSurfaceTransactionApplierCompat surfaceApplier =
-                new SyncRtSurfaceTransactionApplierCompat(this);
-
-        // Keep recents visible throughout the animation.
-        SurfaceParams[] params = new SurfaceParams[2];
-        // Closing app should stay on top.
-        int boostedMode = MODE_CLOSING;
-        params[0] = new SurfaceParams(recentsTarget.leash, 1f, null /* matrix */,
-                null /* windowCrop */, getLayer(recentsTarget, boostedMode), 0 /* cornerRadius */);
-
-        ValueAnimator remoteAppAnim = ValueAnimator.ofInt(0, 1);
-        remoteAppAnim.setDuration(REMOTE_TO_RECENTS_VERTICAL_EASE_IN_DURATION);
-        remoteAppAnim.addUpdateListener(new MultiValueUpdateListener() {
-            private final FloatProp mScaleX;
-            private final FloatProp mScaleY;
-            private final FloatProp mTranslationX;
-            private final FloatProp mTranslationY;
-            private final FloatProp mAlpha;
-
-            {
-                // Scale down and move to view location.
-                float endScaleX = ((float) endRect.width()) / appBounds.width();
-                mScaleX = new FloatProp(1f, endScaleX, 0, REMOTE_TO_RECENTS_APP_SCALE_DOWN_DURATION,
-                        FAST_OUT_SLOW_IN_1);
-                float endScaleY = ((float) endRect.height()) / appBounds.height();
-                mScaleY = new FloatProp(1f, endScaleY, 0, REMOTE_TO_RECENTS_APP_SCALE_DOWN_DURATION,
-                        FAST_OUT_SLOW_IN_1);
-                float endTranslationX = endRect.left -
-                        (appBounds.width() - thumbnailView.getWidth()) / 2.0f;
-                mTranslationX = new FloatProp(0, endTranslationX, 0,
-                        REMOTE_TO_RECENTS_APP_SCALE_DOWN_DURATION, FAST_OUT_SLOW_IN_1);
-                float endTranslationY = endRect.top -
-                        (appBounds.height() - thumbnailView.getHeight()) / 2.0f;
-                mTranslationY = new FloatProp(0, endTranslationY, 0,
-                        REMOTE_TO_RECENTS_APP_SCALE_DOWN_DURATION, FAST_OUT_SLOW_IN_2);
-                mAlpha = new FloatProp(1.0f, 0, 0, REMOTE_TO_RECENTS_APP_SCALE_DOWN_DURATION,
-                        ACCEL_2);
-            }
-
-            @Override
-            public void onUpdate(float percent) {
-                Matrix m = new Matrix();
-                m.preScale(mScaleX.value, mScaleY.value,
-                        appBounds.width() / 2.0f, appBounds.height() / 2.0f);
-                m.postTranslate(mTranslationX.value, mTranslationY.value);
-                appMatrix.preConcat(m);
-                params[1] = new SurfaceParams(appTarget.leash, mAlpha.value, appMatrix,
-                        null /* windowCrop */, getLayer(appTarget, boostedMode),
-                        0 /* cornerRadius */);
-                surfaceApplier.scheduleApply(params);
-
-                m.mapRect(currentAppRect, new RectF(appBounds));
-                setViewToRect(thumbnailView, new RectF(endRect), currentAppRect);
-                appMatrix.reset();
-            }
-        });
-        remoteAppAnim.addListener(new AnimatorListenerAdapter() {
-            @Override
-            public void onAnimationEnd(Animator animation) {
-                thumbnailView.setTranslationY(0);
-                thumbnailView.setTranslationX(0);
-                thumbnailView.setScaleX(1);
-                thumbnailView.setScaleY(1);
-            }
-        });
-        anim.play(remoteAppAnim);
-    }
-
-    /**
-     * Play task list fade in animation as part of remote app to recents animation. This animation
-     * ensures that the task views in the recents list fade in from bottom to top.
-     *
-     * @param anim animator set to play on
-     * @param appTaskView the task view associated with the remote app closing
-     */
-    private void playRemoteTaskListFadeIn(@NonNull AnimatorSet anim,
-            @NonNull TaskItemView appTaskView) {
-        long delay = REMOTE_TO_RECENTS_ITEM_FADE_START_DELAY;
-        int childCount = mTaskRecyclerView.getChildCount();
-        for (int i = 0; i < childCount; i++) {
-            ValueAnimator fadeAnim = ValueAnimator.ofFloat(0, 1.0f);
-            fadeAnim.setDuration(REMOTE_TO_RECENTS_ITEM_FADE_DURATION).setInterpolator(OUT_SLOW_IN);
-            fadeAnim.setStartDelay(delay);
-            View view = mTaskRecyclerView.getChildAt(i);
-            if (Objects.equals(view, appTaskView)) {
-                // Only animate icon and text for the view with snapshot animating in
-                final View icon = appTaskView.getIconView();
-                final View label = appTaskView.getLabelView();
-
-                icon.setAlpha(0.0f);
-                label.setAlpha(0.0f);
-
-                fadeAnim.addUpdateListener(alphaVal -> {
-                    float val = alphaVal.getAnimatedFraction();
-
-                    icon.setAlpha(val);
-                    label.setAlpha(val);
-                });
-                fadeAnim.addListener(new AnimatorListenerAdapter() {
-                    @Override
-                    public void onAnimationEnd(Animator animation) {
-                        icon.setAlpha(1.0f);
-                        label.setAlpha(1.0f);
-                    }
-                });
-            } else {
-                // Otherwise, fade in the entire view.
-                view.setAlpha(0.0f);
-                fadeAnim.addUpdateListener(alphaVal -> {
-                    float val = alphaVal.getAnimatedFraction();
-                    view.setAlpha(val);
-                });
-                fadeAnim.addListener(new AnimatorListenerAdapter() {
-                    @Override
-                    public void onAnimationEnd(Animator animation) {
-                        view.setAlpha(1.0f);
-                    }
-                });
-            }
-            anim.play(fadeAnim);
-
-            int itemType = mTaskRecyclerView.getChildViewHolder(view).getItemViewType();
-            if (itemType == ITEM_TYPE_CLEAR_ALL) {
-                // Don't add delay. Clear all should animate at same time as next view.
-                continue;
-            }
-            delay += REMOTE_TO_RECENTS_ITEM_FADE_BETWEEN_DELAY;
-        }
-    }
-
-    /**
-     * Set view properties so that the view fits to the target rect.
-     *
-     * @param view view to set
-     * @param origRect original rect that view was located
-     * @param targetRect rect to set to
-     */
-    private void setViewToRect(View view, RectF origRect, RectF targetRect) {
-        float dX = targetRect.left - origRect.left;
-        float dY = targetRect.top - origRect.top;
-        view.setTranslationX(dX);
-        view.setTranslationY(dY);
-
-        float scaleX = targetRect.width() / origRect.width();
-        float scaleY = targetRect.height() / origRect.height();
-        view.setPivotX(0);
-        view.setPivotY(0);
-        view.setScaleX(scaleX);
-        view.setScaleY(scaleY);
-    }
-
-    @Override
-    public void setInsets(Rect insets) {
-        mInsets = insets;
-        mTaskRecyclerView.setPadding(insets.left, insets.top, insets.right, insets.bottom);
-        mTaskRecyclerView.invalidateItemDecorations();
-        if (mInsets.top != 0) {
-            updateStatusBarScrim();
-        }
-    }
-
-    /**
-     * Callback for when this view is ready for a remote animation from app to overview.
-     */
-    public interface onReadyForRemoteAnimCallback {
-
-        void onReadyForRemoteAnim();
-    }
-}
diff --git a/go/quickstep/src/com/android/quickstep/views/TaskItemView.java b/go/quickstep/src/com/android/quickstep/views/TaskItemView.java
deleted file mode 100644
index f184ad06a0..0000000000
--- a/go/quickstep/src/com/android/quickstep/views/TaskItemView.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- * Copyright (C) 2019 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.
- */
-package com.android.quickstep.views;
-
-import android.content.Context;
-import android.content.res.Configuration;
-import android.content.res.Resources;
-import android.graphics.drawable.Drawable;
-import android.util.AttributeSet;
-import android.util.FloatProperty;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import com.android.launcher3.R;
-import com.android.quickstep.ThumbnailDrawable;
-import com.android.systemui.shared.recents.model.ThumbnailData;
-
-/**
- * View representing an individual task item with the icon + thumbnail adjacent to the task label.
- */
-public final class TaskItemView extends LinearLayout {
-
-    private static final String EMPTY_LABEL = "";
-    private static final String DEFAULT_LABEL = "...";
-    private final Drawable mDefaultIcon;
-    private final Drawable mDefaultThumbnail;
-    private final TaskLayerDrawable mIconDrawable;
-    private final TaskLayerDrawable mThumbnailDrawable;
-    private View mTaskIconThumbnailView;
-    private TextView mLabelView;
-    private ImageView mIconView;
-    private ImageView mThumbnailView;
-    private float mContentTransitionProgress;
-    private int mDisplayedOrientation;
-
-    /**
-     * Property representing the content transition progress of the view. 1.0f represents that the
-     * currently bound icon, thumbnail, and label are fully animated in and visible.
-     */
-    public static FloatProperty CONTENT_TRANSITION_PROGRESS =
-            new FloatProperty<TaskItemView>("taskContentTransitionProgress") {
-                @Override
-                public void setValue(TaskItemView view, float progress) {
-                    view.setContentTransitionProgress(progress);
-                }
-
-                @Override
-                public Float get(TaskItemView view) {
-                    return view.mContentTransitionProgress;
-                }
-            };
-
-    public TaskItemView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        Resources res = context.getResources();
-        mDefaultIcon = res.getDrawable(android.R.drawable.sym_def_app_icon, context.getTheme());
-        mDefaultThumbnail = res.getDrawable(R.drawable.default_thumbnail, context.getTheme());
-        mIconDrawable = new TaskLayerDrawable(context);
-        mThumbnailDrawable = new TaskLayerDrawable(context);
-    }
-
-    @Override
-    protected void onFinishInflate() {
-        super.onFinishInflate();
-        mLabelView = findViewById(R.id.task_label);
-        mTaskIconThumbnailView = findViewById(R.id.task_icon_and_thumbnail);
-        mThumbnailView = findViewById(R.id.task_thumbnail);
-        mIconView = findViewById(R.id.task_icon);
-
-        mThumbnailView.setImageDrawable(mThumbnailDrawable);
-        mIconView.setImageDrawable(mIconDrawable);
-
-        resetToEmptyUi();
-        CONTENT_TRANSITION_PROGRESS.setValue(this, 1.0f);
-    }
-
-    /**
-     * Resets task item view to empty, loading UI.
-     */
-    public void resetToEmptyUi() {
-        mIconDrawable.resetDrawable();
-        mThumbnailDrawable.resetDrawable();
-        setLabel(EMPTY_LABEL);
-    }
-
-    /**
-     * Set the label for the task item. Sets to a default label if null.
-     *
-     * @param label task label
-     */
-    public void setLabel(@Nullable String label) {
-        mLabelView.setText(getSafeLabel(label));
-        // TODO: Animation for label
-    }
-
-    /**
-     * Set the icon for the task item. Sets to a default icon if null.
-     *
-     * @param icon task icon
-     */
-    public void setIcon(@Nullable Drawable icon) {
-        // TODO: Scale the icon up based off the padding on the side
-        // The icon proper is actually smaller than the drawable and has "padding" on the side for
-        // the purpose of drawing the shadow, allowing the icon to pop up, so we need to scale the
-        // view if we want the icon to be flush with the bottom of the thumbnail.
-        mIconDrawable.setCurrentDrawable(getSafeIcon(icon));
-    }
-
-    /**
-     * Set the task thumbnail for the task. Sets to a default thumbnail if null.
-     *
-     * @param thumbnailData task thumbnail data for the task
-     */
-    public void setThumbnail(@Nullable ThumbnailData thumbnailData) {
-        mThumbnailDrawable.setCurrentDrawable(getSafeThumbnail(thumbnailData));
-    }
-
-    public View getThumbnailView() {
-        return mThumbnailView;
-    }
-
-    public View getIconView() {
-        return mIconView;
-    }
-
-    public View getLabelView() {
-        return mLabelView;
-    }
-
-    /**
-     * Start a new animation from the current task content to the specified new content. The caller
-     * is responsible for the actual animation control via the property
-     * {@link #CONTENT_TRANSITION_PROGRESS}.
-     *
-     * @param endIcon the icon to animate to
-     * @param endThumbnail the thumbnail to animate to
-     * @param endLabel the label to animate to
-     */
-    public void startContentAnimation(@Nullable Drawable endIcon,
-            @Nullable ThumbnailData endThumbnail, @Nullable String endLabel) {
-        mIconDrawable.startNewTransition(getSafeIcon(endIcon));
-        mThumbnailDrawable.startNewTransition(getSafeThumbnail(endThumbnail));
-        // TODO: Animation for label
-
-        setContentTransitionProgress(0.0f);
-    }
-
-    private void setContentTransitionProgress(float progress) {
-        mContentTransitionProgress = progress;
-        mIconDrawable.setTransitionProgress(progress);
-        mThumbnailDrawable.setTransitionProgress(progress);
-        // TODO: Animation for label
-    }
-
-    private @NonNull Drawable getSafeIcon(@Nullable Drawable icon) {
-        return (icon != null) ? icon : mDefaultIcon;
-    }
-
-    private @NonNull Drawable getSafeThumbnail(@Nullable ThumbnailData thumbnailData) {
-        if (thumbnailData == null || thumbnailData.thumbnail == null) {
-            return mDefaultThumbnail;
-        }
-        int orientation = getResources().getConfiguration().orientation;
-        return new ThumbnailDrawable(getResources(), thumbnailData,
-                orientation /* requestedOrientation */);
-    }
-
-    private @NonNull String getSafeLabel(@Nullable String label) {
-        return (label != null) ? label : DEFAULT_LABEL;
-    }
-
-    @Override
-    protected void onAttachedToWindow() {
-        super.onAttachedToWindow();
-        onOrientationChanged(getResources().getConfiguration().orientation);
-    }
-
-    @Override
-    protected void onConfigurationChanged(Configuration newConfig) {
-        super.onConfigurationChanged(newConfig);
-        onOrientationChanged(newConfig.orientation);
-    }
-
-    private void onOrientationChanged(int newOrientation) {
-        if (mDisplayedOrientation == newOrientation) {
-            return;
-        }
-        mDisplayedOrientation = newOrientation;
-        int layerCount = mThumbnailDrawable.getNumberOfLayers();
-        for (int i = 0; i < layerCount; i++) {
-            Drawable drawable = mThumbnailDrawable.getDrawable(i);
-            if (drawable instanceof ThumbnailDrawable) {
-                ((ThumbnailDrawable) drawable).setRequestedOrientation(newOrientation);
-            }
-        }
-        mTaskIconThumbnailView.forceLayout();
-    }
-}
diff --git a/go/quickstep/src/com/android/quickstep/views/TaskLayerDrawable.java b/go/quickstep/src/com/android/quickstep/views/TaskLayerDrawable.java
deleted file mode 100644
index 98b66b995d..0000000000
--- a/go/quickstep/src/com/android/quickstep/views/TaskLayerDrawable.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright (C) 2019 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.
- */
-
-package com.android.quickstep.views;
-
-import android.content.Context;
-import android.graphics.drawable.Drawable;
-import android.graphics.drawable.LayerDrawable;
-
-import androidx.annotation.NonNull;
-
-import com.android.launcher3.R;
-
-/**
- * A layer drawable for task content that transitions between two drawables by crossfading. Similar
- * to {@link android.graphics.drawable.TransitionDrawable} but allows callers to control transition
- * progress and provides a default, empty drawable.
- */
-public final class TaskLayerDrawable extends LayerDrawable {
-    private final Drawable mEmptyDrawable;
-    private float mProgress;
-
-    public TaskLayerDrawable(Context context) {
-        super(new Drawable[0]);
-
-        // Use empty drawable for both layers initially.
-        mEmptyDrawable = context.getResources().getDrawable(
-                R.drawable.empty_content_box, context.getTheme());
-        addLayer(mEmptyDrawable);
-        addLayer(mEmptyDrawable);
-        setTransitionProgress(1.0f);
-    }
-
-    /**
-     * Immediately set the front-most drawable layer.
-     *
-     * @param drawable drawable to set
-     */
-    public void setCurrentDrawable(@NonNull Drawable drawable) {
-        setDrawable(0, drawable);
-        applyTransitionProgress(mProgress);
-    }
-
-    /**
-     * Immediately reset the drawable to showing the empty drawable.
-     */
-    public void resetDrawable() {
-        setCurrentDrawable(mEmptyDrawable);
-    }
-
-    /**
-     * Prepare to start animating the transition by pushing the current drawable to the back and
-     * setting a new drawable to the front layer and making it invisible.
-     *
-     * @param endDrawable drawable to animate to
-     */
-    public void startNewTransition(@NonNull Drawable endDrawable) {
-        Drawable oldDrawable = getDrawable(0);
-        setDrawable(1, oldDrawable);
-        setDrawable(0, endDrawable);
-        setTransitionProgress(0.0f);
-    }
-
-    /**
-     * Set the progress of the transition animation to crossfade the two drawables.
-     *
-     * @param progress current transition progress between 0 (front view invisible) and 1
-     *                 (front view visible)
-     */
-    public void setTransitionProgress(float progress) {
-        if (progress > 1 || progress < 0) {
-            throw new IllegalArgumentException("Transition progress should be between 0 and 1");
-        }
-        mProgress = progress;
-        applyTransitionProgress(progress);
-    }
-
-    private void applyTransitionProgress(float progress) {
-        int drawableAlpha = (int) (progress * 255);
-        getDrawable(0).setAlpha(drawableAlpha);
-        if (getDrawable(0) != getDrawable(1)) {
-            // Only do this if it's a different drawable so that it fades out.
-            // Otherwise, we'd just be overwriting the front drawable's alpha.
-            getDrawable(1).setAlpha(255 - drawableAlpha);
-        }
-        invalidateSelf();
-    }
-}
diff --git a/go/quickstep/src/com/android/quickstep/views/TaskThumbnailIconView.java b/go/quickstep/src/com/android/quickstep/views/TaskThumbnailIconView.java
deleted file mode 100644
index eaefa21673..0000000000
--- a/go/quickstep/src/com/android/quickstep/views/TaskThumbnailIconView.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright (C) 2019 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.
- */
-
-package com.android.quickstep.views;
-
-import static android.content.res.Configuration.ORIENTATION_PORTRAIT;
-import static android.view.View.MeasureSpec.makeMeasureSpec;
-
-import android.content.Context;
-import android.graphics.Rect;
-import android.util.AttributeSet;
-import android.view.Gravity;
-import android.view.View;
-import android.view.ViewGroup;
-
-import com.android.launcher3.R;
-
-/**
- * Square view that holds thumbnail and icon and shrinks them appropriately so that both fit nicely
- * within the view. Side length is determined by height.
- */
-final class TaskThumbnailIconView extends ViewGroup {
-    private final Rect mTmpFrameRect = new Rect();
-    private final Rect mTmpChildRect = new Rect();
-    private View mThumbnailView;
-    private View mIconView;
-    private static final float SUBITEM_FRAME_RATIO = .6f;
-
-    public TaskThumbnailIconView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    @Override
-    protected void onFinishInflate() {
-        super.onFinishInflate();
-        mThumbnailView = findViewById(R.id.task_thumbnail);
-        mIconView = findViewById(R.id.task_icon);
-    }
-
-    @Override
-    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-        int height = getDefaultSize(getSuggestedMinimumHeight(), heightMeasureSpec);
-        int width = height;
-        setMeasuredDimension(width, height);
-
-        int subItemSize = (int) (SUBITEM_FRAME_RATIO * height);
-        if (mThumbnailView.getVisibility() != GONE) {
-            boolean isPortrait =
-                    (getResources().getConfiguration().orientation == ORIENTATION_PORTRAIT);
-            int thumbnailHeightSpec =
-                    makeMeasureSpec(isPortrait ? height : subItemSize, MeasureSpec.EXACTLY);
-            int thumbnailWidthSpec =
-                    makeMeasureSpec(isPortrait ? subItemSize : width, MeasureSpec.EXACTLY);
-            measureChild(mThumbnailView, thumbnailWidthSpec, thumbnailHeightSpec);
-        }
-        if (mIconView.getVisibility() != GONE) {
-            int iconHeightSpec = makeMeasureSpec(subItemSize, MeasureSpec.EXACTLY);
-            int iconWidthSpec = makeMeasureSpec(subItemSize, MeasureSpec.EXACTLY);
-            measureChild(mIconView, iconWidthSpec, iconHeightSpec);
-        }
-    }
-
-    @Override
-    protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
-        mTmpFrameRect.left = getPaddingLeft();
-        mTmpFrameRect.right = right - left - getPaddingRight();
-        mTmpFrameRect.top = getPaddingTop();
-        mTmpFrameRect.bottom = bottom - top - getPaddingBottom();
-
-        // Layout the thumbnail to the top-start corner of the view
-        if (mThumbnailView.getVisibility() != GONE) {
-            final int width = mThumbnailView.getMeasuredWidth();
-            final int height = mThumbnailView.getMeasuredHeight();
-
-            final int thumbnailGravity = Gravity.TOP | Gravity.START;
-            Gravity.apply(thumbnailGravity, width, height, mTmpFrameRect, mTmpChildRect);
-
-            mThumbnailView.layout(mTmpChildRect.left, mTmpChildRect.top,
-                    mTmpChildRect.right, mTmpChildRect.bottom);
-        }
-
-        // Layout the icon to the bottom-end corner of the view
-        if (mIconView.getVisibility() != GONE) {
-            final int width = mIconView.getMeasuredWidth();
-            final int height = mIconView.getMeasuredHeight();
-
-            int thumbnailGravity = Gravity.BOTTOM | Gravity.END;
-            Gravity.apply(thumbnailGravity, width, height, mTmpFrameRect, mTmpChildRect);
-
-            mIconView.layout(mTmpChildRect.left, mTmpChildRect.top,
-                    mTmpChildRect.right, mTmpChildRect.bottom);
-        }
-    }
-}
diff --git a/go/res/values/override.xml b/go/res/values/override.xml
deleted file mode 100644
index 268cb980c7..0000000000
--- a/go/res/values/override.xml
+++ /dev/null
@@ -1,22 +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>
-    <!-- String representing the intent to delete a package. -->
-    <string name="delete_package_intent" translatable="false">#Intent;action=android.intent.action.DELETE;launchFlags=0x10800000;B.android.intent.extra.RETURN_RESULT=true;end</string>
-</resources>
\ No newline at end of file
diff --git a/go/res/xml/device_profiles.xml b/go/res/xml/device_profiles.xml
deleted file mode 100644
index 0fd0eebfb9..0000000000
--- a/go/res/xml/device_profiles.xml
+++ /dev/null
@@ -1,39 +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.
--->
-
-<profiles xmlns:launcher="http://schemas.android.com/apk/res-auto" >
-
-    <grid-option
-        launcher:name="4_by_4"
-        launcher:numRows="4"
-        launcher:numColumns="4"
-        launcher:numFolderRows="4"
-        launcher:numFolderColumns="4"
-        launcher:numHotseatIcons="4"
-        launcher:defaultLayoutId="@xml/default_workspace_4x4" >
-
-        <display-option
-            launcher:name="Go Device"
-            launcher:minWidthDps="296"
-            launcher:minHeightDps="491.33"
-            launcher:iconImageSize="60"
-            launcher:iconTextSize="14.0"
-            launcher:canBeDefault="true" />
-
-    </grid-option>
-
-</profiles>
\ No newline at end of file
diff --git a/go/src/com/android/launcher3/config/FeatureFlags.java b/go/src/com/android/launcher3/config/FeatureFlags.java
deleted file mode 100644
index a90808c1e3..0000000000
--- a/go/src/com/android/launcher3/config/FeatureFlags.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * 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.
- */
-
-package com.android.launcher3.config;
-
-import android.content.Context;
-
-/**
- * Defines a set of flags used to control various launcher behaviors
- */
-public final class FeatureFlags extends BaseFlags {
-    private FeatureFlags() {
-        // Prevent instantiation
-    }
-
-    // Features to control Launcher3Go behavior
-    public static final boolean GO_DISABLE_WIDGETS = true;
-    public static final boolean LAUNCHER3_SPRING_ICONS = false;
-}
diff --git a/go/src/com/android/launcher3/model/LoaderResults.java b/go/src/com/android/launcher3/model/LoaderResults.java
deleted file mode 100644
index 26c3313185..0000000000
--- a/go/src/com/android/launcher3/model/LoaderResults.java
+++ /dev/null
@@ -1,41 +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.
- */
-
-package com.android.launcher3.model;
-
-import com.android.launcher3.LauncherAppState;
-import com.android.launcher3.model.BgDataModel.Callbacks;
-
-import java.lang.ref.WeakReference;
-
-/**
- * Helper class to handle results of {@link com.android.launcher3.model.LoaderTask}.
- */
-public class LoaderResults extends BaseLoaderResults {
-
-    public LoaderResults(LauncherAppState app, BgDataModel dataModel,
-            AllAppsList allAppsList, int pageToBindFirst, WeakReference<Callbacks> callbacks) {
-        super(app, dataModel, allAppsList, pageToBindFirst, callbacks);
-    }
-
-    @Override
-    public void bindDeepShortcuts() {
-    }
-
-    @Override
-    public void bindWidgets() {
-    }
-}
diff --git a/go/src/com/android/launcher3/model/WidgetsModel.java b/go/src/com/android/launcher3/model/WidgetsModel.java
deleted file mode 100644
index 18f3f9d91c..0000000000
--- a/go/src/com/android/launcher3/model/WidgetsModel.java
+++ /dev/null
@@ -1,67 +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.
- */
-
-package com.android.launcher3.model;
-
-import android.content.Context;
-import android.os.UserHandle;
-
-import com.android.launcher3.icons.ComponentWithLabel;
-import com.android.launcher3.LauncherAppState;
-import com.android.launcher3.util.PackageUserKey;
-import com.android.launcher3.widget.WidgetListRowEntry;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-
-import androidx.annotation.Nullable;
-
-/**
- * Widgets data model that is used by the adapters of the widget views and controllers.
- *
- * <p> The widgets and shortcuts are organized using package name as its index.
- */
-public class WidgetsModel {
-    private static final ArrayList<WidgetListRowEntry> EMPTY_WIDGET_LIST = new ArrayList<>();
-
-    /**
-     * Returns a list of {@link WidgetListRowEntry}. All {@link WidgetItem} in a single row
-     * are sorted (based on label and user), but the overall list of {@link WidgetListRowEntry}s
-     * is not sorted. This list is sorted at the UI when using
-     * {@link com.android.launcher3.widget.WidgetsDiffReporter}
-     *
-     * @see com.android.launcher3.widget.WidgetsListAdapter#setWidgets(ArrayList)
-     */
-    public synchronized ArrayList<WidgetListRowEntry> getWidgetsList(Context context) {
-        return EMPTY_WIDGET_LIST;
-    }
-
-    /**
-     * @param packageUser If null, all widgets and shortcuts are updated and returned, otherwise
-     *                    only widgets and shortcuts associated with the package/user are.
-     */
-    public List<ComponentWithLabel> update(LauncherAppState app,
-            @Nullable PackageUserKey packageUser) {
-        return Collections.emptyList();
-    }
-
-
-    public void onPackageIconsUpdated(Set<String> packageNames, UserHandle user,
-            LauncherAppState app) {
-    }
-}
\ No newline at end of file
diff --git a/go/src/com/android/launcher3/shortcuts/DeepShortcutManager.java b/go/src/com/android/launcher3/shortcuts/DeepShortcutManager.java
deleted file mode 100644
index 42b1194292..0000000000
--- a/go/src/com/android/launcher3/shortcuts/DeepShortcutManager.java
+++ /dev/null
@@ -1,119 +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.
- */
-
-package com.android.launcher3.shortcuts;
-
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.pm.ShortcutInfo;
-import android.graphics.Rect;
-import android.graphics.drawable.Drawable;
-import android.os.Bundle;
-import android.os.UserHandle;
-
-import com.android.launcher3.ItemInfo;
-import com.android.launcher3.notification.NotificationKeyData;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Performs operations related to deep shortcuts, such as querying for them, pinning them, etc.
- */
-public class DeepShortcutManager {
-
-    private static final DeepShortcutManager sInstance = new DeepShortcutManager();
-
-    public static DeepShortcutManager getInstance(Context context) {
-        return sInstance;
-    }
-
-    private final QueryResult mFailure = new QueryResult();
-
-    private DeepShortcutManager() { }
-
-    /**
-     * Queries for the shortcuts with the package name and provided ids.
-     *
-     * This method is intended to get the full details for shortcuts when they are added or updated,
-     * because we only get "key" fields in onShortcutsChanged().
-     */
-    public QueryResult queryForFullDetails(String packageName,
-            List<String> shortcutIds, UserHandle user) {
-        return mFailure;
-    }
-
-    /**
-     * Gets all the manifest and dynamic shortcuts associated with the given package and user,
-     * to be displayed in the shortcuts container on long press.
-     */
-    public QueryResult queryForShortcutsContainer(ComponentName activity,
-            UserHandle user) {
-        return mFailure;
-    }
-
-    /**
-     * Removes the given shortcut from the current list of pinned shortcuts.
-     * (Runs on background thread)
-     */
-    public void unpinShortcut(final ShortcutKey key) {
-    }
-
-    /**
-     * Adds the given shortcut to the current list of pinned shortcuts.
-     * (Runs on background thread)
-     */
-    public void pinShortcut(final ShortcutKey key) {
-    }
-
-    public void startShortcut(String packageName, String id, Rect sourceBounds,
-            Bundle startActivityOptions, UserHandle user) {
-    }
-
-    public Drawable getShortcutIconDrawable(ShortcutInfo shortcutInfo, int density) {
-        return null;
-    }
-
-    /**
-     * Returns the id's of pinned shortcuts associated with the given package and user.
-     *
-     * If packageName is null, returns all pinned shortcuts regardless of package.
-     */
-    public QueryResult queryForPinnedShortcuts(String packageName, UserHandle user) {
-        return mFailure;
-    }
-
-    public QueryResult queryForPinnedShortcuts(String packageName,
-            List<String> shortcutIds, UserHandle user) {
-        return mFailure;
-    }
-
-    public QueryResult queryForAllShortcuts(UserHandle user) {
-        return mFailure;
-    }
-
-    public boolean hasHostPermission() {
-        return false;
-    }
-
-
-    public static class QueryResult extends ArrayList<ShortcutInfo> {
-
-        public boolean wasSuccess() {
-            return true;
-        }
-    }
-}
diff --git a/gradle.properties b/gradle.properties
index 8a078864cc..2f355b6e7d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,14 +1,9 @@
 # Until all the dependencies move to android X
 android.useAndroidX = true
 android.enableJetifier = true
-
-ANDROID_X_VERSION=1.0.0
-
-GRADLE_CLASS_PATH=com.android.tools.build:gradle:4.0.0
-
-KOTLIN_GRADLE_PLUGIN=org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72
-
-PROTOBUF_CLASS_PATH=com.google.protobuf:protobuf-gradle-plugin:0.8.9
-PROTOBUF_DEPENDENCY=com.google.protobuf.nano:protobuf-javanano:3.0.0
-
-BUILD_TOOLS_VERSION=29.0.2
+org.gradle.daemon=true
+org.gradle.configureondemand=true
+org.gradle.caching=true
+org.gradle.parallel=true
+org.gradle.jvmargs=-XX:MaxPermSize=512m
+android.debug.obsoleteApi=true
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000000..f6b961fd5a
Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000000..a0221fbe9d
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,7 @@
+#Mon Sep 28 12:38:01 CST 2020
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+abe\#Fri=Sep 18 18\:12\:26 CST 2020
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip
diff --git a/gradlew b/gradlew
new file mode 100644
index 0000000000..cccdd3d517
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 0000000000..f9553162f1
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,84 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/iconloaderlib/build.gradle b/iconloaderlib/build.gradle
index cf24bf2e2c..bd6a007643 100644
--- a/iconloaderlib/build.gradle
+++ b/iconloaderlib/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion BUILD_TOOLS_VERSION
+    compileSdkVersion 30
+    buildToolsVersion '30.0.1'
     publishNonDefault true
 
     defaultConfig {
         minSdkVersion 25
-        targetSdkVersion 28
+        targetSdkVersion 29
         versionCode 1
         versionName "1.0"
     }
@@ -35,7 +35,7 @@ android {
 }
 
 dependencies {
-    implementation "androidx.core:core:${ANDROID_X_VERSION}"
+    implementation "androidx.core:core:1.3.1"
 }
 repositories {
     google()
diff --git a/iconloaderlib/src/com/android/launcher3/AdaptiveIconCompat.java b/iconloaderlib/src/com/android/launcher3/AdaptiveIconCompat.java
new file mode 100644
index 0000000000..0e1d9f512e
--- /dev/null
+++ b/iconloaderlib/src/com/android/launcher3/AdaptiveIconCompat.java
@@ -0,0 +1,1141 @@
+/*
+ *  Copyright (c) 2020 Omega Launcher
+ *
+ *  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.
+ *
+ */
+
+package com.android.launcher3;
+
+import android.annotation.SuppressLint;
+import android.content.res.ColorStateList;
+import android.content.res.Resources;
+import android.content.res.Resources.Theme;
+import android.content.res.TypedArray;
+import android.graphics.Bitmap;
+import android.graphics.BitmapShader;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.ColorFilter;
+import android.graphics.Matrix;
+import android.graphics.Outline;
+import android.graphics.Paint;
+import android.graphics.Path;
+import android.graphics.PixelFormat;
+import android.graphics.PorterDuff.Mode;
+import android.graphics.Rect;
+import android.graphics.Region;
+import android.graphics.Shader;
+import android.graphics.Shader.TileMode;
+import android.graphics.drawable.AdaptiveIconDrawable;
+import android.graphics.drawable.Drawable;
+import android.os.Build.VERSION;
+import android.os.Build.VERSION_CODES;
+import android.util.AttributeSet;
+import android.util.DisplayMetrics;
+import android.util.Log;
+import android.util.TypedValue;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+/**
+ * <p>This class can also be created via XML inflation using <code>&lt;adaptive-icon></code> tag
+ * in addition to dynamic creation.
+ *
+ * <p>This drawable supports two drawable layers: foreground and background. The layers are clipped
+ * when rendering using the mask defined in the device configuration.
+ *
+ * <ul>
+ * <li>Both foreground and background layers should be sized at 108 x 108 dp.</li>
+ * <li>The inner 72 x 72 dp  of the icon appears within the masked viewport.</li>
+ * <li>The outer 18 dp on each of the 4 sides of the layers is reserved for use by the system UI
+ * surfaces to create interesting visual effects, such as parallax or pulsing.</li>
+ * </ul>
+ *
+ * Such motion effect is achieved by internally setting the bounds of the foreground and
+ * background layer as following:
+ * <pre>
+ * Rect(getBounds().left - getBounds().getWidth() * #getExtraInsetFraction(),
+ *      getBounds().top - getBounds().getHeight() * #getExtraInsetFraction(),
+ *      getBounds().right + getBounds().getWidth() * #getExtraInsetFraction(),
+ *      getBounds().bottom + getBounds().getHeight() * #getExtraInsetFraction())
+ * </pre>
+ */
+@SuppressLint("SoonBlockedPrivateApi")
+public class AdaptiveIconCompat extends Drawable implements Drawable.Callback {
+
+    public static final String TAG = "AdaptiveIconCompat";
+
+    /**
+     * Mask path is defined inside device configuration in following dimension: [100 x 100]
+     */
+    public static final float MASK_SIZE = 100f;
+
+    /**
+     * Launcher icons design guideline
+     */
+    private static final float SAFEZONE_SCALE = 66f / 72f;
+
+    /**
+     * All four sides of the layers are padded with extra inset so as to provide
+     * extra content to reveal within the clip path when performing affine transformations on the
+     * layers.
+     *
+     * Each layers will reserve 25% of it's width and height.
+     *
+     * As a result, the view port of the layers is smaller than their intrinsic width and height.
+     */
+    private static final float EXTRA_INSET_PERCENTAGE = 1 / 4f;
+    private static final float DEFAULT_VIEW_PORT_SCALE = 1f / (1 + 2 * EXTRA_INSET_PERCENTAGE);
+
+    /**
+     * Clip path defined in R.string.config_icon_mask.
+     */
+    private static Path sMask;
+
+    /**
+     * Scaled mask based on the view bounds.
+     */
+    private final Path mMask;
+    private final Matrix mMaskMatrix;
+    private final Region mTransparentRegion;
+    private final int mMaskId;
+    private static final int BACKGROUND_ID = 0;
+    private static final int FOREGROUND_ID = 1;
+    private static Method methodGetAdaptiveIconMaskPath;
+
+    /**
+     * State variable that maintains the {@link ChildDrawable} array.
+     */
+    LayerState mLayerState;
+
+    private Shader mLayersShader;
+    private Bitmap mLayersBitmap;
+    private static Method methodExtractThemeAttrs;
+    private Rect mHotspotBounds;
+    private boolean mMutated;
+
+    private boolean mSuspendChildInvalidation;
+    private boolean mChildRequestedInvalidation;
+    private static Method methodCreateFromXmlInnerForDensity;
+    private Paint mPaint = new Paint(Paint.ANTI_ALIAS_FLAG | Paint.DITHER_FLAG |
+            Paint.FILTER_BITMAP_FLAG);
+
+    static {
+        try {
+            Class classIconShapeManager = Class.forName("com.saggitt.omega.adaptive.IconShapeManager");
+            methodGetAdaptiveIconMaskPath = classIconShapeManager.getMethod("getAdaptiveIconMaskPath");
+            methodExtractThemeAttrs = TypedArray.class.getDeclaredMethod("extractThemeAttrs");
+            methodCreateFromXmlInnerForDensity = Drawable.class.getDeclaredMethod(
+                    "createFromXmlInnerForDensity", Resources.class,
+                    XmlPullParser.class, AttributeSet.class, int.class, Theme.class);
+            methodCreateFromXmlInnerForDensity.setAccessible(true);
+        } catch (NoSuchMethodException | ClassNotFoundException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private final Rect mTmpOutRect = new Rect();
+    private final Canvas mCanvas;
+    private Bitmap mMaskBitmap;
+
+    /**
+     * Constructor used for xml inflation.
+     */
+    @RequiresApi(api = VERSION_CODES.O)
+    public AdaptiveIconCompat() throws Exception {
+        this((LayerState) null, null);
+    }
+
+    /**
+     * The one constructor to rule them all. This is called by all public
+     * constructors to set the state and initialize local properties.
+     */
+    @RequiresApi(api = VERSION_CODES.O)
+    @SuppressLint("RestrictedApi")
+    AdaptiveIconCompat(@Nullable LayerState state, @Nullable Resources res) {
+        mLayerState = createConstantState(state, res);
+
+        if (sMask == null) {
+            sMask = createMaskPath();
+        }
+        mMask = createMaskPath();
+        mMaskMatrix = new Matrix();
+        mCanvas = new Canvas();
+        mTransparentRegion = new Region();
+        mMaskId = sMask.hashCode();
+    }
+
+    private int getInt(Field field, Object obj) {
+        try {
+            return field.getInt(obj);
+        } catch (IllegalAccessException e) {
+            return 0;
+        }
+    }
+
+    private <T> T invoke(Method method, Object obj, Object... params) {
+        try {
+            return (T) method.invoke(obj, params);
+        } catch (IllegalAccessException | InvocationTargetException e) {
+            return null;
+        }
+    }
+
+    /**
+     * Constructor used to dynamically create this drawable.
+     *
+     * @param backgroundDrawable drawable that should be rendered in the background
+     * @param foregroundDrawable drawable that should be rendered in the foreground
+     */
+    @RequiresApi(api = VERSION_CODES.O)
+    public AdaptiveIconCompat(Drawable backgroundDrawable,
+                              Drawable foregroundDrawable) {
+        this((LayerState) null, null);
+        if (backgroundDrawable != null) {
+            addLayer(BACKGROUND_ID, createChildDrawable(backgroundDrawable));
+        }
+        if (foregroundDrawable != null) {
+            addLayer(FOREGROUND_ID, createChildDrawable(foregroundDrawable));
+        }
+    }
+
+    private ChildDrawable createChildDrawable(Drawable drawable) {
+        final ChildDrawable layer = new ChildDrawable(mLayerState.mDensity);
+        layer.mDrawable = drawable;
+        layer.mDrawable.setCallback(this);
+        mLayerState.mChildrenChangingConfigurations |=
+                layer.mDrawable.getChangingConfigurations();
+        return layer;
+    }
+
+    LayerState createConstantState(@Nullable LayerState state, @Nullable Resources res) {
+        return new LayerState(state, this, res);
+    }
+
+    static int resolveDensity(@Nullable Resources r, int parentDensity) {
+        final int densityDpi = r == null ? parentDensity : r.getDisplayMetrics().densityDpi;
+        return densityDpi == 0 ? DisplayMetrics.DENSITY_DEFAULT : densityDpi;
+    }
+
+    /**
+     * Sets the layer to the {@param index} and invalidates cache.
+     *
+     * @param index The index of the layer.
+     * @param layer The layer to add.
+     */
+    private void addLayer(int index, @NonNull ChildDrawable layer) {
+        mLayerState.mChildren[index] = layer;
+        mLayerState.invalidateCache();
+    }
+
+    @Override
+    public void inflate(@NonNull Resources r, @NonNull XmlPullParser parser,
+                        @NonNull AttributeSet attrs, @Nullable Theme theme)
+            throws XmlPullParserException, IOException {
+        super.inflate(r, parser, attrs, theme);
+
+        final LayerState state = mLayerState;
+        if (state == null) {
+            return;
+        }
+
+        // The density may have changed since the last update. This will
+        // apply scaling to any existing constant state properties.
+        final int deviceDensity = resolveDensity(r, 0);
+        state.setDensity(deviceDensity);
+
+        final ChildDrawable[] array = state.mChildren;
+        for (int i = 0; i < state.mChildren.length; i++) {
+            final ChildDrawable layer = array[i];
+            layer.setDensity(deviceDensity);
+        }
+
+        inflateLayers(r, parser, attrs, theme);
+    }
+
+    /**
+     * All four sides of the layers are padded with extra inset so as to provide
+     * extra content to reveal within the clip path when performing affine transformations on the
+     * layers.
+     *
+     * @see #getForeground() and #getBackground() for more info on how this value is used
+     */
+    public static float getExtraInsetFraction() {
+        return EXTRA_INSET_PERCENTAGE;
+    }
+
+    /**
+     * @hide
+     */
+    public static float getExtraInsetPercentage() {
+        return EXTRA_INSET_PERCENTAGE;
+    }
+
+    private static Drawable createFromXmlInnerForDensity(@NonNull Resources r,
+                                                         @NonNull XmlPullParser parser, @NonNull AttributeSet attrs, int density,
+                                                         @Nullable Theme theme) {
+        try {
+            return (Drawable) methodCreateFromXmlInnerForDensity.invoke(null,
+                    r, parser, attrs, density, theme);
+        } catch (IllegalAccessException | InvocationTargetException e) {
+            throw new RuntimeException("Error while creating adaptive icon", e);
+        }
+    }
+
+    /**
+     * When called before the bound is set, the returned path is identical to
+     * R.string.config_icon_mask. After the bound is set, the
+     * returned path's computed bound is same as the #getBounds().
+     *
+     * @return the mask path object used to clip the drawable
+     */
+    public Path getIconMask() {
+        return mMask;
+    }
+
+    /**
+     * Returns the foreground drawable managed by this class. The bound of this drawable is
+     * extended by {@link #getExtraInsetFraction()} * getBounds().width on left/right sides and by
+     * {@link #getExtraInsetFraction()} * getBounds().height on top/bottom sides.
+     *
+     * @return the foreground drawable managed by this drawable
+     */
+    public Drawable getForeground() {
+        return mLayerState.mChildren[FOREGROUND_ID].mDrawable;
+    }
+
+    /**
+     * Returns the foreground drawable managed by this class. The bound of this drawable is
+     * extended by {@link #getExtraInsetFraction()} * getBounds().width on left/right sides and by
+     * {@link #getExtraInsetFraction()} * getBounds().height on top/bottom sides.
+     *
+     * @return the background drawable managed by this drawable
+     */
+    public Drawable getBackground() {
+        return mLayerState.mChildren[BACKGROUND_ID].mDrawable;
+    }
+
+    @Override
+    protected void onBoundsChange(Rect bounds) {
+        if (bounds.isEmpty()) {
+            return;
+        }
+        updateLayerBounds(bounds);
+    }
+
+    private void updateLayerBounds(Rect bounds) {
+        try {
+            suspendChildInvalidation();
+            updateLayerBoundsInternal(bounds);
+            updateMaskBoundsInternal(bounds);
+        } finally {
+            resumeChildInvalidation();
+        }
+    }
+
+    /**
+     * Set the child layer bounds bigger than the view port size by {@link #DEFAULT_VIEW_PORT_SCALE}
+     */
+    private void updateLayerBoundsInternal(Rect bounds) {
+        int cX = bounds.width() / 2;
+        int cY = bounds.height() / 2;
+
+        for (int i = 0, count = mLayerState.N_CHILDREN; i < count; i++) {
+            final ChildDrawable r = mLayerState.mChildren[i];
+            if (r == null) {
+                continue;
+            }
+            final Drawable d = r.mDrawable;
+            if (d == null) {
+                continue;
+            }
+
+            int insetWidth = (int) (bounds.width() / (DEFAULT_VIEW_PORT_SCALE * 2));
+            int insetHeight = (int) (bounds.height() / (DEFAULT_VIEW_PORT_SCALE * 2));
+            final Rect outRect = mTmpOutRect;
+            outRect.set(cX - insetWidth, cY - insetHeight, cX + insetWidth, cY + insetHeight);
+
+            d.setBounds(outRect);
+        }
+    }
+
+    private void updateMaskBoundsInternal(Rect b) {
+        mMaskMatrix.setScale(b.width() / MASK_SIZE, b.height() / MASK_SIZE);
+        sMask.transform(mMaskMatrix, mMask);
+
+        if (mMaskBitmap == null || mMaskBitmap.getWidth() != b.width() ||
+                mMaskBitmap.getHeight() != b.height()) {
+            mMaskBitmap = Bitmap.createBitmap(b.width(), b.height(), Bitmap.Config.ALPHA_8);
+            mLayersBitmap = Bitmap.createBitmap(b.width(), b.height(), Bitmap.Config.ARGB_8888);
+        }
+        // mMaskBitmap bound [0, w] x [0, h]
+        mCanvas.setBitmap(mMaskBitmap);
+        mPaint.setShader(null);
+        mPaint.setColor(0xFFFFFFFF);
+        mCanvas.drawPath(mMask, mPaint);
+
+        // mMask bound [left, top, right, bottom]
+        mMaskMatrix.postTranslate(b.left, b.top);
+        mMask.reset();
+        sMask.transform(mMaskMatrix, mMask);
+        // reset everything that depends on the view bounds
+        mTransparentRegion.setEmpty();
+        mLayersShader = null;
+    }
+
+    @Override
+    public void draw(Canvas canvas) {
+        if (mLayersBitmap == null) {
+            return;
+        }
+        if (mLayersShader == null) {
+            mCanvas.setBitmap(mLayersBitmap);
+            mCanvas.drawColor(Color.BLACK);
+            for (int i = 0; i < mLayerState.N_CHILDREN; i++) {
+                if (mLayerState.mChildren[i] == null) {
+                    continue;
+                }
+                final Drawable dr = mLayerState.mChildren[i].mDrawable;
+                if (dr != null) {
+                    dr.draw(mCanvas);
+                }
+            }
+            mLayersShader = new BitmapShader(mLayersBitmap, TileMode.CLAMP, TileMode.CLAMP);
+            mPaint.setShader(mLayersShader);
+        }
+        if (mMaskBitmap != null) {
+            Rect bounds = getBounds();
+            canvas.drawBitmap(mMaskBitmap, bounds.left, bounds.top, mPaint);
+        }
+    }
+
+    @Override
+    public void invalidateSelf() {
+        mLayersShader = null;
+        super.invalidateSelf();
+    }
+
+    @Override
+    public void getOutline(@NonNull Outline outline) {
+        outline.setConvexPath(mMask);
+    }
+
+    public Region getSafeZone() {
+        mMaskMatrix.reset();
+        mMaskMatrix.setScale(SAFEZONE_SCALE, SAFEZONE_SCALE, getBounds().centerX(), getBounds().centerY());
+        Path p = new Path();
+        mMask.transform(mMaskMatrix, p);
+        Region safezoneRegion = new Region(getBounds());
+        safezoneRegion.setPath(p, safezoneRegion);
+        return safezoneRegion;
+    }
+
+    protected static @NonNull
+    TypedArray obtainAttributes(@NonNull Resources res,
+                                @Nullable Theme theme, @NonNull AttributeSet set, @NonNull int[] attrs) {
+        if (theme == null) {
+            return res.obtainAttributes(set, attrs);
+        }
+        return theme.obtainStyledAttributes(set, attrs, 0, 0);
+    }
+
+    @NonNull
+    public static Drawable wrap(@NonNull Drawable icon) {
+        if (VERSION.SDK_INT >= VERSION_CODES.O && icon instanceof AdaptiveIconDrawable) {
+            AdaptiveIconDrawable adaptive = (AdaptiveIconDrawable) icon;
+            return new AdaptiveIconCompat(adaptive.getBackground(), adaptive.getForeground());
+        } else {
+            return icon;
+        }
+    }
+
+    @Nullable
+    public static Drawable wrapNullable(@Nullable Drawable icon) {
+        if (VERSION.SDK_INT >= VERSION_CODES.O && icon instanceof AdaptiveIconDrawable) {
+            AdaptiveIconDrawable adaptive = (AdaptiveIconDrawable) icon;
+            return new AdaptiveIconCompat(adaptive.getBackground(), adaptive.getForeground());
+        } else {
+            return icon;
+        }
+    }
+
+    private void dumpAttrs(AttributeSet attrs) {
+        final int N = attrs.getAttributeCount();
+        for (int i = 0; i < N; i++) {
+            Log.d(TAG, "name: " + attrs.getAttributeName(i));
+            Log.d(TAG, "id: " + attrs.getAttributeNameResource(i));
+        }
+    }
+
+    private void updateLayerFromTypedArray(@NonNull ChildDrawable layer, @NonNull TypedArray a) {
+        final LayerState state = mLayerState;
+
+        // Account for any configuration changes.
+        state.mChildrenChangingConfigurations |= a.getChangingConfigurations();
+
+        // Extract the theme attributes, if any.
+        layer.mThemeAttrs = invoke(methodExtractThemeAttrs, a);
+
+        @SuppressLint("ResourceType") Drawable dr = getDrawable(a, 0);
+        if (dr != null) {
+            if (layer.mDrawable != null) {
+                // It's possible that a drawable was already set, in which case
+                // we should clear the callback. We may have also integrated the
+                // drawable's changing configurations, but we don't have enough
+                // information to revert that change.
+                layer.mDrawable.setCallback(null);
+            }
+
+            // Take ownership of the new drawable.
+            layer.mDrawable = dr;
+            layer.mDrawable.setCallback(this);
+            state.mChildrenChangingConfigurations |=
+                    layer.mDrawable.getChangingConfigurations();
+        }
+    }
+
+    private Drawable getDrawable(TypedArray a, int index) {
+        final TypedValue value = new TypedValue();
+        a.getValue(index, value);
+        if (value.resourceId != 0)
+            return a.getResources().getDrawableForDensity(value.resourceId, 480, null);
+        return null;
+    }
+
+    @Override
+    public boolean canApplyTheme() {
+        return (mLayerState != null && mLayerState.canApplyTheme()) || super.canApplyTheme();
+    }
+
+    /**
+     * Temporarily suspends child invalidation.
+     *
+     * @see #resumeChildInvalidation()
+     */
+    private void suspendChildInvalidation() {
+        mSuspendChildInvalidation = true;
+    }
+
+    /**
+     * Resumes child invalidation after suspension, immediately performing an
+     * invalidation if one was requested by a child during suspension.
+     *
+     * @see #suspendChildInvalidation()
+     */
+    private void resumeChildInvalidation() {
+        mSuspendChildInvalidation = false;
+
+        if (mChildRequestedInvalidation) {
+            mChildRequestedInvalidation = false;
+            invalidateSelf();
+        }
+    }
+
+    @Override
+    public void invalidateDrawable(@NonNull Drawable who) {
+        if (mSuspendChildInvalidation) {
+            mChildRequestedInvalidation = true;
+        } else {
+            invalidateSelf();
+        }
+    }
+
+    @Override
+    public void scheduleDrawable(@NonNull Drawable who, @NonNull Runnable what, long when) {
+        scheduleSelf(what, when);
+    }
+
+    @Override
+    public void unscheduleDrawable(@NonNull Drawable who, @NonNull Runnable what) {
+        unscheduleSelf(what);
+    }
+
+    @Override
+    public int getChangingConfigurations() {
+        return super.getChangingConfigurations() | mLayerState.getChangingConfigurations();
+    }
+
+    @Override
+    public void setHotspot(float x, float y) {
+        final ChildDrawable[] array = mLayerState.mChildren;
+        for (int i = 0; i < mLayerState.N_CHILDREN; i++) {
+            final Drawable dr = array[i].mDrawable;
+            if (dr != null) {
+                dr.setHotspot(x, y);
+            }
+        }
+    }
+
+    @Override
+    public void setHotspotBounds(int left, int top, int right, int bottom) {
+        final ChildDrawable[] array = mLayerState.mChildren;
+        for (int i = 0; i < mLayerState.N_CHILDREN; i++) {
+            final Drawable dr = array[i].mDrawable;
+            if (dr != null) {
+                dr.setHotspotBounds(left, top, right, bottom);
+            }
+        }
+
+        if (mHotspotBounds == null) {
+            mHotspotBounds = new Rect(left, top, right, bottom);
+        } else {
+            mHotspotBounds.set(left, top, right, bottom);
+        }
+    }
+
+    @Override
+    public void getHotspotBounds(Rect outRect) {
+        if (mHotspotBounds != null) {
+            outRect.set(mHotspotBounds);
+        } else {
+            super.getHotspotBounds(outRect);
+        }
+    }
+
+    @Override
+    public boolean setVisible(boolean visible, boolean restart) {
+        final boolean changed = super.setVisible(visible, restart);
+        final ChildDrawable[] array = mLayerState.mChildren;
+
+        for (int i = 0; i < mLayerState.N_CHILDREN; i++) {
+            final Drawable dr = array[i].mDrawable;
+            if (dr != null) {
+                dr.setVisible(visible, restart);
+            }
+        }
+
+        return changed;
+    }
+
+    @Override
+    public void setDither(boolean dither) {
+        final ChildDrawable[] array = mLayerState.mChildren;
+        for (int i = 0; i < mLayerState.N_CHILDREN; i++) {
+            final Drawable dr = array[i].mDrawable;
+            if (dr != null) {
+                dr.setDither(dither);
+            }
+        }
+    }
+
+    @Override
+    public void setAlpha(int alpha) {
+        mPaint.setAlpha(alpha);
+    }
+
+    @Override
+    public void setColorFilter(ColorFilter colorFilter) {
+        final ChildDrawable[] array = mLayerState.mChildren;
+        for (int i = 0; i < mLayerState.N_CHILDREN; i++) {
+            final Drawable dr = array[i].mDrawable;
+            if (dr != null) {
+                dr.setColorFilter(colorFilter);
+            }
+        }
+    }
+
+    @Override
+    public void setTintList(ColorStateList tint) {
+        final ChildDrawable[] array = mLayerState.mChildren;
+        final int N = mLayerState.N_CHILDREN;
+        for (int i = 0; i < N; i++) {
+            final Drawable dr = array[i].mDrawable;
+            if (dr != null) {
+                dr.setTintList(tint);
+            }
+        }
+    }
+
+    @Override
+    public void setTintMode(Mode tintMode) {
+        final ChildDrawable[] array = mLayerState.mChildren;
+        final int N = mLayerState.N_CHILDREN;
+        for (int i = 0; i < N; i++) {
+            final Drawable dr = array[i].mDrawable;
+            if (dr != null) {
+                dr.setTintMode(tintMode);
+            }
+        }
+    }
+
+    public static void onShapeChanged() {
+        sMask = null;
+    }
+
+    @Override
+    public int getOpacity() {
+        if (mLayerState.mOpacityOverride != PixelFormat.UNKNOWN) {
+            return mLayerState.mOpacityOverride;
+        }
+        return mLayerState.getOpacity();
+    }
+
+    @Override
+    public void setAutoMirrored(boolean mirrored) {
+        mLayerState.mAutoMirrored = mirrored;
+
+        final ChildDrawable[] array = mLayerState.mChildren;
+        for (int i = 0; i < mLayerState.N_CHILDREN; i++) {
+            final Drawable dr = array[i].mDrawable;
+            if (dr != null) {
+                dr.setAutoMirrored(mirrored);
+            }
+        }
+    }
+
+    @RequiresApi(api = VERSION_CODES.O)
+    @SuppressLint("RestrictedApi")
+    private Path createMaskPath() {
+        try {
+            return (Path) methodGetAdaptiveIconMaskPath.invoke(null);
+        } catch (Exception e) {
+            Log.d(TAG, "Can't load icon mask", e);
+        }
+        return new AdaptiveIconDrawable(null, null).getIconMask();
+    }
+
+    @Override
+    public void jumpToCurrentState() {
+        final ChildDrawable[] array = mLayerState.mChildren;
+        for (int i = 0; i < mLayerState.N_CHILDREN; i++) {
+            final Drawable dr = array[i].mDrawable;
+            if (dr != null) {
+                dr.jumpToCurrentState();
+            }
+        }
+    }
+
+    @Override
+    public boolean isStateful() {
+        return mLayerState.isStateful();
+    }
+
+    @Override
+    protected boolean onStateChange(int[] state) {
+        boolean changed = false;
+
+        final ChildDrawable[] array = mLayerState.mChildren;
+        for (int i = 0; i < mLayerState.N_CHILDREN; i++) {
+            final Drawable dr = array[i].mDrawable;
+            if (dr != null && dr.isStateful() && dr.setState(state)) {
+                changed = true;
+            }
+        }
+
+        if (changed) {
+            updateLayerBounds(getBounds());
+        }
+
+        return changed;
+    }
+
+    @Override
+    protected boolean onLevelChange(int level) {
+        boolean changed = false;
+
+        final ChildDrawable[] array = mLayerState.mChildren;
+        for (int i = 0; i < mLayerState.N_CHILDREN; i++) {
+            final Drawable dr = array[i].mDrawable;
+            if (dr != null && dr.setLevel(level)) {
+                changed = true;
+            }
+        }
+
+        if (changed) {
+            updateLayerBounds(getBounds());
+        }
+
+        return changed;
+    }
+
+    @Override
+    public @Nullable
+    Region getTransparentRegion() {
+        if (mTransparentRegion.isEmpty()) {
+            mMask.toggleInverseFillType();
+            mTransparentRegion.set(getBounds());
+            mTransparentRegion.setPath(mMask, mTransparentRegion);
+            mMask.toggleInverseFillType();
+        }
+        return mTransparentRegion;
+    }
+
+    private int getMaxIntrinsicWidth() {
+        int width = -1;
+        for (int i = 0; i < mLayerState.N_CHILDREN; i++) {
+            final ChildDrawable r = mLayerState.mChildren[i];
+            if (r.mDrawable == null) {
+                continue;
+            }
+            final int w = r.mDrawable.getIntrinsicWidth();
+            if (w > width) {
+                width = w;
+            }
+        }
+        return width;
+    }
+
+    /**
+     * Inflates child layers using the specified parser.
+     */
+    private void inflateLayers(@NonNull Resources r, @NonNull XmlPullParser parser,
+                               @NonNull AttributeSet attrs, @Nullable Theme theme)
+            throws XmlPullParserException, IOException {
+        final LayerState state = mLayerState;
+
+        final int innerDepth = parser.getDepth() + 1;
+        int type;
+        int depth;
+        int childIndex = 0;
+        while ((type = parser.next()) != XmlPullParser.END_DOCUMENT
+                && ((depth = parser.getDepth()) >= innerDepth || type != XmlPullParser.END_TAG)) {
+            if (type != XmlPullParser.START_TAG) {
+                continue;
+            }
+
+            if (depth > innerDepth) {
+                continue;
+            }
+            String tagName = parser.getName();
+            switch (tagName) {
+                case "background":
+                    childIndex = BACKGROUND_ID;
+                    break;
+                case "foreground":
+                    childIndex = FOREGROUND_ID;
+                    break;
+                default:
+                    continue;
+            }
+
+            final ChildDrawable layer = new ChildDrawable(state.mDensity);
+            final TypedArray a = obtainAttributes(r, theme, attrs, new int[]{android.R.attr.drawable});
+            updateLayerFromTypedArray(layer, a);
+            a.recycle();
+
+            // If the layer doesn't have a drawable or unresolved theme
+            // attribute for a drawable, attempt to parse one from the child
+            // element. If multiple child elements exist, we'll only use the
+            // first one.
+            if (layer.mDrawable == null && (layer.mThemeAttrs == null)) {
+                while ((type = parser.next()) == XmlPullParser.TEXT) {
+                }
+                if (type != XmlPullParser.START_TAG) {
+                    throw new XmlPullParserException(parser.getPositionDescription()
+                            + ": <foreground> or <background> tag requires a 'drawable'"
+                            + "attribute or child tag defining a drawable");
+                }
+
+                // We found a child drawable. Take ownership.
+                layer.mDrawable = createFromXmlInnerForDensity(r, parser, attrs,
+                        mLayerState.mSrcDensityOverride, theme);
+                layer.mDrawable.setCallback(this);
+                state.mChildrenChangingConfigurations |=
+                        layer.mDrawable.getChangingConfigurations();
+            }
+            addLayer(childIndex, layer);
+        }
+    }
+
+    private int getMaxIntrinsicHeight() {
+        int height = -1;
+        for (int i = 0; i < mLayerState.N_CHILDREN; i++) {
+            final ChildDrawable r = mLayerState.mChildren[i];
+            if (r.mDrawable == null) {
+                continue;
+            }
+            final int h = r.mDrawable.getIntrinsicHeight();
+            if (h > height) {
+                height = h;
+            }
+        }
+        return height;
+    }
+
+    @Override
+    public ConstantState getConstantState() {
+        if (mLayerState.canConstantState()) {
+            mLayerState.mChangingConfigurations = getChangingConfigurations();
+            return mLayerState;
+        }
+        return null;
+    }
+
+    @Override
+    public Drawable mutate() {
+        if (!mMutated && super.mutate() == this) {
+            mLayerState = createConstantState(mLayerState, null);
+            for (int i = 0; i < mLayerState.N_CHILDREN; i++) {
+                final Drawable dr = mLayerState.mChildren[i].mDrawable;
+                if (dr != null) {
+                    dr.mutate();
+                }
+            }
+            mMutated = true;
+        }
+        return this;
+    }
+
+    public void setOpacity(int opacity) {
+        mLayerState.mOpacityOverride = opacity;
+    }
+
+    @Override
+    public boolean isAutoMirrored() {
+        return mLayerState.mAutoMirrored;
+    }
+
+    @Override
+    public int getIntrinsicWidth() {
+        return (int) (getMaxIntrinsicWidth() * DEFAULT_VIEW_PORT_SCALE);
+    }
+
+    @Override
+    public int getIntrinsicHeight() {
+        return (int) (getMaxIntrinsicHeight() * DEFAULT_VIEW_PORT_SCALE);
+    }
+
+    public boolean isMaskValid() {
+        return sMask != null && mMaskId == sMask.hashCode();
+    }
+
+    static class ChildDrawable {
+        public Drawable mDrawable;
+        public int[] mThemeAttrs;
+        public int mDensity = DisplayMetrics.DENSITY_DEFAULT;
+
+        ChildDrawable(int density) {
+            mDensity = density;
+        }
+
+        ChildDrawable(@NonNull ChildDrawable orig, @NonNull AdaptiveIconCompat owner,
+                      @Nullable Resources res) {
+
+            final Drawable dr = orig.mDrawable;
+            final Drawable clone;
+            if (dr != null) {
+                final ConstantState cs = dr.getConstantState();
+                if (cs == null) {
+                    clone = dr;
+                } else if (res != null) {
+                    clone = cs.newDrawable(res);
+                } else {
+                    clone = cs.newDrawable();
+                }
+                clone.setCallback(owner);
+                clone.setBounds(dr.getBounds());
+                clone.setLevel(dr.getLevel());
+            } else {
+                clone = null;
+            }
+
+            mDrawable = clone;
+            mThemeAttrs = orig.mThemeAttrs;
+
+            mDensity = resolveDensity(res, orig.mDensity);
+        }
+
+        public boolean canApplyTheme() {
+            return mThemeAttrs != null
+                    || (mDrawable != null && mDrawable.canApplyTheme());
+        }
+
+        public final void setDensity(int targetDensity) {
+            if (mDensity != targetDensity) {
+                mDensity = targetDensity;
+            }
+        }
+    }
+
+    static class LayerState extends ConstantState {
+        private int[] mThemeAttrs;
+
+        final static int N_CHILDREN = 2;
+        ChildDrawable[] mChildren;
+
+        // The density at which to render the drawable and its children.
+        int mDensity;
+
+        // The density to use when inflating/looking up the children drawables. A value of 0 means
+        // use the system's density.
+        int mSrcDensityOverride = 0;
+
+        int mOpacityOverride = PixelFormat.UNKNOWN;
+
+        int mChangingConfigurations;
+        int mChildrenChangingConfigurations;
+
+        private boolean mCheckedOpacity;
+        private int mOpacity;
+
+        private boolean mCheckedStateful;
+        private boolean mIsStateful;
+        private boolean mAutoMirrored = false;
+
+        LayerState(@Nullable LayerState orig, @NonNull AdaptiveIconCompat owner,
+                   @Nullable Resources res) {
+            mDensity = resolveDensity(res, orig != null ? orig.mDensity : 0);
+            mChildren = new ChildDrawable[N_CHILDREN];
+            if (orig != null) {
+                final ChildDrawable[] origChildDrawable = orig.mChildren;
+
+                mChangingConfigurations = orig.mChangingConfigurations;
+                mChildrenChangingConfigurations = orig.mChildrenChangingConfigurations;
+
+                for (int i = 0; i < N_CHILDREN; i++) {
+                    final ChildDrawable or = origChildDrawable[i];
+                    mChildren[i] = new ChildDrawable(or, owner, res);
+                }
+
+                mCheckedOpacity = orig.mCheckedOpacity;
+                mOpacity = orig.mOpacity;
+                mCheckedStateful = orig.mCheckedStateful;
+                mIsStateful = orig.mIsStateful;
+                mAutoMirrored = orig.mAutoMirrored;
+                mThemeAttrs = orig.mThemeAttrs;
+                mOpacityOverride = orig.mOpacityOverride;
+                mSrcDensityOverride = orig.mSrcDensityOverride;
+            } else {
+                for (int i = 0; i < N_CHILDREN; i++) {
+                    mChildren[i] = new ChildDrawable(mDensity);
+                }
+            }
+        }
+
+        public final void setDensity(int targetDensity) {
+            if (mDensity != targetDensity) {
+                mDensity = targetDensity;
+            }
+        }
+
+        @Override
+        public boolean canApplyTheme() {
+            if (mThemeAttrs != null || super.canApplyTheme()) {
+                return true;
+            }
+
+            final ChildDrawable[] array = mChildren;
+            for (int i = 0; i < N_CHILDREN; i++) {
+                final ChildDrawable layer = array[i];
+                if (layer.canApplyTheme()) {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        @RequiresApi(api = VERSION_CODES.O)
+        @Override
+        public Drawable newDrawable() {
+            return new AdaptiveIconCompat(this, null);
+        }
+
+        @RequiresApi(api = VERSION_CODES.O)
+        @Override
+        public Drawable newDrawable(@Nullable Resources res) {
+            return new AdaptiveIconCompat(this, res);
+        }
+
+        @Override
+        public int getChangingConfigurations() {
+            return mChangingConfigurations
+                    | mChildrenChangingConfigurations;
+        }
+
+        public final int getOpacity() {
+            if (mCheckedOpacity) {
+                return mOpacity;
+            }
+
+            final ChildDrawable[] array = mChildren;
+
+            // Seek to the first non-null drawable.
+            int firstIndex = -1;
+            for (int i = 0; i < N_CHILDREN; i++) {
+                if (array[i].mDrawable != null) {
+                    firstIndex = i;
+                    break;
+                }
+            }
+
+            int op;
+            if (firstIndex >= 0) {
+                op = array[firstIndex].mDrawable.getOpacity();
+            } else {
+                op = PixelFormat.TRANSPARENT;
+            }
+
+            // Merge all remaining non-null drawables.
+            for (int i = firstIndex + 1; i < N_CHILDREN; i++) {
+                final Drawable dr = array[i].mDrawable;
+                if (dr != null) {
+                    op = Drawable.resolveOpacity(op, dr.getOpacity());
+                }
+            }
+
+            mOpacity = op;
+            mCheckedOpacity = true;
+            return op;
+        }
+
+        public final boolean isStateful() {
+            if (mCheckedStateful) {
+                return mIsStateful;
+            }
+
+            final ChildDrawable[] array = mChildren;
+            boolean isStateful = false;
+            for (int i = 0; i < N_CHILDREN; i++) {
+                final Drawable dr = array[i].mDrawable;
+                if (dr != null && dr.isStateful()) {
+                    isStateful = true;
+                    break;
+                }
+            }
+
+            mIsStateful = isStateful;
+            mCheckedStateful = true;
+            return isStateful;
+        }
+
+        public final boolean canConstantState() {
+            final ChildDrawable[] array = mChildren;
+            for (int i = 0; i < N_CHILDREN; i++) {
+                final Drawable dr = array[i].mDrawable;
+                if (dr != null && dr.getConstantState() == null) {
+                    return false;
+                }
+            }
+
+            // Don't cache the result, this method is not called very often.
+            return true;
+        }
+
+        public void invalidateCache() {
+            mCheckedOpacity = false;
+            mCheckedStateful = false;
+        }
+    }
+}
+
diff --git a/iconloaderlib/src/com/android/launcher3/icons/BaseIconFactory.java b/iconloaderlib/src/com/android/launcher3/icons/BaseIconFactory.java
index 7a9a522c7a..519b4412b5 100644
--- a/iconloaderlib/src/com/android/launcher3/icons/BaseIconFactory.java
+++ b/iconloaderlib/src/com/android/launcher3/icons/BaseIconFactory.java
@@ -1,10 +1,5 @@
 package com.android.launcher3.icons;
 
-import static android.graphics.Paint.DITHER_FLAG;
-import static android.graphics.Paint.FILTER_BITMAP_FLAG;
-
-import static com.android.launcher3.icons.ShadowGenerator.BLUR_FACTOR;
-
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
@@ -19,11 +14,19 @@
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
+import android.graphics.drawable.DrawableWrapper;
 import android.os.Build;
 import android.os.Process;
 import android.os.UserHandle;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.android.launcher3.AdaptiveIconCompat;
+
+import static android.graphics.Paint.DITHER_FLAG;
+import static android.graphics.Paint.FILTER_BITMAP_FLAG;
+import static com.android.launcher3.icons.ShadowGenerator.BLUR_FACTOR;
 
 /**
  * This class will be moved to androidx library. There shouldn't be any dependency outside
@@ -32,6 +35,7 @@
 public class BaseIconFactory implements AutoCloseable {
 
     private static final String TAG = "BaseIconFactory";
+
     private static final int DEFAULT_WRAPPER_BACKGROUND = Color.WHITE;
     static final boolean ATLEAST_OREO = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O;
     static final boolean ATLEAST_P = Build.VERSION.SDK_INT >= Build.VERSION_CODES.P;
@@ -56,7 +60,7 @@ public class BaseIconFactory implements AutoCloseable {
     private int mWrapperBackgroundColor = DEFAULT_WRAPPER_BACKGROUND;
 
     protected BaseIconFactory(Context context, int fillResIconDpi, int iconBitmapSize,
-            boolean shapeDetection) {
+                              boolean shapeDetection) {
         mContext = context.getApplicationContext();
         mShapeDetection = shapeDetection;
         mFillResIconDpi = fillResIconDpi;
@@ -70,7 +74,7 @@ protected BaseIconFactory(Context context, int fillResIconDpi, int iconBitmapSiz
         clear();
     }
 
-    protected BaseIconFactory(Context context, int fillResIconDpi, int iconBitmapSize) {
+    public BaseIconFactory(Context context, int fillResIconDpi, int iconBitmapSize) {
         this(context, fillResIconDpi, iconBitmapSize, false);
     }
 
@@ -120,22 +124,22 @@ public BitmapInfo createIconBitmap(Bitmap icon) {
     }
 
     public BitmapInfo createBadgedIconBitmap(Drawable icon, UserHandle user,
-            boolean shrinkNonAdaptiveIcons) {
+                                             boolean shrinkNonAdaptiveIcons) {
         return createBadgedIconBitmap(icon, user, shrinkNonAdaptiveIcons, false, null);
     }
 
     public BitmapInfo createBadgedIconBitmap(Drawable icon, UserHandle user,
-            int iconAppTargetSdk) {
+                                             int iconAppTargetSdk) {
         return createBadgedIconBitmap(icon, user, iconAppTargetSdk, false);
     }
 
     public BitmapInfo createBadgedIconBitmap(Drawable icon, UserHandle user,
-            int iconAppTargetSdk, boolean isInstantApp) {
+                                             int iconAppTargetSdk, boolean isInstantApp) {
         return createBadgedIconBitmap(icon, user, iconAppTargetSdk, isInstantApp, null);
     }
 
     public BitmapInfo createBadgedIconBitmap(Drawable icon, UserHandle user,
-            int iconAppTargetSdk, boolean isInstantApp, float[] scale) {
+                                             int iconAppTargetSdk, boolean isInstantApp, float[] scale) {
         boolean shrinkNonAdaptiveIcons = ATLEAST_P ||
                 (ATLEAST_OREO && iconAppTargetSdk >= Build.VERSION_CODES.O);
         return createBadgedIconBitmap(icon, user, shrinkNonAdaptiveIcons, isInstantApp, scale);
@@ -144,28 +148,28 @@ public BitmapInfo createBadgedIconBitmap(Drawable icon, UserHandle user,
     public Bitmap createScaledBitmapWithoutShadow(Drawable icon, int iconAppTargetSdk) {
         boolean shrinkNonAdaptiveIcons = ATLEAST_P ||
                 (ATLEAST_OREO && iconAppTargetSdk >= Build.VERSION_CODES.O);
-        return  createScaledBitmapWithoutShadow(icon, shrinkNonAdaptiveIcons);
+        return createScaledBitmapWithoutShadow(icon, shrinkNonAdaptiveIcons);
     }
 
     /**
      * Creates bitmap using the source drawable and various parameters.
      * The bitmap is visually normalized with other icons and has enough spacing to add shadow.
      *
-     * @param icon                      source of the icon
-     * @param user                      info can be used for a badge
-     * @param shrinkNonAdaptiveIcons    {@code true} if non adaptive icons should be treated
-     * @param isInstantApp              info can be used for a badge
-     * @param scale                     returns the scale result from normalization
+     * @param icon                   source of the icon
+     * @param user                   info can be used for a badge
+     * @param shrinkNonAdaptiveIcons {@code true} if non adaptive icons should be treated
+     * @param isInstantApp           info can be used for a badge
+     * @param scale                  returns the scale result from normalization
      * @return a bitmap suitable for disaplaying as an icon at various system UIs.
      */
     public BitmapInfo createBadgedIconBitmap(@NonNull Drawable icon, UserHandle user,
-            boolean shrinkNonAdaptiveIcons, boolean isInstantApp, float[] scale) {
+                                             boolean shrinkNonAdaptiveIcons, boolean isInstantApp, float[] scale) {
         if (scale == null) {
             scale = new float[1];
         }
         icon = normalizeAndWrapToAdaptiveIcon(icon, shrinkNonAdaptiveIcons, null, scale);
         Bitmap bitmap = createIconBitmap(icon, scale[0]);
-        if (ATLEAST_OREO && icon instanceof AdaptiveIconDrawable) {
+        if (ATLEAST_OREO && icon instanceof AdaptiveIconCompat) {
             mCanvas.setBitmap(bitmap);
             getShadowGenerator().recreateIcon(Bitmap.createBitmap(bitmap), mCanvas);
             mCanvas.setBitmap(null);
@@ -209,23 +213,19 @@ public void disableColorExtraction() {
     }
 
     private Drawable normalizeAndWrapToAdaptiveIcon(@NonNull Drawable icon,
-            boolean shrinkNonAdaptiveIcons, RectF outIconBounds, float[] outScale) {
-        if (icon == null) {
-            return null;
-        }
-        //TODO REVISAR ADAPTIVE ICONS
-        /*float scale = 1f;
+                                                    boolean shrinkNonAdaptiveIcons, RectF outIconBounds, float[] outScale) {
+        float scale;
 
         if (shrinkNonAdaptiveIcons && ATLEAST_OREO) {
-            if (mWrapperIcon == null) {
-                mWrapperIcon = mContext.getDrawable(R.drawable.adaptive_icon_drawable_wrapper)
-                        .mutate();
+            if (mWrapperIcon == null || !((AdaptiveIconCompat) mWrapperIcon).isMaskValid()) {
+                mWrapperIcon = AdaptiveIconCompat.wrap(
+                        mContext.getDrawable(R.drawable.adaptive_icon_drawable_wrapper).mutate());
             }
-            AdaptiveIconDrawable dr = (AdaptiveIconDrawable) mWrapperIcon;
+            AdaptiveIconCompat dr = (AdaptiveIconCompat) mWrapperIcon;
             dr.setBounds(0, 0, 1, 1);
             boolean[] outShape = new boolean[1];
             scale = getNormalizer().getScale(icon, outIconBounds, dr.getIconMask(), outShape);
-            if (!(icon instanceof AdaptiveIconDrawable) && !outShape[0]) {
+            if (!outShape[0] && (icon instanceof NonAdaptiveIconDrawable)) {
                 FixedScaleDrawable fsd = ((FixedScaleDrawable) dr.getForeground());
                 fsd.setDrawable(icon);
                 fsd.setScale(scale);
@@ -234,26 +234,12 @@ private Drawable normalizeAndWrapToAdaptiveIcon(@NonNull Drawable icon,
 
                 ((ColorDrawable) dr.getBackground()).setColor(mWrapperBackgroundColor);
             }
+
         } else {
             scale = getNormalizer().getScale(icon, outIconBounds, null, null);
         }
-
-        outScale[0] = scale;
-        return icon;*/
-        float scale = 1f;
-        Drawable mIcon = icon;
-        if (ATLEAST_OREO) {
-            boolean[] outShape = new boolean[1];
-            if (mWrapperIcon == null) {
-                mWrapperIcon = mContext.getDrawable(R.drawable.adaptive_icon_drawable_wrapper)
-                        .mutate();
-            }
-            AdaptiveIconDrawable dr = (AdaptiveIconDrawable) mWrapperIcon;
-            dr.setBounds(0, 0, 1, 1);
-            scale = getNormalizer().getScale(mIcon, outIconBounds, dr.getIconMask(), outShape);
-        }
         outScale[0] = scale;
-        return mIcon;
+        return icon;
     }
 
     /**
@@ -275,12 +261,12 @@ public void badgeWithDrawable(Canvas target, Drawable badge) {
         badge.draw(target);
     }
 
-    private Bitmap createIconBitmap(Drawable icon, float scale) {
+    public Bitmap createIconBitmap(Drawable icon, float scale) {
         return createIconBitmap(icon, scale, mIconBitmapSize);
     }
 
     /**
-     * @param icon drawable that should be flattened to a bitmap
+     * @param icon  drawable that should be flattened to a bitmap
      * @param scale the scale to apply before drawing {@param icon} on the canvas
      */
     public Bitmap createIconBitmap(@NonNull Drawable icon, float scale, int size) {
@@ -293,7 +279,7 @@ public Bitmap createIconBitmap(@NonNull Drawable icon, float scale, int size) {
 
         if (ATLEAST_OREO && icon instanceof AdaptiveIconDrawable) {
             int offset = Math.max((int) Math.ceil(BLUR_FACTOR * size),
-                    Math.round(size * (1 - scale) / 2 ));
+                    Math.round(size * (1 - scale) / 2));
             icon.setBounds(offset, offset, size - offset, size - offset);
             icon.draw(mCanvas);
         } else {
@@ -377,4 +363,11 @@ public int getIntrinsicWidth() {
             return getBitmap().getWidth();
         }
     }
+
+    public static class NonAdaptiveIconDrawable extends DrawableWrapper {
+
+        public NonAdaptiveIconDrawable(@Nullable Drawable dr) {
+            super(dr);
+        }
+    }
 }
diff --git a/iconloaderlib/src/com/android/launcher3/icons/ColorExtractor.java b/iconloaderlib/src/com/android/launcher3/icons/ColorExtractor.java
index 87bda825cc..60930a8869 100644
--- a/iconloaderlib/src/com/android/launcher3/icons/ColorExtractor.java
+++ b/iconloaderlib/src/com/android/launcher3/icons/ColorExtractor.java
@@ -18,6 +18,7 @@
 import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.util.SparseArray;
+
 import java.util.Arrays;
 
 /**
@@ -28,7 +29,7 @@ public class ColorExtractor {
     private final int NUM_SAMPLES = 20;
     private final float[] mTmpHsv = new float[3];
     private final float[] mTmpHueScoreHistogram = new float[360];
-    private final int[] mTmpPixels = new int[NUM_SAMPLES];
+    private final int[] mTmpPixels = new int[112 * 112];
     private final SparseArray<Float> mTmpRgbScores = new SparseArray<>();
 
     /**
@@ -124,4 +125,30 @@ public int findDominantColorByHue(Bitmap bitmap, int samples) {
         }
         return bestColor;
     }
+
+    private static final int MAGIC_NUMBER = 25;
+
+    /*
+     * References:
+     * https://www.cs.umb.edu/~jreyes/csit114-fall-2007/project4/filters.html#posterize
+     * https://github.com/gitgraghu/image-processing/blob/master/src/Effects/Posterize.java
+     */
+    public static int posterize(int rgb) {
+        int red = (0xff & (rgb >> 16));
+        int green = (0xff & (rgb >> 8));
+        int blue = (0xff & rgb);
+        red -= red % MAGIC_NUMBER;
+        green -= green % MAGIC_NUMBER;
+        blue -= blue % MAGIC_NUMBER;
+        if (red < 0) {
+            red = 0;
+        }
+        if (green < 0) {
+            green = 0;
+        }
+        if (blue < 0) {
+            blue = 0;
+        }
+        return red << 16 | green << 8 | blue;
+    }
 }
diff --git a/iconloaderlib/src/com/android/launcher3/icons/FixedScaleDrawable.java b/iconloaderlib/src/com/android/launcher3/icons/FixedScaleDrawable.java
index 516965ec2b..96f19a72a5 100644
--- a/iconloaderlib/src/com/android/launcher3/icons/FixedScaleDrawable.java
+++ b/iconloaderlib/src/com/android/launcher3/icons/FixedScaleDrawable.java
@@ -15,7 +15,7 @@
 public class FixedScaleDrawable extends DrawableWrapper {
 
     // TODO b/33553066 use the constant defined in MaskableIconDrawable
-    private static final float LEGACY_ICON_SCALE = .7f * .6667f;
+    public static final float LEGACY_ICON_SCALE = .7f * .667f;
     private float mScaleX, mScaleY;
 
     public FixedScaleDrawable() {
diff --git a/iconloaderlib/src/com/android/launcher3/icons/IconNormalizer.java b/iconloaderlib/src/com/android/launcher3/icons/IconNormalizer.java
index de39e79fec..f06b009042 100644
--- a/iconloaderlib/src/com/android/launcher3/icons/IconNormalizer.java
+++ b/iconloaderlib/src/com/android/launcher3/icons/IconNormalizer.java
@@ -18,7 +18,6 @@
 
 import android.annotation.TargetApi;
 import android.content.Context;
-import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Color;
@@ -35,11 +34,13 @@
 import android.os.Build;
 import android.util.Log;
 
-import java.nio.ByteBuffer;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import com.android.launcher3.AdaptiveIconCompat;
+
+import java.nio.ByteBuffer;
+
 public class IconNormalizer {
 
     private static final String TAG = "IconNormalizer";
@@ -192,6 +193,42 @@ private boolean isShape(Path maskPath) {
         return isTransparentBitmap();
     }
 
+    /**
+     * Returns if the shape of the icon is same as the path.
+     * For this method to work, the shape path bounds should be in [0,1]x[0,1] bounds.
+     */
+    private boolean isShape(Path maskPath, int minVisibleAlpha) {
+        // Condition1:
+        // If width and height of the path not close to a square, then the icon shape is
+        // not same as the mask shape.
+        float iconRatio = ((float) mBounds.width()) / mBounds.height();
+        if (Math.abs(iconRatio - 1) > BOUND_RATIO_MARGIN) {
+            if (DEBUG) {
+                Log.d(TAG, "Not same as mask shape because width != height. " + iconRatio);
+            }
+            return false;
+        }
+
+        // Condition 2:
+        // Actual icon (white) and the fitted shape (e.g., circle)(red) XOR operation
+        // should generate transparent image, if the actual icon is equivalent to the shape.
+
+        // Fit the shape within the icon's bounding box
+        mMatrix.reset();
+        mMatrix.setScale(mBounds.width(), mBounds.height());
+        mMatrix.postTranslate(mBounds.left, mBounds.top);
+        maskPath.transform(mMatrix, mShapePath);
+
+        // XOR operation
+        mCanvas.drawPath(mShapePath, mPaintMaskShape);
+
+        // DST_OUT operation around the mask path outline
+        mCanvas.drawPath(mShapePath, mPaintMaskShapeOutline);
+
+        // Check if the result is almost transparent
+        return isTransparentBitmap(minVisibleAlpha);
+    }
+
     /**
      * Used to determine if certain the bitmap is transparent.
      */
@@ -222,6 +259,36 @@ private boolean isTransparentBitmap() {
         return percentageDiffPixels < PIXEL_DIFF_PERCENTAGE_THRESHOLD;
     }
 
+    /**
+     * Used to determine if certain the bitmap is transparent.
+     */
+    private boolean isTransparentBitmap(int minVisibleAlpha) {
+        ByteBuffer buffer = ByteBuffer.wrap(mPixels);
+        buffer.rewind();
+        mBitmap.copyPixelsToBuffer(buffer);
+
+        int y = mBounds.top;
+        // buffer position
+        int index = y * mMaxSize;
+        // buffer shift after every row, width of buffer = mMaxSize
+        int rowSizeDiff = mMaxSize - mBounds.right;
+
+        int sum = 0;
+        for (; y < mBounds.bottom; y++) {
+            index += mBounds.left;
+            for (int x = mBounds.left; x < mBounds.right; x++) {
+                if ((mPixels[index] & 0xFF) > minVisibleAlpha) {
+                    sum++;
+                }
+                index++;
+            }
+            index += rowSizeDiff;
+        }
+
+        float percentageDiffPixels = ((float) sum) / (mBounds.width() * mBounds.height());
+        return percentageDiffPixels < PIXEL_DIFF_PERCENTAGE_THRESHOLD;
+    }
+
     /**
      * Returns the amount by which the {@param d} should be scaled (in both dimensions) so that it
      * matches the design guidelines for a launcher icon.
@@ -347,13 +414,139 @@ public synchronized float getScale(@NonNull Drawable d, @Nullable RectF outBound
         return getScale(area, rectArea, width * height);
     }
 
+    /**
+     * Returns the amount by which the {@param d} should be scaled (in both dimensions) so that it
+     * matches the design guidelines for a launcher icon.
+     * <p>
+     * We first calculate the convex hull of the visible portion of the icon.
+     * This hull then compared with the bounding rectangle of the hull to find how closely it
+     * resembles a circle and a square, by comparing the ratio of the areas. Note that this is not an
+     * ideal solution but it gives satisfactory result without affecting the performance.
+     * <p>
+     * This closeness is used to determine the ratio of hull area to the full icon size.
+     * Refer {@link #MAX_CIRCLE_AREA_FACTOR} and {@link #MAX_SQUARE_AREA_FACTOR}
+     *
+     * @param outBounds optional rect to receive the fraction distance from each edge.
+     */
+    public synchronized float getScale(@NonNull Drawable d, @Nullable RectF outBounds,
+                                       @Nullable Path path, @Nullable boolean[] outMaskShape, int minVisibleAlpha) {
+        if (BaseIconFactory.ATLEAST_OREO && d instanceof AdaptiveIconCompat) {
+            if (mAdaptiveIconScale == SCALE_NOT_INITIALIZED) {
+                mAdaptiveIconScale = normalizeAdaptiveIcon(d, mMaxSize, mAdaptiveIconBounds);
+            }
+            if (outBounds != null) {
+                outBounds.set(mAdaptiveIconBounds);
+            }
+            return mAdaptiveIconScale;
+        }
+        int width = d.getIntrinsicWidth();
+        int height = d.getIntrinsicHeight();
+        if (width <= 0 || height <= 0) {
+            width = width <= 0 || width > mMaxSize ? mMaxSize : width;
+            height = height <= 0 || height > mMaxSize ? mMaxSize : height;
+        } else if (width > mMaxSize || height > mMaxSize) {
+            int max = Math.max(width, height);
+            width = mMaxSize * width / max;
+            height = mMaxSize * height / max;
+        }
+
+        mBitmap.eraseColor(Color.TRANSPARENT);
+        d.setBounds(0, 0, width, height);
+        d.draw(mCanvas);
+
+        ByteBuffer buffer = ByteBuffer.wrap(mPixels);
+        buffer.rewind();
+        mBitmap.copyPixelsToBuffer(buffer);
+
+        // Overall bounds of the visible icon.
+        int topY = -1;
+        int bottomY = -1;
+        int leftX = mMaxSize + 1;
+        int rightX = -1;
+
+        // Create border by going through all pixels one row at a time and for each row find
+        // the first and the last non-transparent pixel. Set those values to mLeftBorder and
+        // mRightBorder and use -1 if there are no visible pixel in the row.
+
+        // buffer position
+        int index = 0;
+        // buffer shift after every row, width of buffer = mMaxSize
+        int rowSizeDiff = mMaxSize - width;
+        // first and last position for any row.
+        int firstX, lastX;
+
+        for (int y = 0; y < height; y++) {
+            firstX = lastX = -1;
+            for (int x = 0; x < width; x++) {
+                if ((mPixels[index] & 0xFF) > minVisibleAlpha) {
+                    if (firstX == -1) {
+                        firstX = x;
+                    }
+                    lastX = x;
+                }
+                index++;
+            }
+            index += rowSizeDiff;
+
+            mLeftBorder[y] = firstX;
+            mRightBorder[y] = lastX;
+
+            // If there is at least one visible pixel, update the overall bounds.
+            if (firstX != -1) {
+                bottomY = y;
+                if (topY == -1) {
+                    topY = y;
+                }
+
+                leftX = Math.min(leftX, firstX);
+                rightX = Math.max(rightX, lastX);
+            }
+        }
+
+        if (topY == -1 || rightX == -1) {
+            // No valid pixels found. Do not scale.
+            return 1;
+        }
+
+        convertToConvexArray(mLeftBorder, 1, topY, bottomY);
+        convertToConvexArray(mRightBorder, -1, topY, bottomY);
+
+        // Area of the convex hull
+        float area = 0;
+        for (int y = 0; y < height; y++) {
+            if (mLeftBorder[y] <= -1) {
+                continue;
+            }
+            area += mRightBorder[y] - mLeftBorder[y] + 1;
+        }
+
+        mBounds.left = leftX;
+        mBounds.right = rightX;
+
+        mBounds.top = topY;
+        mBounds.bottom = bottomY;
+
+        if (outBounds != null) {
+            outBounds.set(((float) mBounds.left) / width, ((float) mBounds.top) / height,
+                    1 - ((float) mBounds.right) / width,
+                    1 - ((float) mBounds.bottom) / height);
+        }
+        if (outMaskShape != null && mEnableShapeDetection && outMaskShape.length > 0) {
+            outMaskShape[0] = isShape(path, minVisibleAlpha);
+        }
+        // Area of the rectangle required to fit the convex hull
+        float rectArea = (bottomY + 1 - topY) * (rightX + 1 - leftX);
+        return getScale(area, rectArea, width * height);
+    }
+
     /**
      * Modifies {@param xCoordinates} to represent a convex border. Fills in all missing values
      * (except on either ends) with appropriate values.
+     *
      * @param xCoordinates map of x coordinate per y.
-     * @param direction 1 for left border and -1 for right border.
-     * @param topY the first Y position (inclusive) with a valid value.
-     * @param bottomY the last Y position (inclusive) with a valid value.
+     * @param direction    1 for left border and -1 for right border.
+     * @param topY         the first Y position (inclusive) with a valid value.
+     * @param bottomY      the last Y position (inclusive) with a valid value.
      */
     private static void convertToConvexArray(
             float[] xCoordinates, int direction, int topY, int bottomY) {
diff --git a/iconloaderlib/src/com/android/launcher3/icons/cache/BaseIconCache.java b/iconloaderlib/src/com/android/launcher3/icons/cache/BaseIconCache.java
index a886c0aa09..6d0af07378 100644
--- a/iconloaderlib/src/com/android/launcher3/icons/cache/BaseIconCache.java
+++ b/iconloaderlib/src/com/android/launcher3/icons/cache/BaseIconCache.java
@@ -15,10 +15,6 @@
  */
 package com.android.launcher3.icons.cache;
 
-import static com.android.launcher3.icons.BaseIconFactory.getFullResDefaultActivityIcon;
-import static com.android.launcher3.icons.BitmapInfo.LOW_RES_ICON;
-import static com.android.launcher3.icons.GraphicsUtils.setColorAlphaBound;
-
 import android.content.ComponentName;
 import android.content.ContentValues;
 import android.content.Context;
@@ -61,6 +57,10 @@
 import java.util.Set;
 import java.util.function.Supplier;
 
+import static com.android.launcher3.icons.BaseIconFactory.getFullResDefaultActivityIcon;
+import static com.android.launcher3.icons.BitmapInfo.LOW_RES_ICON;
+import static com.android.launcher3.icons.GraphicsUtils.setColorAlphaBound;
+
 public abstract class BaseIconCache {
 
     private static final String TAG = "BaseIconCache";
@@ -223,6 +223,11 @@ public synchronized void removeIconsForPkg(String packageName, UserHandle user)
                 new String[]{packageName + "/%", Long.toString(userSerial)});
     }
 
+    public synchronized void removeAllIcons() {
+        mCache.clear();
+        mIconDb.delete(null, null);
+    }
+
     public IconCacheUpdateHandler getUpdateHandler() {
         updateSystemState();
         return new IconCacheUpdateHandler(this);
@@ -308,16 +313,24 @@ public boolean isDefaultIcon(Bitmap icon, UserHandle user) {
      * Retrieves the entry from the cache. If the entry is not present, it creates a new entry.
      * This method is not thread safe, it must be called from a synchronized method.
      */
+
     protected <T> CacheEntry cacheLocked(
             @NonNull ComponentName componentName, @NonNull UserHandle user,
             @NonNull Supplier<T> infoProvider, @NonNull CachingLogic<T> cachingLogic,
             boolean usePackageIcon, boolean useLowResIcon) {
-        assertWorkerThread();
+        return cacheLocked(componentName, user, infoProvider, cachingLogic, usePackageIcon,
+                useLowResIcon, true);
+    }
+
+    protected <T> CacheEntry cacheLocked(
+            @NonNull ComponentName componentName, @NonNull UserHandle user,
+            @NonNull Supplier<T> infoProvider, @NonNull CachingLogic<T> cachingLogic,
+            boolean usePackageIcon, boolean useLowResIcon, boolean addToMemCache) {
         ComponentKey cacheKey = new ComponentKey(componentName, user);
         CacheEntry entry = mCache.get(cacheKey);
         if (entry == null || (entry.isLowRes() && !useLowResIcon)) {
             entry = new CacheEntry();
-            if (cachingLogic.addToMemCache()) {
+            if (addToMemCache) {
                 mCache.put(cacheKey, entry);
             }
 
diff --git a/omega.jks b/omega.jks
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/proguard.flags b/proguard.flags
index 272ab7a7f1..ff4483a8b2 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -40,6 +40,18 @@
   *;
 }
 
+-keep class com.saggitt.omega.allapps.CustomAppFilter {
+  public <init>(...);
+}
+
+-keep class com.saggitt.omega.preferences.HiddenAppsFragment
+
+# Discovery bounce animation
+-keep class com.android.launcher3.allapps.DiscoveryBounce$VerticalProgressWrapper {
+  public void setProgress(float);
+  public float getProgress();
+}
+
 # Discovery bounce animation
 -keep class com.android.launcher3.allapps.DiscoveryBounce$VerticalProgressWrapper {
   public void setProgress(float);
diff --git a/protos/search.proto b/protos/search.proto
new file mode 100644
index 0000000000..70fbc0e184
--- /dev/null
+++ b/protos/search.proto
@@ -0,0 +1,57 @@
+/*
+ * 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.
+ */
+syntax = "proto2";
+
+option java_package = "com.saggitt.omega.search";
+option java_outer_classname = "SearchProto";
+
+package search;
+
+message Columns {
+    optional int32 edgeMargin = 1;
+    optional int32 innerMargin = 2;
+    optional int32 iconDistance = 3;
+    optional int32 height = 4;
+}
+
+message AppIndex {
+    optional string label = 1;
+    optional string predictionRank = 2;
+    optional string iconBitmap = 3;
+    optional string searchUri = 4;
+}
+
+message SearchBase {
+    optional int32 bgColor = 1;
+    optional string iconViewTemplate = 2;
+    optional string iconLongClick = 3;
+    optional Columns apps = 4;
+    optional int32 allAppsCols = 5;
+    repeated AppIndex index = 6;
+    optional Columns bounds = 7;
+    optional string searchTemplate = 8;
+    optional int32 gIcon = 9;
+    optional int32 micIcon = 10;
+    optional string view = 11;
+    optional Columns viewBounds = 12;
+    optional bool isAllApps = 13;
+    optional Columns appsView = 14;
+    optional bool isDark = 15;
+}
+
+message SearchView {
+    optional SearchBase base = 1;
+}
diff --git a/protos/smartspace.proto b/protos/smartspace.proto
new file mode 100644
index 0000000000..6c8b313184
--- /dev/null
+++ b/protos/smartspace.proto
@@ -0,0 +1,69 @@
+syntax = "proto2";
+
+option java_package = "com.google.android.apps.nexuslauncher.smartspace";
+option java_outer_classname = "SmartspaceProto";
+
+package nano;
+
+message a {
+  repeated b cw = 1;
+}
+
+message b {
+  optional bool cy = 1;
+  optional int32 cJ = 2;
+  optional c cB = 3;
+  optional c cC = 4;
+  optional c cH = 5;
+  optional f cx = 6;
+  optional int32 cA = 7;
+  optional g cG = 8;
+  optional int64 cK = 9;
+  optional int64 cD = 10;
+  optional int64 cE = 11;
+  optional h cF = 12;
+  optional int32 cz = 13;
+}
+
+message c {
+  optional d cL = 1;
+  optional d cM = 2;
+}
+
+message d {
+  optional string cN = 1;
+  optional int32 cP = 2;
+  repeated e cO = 3;
+}
+
+message e {
+  optional string cR = 1;
+  optional int32 cS = 2;
+  optional int32 cQ = 3;
+  optional bool cU = 4;
+}
+
+message f {
+  optional string cV = 1;
+  optional string cW = 2;
+  optional string cX = 3;
+}
+
+message g {
+  optional int32 cY = 1;
+  optional string cZ = 2;
+}
+
+message h {
+  optional int64 da = 1;
+  optional int32 db = 2;
+}
+
+message i {
+  optional bool dc = 6;
+  optional bytes dd = 5;
+  optional b de = 1;
+  optional int64 df = 2;
+  optional int32 dg = 4;
+  optional int64 dh = 3;
+}
\ No newline at end of file
diff --git a/quickstep/AndroidManifest.xml b/quickstep/AndroidManifest.xml
index 480a27c079..31de813ecb 100644
--- a/quickstep/AndroidManifest.xml
+++ b/quickstep/AndroidManifest.xml
@@ -30,7 +30,8 @@
         android:fullBackupOnly="true"
         android:fullBackupContent="@xml/backupscheme"
         android:hardwareAccelerated="true"
-        android:icon="@drawable/ic_launcher_home"
+        android:icon="@mipmap/ic_launcher"
+        android:roundIcon="@mipmap/ic_launcher_round"
         android:label="@string/derived_app_name"
         android:theme="@style/AppTheme"
         android:largeHeap="@bool/config_largeHeap"
diff --git a/quickstep/recents_ui_overrides/res/values/override.xml b/quickstep/recents_ui_overrides/res/values/override.xml
index ed3ba929a8..7b34ad9164 100644
--- a/quickstep/recents_ui_overrides/res/values/override.xml
+++ b/quickstep/recents_ui_overrides/res/values/override.xml
@@ -17,7 +17,7 @@
 <!-- Class overrides for launcher with quickstep. -->
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="app_transition_manager_class" translatable="false">com.android.launcher3.LauncherAppTransitionManagerImpl</string>
+  <string name="app_transition_manager_class" translatable="false">com.saggitt.omega.animation.OmegaAppTransitionManagerImpl</string>
 
   <string name="instant_app_resolver_class" translatable="false">com.android.quickstep.InstantAppResolverImpl</string>
 
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java
index 114fd8e10b..003fbb6ad5 100644
--- a/quickstep/recents_ui_overrides/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java
+++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java
@@ -16,23 +16,6 @@
 
 package com.android.launcher3;
 
-import static com.android.launcher3.LauncherAnimUtils.VIEW_TRANSLATE_X;
-import static com.android.launcher3.LauncherState.BACKGROUND_APP;
-import static com.android.launcher3.LauncherState.HOTSEAT_ICONS;
-import static com.android.launcher3.LauncherState.NORMAL;
-import static com.android.launcher3.LauncherState.OVERVIEW;
-import static com.android.launcher3.LauncherStateManager.ANIM_ALL;
-import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_ALL_APPS_FADE;
-import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_HOTSEAT_SCALE;
-import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_HOTSEAT_TRANSLATE;
-import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_VERTICAL_PROGRESS;
-import static com.android.launcher3.anim.Interpolators.AGGRESSIVE_EASE;
-import static com.android.launcher3.anim.Interpolators.DEACCEL_3;
-import static com.android.launcher3.anim.Interpolators.LINEAR;
-import static com.android.launcher3.anim.Interpolators.OVERSHOOT_1_2;
-import static com.android.quickstep.TaskViewUtils.findTaskViewToLaunch;
-import static com.android.quickstep.TaskViewUtils.getRecentsWindowAnimator;
-
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
@@ -55,11 +38,28 @@
 import com.android.quickstep.views.TaskView;
 import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
 
+import static com.android.launcher3.LauncherAnimUtils.VIEW_TRANSLATE_X;
+import static com.android.launcher3.LauncherState.BACKGROUND_APP;
+import static com.android.launcher3.LauncherState.HOTSEAT_ICONS;
+import static com.android.launcher3.LauncherState.NORMAL;
+import static com.android.launcher3.LauncherState.OVERVIEW;
+import static com.android.launcher3.LauncherStateManager.ANIM_ALL;
+import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_ALL_APPS_FADE;
+import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_HOTSEAT_SCALE;
+import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_HOTSEAT_TRANSLATE;
+import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_VERTICAL_PROGRESS;
+import static com.android.launcher3.anim.Interpolators.AGGRESSIVE_EASE;
+import static com.android.launcher3.anim.Interpolators.DEACCEL_3;
+import static com.android.launcher3.anim.Interpolators.LINEAR;
+import static com.android.launcher3.anim.Interpolators.OVERSHOOT_1_2;
+import static com.android.quickstep.TaskViewUtils.findTaskViewToLaunch;
+import static com.android.quickstep.TaskViewUtils.getRecentsWindowAnimator;
+
 /**
  * A {@link QuickstepAppTransitionManagerImpl} that also implements recents transitions from
  * {@link RecentsView}.
  */
-public final class LauncherAppTransitionManagerImpl extends QuickstepAppTransitionManagerImpl {
+public class LauncherAppTransitionManagerImpl extends QuickstepAppTransitionManagerImpl {
 
     public static final int INDEX_SHELF_ANIM = 0;
     public static final int INDEX_RECENTS_FADE_ANIM = 1;
@@ -219,4 +219,5 @@ public Animator createStateElementAnimation(int index, float... values) {
                 return super.createStateElementAnimation(index, values);
         }
     }
+
 }
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/AppsDividerView.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/AppsDividerView.java
index 425fb13990..ba17309e8b 100644
--- a/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/AppsDividerView.java
+++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/AppsDividerView.java
@@ -16,8 +16,6 @@
 
 package com.android.launcher3.appprediction;
 
-import static com.android.launcher3.LauncherState.ALL_APPS;
-
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.graphics.Canvas;
@@ -39,11 +37,14 @@
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.LauncherStateManager;
 import com.android.launcher3.R;
+import com.android.launcher3.Utilities;
 import com.android.launcher3.allapps.FloatingHeaderRow;
 import com.android.launcher3.allapps.FloatingHeaderView;
 import com.android.launcher3.anim.PropertySetter;
 import com.android.launcher3.util.Themes;
 
+import static com.android.launcher3.LauncherState.ALL_APPS;
+
 /**
  * A view which shows a horizontal divider
  */
@@ -277,7 +278,8 @@ private int getAllAppsVisitedCount() {
     }
 
     private boolean shouldShowAllAppsLabel() {
-        return getAllAppsVisitedCount() < SHOW_ALL_APPS_LABEL_ON_ALL_APPS_VISITED_COUNT;
+        return Utilities.getOmegaPrefs(getContext()).getShowAllAppsLabel();
+        //return getAllAppsVisitedCount() < SHOW_ALL_APPS_LABEL_ON_ALL_APPS_VISITED_COUNT;
     }
 
     @Override
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionAppTracker.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionAppTracker.java
index ed8c097020..ecc247e8e6 100644
--- a/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionAppTracker.java
+++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionAppTracker.java
@@ -16,12 +16,7 @@
 package com.android.launcher3.appprediction;
 
 import android.annotation.TargetApi;
-import android.app.prediction.AppPredictionContext;
-import android.app.prediction.AppPredictionManager;
-import android.app.prediction.AppPredictor;
-import android.app.prediction.AppTarget;
 import android.app.prediction.AppTargetEvent;
-import android.app.prediction.AppTargetId;
 import android.content.ComponentName;
 import android.content.Context;
 import android.os.Build;
@@ -42,6 +37,14 @@
 import com.android.launcher3.uioverrides.plugins.PluginManagerWrapper;
 import com.android.systemui.plugins.AppLaunchEventsPlugin;
 import com.android.systemui.plugins.PluginListener;
+import com.saggitt.omega.OmegaPreferences;
+import com.saggitt.omega.predictions.AppPredictorCompat;
+import com.saggitt.omega.predictions.AppTargetCompat;
+import com.saggitt.omega.predictions.AppTargetEventCompat;
+import com.saggitt.omega.predictions.AppTargetIdCompat;
+import com.saggitt.omega.predictions.OmegaPredictionManager;
+
+import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -54,10 +57,10 @@
  */
 @TargetApi(Build.VERSION_CODES.P)
 public class PredictionAppTracker extends AppLaunchTracker
-        implements PluginListener<AppLaunchEventsPlugin> {
+        implements PluginListener<AppLaunchEventsPlugin>, OmegaPreferences.OnPreferenceChangeListener {
 
     private static final String TAG = "PredictionAppTracker";
-    private static final boolean DBG = false;
+    private static final boolean DBG = true;
 
     private static final int MSG_INIT = 0;
     private static final int MSG_DESTROY = 1;
@@ -69,19 +72,29 @@ public class PredictionAppTracker extends AppLaunchTracker
     private final List<AppLaunchEventsPlugin> mAppLaunchEventsPluginsList;
 
     // Accessed only on worker thread
-    private AppPredictor mHomeAppPredictor;
-    private AppPredictor mRecentsOverviewPredictor;
+    private AppPredictorCompat mHomeAppPredictor;
+    private AppPredictorCompat mRecentsOverviewPredictor;
 
     public PredictionAppTracker(Context context) {
         mContext = context;
         mMessageHandler = new Handler(UI_HELPER_EXECUTOR.getLooper(), this::handleMessage);
         InvariantDeviceProfile.INSTANCE.get(mContext).addOnChangeListener(this::onIdpChanged);
 
+        Utilities.getOmegaPrefs(mContext).addOnPreferenceChangeListener("pref_show_predictions", this);
+
         mMessageHandler.sendEmptyMessage(MSG_INIT);
 
         mAppLaunchEventsPluginsList = new ArrayList<>();
-        PluginManagerWrapper.INSTANCE.get(context)
-                .addPluginListener(this, AppLaunchEventsPlugin.class, true);
+        if (Utilities.ATLEAST_R)
+            PluginManagerWrapper.INSTANCE.get(context)
+                    .addPluginListener(this, AppLaunchEventsPlugin.class, true);
+    }
+
+    @Override
+    public void onValueChanged(@NotNull String key, @NotNull OmegaPreferences prefs,
+                               boolean force) {
+        if (force) return;
+        mMessageHandler.sendEmptyMessage(MSG_INIT);
     }
 
     @UiThread
@@ -105,23 +118,9 @@ private void destroy() {
     }
 
     @WorkerThread
-    private AppPredictor createPredictor(Client client, int count) {
-        AppPredictionManager apm = mContext.getSystemService(AppPredictionManager.class);
-
-        if (apm == null) {
-            return null;
-        }
-
-        AppPredictor predictor = apm.createAppPredictionSession(
-                new AppPredictionContext.Builder(mContext)
-                        .setUiSurface(client.id)
-                        .setPredictedTargetCount(count)
-                        .setExtras(getAppPredictionContextExtras(client))
-                        .build());
-        predictor.registerPredictionUpdates(mContext.getMainExecutor(),
-                PredictionUiStateManager.INSTANCE.get(mContext).appPredictorCallback(client));
-        predictor.requestPredictionUpdate();
-        return predictor;
+    private AppPredictorCompat createPredictor(Client client, int count) {
+        return OmegaPredictionManager.Companion.getInstance(mContext)
+                .createPredictor(client, count, getAppPredictionContextExtras(client));
     }
 
     /**
@@ -142,11 +141,10 @@ private boolean handleMessage(Message msg) {
 
                 // Initialize the clients
 
-                if (Utilities.ATLEAST_R) {
-                    int count = InvariantDeviceProfile.INSTANCE.get(mContext).numAllAppsColumns;
-                    mHomeAppPredictor = createPredictor(Client.HOME, count);
-                    mRecentsOverviewPredictor = createPredictor(Client.OVERVIEW, count);
-                }
+                int count = InvariantDeviceProfile.INSTANCE.get(mContext).numAllAppsColumns;
+                mHomeAppPredictor = createPredictor(Client.HOME, count);
+                mRecentsOverviewPredictor = createPredictor(Client.OVERVIEW, count);
+
                 return true;
             }
             case MSG_DESTROY: {
@@ -155,7 +153,7 @@ private boolean handleMessage(Message msg) {
             }
             case MSG_LAUNCH: {
                 if (mHomeAppPredictor != null) {
-                    mHomeAppPredictor.notifyAppTargetEvent((AppTargetEvent) msg.obj);
+                    mHomeAppPredictor.notifyAppTargetEvent((AppTargetEventCompat) msg.obj);
                 }
                 return true;
             }
@@ -193,8 +191,8 @@ public void onReturnedToHome() {
     public void onStartShortcut(String packageName, String shortcutId, UserHandle user,
                                 String container) {
         // TODO: Use the full shortcut info
-        AppTarget target = new AppTarget.Builder(
-                new AppTargetId("shortcut:" + shortcutId), packageName, user)
+        AppTargetCompat target = new AppTargetCompat
+                .Builder(new AppTargetIdCompat("shortcut:" + shortcutId), packageName, user)
                 .setClassName(shortcutId)
                 .build();
 
@@ -215,8 +213,8 @@ public void onStartShortcut(String packageName, String shortcutId, UserHandle us
     @UiThread
     public void onStartApp(ComponentName cn, UserHandle user, String container) {
         if (cn != null) {
-            AppTarget target = new AppTarget.Builder(
-                    new AppTargetId("app:" + cn), cn.getPackageName(), user)
+            AppTargetCompat target = new AppTargetCompat
+                    .Builder(new AppTargetIdCompat("app:" + cn), cn.getPackageName(), user)
                     .setClassName(cn.getClassName())
                     .build();
             sendLaunch(target, container);
@@ -235,8 +233,8 @@ public void onStartApp(ComponentName cn, UserHandle user, String container) {
     @UiThread
     public void onDismissApp(ComponentName cn, UserHandle user, String container) {
         if (cn == null) return;
-        AppTarget target = new AppTarget.Builder(
-                new AppTargetId("app: " + cn), cn.getPackageName(), user)
+        AppTargetCompat target = new AppTargetCompat.Builder(
+                new AppTargetIdCompat("app: " + cn), cn.getPackageName(), user)
                 .setClassName(cn.getClassName())
                 .build();
         sendDismiss(target, container);
@@ -251,20 +249,20 @@ public void onDismissApp(ComponentName cn, UserHandle user, String container) {
     }
 
     @UiThread
-    private void sendEvent(AppTarget target, String container, int eventId) {
-        AppTargetEvent event = new AppTargetEvent.Builder(target, eventId)
+    private void sendEvent(AppTargetCompat target, String container, int eventId) {
+        AppTargetEventCompat event = new AppTargetEventCompat.Builder(target, eventId)
                 .setLaunchLocation(container == null ? CONTAINER_DEFAULT : container)
                 .build();
         Message.obtain(mMessageHandler, MSG_LAUNCH, event).sendToTarget();
     }
 
     @UiThread
-    private void sendLaunch(AppTarget target, String container) {
+    private void sendLaunch(AppTargetCompat target, String container) {
         sendEvent(target, container, AppTargetEvent.ACTION_LAUNCH);
     }
 
     @UiThread
-    private void sendDismiss(AppTarget target, String container) {
+    private void sendDismiss(AppTargetCompat target, String container) {
         sendEvent(target, container, AppTargetEvent.ACTION_DISMISS);
     }
 
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionRowView.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionRowView.java
index 412f2831f4..c0e48cb468 100644
--- a/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionRowView.java
+++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionRowView.java
@@ -274,7 +274,6 @@ private void applyPredictionApps() {
         }
 
         boolean predictionsEnabled = predictionCount > 0;
-        Log.d(TAG, "Prediction count " + predictionCount);
         if (predictionsEnabled != mPredictionsEnabled) {
             mPredictionsEnabled = predictionsEnabled;
             mLauncher.reapplyUi(false /* cancelCurrentAnimation */);
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionUiStateManager.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionUiStateManager.java
index 9c661074e5..81e0582193 100644
--- a/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionUiStateManager.java
+++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionUiStateManager.java
@@ -16,14 +16,9 @@
 
 package com.android.launcher3.appprediction;
 
-import static com.android.launcher3.LauncherState.BACKGROUND_APP;
-import static com.android.launcher3.LauncherState.OVERVIEW;
-import static com.android.quickstep.InstantAppResolverImpl.COMPONENT_CLASS_MARKER;
-
-import android.app.prediction.AppPredictor;
-import android.app.prediction.AppTarget;
 import android.content.ComponentName;
 import android.content.Context;
+import android.view.ViewTreeObserver;
 
 import androidx.annotation.NonNull;
 
@@ -35,8 +30,6 @@
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.LauncherSettings;
-import com.android.launcher3.LauncherState;
-import com.android.launcher3.LauncherStateManager.StateListener;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.allapps.AllAppsContainerView;
 import com.android.launcher3.allapps.AllAppsStore.OnUpdateListener;
@@ -46,12 +39,18 @@
 import com.android.launcher3.userevent.nano.LauncherLogProto;
 import com.android.launcher3.util.ComponentKey;
 import com.android.launcher3.util.MainThreadInitializedObject;
+import com.saggitt.omega.predictions.AppPredictorCompat;
+import com.saggitt.omega.predictions.AppTargetCompat;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.IntStream;
 
+import static com.android.launcher3.LauncherState.BACKGROUND_APP;
+import static com.android.launcher3.LauncherState.OVERVIEW;
+import static com.android.quickstep.InstantAppResolverImpl.COMPONENT_CLASS_MARKER;
+
 /**
  * Handler responsible to updating the UI due to predicted apps changes. Operations:
  * 1) Pushes the predicted apps to all-apps. If all-apps is visible, waits until it becomes
@@ -65,7 +64,7 @@
  * 4) Maintains the current active client id (for the predictions) and all updates are performed on
  * that client id.
  */
-public class PredictionUiStateManager implements StateListener, ItemInfoUpdateReceiver,
+public class PredictionUiStateManager implements ViewTreeObserver.OnGlobalLayoutListener, ItemInfoUpdateReceiver,
         OnIDPChangeListener, OnUpdateListener {
 
     public static final String LAST_PREDICTION_ENABLED_STATE = "last_prediction_enabled_state";
@@ -157,9 +156,24 @@ public void setTargetAppsView(AllAppsContainerView appsView) {
     }
 
     @Override
-    public void reapplyItemInfo(ItemInfoWithIcon info) { }
+    public void reapplyItemInfo(ItemInfoWithIcon info) {
+    }
 
     @Override
+    public void onGlobalLayout() {
+        if (mAppsView == null) {
+            return;
+        }
+        if (mPendingState != null && canApplyPredictions(mPendingState)) {
+            applyState(mPendingState);
+            mPendingState = null;
+        }
+        if (mPendingState == null) {
+            mAppsView.getViewTreeObserver().removeOnGlobalLayoutListener(this);
+        }
+    }
+
+    /*@Override
     public void onStateTransitionStart(LauncherState toState) { }
 
     @Override
@@ -175,14 +189,15 @@ public void onStateTransitionComplete(LauncherState state) {
             Launcher.getLauncher(mAppsView.getContext()).getStateManager()
                     .removeStateListener(this);
         }
-    }
+    }*/
 
     private void scheduleApplyPredictedApps(PredictionState state) {
         boolean registerListener = mPendingState == null;
         mPendingState = state;
         if (registerListener) {
             // Add a listener and wait until appsView is invisible again.
-            Launcher.getLauncher(mAppsView.getContext()).getStateManager().addStateListener(this);
+            //Launcher.getLauncher(mAppsView.getContext()).getStateManager().addStateListener(this);
+            mAppsView.getViewTreeObserver().addOnGlobalLayoutListener(this);
         }
     }
 
@@ -208,7 +223,7 @@ private void updatePredictionStateAfterCallback() {
         dispatchOnChange(true);
     }
 
-    public AppPredictor.Callback appPredictorCallback(Client client) {
+    public AppPredictorCompat.Callback appPredictorCallback(Client client) {
         return targets -> {
             mPredictionServicePredictions[client.ordinal()] = targets;
             updatePredictionStateAfterCallback();
@@ -235,9 +250,9 @@ private PredictionState parseLastState() {
 
         state.apps = new ArrayList<>();
 
-        List<AppTarget> appTargets = mPredictionServicePredictions[mActiveClient.ordinal()];
+        List<AppTargetCompat> appTargets = mPredictionServicePredictions[mActiveClient.ordinal()];
         if (!appTargets.isEmpty()) {
-            for (AppTarget appTarget : appTargets) {
+            for (AppTargetCompat appTarget : appTargets) {
                 ComponentKey key;
                 if (appTarget.getShortcutInfo() != null) {
                     key = ShortcutKey.fromInfo(appTarget.getShortcutInfo());
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/RecentsUiFactory.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/RecentsUiFactory.java
index 9589e3087d..81eb3475fb 100644
--- a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/RecentsUiFactory.java
+++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/RecentsUiFactory.java
@@ -46,6 +46,8 @@
 import com.android.quickstep.TouchInteractionService;
 import com.android.quickstep.views.RecentsView;
 import com.android.systemui.shared.system.WindowManagerWrapper;
+import com.saggitt.omega.gestures.VerticalSwipeGestureController;
+import com.saggitt.omega.touch.PinchStateChangeTouchController;
 
 import java.util.ArrayList;
 
@@ -59,13 +61,18 @@
 public abstract class RecentsUiFactory {
 
     public static final boolean GO_LOW_RAM_RECENTS_ENABLED = false;
-    private static final AsyncCommand SET_SHELF_HEIGHT_CMD = (visible, height) -> {
+    private static final AsyncCommand SET_SHELF_HEIGHT_CMD = RecentsUiFactory::setShelfHeight;
+
+    private static boolean DISALLOW_SET_SHELF_HEIGHT = !Utilities.ATLEAST_P;
+
+    private static void setShelfHeight(int visible, int height) {
+        if (DISALLOW_SET_SHELF_HEIGHT) return;
         try {
             WindowManagerWrapper.getInstance().setShelfHeight(visible != 0, height);
-        } catch (NoSuchMethodError | NoClassDefFoundError e) {
-            e.printStackTrace();
+        } catch (NoSuchMethodError | SecurityException e) {
+            DISALLOW_SET_SHELF_HEIGHT = true;
         }
-    };
+    }
 
     public static RotationMode ROTATION_LANDSCAPE = new RotationMode(-90) {
         @Override
@@ -150,21 +157,24 @@ public static TouchController[] createTouchControllers(Launcher launcher) {
 
         ArrayList<TouchController> list = new ArrayList<>();
         list.add(launcher.getDragController());
+        list.add(new PinchStateChangeTouchController(launcher));
         if (mode == NO_BUTTON) {
             list.add(new NoButtonQuickSwitchTouchController(launcher));
             list.add(new NavBarToHomeTouchController(launcher));
+            list.add(new VerticalSwipeGestureController(launcher));
             list.add(new FlingAndHoldTouchController(launcher));
         } else {
+            list.add(new VerticalSwipeGestureController(launcher));
             if (launcher.getDeviceProfile().isVerticalBarLayout()) {
                 list.add(new OverviewToAllAppsTouchController(launcher));
                 list.add(new LandscapeEdgeSwipeController(launcher));
-                if (Utilities.ATLEAST_R && mode.hasGestures) {
+                if (mode.hasGestures) {
                     list.add(new TransposedQuickSwitchTouchController(launcher));
                 }
             } else {
                 list.add(new PortraitStatesTouchController(launcher,
-                        Utilities.ATLEAST_R && mode.hasGestures /* allowDragToOverview */));
-                if (Utilities.ATLEAST_R && mode.hasGestures) {
+                        mode.hasGestures /* allowDragToOverview */));
+                if (mode.hasGestures) {
                     list.add(new QuickSwitchTouchController(launcher));
                 }
             }
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/FlingAndHoldTouchController.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/FlingAndHoldTouchController.java
index 3231f378db..94d84cf4e7 100644
--- a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/FlingAndHoldTouchController.java
+++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/FlingAndHoldTouchController.java
@@ -16,41 +16,46 @@
 
 package com.android.launcher3.uioverrides.touchcontrollers;
 
-import static com.android.launcher3.LauncherAppTransitionManagerImpl.INDEX_PAUSE_TO_OVERVIEW_ANIM;
-import static com.android.launcher3.LauncherState.ALL_APPS;
-import static com.android.launcher3.LauncherState.NORMAL;
-import static com.android.launcher3.LauncherState.OVERVIEW;
-import static com.android.launcher3.LauncherState.OVERVIEW_PEEK;
-import static com.android.launcher3.LauncherStateManager.ATOMIC_OVERVIEW_PEEK_COMPONENT;
-import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_ALL_APPS_FADE;
-import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_ALL_APPS_HEADER_FADE;
-import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_WORKSPACE_FADE;
-import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_WORKSPACE_SCALE;
-import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_WORKSPACE_TRANSLATE;
-import static com.android.launcher3.anim.Interpolators.ACCEL;
-import static com.android.launcher3.anim.Interpolators.DEACCEL;
-import static com.android.launcher3.anim.Interpolators.DEACCEL_3;
-import static com.android.launcher3.util.VibratorWrapper.OVERVIEW_HAPTIC;
-import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_OVERVIEW_DISABLED;
-
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
+import android.view.HapticFeedbackConstants;
 import android.view.MotionEvent;
-import android.view.View;
 import android.view.ViewConfiguration;
 
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherAppTransitionManagerImpl;
 import com.android.launcher3.LauncherState;
+import com.android.launcher3.R;
 import com.android.launcher3.anim.AnimatorSetBuilder;
 import com.android.launcher3.anim.Interpolators;
 import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch;
-import com.android.launcher3.util.VibratorWrapper;
 import com.android.quickstep.OverviewInteractionState;
 import com.android.quickstep.util.MotionPauseDetector;
 import com.android.quickstep.views.RecentsView;
 
+import static com.android.launcher3.LauncherState.ALL_APPS;
+import static com.android.launcher3.LauncherState.HOTSEAT_ICONS;
+import static com.android.launcher3.LauncherState.NORMAL;
+import static com.android.launcher3.LauncherState.OVERVIEW;
+import static com.android.launcher3.LauncherState.OVERVIEW_PEEK;
+import static com.android.launcher3.LauncherStateManager.ANIM_ALL;
+import static com.android.launcher3.LauncherStateManager.ATOMIC_OVERVIEW_PEEK_COMPONENT;
+import static com.android.launcher3.Utilities.EDGE_NAV_BAR;
+import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_ALL_APPS_FADE;
+import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_ALL_APPS_HEADER_FADE;
+import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_HOTSEAT_SCALE;
+import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_HOTSEAT_TRANSLATE;
+import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_VERTICAL_PROGRESS;
+import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_WORKSPACE_FADE;
+import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_WORKSPACE_SCALE;
+import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_WORKSPACE_TRANSLATE;
+import static com.android.launcher3.anim.Interpolators.ACCEL;
+import static com.android.launcher3.anim.Interpolators.DEACCEL;
+import static com.android.launcher3.anim.Interpolators.DEACCEL_3;
+import static com.android.launcher3.anim.Interpolators.OVERSHOOT_1_2;
+import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_OVERVIEW_DISABLED;
+
 /**
  * Touch controller which handles swipe and hold to go to Overview
  */
@@ -64,13 +69,18 @@ public class FlingAndHoldTouchController extends PortraitStatesTouchController {
     private final float mMotionPauseMinDisplacement;
     private final float mMotionPauseMaxDisplacement;
 
+    private boolean mFromNavBar;
     private AnimatorSet mPeekAnim;
+    private boolean mAnimatingToHome;
+    private final float mPullbackDistance;
+    private boolean mGoingHome;
 
     public FlingAndHoldTouchController(Launcher l) {
         super(l, false /* allowDragToOverview */);
         mMotionPauseDetector = new MotionPauseDetector(l);
         mMotionPauseMinDisplacement = ViewConfiguration.get(l).getScaledTouchSlop();
         mMotionPauseMaxDisplacement = getShiftRange() * MAX_DISPLACEMENT_PERCENT;
+        mPullbackDistance = mLauncher.getResources().getDimension(R.dimen.home_pullback_distance);
     }
 
     @Override
@@ -78,11 +88,19 @@ protected long getAtomicDuration() {
         return LauncherAppTransitionManagerImpl.ATOMIC_DURATION_FROM_PAUSED_TO_OVERVIEW;
     }
 
+    @Override
+    protected boolean canInterceptTouch(MotionEvent ev) {
+        mFromNavBar = (ev.getEdgeFlags() & EDGE_NAV_BAR) != 0;
+        mGoingHome = false;
+        return super.canInterceptTouch(ev);
+    }
+
     @Override
     public void onDragStart(boolean start) {
         mMotionPauseDetector.clear();
 
         super.onDragStart(start);
+        mGoingHome = mFromNavBar && mStartState == NORMAL;
 
         if (handlingOverviewAnim()) {
             mMotionPauseDetector.setOnMotionPauseListener(isPaused -> {
@@ -103,8 +121,9 @@ public void onAnimationEnd(Animator animation) {
                     }
                 });
                 mPeekAnim.start();
-                VibratorWrapper.INSTANCE.get(mLauncher).vibrate(OVERVIEW_HAPTIC);
-
+                //VibratorWrapper.INSTANCE.get(mLauncher).vibrate(OVERVIEW_HAPTIC);
+                recentsView.performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY,
+                        HapticFeedbackConstants.FLAG_IGNORE_VIEW_SETTING);
                 mLauncher.getDragLayer().getScrim().animateToSysuiMultiplier(isPaused ? 0 : 1,
                         peekDuration, 0);
             });
@@ -175,8 +194,14 @@ public void onDragEnd(float velocity) {
                 mPeekAnim.cancel();
             }
 
-            Animator overviewAnim = mLauncher.getAppTransitionManager().createStateElementAnimation(
-                    INDEX_PAUSE_TO_OVERVIEW_ANIM);
+            AnimatorSetBuilder builder = new AnimatorSetBuilder();
+            builder.setInterpolator(ANIM_VERTICAL_PROGRESS, OVERSHOOT_1_2);
+            if ((OVERVIEW.getVisibleElements(mLauncher) & HOTSEAT_ICONS) != 0) {
+                builder.setInterpolator(ANIM_HOTSEAT_SCALE, OVERSHOOT_1_2);
+                builder.setInterpolator(ANIM_HOTSEAT_TRANSLATE, OVERSHOOT_1_2);
+            }
+            AnimatorSet overviewAnim = mLauncher.getStateManager().createAtomicAnimation(
+                    NORMAL, OVERVIEW, builder, ANIM_ALL, ATOMIC_DURATION);
             overviewAnim.addListener(new AnimatorListenerAdapter() {
                 @Override
                 public void onAnimationEnd(Animator animation) {
@@ -184,14 +209,23 @@ public void onAnimationEnd(Animator animation) {
                 }
             });
             overviewAnim.start();
-        } else {
+        } else if (mGoingHome && Float.compare(Math.signum(velocity), Math.signum(mProgressMultiplier)) == 0) {
+            mAnimatingToHome = true;
+            AnimatorSetBuilder builder = new AnimatorSetBuilder();
+            AnimatorSet homeAnim = mLauncher.getStateManager().createAtomicAnimation(
+                    NORMAL, NORMAL, builder, ANIM_ALL, ATOMIC_DURATION);
+            homeAnim.addListener(new AnimatorListenerAdapter() {
+                @Override
+                public void onAnimationEnd(Animator animation) {
+                    onSwipeInteractionCompleted(NORMAL, Touch.SWIPE);
+                    mAnimatingToHome = false;
+                }
+            });
+            homeAnim.start();
+            mLauncher.getWorkspace().snapToPage(0);
+        } else if (!mAnimatingToHome) {
             super.onDragEnd(velocity);
         }
-
-        View searchView = mLauncher.getAppsView().getSearchView();
-        if (searchView instanceof FeedbackHandler) {
-            ((FeedbackHandler) searchView).resetFeedback();
-        }
         mMotionPauseDetector.clear();
     }
 
@@ -219,6 +253,21 @@ protected void updateAnimatorBuilderOnReinit(AnimatorSetBuilder builder) {
         }
     }
 
+    @Override
+    protected float initCurrentAnimation(int animComponents) {
+        return mProgressMultiplier = super.initCurrentAnimation(animComponents);
+    }
+
+    @Override
+    protected void updateProgress(float fraction) {
+        if (mGoingHome) {
+            float scale = mPullbackDistance * -mProgressMultiplier;
+            fraction = DEACCEL_3.getInterpolation(fraction);
+            fraction *= scale;
+        }
+        super.updateProgress(fraction);
+    }
+
     /**
      * Interface for views with feedback animation requiring reset
      */
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
index 90aa940a40..2e36945e10 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
@@ -15,28 +15,6 @@
  */
 package com.android.quickstep;
 
-import static android.view.MotionEvent.ACTION_DOWN;
-
-import static com.android.launcher3.config.FeatureFlags.ADAPTIVE_ICON_WINDOW_ANIM;
-import static com.android.launcher3.config.FeatureFlags.APPLY_CONFIG_AT_RUNTIME;
-import static com.android.launcher3.config.FeatureFlags.ENABLE_HINTS_IN_OVERVIEW;
-import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
-import static com.android.launcher3.config.FeatureFlags.FAKE_LANDSCAPE_UI;
-import static com.android.launcher3.config.FeatureFlags.QUICKSTEP_SPRINGS;
-import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
-import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
-import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_INPUT_MONITOR;
-import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_SYSUI_PROXY;
-import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_A11Y_BUTTON_CLICKABLE;
-import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_A11Y_BUTTON_LONG_CLICKABLE;
-import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_HOME_DISABLED;
-import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_NAV_BAR_HIDDEN;
-import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED;
-import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_OVERVIEW_DISABLED;
-import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_SCREEN_PINNING;
-import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING_OCCLUDED;
-import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.ACTIVITY_TYPE_ASSISTANT;
-
 import android.annotation.TargetApi;
 import android.app.ActivityManager;
 import android.app.ActivityManager.RunningTaskInfo;
@@ -102,6 +80,7 @@
 import com.android.systemui.shared.system.QuickStepContract.SystemUiStateFlags;
 import com.android.systemui.shared.system.RecentsAnimationListener;
 import com.android.systemui.shared.system.SystemGestureExclusionListenerCompat;
+import com.saggitt.omega.gestures.gestures.GestureTouchConsumer;
 
 import java.io.FileDescriptor;
 import java.io.PrintWriter;
@@ -109,6 +88,27 @@
 import java.util.LinkedList;
 import java.util.List;
 
+import static android.view.MotionEvent.ACTION_DOWN;
+import static com.android.launcher3.config.FeatureFlags.ADAPTIVE_ICON_WINDOW_ANIM;
+import static com.android.launcher3.config.FeatureFlags.APPLY_CONFIG_AT_RUNTIME;
+import static com.android.launcher3.config.FeatureFlags.ENABLE_HINTS_IN_OVERVIEW;
+import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
+import static com.android.launcher3.config.FeatureFlags.FAKE_LANDSCAPE_UI;
+import static com.android.launcher3.config.FeatureFlags.QUICKSTEP_SPRINGS;
+import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
+import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
+import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_INPUT_MONITOR;
+import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_SYSUI_PROXY;
+import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_A11Y_BUTTON_CLICKABLE;
+import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_A11Y_BUTTON_LONG_CLICKABLE;
+import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_HOME_DISABLED;
+import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_NAV_BAR_HIDDEN;
+import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED;
+import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_OVERVIEW_DISABLED;
+import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_SCREEN_PINNING;
+import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING_OCCLUDED;
+import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.ACTIVITY_TYPE_ASSISTANT;
+
 /**
  * Wrapper around a list for processing arguments.
  */
@@ -300,6 +300,8 @@ public void onReceive(Context context, Intent intent) {
     private final RectF mSwipeTouchRegion = new RectF();
     private final RectF mAssistantLeftRegion = new RectF();
     private final RectF mAssistantRightRegion = new RectF();
+    private final RectF mCustomLeftRegion = new RectF();
+    private final RectF mCustomRightRegion = new RectF();
 
     private ComponentName mGestureBlockingActivity;
 
@@ -392,6 +394,7 @@ private void initTouchBounds() {
         DefaultDisplay.Info displayInfo = DefaultDisplay.INSTANCE.get(this).getInfo();
         Point realSize = new Point(displayInfo.realSize);
         mSwipeTouchRegion.set(0, 0, realSize.x, realSize.y);
+        float customGestureFraction = 0.25f;
         if (mMode == Mode.NO_BUTTON) {
             int touchHeight = getNavbarSize(ResourceUtils.NAVBAR_BOTTOM_GESTURE_SIZE);
             mSwipeTouchRegion.top = mSwipeTouchRegion.bottom - touchHeight;
@@ -409,6 +412,18 @@ private void initTouchBounds() {
 
             mAssistantRightRegion.right = mSwipeTouchRegion.right;
             mAssistantRightRegion.left = mSwipeTouchRegion.right - assistantWidth;
+
+            // Custom gesture regions
+            float customGestureWidth = mSwipeTouchRegion.width() * customGestureFraction;
+            mCustomLeftRegion.bottom = mCustomRightRegion.bottom = mAssistantLeftRegion.bottom;
+            mCustomLeftRegion.top = mCustomRightRegion.top = mAssistantLeftRegion.top;
+
+            mCustomLeftRegion.left = 0;
+            mCustomLeftRegion.right = customGestureWidth;
+
+            mCustomRightRegion.right = mSwipeTouchRegion.right;
+            mCustomRightRegion.left = mSwipeTouchRegion.right - customGestureWidth;
+
         } else {
             mAssistantLeftRegion.setEmpty();
             mAssistantRightRegion.setEmpty();
@@ -425,6 +440,26 @@ private void initTouchBounds() {
                     mSwipeTouchRegion.top = mSwipeTouchRegion.bottom
                             - getNavbarSize(ResourceUtils.NAVBAR_BOTTOM_GESTURE_SIZE);
             }
+            // Custom gesture regions
+            mCustomLeftRegion.set(mSwipeTouchRegion);
+            mCustomRightRegion.set(mSwipeTouchRegion);
+            float customGestureWidth;
+            switch (displayInfo.rotation) {
+                case Surface.ROTATION_90:
+                    customGestureWidth = mSwipeTouchRegion.height() * customGestureFraction;
+                    mCustomLeftRegion.top = mSwipeTouchRegion.bottom - customGestureWidth;
+                    mCustomRightRegion.bottom = mSwipeTouchRegion.top + customGestureWidth;
+                    break;
+                case Surface.ROTATION_270:
+                    customGestureWidth = mSwipeTouchRegion.height() * customGestureFraction;
+                    mCustomLeftRegion.bottom = mSwipeTouchRegion.top + customGestureWidth;
+                    mCustomRightRegion.top = mSwipeTouchRegion.bottom - customGestureWidth;
+                    break;
+                default:
+                    customGestureWidth = mSwipeTouchRegion.width() * customGestureFraction;
+                    mCustomLeftRegion.right = mSwipeTouchRegion.left + customGestureWidth;
+                    mCustomRightRegion.left = mSwipeTouchRegion.right - customGestureWidth;
+            }
         }
     }
 
@@ -587,7 +622,14 @@ private boolean canTriggerAssistantAction(MotionEvent ev) {
         return mAssistantAvailable
                 && !QuickStepContract.isAssistantGestureDisabled(mSystemUiStateFlags)
                 && (mAssistantLeftRegion.contains(ev.getX(), ev.getY()) ||
-                    mAssistantRightRegion.contains(ev.getX(), ev.getY()))
+                mAssistantRightRegion.contains(ev.getX(), ev.getY()))
+                && !ActivityManagerWrapper.getInstance().isLockToAppActive();
+    }
+
+    private boolean canTriggerCustomAction(MotionEvent ev) {
+        return !QuickStepContract.isAssistantGestureDisabled(mSystemUiStateFlags)
+                && (mCustomLeftRegion.contains(ev.getX(), ev.getY()) ||
+                mCustomRightRegion.contains(ev.getX(), ev.getY()))
                 && !ActivityManagerWrapper.getInstance().isLockToAppActive();
     }
 
@@ -616,6 +658,11 @@ private InputConsumer newConsumer(boolean useSharedState, MotionEvent event) {
                         mInputMonitorCompat);
             }
 
+            if (canTriggerCustomAction(event)) {
+                base = new GestureTouchConsumer(this, mCustomLeftRegion, mCustomRightRegion,
+                        activityControl, base, mInputMonitorCompat);
+            }
+
             if ((mSystemUiStateFlags & SYSUI_STATE_SCREEN_PINNING) != 0) {
                 // Note: we only allow accessibility to wrap this, and it replaces the previous
                 // base input consumer (which should be NO_OP anyway since topTaskLocked == true).
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java
index 2fa4feb335..b626dcaf92 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java
@@ -15,28 +15,6 @@
  */
 package com.android.quickstep;
 
-import static com.android.launcher3.BaseActivity.INVISIBLE_BY_STATE_HANDLER;
-import static com.android.launcher3.BaseActivity.STATE_HANDLER_INVISIBILITY_FLAGS;
-import static com.android.launcher3.anim.Interpolators.DEACCEL;
-import static com.android.launcher3.anim.Interpolators.LINEAR;
-import static com.android.launcher3.anim.Interpolators.OVERSHOOT_1_2;
-import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
-import static com.android.launcher3.config.FeatureFlags.QUICKSTEP_SPRINGS;
-import static com.android.launcher3.util.DefaultDisplay.getSingleFrameMs;
-import static com.android.launcher3.util.RaceConditionTracker.ENTER;
-import static com.android.launcher3.util.RaceConditionTracker.EXIT;
-import static com.android.launcher3.util.SystemUiController.UI_STATE_OVERVIEW;
-import static com.android.quickstep.MultiStateCallback.DEBUG_STATES;
-import static com.android.quickstep.TouchInteractionService.TOUCH_INTERACTION_LOG;
-import static com.android.quickstep.WindowTransformSwipeHandler.GestureEndTarget.HOME;
-import static com.android.quickstep.WindowTransformSwipeHandler.GestureEndTarget.LAST_TASK;
-import static com.android.quickstep.WindowTransformSwipeHandler.GestureEndTarget.NEW_TASK;
-import static com.android.quickstep.WindowTransformSwipeHandler.GestureEndTarget.RECENTS;
-import static com.android.quickstep.util.ShelfPeekAnim.ShelfAnimState.HIDE;
-import static com.android.quickstep.util.ShelfPeekAnim.ShelfAnimState.PEEK;
-import static com.android.quickstep.views.RecentsView.UPDATE_SYSUI_FLAGS_THRESHOLD;
-import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_OVERVIEW_DISABLED;
-
 import android.animation.Animator;
 import android.animation.AnimatorSet;
 import android.animation.TimeInterpolator;
@@ -92,6 +70,28 @@
 import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
 import com.android.systemui.shared.system.WindowCallbacksCompat;
 
+import static com.android.launcher3.BaseActivity.INVISIBLE_BY_STATE_HANDLER;
+import static com.android.launcher3.BaseActivity.STATE_HANDLER_INVISIBILITY_FLAGS;
+import static com.android.launcher3.anim.Interpolators.DEACCEL;
+import static com.android.launcher3.anim.Interpolators.LINEAR;
+import static com.android.launcher3.anim.Interpolators.OVERSHOOT_1_2;
+import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
+import static com.android.launcher3.config.FeatureFlags.QUICKSTEP_SPRINGS;
+import static com.android.launcher3.util.DefaultDisplay.getSingleFrameMs;
+import static com.android.launcher3.util.RaceConditionTracker.ENTER;
+import static com.android.launcher3.util.RaceConditionTracker.EXIT;
+import static com.android.launcher3.util.SystemUiController.UI_STATE_OVERVIEW;
+import static com.android.quickstep.MultiStateCallback.DEBUG_STATES;
+import static com.android.quickstep.TouchInteractionService.TOUCH_INTERACTION_LOG;
+import static com.android.quickstep.WindowTransformSwipeHandler.GestureEndTarget.HOME;
+import static com.android.quickstep.WindowTransformSwipeHandler.GestureEndTarget.LAST_TASK;
+import static com.android.quickstep.WindowTransformSwipeHandler.GestureEndTarget.NEW_TASK;
+import static com.android.quickstep.WindowTransformSwipeHandler.GestureEndTarget.RECENTS;
+import static com.android.quickstep.util.ShelfPeekAnim.ShelfAnimState.HIDE;
+import static com.android.quickstep.util.ShelfPeekAnim.ShelfAnimState.PEEK;
+import static com.android.quickstep.views.RecentsView.UPDATE_SYSUI_FLAGS_THRESHOLD;
+import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_OVERVIEW_DISABLED;
+
 @TargetApi(Build.VERSION_CODES.O)
 public class WindowTransformSwipeHandler<T extends BaseDraggingActivity>
         extends BaseSwipeUpHandler<T, RecentsView>
@@ -189,7 +189,7 @@ public enum GestureEndTarget {
     public static final long MIN_OVERSHOOT_DURATION = 120;
 
     public static final float MIN_PROGRESS_FOR_OVERVIEW = 0.7f;
-    private static final float SWIPE_DURATION_MULTIPLIER =
+    public static final float SWIPE_DURATION_MULTIPLIER =
             Math.min(1 / MIN_PROGRESS_FOR_OVERVIEW, 1 / (1 - MIN_PROGRESS_FOR_OVERVIEW));
     private static final String SCREENSHOT_CAPTURED_EVT = "ScreenshotCaptured";
 
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/AssistantTouchConsumer.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/AssistantTouchConsumer.java
index 346969e592..5f2a4c4aba 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/AssistantTouchConsumer.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/AssistantTouchConsumer.java
@@ -17,21 +17,6 @@
 
 package com.android.quickstep.inputconsumers;
 
-import static android.view.MotionEvent.ACTION_CANCEL;
-import static android.view.MotionEvent.ACTION_DOWN;
-import static android.view.MotionEvent.ACTION_MOVE;
-import static android.view.MotionEvent.ACTION_POINTER_DOWN;
-import static android.view.MotionEvent.ACTION_POINTER_UP;
-import static android.view.MotionEvent.ACTION_UP;
-
-import static com.android.launcher3.Utilities.squaredHypot;
-import static com.android.launcher3.userevent.nano.LauncherLogProto.Action.Direction.UPLEFT;
-import static com.android.launcher3.userevent.nano.LauncherLogProto.Action.Direction.UPRIGHT;
-import static com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch.FLING;
-import static com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch.SWIPE;
-import static com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch.SWIPE_NOOP;
-import static com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType.NAVBAR;
-
 import android.animation.ValueAnimator;
 import android.content.Context;
 import android.content.res.Resources;
@@ -54,6 +39,20 @@
 import com.android.systemui.shared.recents.ISystemUiProxy;
 import com.android.systemui.shared.system.InputMonitorCompat;
 
+import static android.view.MotionEvent.ACTION_CANCEL;
+import static android.view.MotionEvent.ACTION_DOWN;
+import static android.view.MotionEvent.ACTION_MOVE;
+import static android.view.MotionEvent.ACTION_POINTER_DOWN;
+import static android.view.MotionEvent.ACTION_POINTER_UP;
+import static android.view.MotionEvent.ACTION_UP;
+import static com.android.launcher3.Utilities.squaredHypot;
+import static com.android.launcher3.userevent.nano.LauncherLogProto.Action.Direction.UPLEFT;
+import static com.android.launcher3.userevent.nano.LauncherLogProto.Action.Direction.UPRIGHT;
+import static com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch.FLING;
+import static com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch.SWIPE;
+import static com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch.SWIPE_NOOP;
+import static com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType.NAVBAR;
+
 /**
  * Touch consumer for handling events to launch assistant from launcher
  */
@@ -63,10 +62,10 @@ public class AssistantTouchConsumer extends DelegateInputConsumer {
     private static final long RETRACT_ANIMATION_DURATION_MS = 300;
 
     // From //java/com/google/android/apps/gsa/search/shared/util/OpaContract.java.
-    private static final String OPA_BUNDLE_TRIGGER = "triggered_by";
+    public static final String OPA_BUNDLE_TRIGGER = "triggered_by";
     // From //java/com/google/android/apps/gsa/assistant/shared/proto/opa_trigger.proto.
     private static final int OPA_BUNDLE_TRIGGER_DIAG_SWIPE_GESTURE = 83;
-    private static final String INVOCATION_TYPE_KEY = "invocation_type";
+    public static final String INVOCATION_TYPE_KEY = "invocation_type";
     private static final int INVOCATION_TYPE_GESTURE = 1;
 
     private final PointF mDownPos = new PointF();
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/InputConsumer.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/InputConsumer.java
index a1e5d47a53..4464cc61da 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/InputConsumer.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/InputConsumer.java
@@ -33,9 +33,10 @@ public interface InputConsumer {
     int TYPE_SCREEN_PINNED = 1 << 6;
     int TYPE_OVERVIEW_WITHOUT_FOCUS = 1 << 7;
     int TYPE_RESET_GESTURE = 1 << 8;
+    int TYPE_CUSTOM_GESTURES = 1 << 9;
 
-    String[] NAMES = new String[] {
-           "TYPE_NO_OP",                    // 0
+    String[] NAMES = new String[]{
+            "TYPE_NO_OP",                    // 0
             "TYPE_OVERVIEW",                // 1
             "TYPE_OTHER_ACTIVITY",          // 2
             "TYPE_ASSISTANT",               // 3
@@ -44,6 +45,7 @@ public interface InputConsumer {
             "TYPE_SCREEN_PINNED",           // 6
             "TYPE_OVERVIEW_WITHOUT_FOCUS",  // 7
             "TYPE_RESET_GESTURE",           // 8
+            "TYPE_CUSTOM_GESTURES",         // 9
     };
 
     InputConsumer NO_OP = () -> TYPE_NO_OP;
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java
index e11e848334..be82ad41ab 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java
@@ -16,28 +16,6 @@
 
 package com.android.quickstep.views;
 
-import static androidx.dynamicanimation.animation.DynamicAnimation.MIN_VISIBLE_CHANGE_PIXELS;
-import static com.android.launcher3.BaseActivity.STATE_HANDLER_INVISIBILITY_FLAGS;
-import static com.android.launcher3.InvariantDeviceProfile.CHANGE_FLAG_ICON_PARAMS;
-import static com.android.launcher3.LauncherAnimUtils.SCALE_PROPERTY;
-import static com.android.launcher3.LauncherAnimUtils.VIEW_TRANSLATE_X;
-import static com.android.launcher3.LauncherAnimUtils.VIEW_TRANSLATE_Y;
-import static com.android.launcher3.Utilities.EDGE_NAV_BAR;
-import static com.android.launcher3.Utilities.squaredHypot;
-import static com.android.launcher3.Utilities.squaredTouchSlop;
-import static com.android.launcher3.anim.Interpolators.ACCEL;
-import static com.android.launcher3.anim.Interpolators.ACCEL_2;
-import static com.android.launcher3.anim.Interpolators.FAST_OUT_SLOW_IN;
-import static com.android.launcher3.anim.Interpolators.LINEAR;
-import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
-import static com.android.launcher3.config.FeatureFlags.QUICKSTEP_SPRINGS;
-import static com.android.launcher3.uioverrides.touchcontrollers.TaskViewTouchController.SUCCESS_TRANSITION_PROGRESS;
-import static com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch.TAP;
-import static com.android.launcher3.userevent.nano.LauncherLogProto.ControlType.CLEAR_ALL_BUTTON;
-import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
-import static com.android.launcher3.util.SystemUiController.UI_STATE_OVERVIEW;
-import static com.android.quickstep.TaskUtils.checkCurrentOrManagedUserId;
-
 import android.animation.Animator;
 import android.animation.AnimatorSet;
 import android.animation.LayoutTransition;
@@ -118,6 +96,28 @@
 import java.util.ArrayList;
 import java.util.function.Consumer;
 
+import static androidx.dynamicanimation.animation.DynamicAnimation.MIN_VISIBLE_CHANGE_PIXELS;
+import static com.android.launcher3.BaseActivity.STATE_HANDLER_INVISIBILITY_FLAGS;
+import static com.android.launcher3.InvariantDeviceProfile.CHANGE_FLAG_ICON_PARAMS;
+import static com.android.launcher3.LauncherAnimUtils.SCALE_PROPERTY;
+import static com.android.launcher3.LauncherAnimUtils.VIEW_TRANSLATE_X;
+import static com.android.launcher3.LauncherAnimUtils.VIEW_TRANSLATE_Y;
+import static com.android.launcher3.Utilities.EDGE_NAV_BAR;
+import static com.android.launcher3.Utilities.squaredHypot;
+import static com.android.launcher3.Utilities.squaredTouchSlop;
+import static com.android.launcher3.anim.Interpolators.ACCEL;
+import static com.android.launcher3.anim.Interpolators.ACCEL_2;
+import static com.android.launcher3.anim.Interpolators.FAST_OUT_SLOW_IN;
+import static com.android.launcher3.anim.Interpolators.LINEAR;
+import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
+import static com.android.launcher3.config.FeatureFlags.QUICKSTEP_SPRINGS;
+import static com.android.launcher3.uioverrides.touchcontrollers.TaskViewTouchController.SUCCESS_TRANSITION_PROGRESS;
+import static com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch.TAP;
+import static com.android.launcher3.userevent.nano.LauncherLogProto.ControlType.CLEAR_ALL_BUTTON;
+import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
+import static com.android.launcher3.util.SystemUiController.UI_STATE_OVERVIEW;
+import static com.android.quickstep.TaskUtils.checkCurrentOrManagedUserId;
+
 /**
  * A list of recent tasks.
  */
@@ -406,11 +406,10 @@ public void onIdpChanged(int changeFlags, InvariantDeviceProfile idp) {
     protected void onAttachedToWindow() {
         super.onAttachedToWindow();
         updateTaskStackListenerState();
-        mModel.getThumbnailCache().getHighResLoadingState().addCallback(this);
-        mActivity.addMultiWindowModeChangedListener(mMultiWindowModeChangedListener);
-        //ActivityManagerWrapper.getInstance().registerTaskStackListener(mTaskStackListener);
-        //mSyncTransactionApplier = new SyncRtSurfaceTransactionApplierCompat(this);
-        if (Utilities.ATLEAST_Q) {
+        if (Utilities.isRecentsEnabled()) {
+            mModel.getThumbnailCache().getHighResLoadingState().addCallback(this);
+            mActivity.addMultiWindowModeChangedListener(mMultiWindowModeChangedListener);
+
             try {
                 ActivityManagerWrapper.getInstance().registerTaskStackListener(mTaskStackListener);
                 mSyncTransactionApplier = new SyncRtSurfaceTransactionApplierCompat(this);
@@ -430,7 +429,7 @@ protected void onDetachedFromWindow() {
         mActivity.removeMultiWindowModeChangedListener(mMultiWindowModeChangedListener);
         //ActivityManagerWrapper.getInstance().unregisterTaskStackListener(mTaskStackListener);
         mSyncTransactionApplier = null;
-        if (Utilities.ATLEAST_Q) {
+        if (Utilities.isRecentsEnabled()) {
             try {
                 ActivityManagerWrapper.getInstance().unregisterTaskStackListener(mTaskStackListener);
                 RecentsModel.INSTANCE.get(getContext()).removeThumbnailChangeListener(this);
diff --git a/quickstep/res/layout/scrim_view.xml b/quickstep/res/layout/scrim_view.xml
index 2cc37f9cc4..8e6e5d492e 100644
--- a/quickstep/res/layout/scrim_view.xml
+++ b/quickstep/res/layout/scrim_view.xml
@@ -13,8 +13,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.quickstep.views.ShelfScrimView
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<com.saggitt.omega.blur.BlurScrimView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:id="@+id/scrim_view" />
\ No newline at end of file
diff --git a/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java b/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
index a91410cd9b..ab269b9de8 100644
--- a/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
+++ b/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
@@ -16,26 +16,6 @@
 
 package com.android.launcher3;
 
-import static com.android.launcher3.BaseActivity.INVISIBLE_ALL;
-import static com.android.launcher3.BaseActivity.INVISIBLE_BY_APP_TRANSITIONS;
-import static com.android.launcher3.BaseActivity.INVISIBLE_BY_PENDING_FLAGS;
-import static com.android.launcher3.BaseActivity.PENDING_INVISIBLE_BY_WALLPAPER_ANIMATION;
-import static com.android.launcher3.LauncherState.ALL_APPS;
-import static com.android.launcher3.LauncherState.OVERVIEW;
-import static com.android.launcher3.Utilities.postAsyncCallback;
-import static com.android.launcher3.allapps.AllAppsTransitionController.ALL_APPS_PROGRESS;
-import static com.android.launcher3.anim.Interpolators.AGGRESSIVE_EASE;
-import static com.android.launcher3.anim.Interpolators.DEACCEL_1_7;
-import static com.android.launcher3.anim.Interpolators.EXAGGERATED_EASE;
-import static com.android.launcher3.anim.Interpolators.LINEAR;
-import static com.android.launcher3.dragndrop.DragLayer.ALPHA_INDEX_TRANSITIONS;
-import static com.android.launcher3.views.FloatingIconView.SHAPE_PROGRESS_DURATION;
-import static com.android.quickstep.TaskUtils.taskIsATargetWithMode;
-import static com.android.systemui.shared.system.QuickStepContract.getWindowCornerRadius;
-import static com.android.systemui.shared.system.QuickStepContract.supportsRoundedCornersOnWindows;
-import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.MODE_CLOSING;
-import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.MODE_OPENING;
-
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
@@ -84,6 +64,26 @@
 import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat.SurfaceParams;
 import com.android.systemui.shared.system.WindowManagerWrapper;
 
+import static com.android.launcher3.BaseActivity.INVISIBLE_ALL;
+import static com.android.launcher3.BaseActivity.INVISIBLE_BY_APP_TRANSITIONS;
+import static com.android.launcher3.BaseActivity.INVISIBLE_BY_PENDING_FLAGS;
+import static com.android.launcher3.BaseActivity.PENDING_INVISIBLE_BY_WALLPAPER_ANIMATION;
+import static com.android.launcher3.LauncherState.ALL_APPS;
+import static com.android.launcher3.LauncherState.OVERVIEW;
+import static com.android.launcher3.Utilities.postAsyncCallback;
+import static com.android.launcher3.allapps.AllAppsTransitionController.ALL_APPS_PROGRESS;
+import static com.android.launcher3.anim.Interpolators.AGGRESSIVE_EASE;
+import static com.android.launcher3.anim.Interpolators.DEACCEL_1_7;
+import static com.android.launcher3.anim.Interpolators.EXAGGERATED_EASE;
+import static com.android.launcher3.anim.Interpolators.LINEAR;
+import static com.android.launcher3.dragndrop.DragLayer.ALPHA_INDEX_TRANSITIONS;
+import static com.android.launcher3.views.FloatingIconView.SHAPE_PROGRESS_DURATION;
+import static com.android.quickstep.TaskUtils.taskIsATargetWithMode;
+import static com.android.systemui.shared.system.QuickStepContract.getWindowCornerRadius;
+import static com.android.systemui.shared.system.QuickStepContract.supportsRoundedCornersOnWindows;
+import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.MODE_CLOSING;
+import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.MODE_OPENING;
+
 /**
  * {@link LauncherAppTransitionManager} with Quickstep-specific app transitions for launching from
  * home and/or all-apps.
@@ -126,7 +126,7 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
     private static final long RADIUS_DURATION = 375;
 
     public static final int RECENTS_LAUNCH_DURATION = 336;
-    private static final int LAUNCHER_RESUME_START_DELAY = 100;
+    protected static final int LAUNCHER_RESUME_START_DELAY = 100;
     private static final int CLOSING_TRANSITION_DURATION_MS = 250;
 
     protected static final int CONTENT_ALPHA_DURATION = 217;
@@ -343,16 +343,16 @@ public void setRemoteAnimationProvider(final RemoteAnimationProvider animationPr
      *
      * @param isAppOpening True when this is called when an app is opening.
      *                     False when this is called when an app is closing.
-     * @param trans Array that contains the start and end translation values for the content.
+     * @param trans        Array that contains the start and end translation values for the content.
      */
-    private Pair<AnimatorSet, Runnable> getLauncherContentAnimator(boolean isAppOpening,
-            float[] trans) {
+    protected Pair<AnimatorSet, Runnable> getLauncherContentAnimator(boolean isAppOpening,
+                                                                     float[] trans) {
         AnimatorSet launcherAnimator = new AnimatorSet();
         Runnable endListener;
 
         float[] alphas = isAppOpening
-                ? new float[] {1, 0}
-                : new float[] {0, 1};
+                ? new float[]{1, 0}
+                : new float[]{0, 1};
 
         if (mLauncher.isInState(ALL_APPS)) {
             // All Apps in portrait mode is full screen, so we only animate AllAppsContainerView.
@@ -703,11 +703,11 @@ public void onUpdate(float percent) {
     /**
      * Creates an animator that modifies Launcher as a result from {@link #getWallpaperOpenRunner}.
      */
-    private void createLauncherResumeAnimation(AnimatorSet anim) {
+    protected void createLauncherResumeAnimation(AnimatorSet anim) {
         if (mLauncher.isInState(LauncherState.ALL_APPS)) {
             Pair<AnimatorSet, Runnable> contentAnimator =
                     getLauncherContentAnimator(false /* isAppOpening */,
-                            new float[] {-mContentTransY, 0});
+                            new float[]{-mContentTransY, 0});
             contentAnimator.first.setStartDelay(LAUNCHER_RESUME_START_DELAY);
             anim.play(contentAnimator.first);
             anim.addListener(new AnimatorListenerAdapter() {
@@ -747,7 +747,7 @@ public void onAnimationEnd(Animator animation) {
         }
     }
 
-    private void resetContentView() {
+    protected void resetContentView() {
         mLauncher.getWorkspace().getPageIndicator().skipAnimationsToEnd();
         mDragLayerAlpha.setValue(1f);
         mDragLayer.setLayerType(View.LAYER_TYPE_NONE, null);
diff --git a/quickstep/src/com/android/launcher3/uioverrides/UiFactory.java b/quickstep/src/com/android/launcher3/uioverrides/UiFactory.java
index f6433b1d82..993638e66a 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/UiFactory.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/UiFactory.java
@@ -16,23 +16,9 @@
 
 package com.android.launcher3.uioverrides;
 
-import static android.app.Activity.RESULT_CANCELED;
-
-import static com.android.launcher3.AbstractFloatingView.TYPE_ALL;
-import static com.android.launcher3.AbstractFloatingView.TYPE_HIDE_BACK_BUTTON;
-import static com.android.launcher3.LauncherState.ALL_APPS;
-import static com.android.launcher3.LauncherState.NORMAL;
-import static com.android.launcher3.LauncherState.OVERVIEW;
-import static com.android.launcher3.allapps.DiscoveryBounce.BOUNCE_MAX_COUNT;
-import static com.android.launcher3.allapps.DiscoveryBounce.HOME_BOUNCE_COUNT;
-import static com.android.launcher3.allapps.DiscoveryBounce.HOME_BOUNCE_SEEN;
-import static com.android.launcher3.allapps.DiscoveryBounce.SHELF_BOUNCE_COUNT;
-import static com.android.launcher3.allapps.DiscoveryBounce.SHELF_BOUNCE_SEEN;
-
 import android.animation.AnimatorSet;
 import android.animation.ValueAnimator;
 import android.app.Activity;
-import android.app.Person;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentSender;
@@ -56,6 +42,7 @@
 import com.android.quickstep.SysUINavigationMode;
 import com.android.quickstep.SysUINavigationMode.Mode;
 import com.android.quickstep.SysUINavigationMode.NavigationModeChangeListener;
+import com.android.quickstep.TouchInteractionService;
 import com.android.quickstep.util.RemoteFadeOutAnimationListener;
 import com.android.systemui.shared.system.ActivityCompat;
 
@@ -63,6 +50,18 @@
 import java.io.PrintWriter;
 import java.util.zip.Deflater;
 
+import static android.app.Activity.RESULT_CANCELED;
+import static com.android.launcher3.AbstractFloatingView.TYPE_ALL;
+import static com.android.launcher3.AbstractFloatingView.TYPE_HIDE_BACK_BUTTON;
+import static com.android.launcher3.LauncherState.ALL_APPS;
+import static com.android.launcher3.LauncherState.NORMAL;
+import static com.android.launcher3.LauncherState.OVERVIEW;
+import static com.android.launcher3.allapps.DiscoveryBounce.BOUNCE_MAX_COUNT;
+import static com.android.launcher3.allapps.DiscoveryBounce.HOME_BOUNCE_COUNT;
+import static com.android.launcher3.allapps.DiscoveryBounce.HOME_BOUNCE_SEEN;
+import static com.android.launcher3.allapps.DiscoveryBounce.SHELF_BOUNCE_COUNT;
+import static com.android.launcher3.allapps.DiscoveryBounce.SHELF_BOUNCE_SEEN;
+
 public class UiFactory extends RecentsUiFactory {
 
     public static Runnable enableLiveUIChanges(Launcher launcher) {
@@ -112,8 +111,8 @@ public void onStateTransitionStart(LauncherState toState) {
 
                 @Override
                 public void onStateTransitionComplete(LauncherState finalState) {
-                    boolean swipeUpEnabled = Utilities.ATLEAST_Q && SysUINavigationMode.INSTANCE.get(launcher).getMode()
-                            .hasGestures;
+                    boolean swipeUpEnabled = SysUINavigationMode.INSTANCE.get(launcher).getMode()
+                            .hasGestures && TouchInteractionService.isConnected();
                     LauncherState prevState = launcher.getStateManager().getLastState();
 
                     if (((swipeUpEnabled && finalState == OVERVIEW) || (!swipeUpEnabled
@@ -147,6 +146,7 @@ public void onStateTransitionComplete(LauncherState finalState) {
     }
 
     public static void onEnterAnimationComplete(Context context) {
+        if (!Utilities.isRecentsEnabled()) return;
         // After the transition to home, enable the high-res thumbnail loader if it wasn't enabled
         // as a part of quickstep, so that high-res thumbnails can load the next time we enter
         // overview
diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java b/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java
index 85a9545073..cb01465570 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java
@@ -15,9 +15,6 @@
  */
 package com.android.launcher3.uioverrides.states;
 
-import static com.android.launcher3.LauncherAnimUtils.ALL_APPS_TRANSITION_MS;
-import static com.android.launcher3.anim.Interpolators.DEACCEL_2;
-
 import com.android.launcher3.AbstractFloatingView;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherState;
@@ -25,6 +22,9 @@
 import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
 import com.android.quickstep.SysUINavigationMode;
 
+import static com.android.launcher3.LauncherAnimUtils.ALL_APPS_TRANSITION_MS;
+import static com.android.launcher3.anim.Interpolators.DEACCEL_2;
+
 /**
  * Definition for AllApps state
  */
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java
index db6a40f2e9..701edfaa1b 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java
@@ -15,19 +15,6 @@
  */
 package com.android.launcher3.uioverrides.touchcontrollers;
 
-import static com.android.launcher3.AbstractFloatingView.TYPE_ACCESSIBLE;
-import static com.android.launcher3.LauncherState.ALL_APPS;
-import static com.android.launcher3.LauncherState.NORMAL;
-import static com.android.launcher3.LauncherState.OVERVIEW;
-import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_ALL_APPS_FADE;
-import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_OVERVIEW_FADE;
-import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_VERTICAL_PROGRESS;
-import static com.android.launcher3.anim.Interpolators.ACCEL;
-import static com.android.launcher3.anim.Interpolators.DEACCEL;
-import static com.android.launcher3.anim.Interpolators.LINEAR;
-import static com.android.launcher3.config.FeatureFlags.QUICKSTEP_SPRINGS;
-import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_OVERVIEW_DISABLED;
-
 import android.animation.TimeInterpolator;
 import android.animation.ValueAnimator;
 import android.view.MotionEvent;
@@ -51,6 +38,21 @@
 import com.android.quickstep.RecentsModel;
 import com.android.quickstep.TouchInteractionService;
 import com.android.quickstep.util.LayoutUtils;
+import com.saggitt.omega.OmegaLauncher;
+
+import static com.android.launcher3.AbstractFloatingView.TYPE_ACCESSIBLE;
+import static com.android.launcher3.LauncherState.ALL_APPS;
+import static com.android.launcher3.LauncherState.NORMAL;
+import static com.android.launcher3.LauncherState.OVERVIEW;
+import static com.android.launcher3.Utilities.EDGE_NAV_BAR;
+import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_ALL_APPS_FADE;
+import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_OVERVIEW_FADE;
+import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_VERTICAL_PROGRESS;
+import static com.android.launcher3.anim.Interpolators.ACCEL;
+import static com.android.launcher3.anim.Interpolators.DEACCEL;
+import static com.android.launcher3.anim.Interpolators.LINEAR;
+import static com.android.launcher3.config.FeatureFlags.QUICKSTEP_SPRINGS;
+import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_OVERVIEW_DISABLED;
 
 /**
  * Touch controller for handling various state transitions in portrait UI.
@@ -78,6 +80,9 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr
     // If true, we will finish the current animation instantly on second touch.
     private boolean mFinishFastOnSecondTouch;
 
+    private boolean mGoToOverview;
+    private boolean mStartedFromHotseat;
+
     public PortraitStatesTouchController(Launcher l, boolean allowDragToOverview) {
         super(l, SingleAxisSwipeDetector.VERTICAL);
         mOverviewPortraitStateTouchHelper = new PortraitOverviewStateTouchHelper(l);
@@ -86,6 +91,8 @@ public PortraitStatesTouchController(Launcher l, boolean allowDragToOverview) {
 
     @Override
     protected boolean canInterceptTouch(MotionEvent ev) {
+        mStartedFromHotseat = isTouchOverHotseat(mLauncher, ev);
+        mGoToOverview = false;
         if (mCurrentAnimation != null) {
             if (mFinishFastOnSecondTouch) {
                 // TODO: Animate to finish instead.
@@ -115,8 +122,12 @@ protected boolean canInterceptTouch(MotionEvent ev) {
                 return false;
             }
         } else {
+            if ((ev.getEdgeFlags() & EDGE_NAV_BAR) != 0) {
+                mGoToOverview = true;
+            }
             // If we are swiping to all apps instead of overview, allow it from anywhere.
-            boolean interceptAnywhere = mLauncher.isInState(NORMAL) && !mAllowDragToOverview;
+            //boolean interceptAnywhere = mLauncher.isInState(NORMAL) && !mAllowDragToOverview;
+            boolean interceptAnywhere = mLauncher.isInState(NORMAL);
             // For all other states, only listen if the event originated below the hotseat height
             if (!interceptAnywhere && !isTouchOverHotseat(mLauncher, ev)) {
                 return false;
@@ -139,16 +150,25 @@ protected LauncherState getTargetState(LauncherState fromState, boolean isDragTo
         } else if (fromState == NORMAL && isDragTowardPositive) {
             int stateFlags = OverviewInteractionState.INSTANCE.get(mLauncher)
                     .getSystemUiStateFlags();
-            return mAllowDragToOverview && TouchInteractionService.isConnected()
+            boolean overviewEnabled = TouchInteractionService.isConnected()
                     && (stateFlags & SYSUI_STATE_OVERVIEW_DISABLED) == 0
-                    ? OVERVIEW : ALL_APPS;
+                    && mAllowDragToOverview;
+            if (!mAllowDragToOverview) return ALL_APPS;
+            if (overviewEnabled && mGoToOverview) {
+                return OVERVIEW;
+            }
+            if (mLauncher instanceof OmegaLauncher) {
+                return ((OmegaLauncher) mLauncher).getGestureController()
+                        .getVerticalSwipeGesture().getTargetState(mStartedFromHotseat);
+            }
         }
         return fromState;
     }
 
     @Override
     protected int getLogContainerTypeForNormalState(MotionEvent ev) {
-        return isTouchOverHotseat(mLauncher, ev) ? ContainerType.HOTSEAT : ContainerType.WORKSPACE;
+        //return isTouchOverHotseat(mLauncher, ev) ? ContainerType.HOTSEAT : ContainerType.WORKSPACE;
+        return ContainerType.HOTSEAT;
     }
 
     private AnimatorSetBuilder getNormalToOverviewAnimation() {
@@ -176,7 +196,7 @@ private AnimatorSetBuilder getAllAppsToOverviewAnimation() {
                 0f, 1 - RECENTS_FADE_THRESHOLD));
         return builder;
     }
-
+/*
     private AnimatorSetBuilder getNormalToAllAppsAnimation() {
         AnimatorSetBuilder builder = new AnimatorSetBuilder();
         builder.setInterpolator(ANIM_ALL_APPS_FADE, Interpolators.clampToProgress(ACCEL,
@@ -189,7 +209,7 @@ private AnimatorSetBuilder getAllAppsToNormalAnimation() {
         builder.setInterpolator(ANIM_ALL_APPS_FADE, Interpolators.clampToProgress(DEACCEL,
                 1 - ALL_APPS_CONTENT_FADE_THRESHOLD, 1));
         return builder;
-    }
+    }*/
 
     @Override
     protected AnimatorSetBuilder getAnimatorSetBuilderForStates(LauncherState fromState,
@@ -201,10 +221,6 @@ protected AnimatorSetBuilder getAnimatorSetBuilderForStates(LauncherState fromSt
             builder = getOverviewToAllAppsAnimation();
         } else if (fromState == ALL_APPS && toState == OVERVIEW) {
             builder = getAllAppsToOverviewAnimation();
-        } else if (fromState == NORMAL && toState == ALL_APPS) {
-            builder = getNormalToAllAppsAnimation();
-        } else if (fromState == ALL_APPS && toState == NORMAL) {
-            builder = getAllAppsToNormalAnimation();
         }
         return builder;
     }
diff --git a/quickstep/src/com/android/quickstep/RecentTasksList.java b/quickstep/src/com/android/quickstep/RecentTasksList.java
index 3f53452396..a3d2ea7e13 100644
--- a/quickstep/src/com/android/quickstep/RecentTasksList.java
+++ b/quickstep/src/com/android/quickstep/RecentTasksList.java
@@ -16,8 +16,6 @@
 
 package com.android.quickstep;
 
-import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
-
 import android.annotation.TargetApi;
 import android.app.ActivityManager;
 import android.os.Build;
@@ -38,6 +36,8 @@
 import java.util.List;
 import java.util.function.Consumer;
 
+import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
+
 /**
  * Manages the recent task list from the system, caching it as necessary.
  */
@@ -63,13 +63,8 @@ public RecentTasksList(LooperExecutor mainThreadExecutor,
         mKeyguardManager = keyguardManager;
         mChangeId = 1;
         mActivityManagerWrapper = activityManagerWrapper;
-        //mActivityManagerWrapper.registerTaskStackListener(this);
-        if (Utilities.ATLEAST_Q) {
-            try {
-                mActivityManagerWrapper.registerTaskStackListener(this);
-            } catch (NoSuchMethodError exception) {
-                exception.printStackTrace();
-            }
+        if (Utilities.isRecentsEnabled()) {
+            mActivityManagerWrapper.registerTaskStackListener(this);
         }
     }
 
diff --git a/quickstep/src/com/android/quickstep/RecentsModel.java b/quickstep/src/com/android/quickstep/RecentsModel.java
index ef0ba0d67f..770317347a 100644
--- a/quickstep/src/com/android/quickstep/RecentsModel.java
+++ b/quickstep/src/com/android/quickstep/RecentsModel.java
@@ -64,8 +64,8 @@ public class RecentsModel extends TaskStackChangeListener {
     private ISystemUiProxy mSystemUiProxy;
 
     private final RecentTasksList mTaskList;
-    private final TaskIconCache mIconCache;
-    private final TaskThumbnailCache mThumbnailCache;
+    private TaskIconCache mIconCache;
+    private TaskThumbnailCache mThumbnailCache;
 
     private RecentsModel(Context context) {
         mContext = context;
@@ -75,7 +75,7 @@ private RecentsModel(Context context) {
                 new KeyguardManagerCompat(context), ActivityManagerWrapper.getInstance());
         mIconCache = new TaskIconCache(context, looper);
         mThumbnailCache = new TaskThumbnailCache(context, looper);
-        if (Utilities.ATLEAST_Q) {
+        if (Utilities.isRecentsEnabled()) {
             try {
                 ActivityManagerWrapper.getInstance().registerTaskStackListener(this);
             } catch (NoSuchMethodError error) {
diff --git a/quickstep/src/com/android/quickstep/SysUINavigationMode.java b/quickstep/src/com/android/quickstep/SysUINavigationMode.java
index b67c6f8c8d..f4235cbeab 100644
--- a/quickstep/src/com/android/quickstep/SysUINavigationMode.java
+++ b/quickstep/src/com/android/quickstep/SysUINavigationMode.java
@@ -16,19 +16,21 @@
 
 package com.android.quickstep;
 
-import static com.android.launcher3.util.PackageManagerHelper.getPackageFilter;
-
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources;
 import android.util.Log;
 
+import com.android.launcher3.Utilities;
 import com.android.launcher3.util.MainThreadInitializedObject;
+import com.saggitt.omega.util.NavigationModeCompat;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import static com.android.launcher3.util.PackageManagerHelper.getPackageFilter;
+
 /**
  * Observer for the resource config that specifies the navigation bar mode.
  */
@@ -62,9 +64,10 @@ public static Mode getMode(Context context) {
             "config_navBarInteractionMode";
 
     private final Context mContext;
-    private Mode mMode;
+    private Mode mMode = Mode.NO_BUTTON;
 
     private final List<NavigationModeChangeListener> mChangeListeners = new ArrayList<>();
+    private boolean mUserUnlocked = false;
 
     public SysUINavigationMode(Context context) {
         mContext = context;
@@ -82,12 +85,32 @@ public void onReceive(Context context, Intent intent) {
         }, getPackageFilter("android", ACTION_OVERLAY_CHANGED));
     }
 
+    void onUserUnlocked() {
+        mUserUnlocked = true;
+        NavigationModeCompat.Companion.getInstance(mContext).setListener(this::reinitializeMode);
+        reinitializeMode();
+    }
+
+    private void reinitializeMode() {
+        Mode oldMode = mMode;
+        initializeMode();
+        if (mMode != oldMode) {
+            dispatchModeChange();
+        }
+    }
+
     private void initializeMode() {
-        int modeInt = getSystemIntegerRes(mContext, NAV_BAR_INTERACTION_MODE_RES_NAME);
-        for(Mode m : Mode.values()) {
-            if (m.resValue == modeInt) {
-                mMode = m;
+        if (!Utilities.isRecentsEnabled()) {
+            mMode = Mode.THREE_BUTTONS;
+        } else if (Utilities.ATLEAST_Q) {
+            int modeInt = getSystemIntegerRes(mContext, NAV_BAR_INTERACTION_MODE_RES_NAME);
+            for (Mode m : Mode.values()) {
+                if (m.resValue == modeInt) {
+                    mMode = m;
+                }
             }
+        } else if (mUserUnlocked) {
+            mMode = NavigationModeCompat.Companion.getInstance(mContext).getCurrentMode();
         }
     }
 
diff --git a/quickstep/src/com/android/quickstep/logging/UserEventDispatcherExtension.java b/quickstep/src/com/android/quickstep/logging/UserEventDispatcherExtension.java
index 9575dcecbf..1eba3d324e 100644
--- a/quickstep/src/com/android/quickstep/logging/UserEventDispatcherExtension.java
+++ b/quickstep/src/com/android/quickstep/logging/UserEventDispatcherExtension.java
@@ -19,9 +19,9 @@
 import android.util.Log;
 
 import com.android.launcher3.Utilities;
+import com.android.launcher3.logging.UserEventDispatcher;
 import com.android.launcher3.userevent.nano.LauncherLogProto;
 import com.android.systemui.shared.system.MetricsLoggerCompat;
-import com.saggitt.omega.predictions.OmegaEventPredictor;
 
 import static com.android.launcher3.logging.LoggerUtils.newLauncherEvent;
 import static com.android.launcher3.userevent.nano.LauncherLogProto.ControlType.CANCEL_TARGET;
@@ -35,14 +35,13 @@
  * quickstep interactions.
  */
 @SuppressWarnings("unused")
-public class UserEventDispatcherExtension extends OmegaEventPredictor {
+public class UserEventDispatcherExtension extends UserEventDispatcher {
 
     public static final int ALL_APPS_PREDICTION_TIPS = 2;
 
     private static final String TAG = "UserEventDispatcher";
 
     public UserEventDispatcherExtension(Context context) {
-        super(context);
     }
 
     public void logStateChangeAction(int action, int dir, int downX, int downY,
diff --git a/quickstep/src/com/android/quickstep/views/ShelfScrimView.java b/quickstep/src/com/android/quickstep/views/ShelfScrimView.java
index 3320dae73f..9d75e30387 100644
--- a/quickstep/src/com/android/quickstep/views/ShelfScrimView.java
+++ b/quickstep/src/com/android/quickstep/views/ShelfScrimView.java
@@ -15,15 +15,6 @@
  */
 package com.android.quickstep.views;
 
-import static com.android.launcher3.LauncherState.ALL_APPS_HEADER_EXTRA;
-import static com.android.launcher3.LauncherState.BACKGROUND_APP;
-import static com.android.launcher3.LauncherState.OVERVIEW;
-import static com.android.launcher3.LauncherState.QUICK_SWITCH;
-import static com.android.launcher3.anim.Interpolators.ACCEL;
-import static com.android.launcher3.anim.Interpolators.ACCEL_2;
-import static com.android.launcher3.anim.Interpolators.LINEAR;
-import static com.android.launcher3.icons.GraphicsUtils.setColorAlphaBound;
-
 import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Color;
@@ -36,8 +27,6 @@
 import android.view.animation.Interpolator;
 
 import com.android.launcher3.DeviceProfile;
-import com.android.launcher3.LauncherState;
-import com.android.launcher3.QuickstepAppTransitionManagerImpl;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.Interpolators;
@@ -47,7 +36,15 @@
 import com.android.quickstep.SysUINavigationMode.Mode;
 import com.android.quickstep.SysUINavigationMode.NavigationModeChangeListener;
 import com.android.quickstep.util.LayoutUtils;
-import com.android.quickstep.util.ShelfPeekAnim;
+import com.saggitt.omega.OmegaPreferences;
+
+import static com.android.launcher3.LauncherState.ALL_APPS_HEADER_EXTRA;
+import static com.android.launcher3.LauncherState.BACKGROUND_APP;
+import static com.android.launcher3.LauncherState.OVERVIEW;
+import static com.android.launcher3.anim.Interpolators.ACCEL;
+import static com.android.launcher3.anim.Interpolators.ACCEL_2;
+import static com.android.launcher3.anim.Interpolators.LINEAR;
+import static com.android.launcher3.icons.GraphicsUtils.setColorAlphaBound;
 
 /**
  * Scrim used for all-apps and shelf in Overview
@@ -69,36 +66,37 @@ public class ShelfScrimView extends ScrimView implements NavigationModeChangeLis
     private boolean mDrawingFlatColor;
 
     // For shelf mode
-    private final int mEndAlpha;
-    private final float mRadius;
-    private final int mMaxScrimAlpha;
+    protected int mEndAlpha;
+    public float mRadius;
+    protected int mMaxScrimAlpha;
     private final Paint mPaint;
 
     // Mid point where the alpha changes
-    private int mMidAlpha;
-    private float mMidProgress;
+    protected int mMidAlpha;
+    protected float mMidProgress;
 
     // The progress at which the drag handle starts moving up with the shelf.
     private float mDragHandleProgress;
 
-    private Interpolator mBeforeMidProgressColorInterpolator = ACCEL;
-    private Interpolator mAfterMidProgressColorInterpolator = ACCEL;
+    protected Interpolator mBeforeMidProgressColorInterpolator = ACCEL;
+    protected Interpolator mAfterMidProgressColorInterpolator = ACCEL;
 
     private float mShiftRange;
 
     private final float mShelfOffset;
     private float mTopOffset;
-    private float mShelfTop;
+    protected float mShelfTop;
     private float mShelfTopAtThreshold;
 
-    private int mShelfColor;
+    protected int mShelfColor;
     private int mRemainingScreenColor;
 
     private final Path mTempPath = new Path();
     private final Path mRemainingScreenPath = new Path();
     private boolean mRemainingScreenPathValid = false;
 
-    private Mode mSysUINavigationMode;
+    protected Mode mSysUINavigationMode;
+    protected final OmegaPreferences prefs;
 
     public ShelfScrimView(Context context, AttributeSet attrs) {
         super(context, attrs);
@@ -111,6 +109,7 @@ public ShelfScrimView(Context context, AttributeSet attrs) {
         mShelfOffset = context.getResources().getDimension(R.dimen.shelf_surface_offset);
         // Just assume the easiest UI for now, until we have the proper layout information.
         mDrawingFlatColor = true;
+        prefs = Utilities.getOmegaPrefs(context);
     }
 
     @Override
@@ -195,7 +194,7 @@ public void updateColors() {
         }
 
         if (mProgress >= 1) {
-            mRemainingScreenColor = 0;
+            /*mRemainingScreenColor = 0;
             mShelfColor = 0;
             ShelfPeekAnim shelfPeekAnim = ((QuickstepAppTransitionManagerImpl)
                     mLauncher.getAppTransitionManager()).getShelfPeekAnim();
@@ -205,6 +204,13 @@ public void updateColors() {
                     && shelfPeekAnim.isPeeking()) {
                 // Show the shelf background when peeking during swipe up.
                 mShelfColor = setColorAlphaBound(mEndScrim, mMidAlpha);
+            }*/
+            mRemainingScreenColor = 0;
+            mShelfColor = 0;
+            if (mSysUINavigationMode == Mode.NO_BUTTON
+                    && mLauncher.getStateManager().getState() == BACKGROUND_APP) {
+                // Show the shelf background when peeking during swipe up.
+                mShelfColor = setColorAlphaBound(mEndScrim, mMidAlpha);
             }
         } else if (mProgress >= mMidProgress) {
             mRemainingScreenColor = 0;
@@ -276,4 +282,22 @@ private void drawBackground(Canvas canvas) {
         mPaint.setColor(mShelfColor);
         canvas.drawRoundRect(0, mShelfTop, width, height + mRadius, mRadius, mRadius, mPaint);
     }
+
+    @Override
+    protected void onDrawRoundRect(Canvas canvas, float left, float top, float right, float bottom,
+                                   float rx, float ry, Paint paint) {
+        canvas.drawRoundRect(left, top, right, bottom, rx, ry, paint);
+    }
+
+    public int getShelfColor() {
+        return mShelfColor;
+    }
+
+    protected float getMidProgress() {
+        return OVERVIEW.getVerticalProgress(mLauncher);
+    }
+
+    protected int getMidAlpha() {
+        return Themes.getAttrInteger(getContext(), R.attr.allAppsInterimScrimAlpha);
+    }
 }
diff --git a/res/drawable-nodpi/qsb_widget.png b/res/drawable-nodpi/qsb_widget.png
new file mode 100644
index 0000000000..58b5797fa9
Binary files /dev/null and b/res/drawable-nodpi/qsb_widget.png differ
diff --git a/res/drawable-nodpi/smartspace_widget.png b/res/drawable-nodpi/smartspace_widget.png
new file mode 100644
index 0000000000..0058c9952d
Binary files /dev/null and b/res/drawable-nodpi/smartspace_widget.png differ
diff --git a/res/drawable-v26/ic_launcher_home.xml b/res/drawable-v26/ic_launcher_home.xml
deleted file mode 100644
index 7038775f35..0000000000
--- a/res/drawable-v26/ic_launcher_home.xml
+++ /dev/null
@@ -1,21 +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="@color/icon_background" />
-    <foreground>
-        <bitmap android:src="@mipmap/ic_launcher_home_foreground"/>
-    </foreground>
-</adaptive-icon>
diff --git a/res/drawable/ic_launcher_foreground.xml b/res/drawable/ic_launcher_foreground.xml
new file mode 100644
index 0000000000..1af1f5af1f
--- /dev/null
+++ b/res/drawable/ic_launcher_foreground.xml
@@ -0,0 +1,19 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="200dp"
+    android:height="200dp"
+    android:viewportWidth="230.541"
+    android:viewportHeight="230.541">
+    <path
+        android:fillColor="#0988d1"
+        android:pathData="m151.663,123.501c7.627,-14.02 8.078,-28.044 1.267,-39.489 -7.346,-12.346 -18.382,-20.035 -34.254,-19.857 5.499,1.057 8.344,5.545 8.213,8.356 0.36,3.331 -1.797,8.411 -8.133,9.763 9.299,-0.111 14.659,4.492 18.628,11.164 3.447,5.793 2.903,12.943 -1.617,21.251 -14.759,27.131 -11.559,35.677 -11.179,40.826 4.191,20.499 49.874,3.973 47.649,-5.76 -35.425,0.149 -35.337,0.214 -20.575,-26.253z"
+        android:strokeWidth="0.520585" />
+    <path
+        android:fillColor="#0988d1"
+        android:pathData="M80.364,123.502C72.858,109.482 72.415,95.458 79.117,84.013 86.346,71.667 97.206,63.977 112.826,64.156c-5.926,1.436 -7.545,6.541 -7.195,9.221 0.058,3.113 1.9,7.306 7.117,8.898 -9.151,-0.111 -14.426,4.492 -18.332,11.164 -3.392,5.793 -2.857,12.943 1.591,21.251 14.525,27.131 11.375,35.677 11.001,40.826 -4.125,20.499 -49.081,3.973 -46.892,-5.76 34.862,0.149 34.776,0.214 20.248,-26.253z"
+        android:strokeWidth="0.516431" />
+    <path
+        android:fillColor="#0988d1"
+        android:fillType="evenOdd"
+        android:pathData="M108.398,73.169a7.884,7.393 0,1 0,15.768 0a7.884,7.393 0,1 0,-15.768 0z"
+        android:strokeWidth="0.54274" />
+</vector>
diff --git a/res/drawable/ic_launcher_home.xml b/res/drawable/ic_launcher_home.xml
deleted file mode 100644
index a6f2519954..0000000000
--- a/res/drawable/ic_launcher_home.xml
+++ /dev/null
@@ -1,18 +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.
--->
-<bitmap
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@mipmap/ic_launcher_home" />
diff --git a/res/layout/all_apps.xml b/res/layout/all_apps.xml
index e536f7da5e..5e1a8f5211 100644
--- a/res/layout/all_apps.xml
+++ b/res/layout/all_apps.xml
@@ -16,8 +16,7 @@
 <!-- The top and bottom paddings are defined in this container, but since we want
      the list view to span the full width (for touch interception purposes), we
      will bake the left/right padding into that view's background itself. -->
-<com.android.launcher3.allapps.AllAppsContainerView
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<com.saggitt.omega.allapps.AllAppsSearchContainerView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/apps_view"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -30,53 +29,11 @@
         layout="@layout/all_apps_rv_layout"
         android:visibility="gone" />
 
-    <com.saggitt.omega.allapps.PredictionsFloatingHeader
-        android:id="@+id/all_apps_header"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/search_container_all_apps"
-        android:clipToPadding="false"
-        android:paddingTop="@dimen/all_apps_header_top_padding"
-        android:orientation="vertical">
-
-        <include layout="@layout/floating_header_content" />
-
-        <com.android.launcher3.allapps.PersonalWorkSlidingTabStrip
-            android:id="@+id/tabs"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/all_apps_header_tab_height"
-            android:layout_marginLeft="@dimen/all_apps_tabs_side_padding"
-            android:layout_marginRight="@dimen/all_apps_tabs_side_padding"
-            android:orientation="horizontal"
-            style="@style/TextHeadline">
-
-            <Button
-                android:id="@+id/tab_personal"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:background="?android:attr/selectableItemBackground"
-                android:text="@string/all_apps_personal_tab"
-                android:textAllCaps="true"
-                android:textColor="@color/all_apps_tab_text"
-                android:textSize="14sp" />
-
-            <Button
-                android:id="@+id/tab_work"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:background="?android:attr/selectableItemBackground"
-                android:text="@string/all_apps_work_tab"
-                android:textAllCaps="true"
-                android:textColor="@color/all_apps_tab_text"
-                android:textSize="14sp" />
-        </com.android.launcher3.allapps.PersonalWorkSlidingTabStrip>
-    </com.saggitt.omega.allapps.PredictionsFloatingHeader>
+    <include layout="@layout/all_apps_floating_header" />
 
     <include
         android:id="@id/search_container_all_apps"
-        layout="@layout/search_container_all_apps"/>
+        layout="@layout/search_container_all_apps_google" />
 
     <include layout="@layout/all_apps_fast_scroller" />
-</com.android.launcher3.allapps.AllAppsContainerView>
\ No newline at end of file
+</com.saggitt.omega.allapps.AllAppsSearchContainerView>
\ No newline at end of file
diff --git a/res/layout/all_apps_tabs.xml b/res/layout/all_apps_tabs.xml
index 2accd2d21f..2f5a34c444 100644
--- a/res/layout/all_apps_tabs.xml
+++ b/res/layout/all_apps_tabs.xml
@@ -28,9 +28,9 @@
     android:descendantFocusability="afterDescendants"
     android:paddingTop="@dimen/all_apps_header_top_padding"
     launcher:pageIndicator="@+id/tabs" >
-
+<!--
     <include layout="@layout/all_apps_rv_layout" />
 
-    <include layout="@layout/all_apps_rv_layout" />
+    <include layout="@layout/all_apps_rv_layout" /> -->
 
 </com.android.launcher3.allapps.AllAppsPagedView>
\ No newline at end of file
diff --git a/res/layout/hotseat.xml b/res/layout/hotseat.xml
index 82b0b8d74e..6cd46067ab 100644
--- a/res/layout/hotseat.xml
+++ b/res/layout/hotseat.xml
@@ -13,8 +13,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.launcher3.Hotseat
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<com.saggitt.omega.blur.BlurHotseat xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:launcher="http://schemas.android.com/apk/res-auto"
     android:id="@+id/hotseat"
     android:layout_width="match_parent"
diff --git a/res/layout/launcher.xml b/res/layout/launcher.xml
index cca899bda8..d4df0f71bc 100644
--- a/res/layout/launcher.xml
+++ b/res/layout/launcher.xml
@@ -12,14 +12,18 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.launcher3.LauncherRootView
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.launcher3.LauncherRootView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:launcher="http://schemas.android.com/apk/res-auto"
     android:id="@+id/launcher"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true">
 
+    <com.saggitt.omega.views.OmegaBackgroundView
+        android:id="@+id/omega_background"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
     <com.android.launcher3.dragndrop.DragLayer
         android:id="@+id/drag_layer"
         android:layout_width="match_parent"
@@ -28,6 +32,11 @@
         android:clipToPadding="false"
         android:importantForAccessibility="no">
 
+        <View
+            android:id="@+id/dummy_view"
+            android:layout_width="0dp"
+            android:layout_height="0dp" />
+
         <!-- The workspace contains 5 screens of cells -->
         <!-- DO NOT CHANGE THE ID -->
         <com.android.launcher3.Workspace
@@ -38,6 +47,10 @@
             android:theme="@style/HomeScreenElementTheme"
             launcher:pageIndicator="@+id/page_indicator" />
 
+        <View
+            android:layout_width="0dp"
+            android:layout_height="10dp"
+            android:id="@+id/workspace_blocked_row" />
         <!-- DO NOT CHANGE THE ID -->
         <include
             android:id="@+id/hotseat"
@@ -48,6 +61,10 @@
             layout="@layout/overview_panel"
             android:visibility="gone" />
 
+        <include
+            android:id="@+id/options_view"
+            layout="@layout/options_view" />
+
         <!-- Keep these behind the workspace so that they are not visible when
          we go into AllApps -->
         <com.android.launcher3.pageindicators.WorkspacePageIndicator
@@ -72,5 +89,4 @@
             android:layout_height="match_parent" />
 
     </com.android.launcher3.dragndrop.DragLayer>
-
 </com.android.launcher3.LauncherRootView>
diff --git a/res/layout/pref_dialog_grid_size.xml b/res/layout/pref_dialog_grid_size.xml
new file mode 100644
index 0000000000..0359a0f4a4
--- /dev/null
+++ b/res/layout/pref_dialog_grid_size.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <NumberPicker
+        android:id="@+id/rowsPicker"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="8dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginTop="56dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/textView5"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <NumberPicker
+        android:id="@+id/columnsPicker"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        app:layout_constraintBottom_toBottomOf="@+id/rowsPicker"
+        app:layout_constraintStart_toEndOf="@+id/textView5"
+        app:layout_constraintTop_toTopOf="@+id/rowsPicker" />
+
+    <TextView
+        android:id="@+id/textView5"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="8dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="8dp"
+        android:text="x"
+        app:layout_constraintBottom_toBottomOf="@+id/rowsPicker"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/rowsPicker" />
+
+    <TextView
+        android:id="@+id/textView6"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="8dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginStart="8dp"
+        android:text="@string/grid_size_height"
+        android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+        app:layout_constraintBottom_toTopOf="@+id/rowsPicker"
+        app:layout_constraintEnd_toEndOf="@+id/rowsPicker"
+        app:layout_constraintStart_toStartOf="@+id/rowsPicker" />
+
+    <TextView
+        android:id="@+id/textView8"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="8dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginStart="8dp"
+        android:text="@string/grid_size_width"
+        android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+        app:layout_constraintBottom_toTopOf="@+id/columnsPicker"
+        app:layout_constraintEnd_toEndOf="@+id/columnsPicker"
+        app:layout_constraintStart_toStartOf="@+id/columnsPicker" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/res/layout/qsb_default_view.xml b/res/layout/qsb_default_view.xml
index 04fe236084..bf3ea212e9 100644
--- a/res/layout/qsb_default_view.xml
+++ b/res/layout/qsb_default_view.xml
@@ -15,8 +15,9 @@
      limitations under the License.
 -->
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-             android:layout_width="match_parent"
-             android:layout_height="match_parent">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -46,7 +47,7 @@
             android:visibility="gone"
             android:layout_height="match_parent"
             android:src="@drawable/ic_setting"
-            android:tint="?android:attr/textColorSecondary"
+            app:tint="?android:attr/textColorSecondary"
             android:contentDescription="@string/gadget_setup_text"
             android:padding="8dp"
             android:background="?android:attr/selectableItemBackground" />
diff --git a/res/raw/downgrade_schema.json b/res/raw/downgrade_schema.json
index 8f1780e5f7..957cf440bf 100644
--- a/res/raw/downgrade_schema.json
+++ b/res/raw/downgrade_schema.json
@@ -2,17 +2,16 @@
   // Note: Comments are not supported in JSON schema, but android parser is lenient.
 
   // Maximum DB version supported by this schema
-  "version" : 28,
-
-  "downgrade_to_27" : [
+  "version": 32,
+  "downgrade_to_27": [
     "CREATE TABLE workspaceScreens (_id INTEGER PRIMARY KEY,screenRank INTEGER,modified INTEGER NOT NULL DEFAULT 0)",
     "insert into workspaceScreens (_id, screenRank) select screen as _id, screen as screenRank from favorites where container = -100 group by screen order by screen"
   ],
   // Downgrade from 27 to 26. Empty array indicates, the DB is compatible
-  "downgrade_to_26" : [],
-  "downgrade_to_25" : [],
-  "downgrade_to_24" : [],
-  "downgrade_to_23" : [],
+  "downgrade_to_26": [],
+  "downgrade_to_25": [],
+  "downgrade_to_24": [],
+  "downgrade_to_23": [],
   "downgrade_to_22" : [
     "ALTER TABLE favorites RENAME TO temp_favorites;",
     "CREATE TABLE favorites(_id INTEGER PRIMARY KEY, title TEXT, intent TEXT, container INTEGER, screen INTEGER, cellX INTEGER, cellY INTEGER, spanX INTEGER, spanY INTEGER, itemType INTEGER, appWidgetId INTEGER NOT NULL DEFAULT - 1, iconPackage TEXT, iconResource TEXT, icon BLOB, appWidgetProvider TEXT, modified INTEGER NOT NULL DEFAULT 0, restored INTEGER NOT NULL DEFAULT 0, profileId INTEGER DEFAULT 0, rank INTEGER NOT NULL DEFAULT 0);",
diff --git a/res/values-v26/styles.xml b/res/values-v26/styles.xml
index c3ae9a3348..4e9b1eeab8 100644
--- a/res/values-v26/styles.xml
+++ b/res/values-v26/styles.xml
@@ -21,9 +21,18 @@
     <style name="WidgetContainerTheme" parent="@android:style/Theme.DeviceDefault.Settings">
         <item name="android:colorPrimaryDark">#E8EAED</item>
         <item name="android:colorEdgeEffect">?android:attr/textColorSecondary</item>
+        <item name="bottomSheetNavBarColor">#00000000</item>
     </style>
+
     <style name="WidgetContainerTheme.Dark" parent="AppTheme.Dark">
         <item name="android:colorEdgeEffect">?android:attr/textColorSecondary</item>
         <item name="android:colorPrimaryDark">#616161</item> <!-- Gray 700 -->
+        <item name="bottomSheetNavBarColor">#00000000</item>
+    </style>
+
+    <style name="WidgetContainerTheme.Black" parent="AppTheme.Black">
+        <item name="android:colorEdgeEffect">?android:attr/textColorSecondary</item>
+        <item name="android:colorPrimaryDark">#000000</item>
+        <item name="bottomSheetNavBarColor">#00000000</item>
     </style>
 </resources>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index de17eb7b4f..36f974a9a9 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -51,6 +51,7 @@
             <enum name="folder" value="2" />
             <enum name="widget_section" value="3" />
             <enum name="shortcut_popup" value="4" />
+            <enum name="drawer_folder" value="5" />
         </attr>
         <attr name="centerVertically" format="boolean" />
     </declare-styleable>
@@ -144,13 +145,22 @@
         <attr name="android:src" />
         <attr name="android:shadowColor" />
         <attr name="android:elevation" />
-        <attr name="darkTintColor" format="color"/>
+        <attr name="darkTintColor" format="color" />
     </declare-styleable>
 
     <declare-styleable name="RecyclerViewFastScroller">
         <attr name="canThumbDetach" format="boolean" />
     </declare-styleable>
 
+    <declare-styleable name="SeekbarPreference">
+        <attr name="minValue" format="float" />
+        <attr name="maxValue" format="float" />
+        <attr name="summaryFormat" format="string" />
+        <attr name="summaryMultiplier" format="integer" />
+        <attr name="defaultSeekbarValue" format="float" />
+        <attr name="steps" format="integer" />
+    </declare-styleable>
+
     <declare-styleable name="PreviewFragment">
         <attr name="android:name" />
         <attr name="android:id" />
diff --git a/res/values/config.xml b/res/values/config.xml
index a9a2e126fc..39574dcd4b 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -109,14 +109,22 @@
     <item type="id" name="action_move_screen_forwards" />
     <item type="id" name="action_resize" />
     <item type="id" name="action_deep_shortcuts" />
-    <item type="id" name="action_shortcuts_and_notifications"/>
+    <item type="id" name="action_shortcuts_and_notifications" />
     <item type="id" name="action_dismiss_notification" />
     <item type="id" name="action_remote_action_shortcut" />
+    <item name="action_customize" type="id" />
 
-<!-- QSB IDs. DO not change -->
+    <!-- QSB IDs. DO not change -->
     <item type="id" name="search_container_workspace" />
     <item type="id" name="search_container_all_apps" />
+    <item type="id" name="search_container_hotseat" />
 
-<!-- Recents -->
-    <item type="id" name="overview_panel"/>
+    <!-- View ID to use for blocked area on the first screen -->
+    <item type="id" name="workspace_blocked_row" />
+
+    <!-- Recents -->
+    <item type="id" name="overview_panel" />
+
+    <integer name="shade_all_apps_light_alpha">14</integer>
+    <integer name="shade_all_apps_dark_alpha">9</integer>
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 4bcb8a7f43..16dac20f2b 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -24,16 +24,17 @@
     <dimen name="dynamic_grid_icon_drawable_padding">8dp</dimen>
     <!-- Minimum space between workspace and hotseat in spring loaded mode -->
     <dimen name="dynamic_grid_min_spring_loaded_space">8dp</dimen>
-
     <dimen name="dynamic_grid_cell_layout_padding">5.5dp</dimen>
     <dimen name="dynamic_grid_cell_padding_x">8dp</dimen>
 
     <!-- Hotseat -->
-    <dimen name="dynamic_grid_hotseat_top_padding">8dp</dimen>
-    <dimen name="dynamic_grid_hotseat_bottom_padding">2dp</dimen>
+    <dimen name="dynamic_grid_hotseat_top_padding">0dp</dimen>
+    <dimen name="dynamic_grid_hotseat_bottom_padding">62dp</dimen>
     <!-- Extra bottom padding for non-tall devices. -->
-    <dimen name="dynamic_grid_hotseat_bottom_non_tall_padding">0dp</dimen>
-    <dimen name="dynamic_grid_hotseat_extra_vertical_size">34dp</dimen>
+
+    <dimen name="dynamic_grid_hotseat_bottom_non_tall_padding">15dp</dimen>
+
+    <dimen name="dynamic_grid_hotseat_extra_vertical_size">24dp</dimen>
     <dimen name="dynamic_grid_hotseat_side_padding">0dp</dimen>
 
     <!-- Hotseat/all-apps scrim -->
@@ -41,7 +42,7 @@
     <dimen name="vertical_drag_handle_size">24dp</dimen>
     <dimen name="vertical_drag_handle_overlap_workspace">0dp</dimen>
 
-<!-- Drop target bar -->
+    <!-- Drop target bar -->
     <dimen name="dynamic_grid_drop_target_size">48dp</dimen>
     <dimen name="drop_target_vertical_gap">20dp</dimen>
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 9d9c2e8ded..02e9d5f5bc 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -26,15 +26,15 @@
     <!-- Work folder name -->
     <string name="work_folder_name">Work</string>
     <!-- Displayed when user selects a shortcut for an app that was uninstalled [CHAR_LIMIT=none]-->
-    <string name="activity_not_found">App isn\'t installed.</string>
+    <string name="activity_not_found">App not installed.</string>
     <!-- Displayed when user selects a shortcut for an app that is current not available [CHAR_LIMIT=none]-->
-    <string name="activity_not_available">App isn\'t available</string>
+    <string name="activity_not_available">App unavailable</string>
     <!-- SafeMode shortcut error string -->
-    <string name="safemode_shortcut_error">Downloaded app disabled in Safe mode</string>
+    <string name="safemode_shortcut_error">Downloaded app turned off in \"Safe mode\"</string>
     <!-- SafeMode widget error string -->
-    <string name="safemode_widget_error">Widgets disabled in Safe mode</string>
+    <string name="safemode_widget_error">Widgets turned off in \"Safe mode\"</string>
     <!-- Message shown when a shortcut is not available. It could have been temporarily disabled and may start working again after some time. -->
-    <string name="shortcut_not_available">Shortcut isn\'t available</string>
+    <string name="shortcut_not_available">Shortcut unavailable</string>
     <!-- User visible name for the launcher/home screen. [CHAR_LIMIT=30] -->
     <string name="home_screen">Home screen</string>
     <!-- Label for showing custom action list of a shortcut or widget. [CHAR_LIMIT=30] -->
@@ -42,16 +42,16 @@
 
     <!-- Widgets -->
     <!-- Message to tell the user to press and hold on a widget to add it [CHAR_LIMIT=50] -->
-    <string name="long_press_widget_to_add">Touch &amp; hold to pick up a widget.</string>
+    <string name="long_press_widget_to_add">Touch and hold to pick up a widget.</string>
     <!-- Accessibility spoken hint message in widget picker, which allows user to add a widget. Custom action is the label for additional accessibility actions available in this mode [CHAR_LIMIT=100] -->
-    <string name="long_accessible_way_to_add">Double-tap &amp; hold to pick up a widget or use custom actions.</string>
+    <string name="long_accessible_way_to_add">Double-tap and hold to pick up a widget or use custom actions.</string>
     <!-- The format string for the dimensions of a widget in the drawer -->
     <!-- There is a special version of this format string for Farsi -->
     <string name="widget_dims_format">%1$d \u00d7 %2$d</string>
     <!-- Accessibility spoken message format for the dimensions of a widget in the drawer -->
     <string name="widget_accessible_dims_format">%1$d wide by %2$d high</string>
     <!-- Message to tell the user to press and hold a widget/icon to add it  -->
-    <string name="add_item_request_drag_hint">Touch &amp; hold to place manually</string>
+    <string name="add_item_request_drag_hint">Touch and hold to place manually</string>
     <!-- Button label to automatically add icon on home screen [CHAR_LIMIT=50] -->
     <string name="place_automatically">Add automatically</string>
 
@@ -73,20 +73,20 @@
 
     <!-- Drag and drop -->
     <!-- Message to tell the user to press and hold on a shortcut to add it [CHAR_LIMIT=50] -->
-    <string name="long_press_shortcut_to_add">Touch &amp; hold to pick up a shortcut.</string>
+    <string name="long_press_shortcut_to_add">Touch and hold to pick up a shortcut.</string>
     <!-- Accessibility spoken hint message in deep shortcut menu, which allows user to add a shortcut. Custom action is the label for additional accessibility actions available in this mode [CHAR_LIMIT=200] -->
-    <string name="long_accessible_way_to_add_shortcut">Double-tap &amp; hold to pick up a shortcut or use custom actions.</string>
+    <string name="long_accessible_way_to_add_shortcut">Double-tap and hold to pick up a shortcut or use custom actions.</string>
 
     <skip />
     <!-- Error message when user has filled a home screen -->
-    <string name="out_of_space">No more room on this Home screen.</string>
+    <string name="out_of_space">No more room on this home screen.</string>
     <!-- Error message when user has filled the hotseat -->
-    <string name="hotseat_out_of_space">No more room in the Favorites tray</string>
+    <string name="hotseat_out_of_space">No more room in the \"Favorites\" tray</string>
 
     <!-- All applications label -->
-    <string name="all_apps_button_label">Apps list</string>
-    <string name="all_apps_button_personal_label">Personal apps list</string>
-    <string name="all_apps_button_work_label">Work apps list</string>
+    <string name="all_apps_button_label">App list</string>
+    <string name="all_apps_button_personal_label">Personal app list</string>
+    <string name="all_apps_button_work_label">App list for work</string>
 
     <!-- Label for button in all applications label to go back home (to the workspace / desktop)
          for accessibilty (spoken when the button gets focus). -->
@@ -114,15 +114,15 @@
     <string name="permdesc_install_shortcut">Allows an app to add
         shortcuts without user intervention.</string>
     <!-- Permission short label -->
-    <string name="permlab_read_settings">read Home settings and shortcuts</string>
+    <string name="permlab_read_settings">Read \"Home\" settings and shortcuts</string>
     <!-- Permission description -->
     <string name="permdesc_read_settings">Allows the app to read the settings and
-        shortcuts in Home.</string>
+        shortcuts in \"Home\".</string>
     <!-- Permission short label -->
-    <string name="permlab_write_settings">write Home settings and shortcuts</string>
+    <string name="permlab_write_settings">Write \"Home\" settings and shortcuts</string>
     <!-- Permission description -->
     <string name="permdesc_write_settings">Allows the app to change the settings and
-        shortcuts in Home.</string>
+        shortcuts in \"Home\".</string>
 
     <!-- Toast shown on clicking a direct call shortcut. [CHAR_LIMIT=80] -->
     <string name="msg_no_phone_permission"><xliff:g id="app_name" example="Launcher3">%1$s</xliff:g> is not allowed to make phone calls</string>
@@ -131,16 +131,16 @@
     <skip />    
 
     <!-- Text to show user in place of a gadget when we can't display it properly -->
-    <string name="gadget_error_text">Problem loading widget</string>
+    <string name="gadget_error_text">Could not load widget</string>
 
     <!-- Text to show user in place of a gadget when it is not yet initialized. -->
-    <string name="gadget_setup_text">Setup</string>
+    <string name="gadget_setup_text">Set up</string>
 
     <!-- Text to inform the user that they can't uninstall a system application -->
-    <string name="uninstall_system_app_text">This is a system app and can\'t be uninstalled.</string>
+    <string name="uninstall_system_app_text">This (system app) can\'t be uninstalled.</string>
 
     <!-- Default folder title -->
-    <string name="folder_hint_text">Unnamed Folder</string>
+    <string name="folder_hint_text">Unnamed folder</string>
 
     <!-- Accessibility -->
     <!-- The format string for when an app is temporarily disabled. -->
@@ -165,11 +165,11 @@
     <!-- Instruction that clicking outside will close folder -->
     <string name="folder_tap_to_close">Tap to close folder</string>
     <!-- Instruction that clicking outside will commit folder rename -->
-    <string name="folder_tap_to_rename">Tap to save rename</string>
+    <string name="folder_tap_to_rename">Tap to rename</string>
     <!-- Indication that folder closed -->
     <string name="folder_closed">Folder closed</string>
     <!-- Folder renamed format -->
-    <string name="folder_renamed">Folder renamed to <xliff:g id="name" example="Games">%1$s</xliff:g></string>
+    <string name="folder_renamed">Folder renamed <xliff:g id="name" example="Games">%1$s</xliff:g></string>
     <!-- Folder name format -->
     <string name="folder_name_format">Folder: <xliff:g id="name" example="Games">%1$s</xliff:g></string>
 
@@ -179,17 +179,17 @@
     <!-- Text for wallpaper change button -->
     <string name="wallpaper_button_text">Wallpapers</string>
     <!-- Text for wallpaper change button -->
-    <string name="styles_wallpaper_button_text">Styles &amp; wallpapers</string>
+    <string name="styles_wallpaper_button_text">Styles and wallpapers</string>
     <!-- Text for settings button -->
     <string name="settings_button_text">Home settings</string>
     <!-- Message shown when a feature is disabled by the administrator -->
-    <string name="msg_disabled_by_admin">Disabled by your admin</string>
+    <string name="msg_disabled_by_admin">Turned off by your admin</string>
 
     <!-- Strings for settings -->
     <!-- Title for Allow Rotation setting. [CHAR LIMIT=50] -->
-    <string name="allow_rotation_title">Allow Home screen rotation</string>
+    <string name="allow_rotation_title">Allow home screen rotation</string>
     <!-- Text explaining when the home screen will get rotated. [CHAR LIMIT=100] -->
-    <string name="allow_rotation_desc">When phone is rotated</string>
+    <string name="allow_rotation_desc">When the device is rotated</string>
     <!-- Title for Notification dots setting. Tapping this will link to the system Notifications settings screen where the user can turn off notification dots globally. [CHAR LIMIT=50] -->
     <string name="notification_dots_title">Notification dots</string>
     <!-- Text to indicate that the system notification dots setting is on [CHAR LIMIT=100] -->
@@ -199,18 +199,18 @@
     <!-- Title for the dialog shown when the app does not has notification access, explaining the requirement for notification access [CHAR LIMIT=50] -->
     <string name="title_missing_notification_access">Notification access needed</string>
     <!-- Message explaining to the user that the notification access is required by the app for showing 'Notification dots' [CHAR LIMIT=NONE] -->
-    <string name="msg_missing_notification_access">To show Notification Dots, turn on app notifications for <xliff:g id="name" example="My App">%1$s</xliff:g></string>
+    <string name="msg_missing_notification_access">To show notification dots, turn on app notifications for <xliff:g id="name" example="My App">%1$s</xliff:g></string>
     <!-- Button text in the confirmation dialog which would take the user to the system settings [CHAR LIMIT=50] -->
     <string name="title_change_settings">Change settings</string>
     <!-- Summary for Notification dots setting. Tapping this will link enable/disable notification dots feature on the home screen. [CHAR LIMIT=50] -->
     <string name="notification_dots_service_title">Show notification dots</string>
 
     <!-- Label for the setting that allows the automatic placement of launcher shortcuts for applications and games installed on the device [CHAR LIMIT=40] -->
-    <string name="auto_add_shortcuts_label">Add icon to Home screen</string>
+    <string name="auto_add_shortcuts_label">Add icon to home screen</string>
     <!-- Text description of the setting that allows the automatic placement of launcher shortcuts for applications and games installed on the device [CHAR LIMIT=NONE] -->
     <string name="auto_add_shortcuts_description">For new apps</string>
 
-    <!-- Label on an icon that references an uninstalled package, for which we have no information about when it might be installed. [CHAR_LIMIT=15] -->
+    <!-- Label on an icon that references an uninstalled package, for which we have no info about when it might be installed. [CHAR_LIMIT=15] -->
     <string name="package_state_unknown">Unknown</string>
 
     <!-- Button for abandoned promises dialog, to removes this abandoned promise icon. -->
@@ -218,7 +218,7 @@
     <!-- Button for abandoned promise dialog, to search in the market for the missing package. -->
     <string name="abandoned_search">Search</string>
     <!-- Title for abandoned promise dialog. -->
-    <string name="abandoned_promises_title">This app is not installed</string>
+    <string name="abandoned_promises_title">App not installed</string>
     <!-- Explanation for abandoned promise dialog. "The first 'it' refers to the shortcut icon.
     The second "it" refers to the app. -->
     <string name="abandoned_promise_explanation">The app for this icon isn\'t installed.
@@ -240,7 +240,7 @@
 
 <!-- Strings for accessibility actions -->
     <!-- Accessibility action to add an app to workspace. [CHAR_LIMIT=30] -->
-    <string name="action_add_to_workspace">Add to Home screen</string>
+    <string name="action_add_to_workspace">Add to home screen</string>
 
     <!-- Accessibility action to move item to the current location. [CHAR_LIMIT=30] -->
     <string name="action_move_here">Move item here</string>
@@ -285,7 +285,7 @@
     <string name="folder_created">Folder created</string>
 
     <!-- Accessibility action to move an item from folder to workspace. [CHAR_LIMIT=30] -->
-    <string name="action_move_to_workspace">Move to Home screen</string>
+    <string name="action_move_to_workspace">Move to home screen</string>
 
     <!-- Accessibility action to resize a widget. [CHAR_LIMIT=30] -->
     <string name="action_resize">Resize</string>
@@ -328,12 +328,12 @@
     <!-- Title of an overlay in All Apps. This overlay is letting a user know about their work profile, which is managed by their employer. "Work apps" are apps in a user's work profile.-->
     <string name="bottom_work_tab_user_education_title">Find work apps here</string>
     <!-- Text in an overlay in All Apps. This overlay is letting a user know about their work profile, which is managed by their employer.-->
-    <string name="bottom_work_tab_user_education_body">Each work app has a badge and is kept secure by your organization. Move apps to your Home screen for easier access.</string>
+    <string name="bottom_work_tab_user_education_body">Each work app has a badge and is kept secure by your organization. Move apps to your home screen for easier access.</string>
     <!-- This string is in the work profile tab when a user has All Apps open on their phone. It describes the label of a toggle, "Work profile," as being managed by the user's employer.
     "Organization" is used to represent a variety of businesses, non-profits, and educational institutions).-->
     <string name="work_mode_on_label">Managed by your organization</string>
-    <!-- This string appears under a the label of a toggle in the work profile tab on a user's phone. It describes the status of the toggle, "Work profile," when it's turned off. "Work profile" means a separate profile on a user's phone that's speficially for their work apps and is managed by their company.-->
-    <string name="work_mode_off_label">Notifications and apps are off</string>
+    <!-- This string appears under a the label of a toggle in the work profile tab on a user's device. It describes the status of the toggle, "Work profile," when it's turned off. "Work profile" means a separate profile on a user's phone that's speficially for their work apps and is managed by their company.-->
+    <string name="work_mode_off_label">Notifications and apps off</string>
     <string name="bottom_work_tab_user_education_close_button">Close</string>
     <string name="bottom_work_tab_user_education_closed">Closed</string>
 
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 4eb83ea88f..300a958ce2 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -61,6 +61,9 @@
         <item name="android:windowDrawsSystemBarBackgrounds">true</item>
         <item name="android:statusBarColor">#00000000</item>
         <item name="android:navigationBarColor">#00000000</item>
+
+        <item name="dashIconTint">#0270CF</item>
+        <item name="dashIconBackground">#ffffffff</item>
     </style>
 
     <style name="LauncherTheme.DarkMainColor" parent="@style/LauncherTheme">
@@ -80,6 +83,8 @@
         <item name="folderFillColor">#CDFFFFFF</item>
         <item name="folderIconBorderColor">#FF80868B</item>
         <item name="folderTextColor">?attr/workspaceTextColor</item>
+
+        <item name="dashIconTint">@color/white</item>
     </style>
 
     <style name="LauncherTheme.Dark" parent="@style/LauncherTheme">
@@ -102,6 +107,10 @@
         <item name="folderTextColor">@android:color/white</item>
         <item name="isMainColorDark">true</item>
         <item name="loadingIconColor">#99FFFFFF</item>
+        <item name="android:alertDialogTheme">@style/SettingsTheme_Dark.Dialog</item>
+
+        <item name="dashIconTint">#0270CF</item>
+        <item name="dashIconBackground">#3C4043</item>
     </style>
 
     <style name="LauncherTheme.Dark.DarkMainColor" parent="@style/LauncherTheme.Dark">
@@ -122,16 +131,45 @@
         <item name="workspaceStatusBarScrim">@null</item>
     </style>
 
+    <style name="LauncherTheme.Black" parent="@style/LauncherTheme.Dark">
+        <item name="android:colorPrimary">#000000</item>
+        <item name="allAppsScrimColor">#EA000000</item>
+        <item name="allAppsNavBarScrimColor">#80000000</item>
+        <item name="popupColorPrimary">?android:attr/colorPrimary</item>
+        <item name="popupColorSecondary">#000000</item>
+        <item name="popupColorTertiary">#212121</item>
+        <item name="widgetsTheme">@style/WidgetContainerTheme.Black</item>
+        <item name="isMainColorDark">true</item>
+    </style>
+
+    <style name="LauncherTheme.Black.DarkText" parent="@style/LauncherTheme.Black">
+        <item name="allAppsInterimScrimAlpha">25</item>
+        <item name="workspaceTextColor">#FF212121</item>
+        <item name="workspaceShadowColor">@android:color/transparent</item>
+        <item name="workspaceAmbientShadowColor">@android:color/transparent</item>
+        <item name="workspaceKeyShadowColor">@android:color/transparent</item>
+        <item name="isWorkspaceDarkText">true</item>
+        <item name="workspaceStatusBarScrim">@null</item>
+    </style>
+
     <!-- A derivative project can extend these themes to customize the application theme without
          affecting the base theme -->
     <style name="AppTheme" parent="@style/LauncherTheme" />
+
     <style name="AppTheme.DarkMainColor" parent="@style/LauncherTheme.DarkMainColor" />
+
     <style name="AppTheme.DarkText" parent="@style/LauncherTheme.DarkText" />
 
     <style name="AppTheme.Dark" parent="@style/LauncherTheme.Dark" />
+
     <style name="AppTheme.Dark.DarkMainColor" parent="@style/LauncherTheme.Dark.DarkMainColor" />
+
     <style name="AppTheme.Dark.DarkText" parent="@style/LauncherTheme.Dark.DarkText" />
 
+    <style name="AppTheme.Black" parent="@style/LauncherTheme.Black" />
+
+    <style name="AppTheme.Black.DarkText" parent="@style/LauncherTheme.Black.DarkText" />
+
     <style name="AppItemActivityTheme" parent="@android:style/Theme.Material.Light.Dialog.Alert">
         <item name="widgetsTheme">@style/WidgetContainerTheme</item>
     </style>
@@ -158,7 +196,15 @@
         <item name="android:textColorSecondary">?android:attr/textColorSecondaryInverse</item>
     </style>
 
-    <style name="WidgetContainerTheme.Dark" />
+    <style name="WidgetContainerTheme.Dark" parent="LauncherTheme.Dark">
+        <item name="android:colorPrimaryDark">#616161</item> <!-- Gray 700 -->
+        <item name="bottomSheetNavBarColor">#00000000</item>
+    </style>
+
+    <style name="WidgetContainerTheme.Black" parent="@android:style/Theme.Material.Settings">
+        <item name="android:colorPrimaryDark">#000000</item>
+        <item name="bottomSheetNavBarColor">#00000000</item>
+    </style>
 
     <style name="FastScrollerPopup" parent="@android:style/TextAppearance.DeviceDefault.DialogWindowTitle">
         <item name="android:layout_width">wrap_content</item>
diff --git a/res/xml/default_workspace_5x5.xml b/res/xml/default_workspace_5x5.xml
index ccdde2ca80..c0c9eb9a5f 100644
--- a/res/xml/default_workspace_5x5.xml
+++ b/res/xml/default_workspace_5x5.xml
@@ -22,7 +22,7 @@
         launcher:container="-101"
         launcher:screen="0"
         launcher:x="0"
-        launcher:y="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" />
@@ -32,7 +32,7 @@
         launcher:container="-101"
         launcher:screen="1"
         launcher:x="1"
-        launcher:y="0" >
+        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:" />
@@ -44,37 +44,35 @@
         launcher:container="-101"
         launcher:screen="2"
         launcher:x="2"
-        launcher:y="0" >
-        <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_MAPS;end" />
-        <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_MUSIC;end" />
+        launcher:y="0">
+        <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_BROWSER;end" />
+        <favorite launcher:uri="http://www.example.com/" />
     </resolve>
 
     <resolve
         launcher:container="-101"
         launcher:screen="3"
         launcher:x="3"
-        launcher:y="0" >
-        <favorite
-            launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_BROWSER;end" />
-        <favorite launcher:uri="http://www.example.com/" />
+        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>
 
     <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" />
+        launcher:y="0">
+        <favorite launcher:uri="#Intent;action=com.saggitt.omega.START_ACTION;package=com.saggitt.omega;component=com.saggitt.omega/.gestures.ui.RunHandlerActivity;com.saggitt.omega.EXTRA_HANDLER=%7B%22class%22%3A%22com.saggitt.omega.gestures.handlers.OpenDrawerGestureHandler%22%7D;end" />
     </resolve>
 
     <!-- Bottom row -->
     <resolve
         launcher:screen="0"
         launcher:x="0"
-        launcher:y="-1" >
-	    <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_EMAIL;end" />
-	    <favorite launcher:uri="mailto:" />
+        launcher:y="-1">
+        <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_EMAIL;end" />
+        <favorite launcher:uri="mailto:" />
 
     </resolve>
 
@@ -90,8 +88,20 @@
     <resolve
         launcher:screen="0"
         launcher:x="4"
-        launcher:y="-1" >
+        launcher:y="-1">
         <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_MARKET;end" />
         <favorite launcher:uri="market://details?id=com.android.launcher" />
     </resolve>
+
+    <resolve
+        launcher:screen="1"
+        launcher:x="0"
+        launcher:y="-1">
+        <favorite launcher:uri="#Intent;action=com.saggitt.omega.START_ACTION;
+            package=com.saggitt.omega;
+            component=com.saggitt.omega/.gestures.ui.RunHandlerActivity;
+            com.saggitt.omega.EXTRA_HANDLER=%7B%22class%22%3A%22com.saggitt.omega.gestures.handlers.OpenSettingsGestureHandler%22%7D;end" />
+
+    </resolve>
+
 </favorites>
diff --git a/res/xml/network_security_config.xml b/res/xml/network_security_config.xml
new file mode 100644
index 0000000000..55b20fbb79
--- /dev/null
+++ b/res/xml/network_security_config.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~  Copyright (c) 2020 Omega Launcher
+  ~
+  ~  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.
+  ~
+  -->
+
+<network-security-config></network-security-config>
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index b52bd4f784..ec3ea0fcb6 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,2 +1,5 @@
 include ':IconLoader'
 project(':IconLoader').projectDir = new File(rootDir, 'iconloaderlib')
+
+include ':SharedLibWrapper'
+project(':SharedLibWrapper').projectDir = new File(rootDir, 'SharedLibWrapper')
\ No newline at end of file
diff --git a/snapshots/omega1.jpg b/snapshots/omega1.jpg
new file mode 100644
index 0000000000..36af07eaee
Binary files /dev/null and b/snapshots/omega1.jpg differ
diff --git a/snapshots/omega2.jpg b/snapshots/omega2.jpg
new file mode 100644
index 0000000000..7078a8cb9c
Binary files /dev/null and b/snapshots/omega2.jpg differ
diff --git a/snapshots/omega3.jpg b/snapshots/omega3.jpg
new file mode 100644
index 0000000000..db2cc71696
Binary files /dev/null and b/snapshots/omega3.jpg differ
diff --git a/snapshots/omega4.jpg b/snapshots/omega4.jpg
new file mode 100644
index 0000000000..2f91ce4a1d
Binary files /dev/null and b/snapshots/omega4.jpg differ
diff --git a/snapshots/omega5.jpg b/snapshots/omega5.jpg
new file mode 100644
index 0000000000..d860f5300d
Binary files /dev/null and b/snapshots/omega5.jpg differ
diff --git a/snapshots/omega6.jpg b/snapshots/omega6.jpg
new file mode 100644
index 0000000000..acee00a888
Binary files /dev/null and b/snapshots/omega6.jpg differ
diff --git a/snapshots/omega7.jpg b/snapshots/omega7.jpg
new file mode 100644
index 0000000000..f8fbb36c34
Binary files /dev/null and b/snapshots/omega7.jpg differ
diff --git a/snapshots/omega8.jpg b/snapshots/omega8.jpg
new file mode 100644
index 0000000000..c022d7814b
Binary files /dev/null and b/snapshots/omega8.jpg differ
diff --git a/src/com/android/launcher3/AbstractFloatingView.java b/src/com/android/launcher3/AbstractFloatingView.java
index af2cdc3ed0..da9c96dea9 100644
--- a/src/com/android/launcher3/AbstractFloatingView.java
+++ b/src/com/android/launcher3/AbstractFloatingView.java
@@ -16,12 +16,6 @@
 
 package com.android.launcher3;
 
-import static android.view.accessibility.AccessibilityEvent.TYPE_WINDOW_CONTENT_CHANGED;
-import static android.view.accessibility.AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED;
-
-import static com.android.launcher3.compat.AccessibilityManagerCompat.isAccessibilityEnabled;
-import static com.android.launcher3.compat.AccessibilityManagerCompat.sendCustomAccessibilityEvent;
-
 import android.animation.Animator;
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -44,27 +38,18 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
+import static android.view.accessibility.AccessibilityEvent.TYPE_WINDOW_CONTENT_CHANGED;
+import static android.view.accessibility.AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED;
+import static com.android.launcher3.compat.AccessibilityManagerCompat.isAccessibilityEnabled;
+import static com.android.launcher3.compat.AccessibilityManagerCompat.sendCustomAccessibilityEvent;
+
 /**
  * Base class for a View which shows a floating UI on top of the launcher UI.
  */
 public abstract class AbstractFloatingView extends LinearLayout implements TouchController {
 
-    @IntDef(flag = true, value = {
-            TYPE_FOLDER,
-            TYPE_ACTION_POPUP,
-            TYPE_WIDGETS_BOTTOM_SHEET,
-            TYPE_WIDGET_RESIZE_FRAME,
-            TYPE_WIDGETS_FULL_SHEET,
-            TYPE_ON_BOARD_POPUP,
-            TYPE_DISCOVERY_BOUNCE,
-            TYPE_SNACKBAR,
-            TYPE_LISTENER,
-
-            TYPE_TASK_MENU,
-            TYPE_OPTIONS_POPUP
-    })
-    @Retention(RetentionPolicy.SOURCE)
-    public @interface FloatingViewType {}
+    // Custom popups
+    public static final int TYPE_SETTINGS_SHEET = 1 << 12;
     public static final int TYPE_FOLDER = 1 << 0;
     public static final int TYPE_ACTION_POPUP = 1 << 1;
     public static final int TYPE_WIDGETS_BOTTOM_SHEET = 1 << 2;
@@ -78,11 +63,29 @@ public abstract class AbstractFloatingView extends LinearLayout implements Touch
     // Popups related to quickstep UI
     public static final int TYPE_TASK_MENU = 1 << 9;
     public static final int TYPE_OPTIONS_POPUP = 1 << 10;
-
     public static final int TYPE_ALL = TYPE_FOLDER | TYPE_ACTION_POPUP
             | TYPE_WIDGETS_BOTTOM_SHEET | TYPE_WIDGET_RESIZE_FRAME | TYPE_WIDGETS_FULL_SHEET
             | TYPE_ON_BOARD_POPUP | TYPE_DISCOVERY_BOUNCE | TYPE_TASK_MENU
-            | TYPE_OPTIONS_POPUP | TYPE_SNACKBAR | TYPE_LISTENER;
+            | TYPE_OPTIONS_POPUP | TYPE_SNACKBAR | TYPE_LISTENER | TYPE_SETTINGS_SHEET;
+
+    @IntDef(flag = true, value = {
+            TYPE_FOLDER,
+            TYPE_ACTION_POPUP,
+            TYPE_WIDGETS_BOTTOM_SHEET,
+            TYPE_WIDGET_RESIZE_FRAME,
+            TYPE_WIDGETS_FULL_SHEET,
+            TYPE_ON_BOARD_POPUP,
+            TYPE_DISCOVERY_BOUNCE,
+            TYPE_SNACKBAR,
+            TYPE_LISTENER,
+
+            TYPE_TASK_MENU,
+            TYPE_OPTIONS_POPUP,
+            TYPE_SETTINGS_SHEET
+    })
+    @Retention(RetentionPolicy.SOURCE)
+    public @interface FloatingViewType {
+    }
 
     // Type of popups which should be kept open during launcher rebind
     public static final int TYPE_REBIND_SAFE = TYPE_WIDGETS_FULL_SHEET
diff --git a/src/com/android/launcher3/AppFilter.java b/src/com/android/launcher3/AppFilter.java
index 8196fb2d8f..fe1b0a498d 100644
--- a/src/com/android/launcher3/AppFilter.java
+++ b/src/com/android/launcher3/AppFilter.java
@@ -12,9 +12,6 @@ public static AppFilter newInstance(Context context) {
         return Overrides.getObject(AppFilter.class, context, R.string.app_filter_class);
     }
 
-    public boolean shouldShowApp(ComponentName app) {
-        return true;
-    }
     public boolean shouldShowApp(ComponentName app, UserHandle user) {
         return true;
     }
diff --git a/src/com/android/launcher3/AutoInstallsLayout.java b/src/com/android/launcher3/AutoInstallsLayout.java
index ac4396778a..cec68b5189 100644
--- a/src/com/android/launcher3/AutoInstallsLayout.java
+++ b/src/com/android/launcher3/AutoInstallsLayout.java
@@ -44,10 +44,11 @@
 import com.android.launcher3.LauncherSettings.Favorites;
 import com.android.launcher3.icons.GraphicsUtils;
 import com.android.launcher3.icons.LauncherIcons;
-import com.android.launcher3.qsb.QsbContainerView;
 import com.android.launcher3.util.IntArray;
 import com.android.launcher3.util.PackageManagerHelper;
 import com.android.launcher3.util.Thunk;
+import com.android.launcher3.widget.custom.CustomAppWidgetProviderInfo;
+import com.android.launcher3.widget.custom.CustomWidgetParser;
 
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
@@ -131,6 +132,7 @@ static AutoInstallsLayout get(Context context, AppWidgetHost appWidgetHost,
     private static final String ATTR_CLASS_NAME = "className";
     private static final String ATTR_TITLE = "title";
     private static final String ATTR_SCREEN = "screen";
+    private static final String ATTR_PROVIDER_ID = "providerId";
 
     // x and y can be specified as negative integers, in which case -1 represents the
     // last row / column, -2 represents the second last, and so on.
@@ -323,7 +325,7 @@ protected ArrayMap<String, TagParser> getLayoutElementsMap() {
         parsers.put(TAG_AUTO_INSTALL, new AutoInstallParser());
         parsers.put(TAG_FOLDER, new FolderParser());
         parsers.put(TAG_APPWIDGET, new PendingWidgetParser());
-        parsers.put(TAG_SEARCH_WIDGET, new SearchWidgetParser());
+        //parsers.put(TAG_SEARCH_WIDGET, new SearchWidgetParser());
         parsers.put(TAG_SHORTCUT, new ShortcutParser(mSourceRes));
         return parsers;
     }
@@ -547,7 +549,7 @@ protected int verifyAndInsert(ComponentName cn, Bundle extras) {
         }
     }
 
-    protected class SearchWidgetParser extends PendingWidgetParser {
+    /*protected class SearchWidgetParser extends PendingWidgetParser {
         @Override
         @Nullable
         public ComponentName getComponentName(XmlPullParser parser) {
@@ -562,6 +564,75 @@ protected int verifyAndInsert(ComponentName cn, Bundle extras) {
             mValues.put(Favorites.RESTORED, flags);
             return super.verifyAndInsert(cn, extras);
         }
+    }*/
+
+    protected class CustomAppWidgetParser implements TagParser {
+
+        @Override
+        public int parseAndAdd(XmlPullParser parser) throws XmlPullParserException, IOException {
+            final int providerId = Integer.parseInt(getAttributeValue(parser, ATTR_PROVIDER_ID));
+            LauncherAppWidgetProviderInfo provider = null;
+
+            for (LauncherAppWidgetProviderInfo each : CustomWidgetParser.getCustomWidgets(mContext)) {
+                if (each instanceof CustomAppWidgetProviderInfo) {
+                    if (((CustomAppWidgetProviderInfo) each).providerId == providerId) {
+                        provider = each;
+                        break;
+                    }
+                }
+            }
+
+            if (provider == null) {
+                if (LOGD) Log.d(TAG, "Skipping invalid <custom-appwidget> with no provider");
+                return -1;
+            }
+
+            mValues.put(Favorites.SPANX, getAttributeValue(parser, ATTR_SPAN_X));
+            mValues.put(Favorites.SPANY, getAttributeValue(parser, ATTR_SPAN_Y));
+            mValues.put(Favorites.ITEM_TYPE, Favorites.ITEM_TYPE_CUSTOM_APPWIDGET);
+            mValues.put(Favorites.APPWIDGET_ID, CustomWidgetParser
+                    .getWidgetIdForCustomProvider(mContext, provider.provider));
+
+            // Read the extras
+            Bundle extras = new Bundle();
+            int widgetDepth = parser.getDepth();
+            int type;
+            while ((type = parser.next()) != XmlPullParser.END_TAG ||
+                    parser.getDepth() > widgetDepth) {
+                if (type != XmlPullParser.START_TAG) {
+                    continue;
+                }
+
+                if (TAG_EXTRA.equals(parser.getName())) {
+                    String key = getAttributeValue(parser, ATTR_KEY);
+                    String value = getAttributeValue(parser, ATTR_VALUE);
+                    if (key != null && value != null) {
+                        extras.putString(key, value);
+                    } else {
+                        throw new RuntimeException("Widget extras must have a key and value");
+                    }
+                } else {
+                    throw new RuntimeException("Widgets can contain only extras");
+                }
+            }
+
+            return verifyAndInsert(provider.provider, extras);
+        }
+
+        protected int verifyAndInsert(ComponentName cn, Bundle extras) {
+            mValues.put(Favorites.APPWIDGET_PROVIDER, cn.flattenToString());
+            mValues.put(Favorites._ID, mCallback.generateNewItemId());
+            if (!extras.isEmpty()) {
+                mValues.put(Favorites.INTENT, new Intent().putExtras(extras).toUri(0));
+            }
+
+            int insertedId = mCallback.insertAndCheck(mDb, mValues);
+            if (insertedId < 0) {
+                return -1;
+            } else {
+                return insertedId;
+            }
+        }
     }
 
     protected class FolderParser implements TagParser {
diff --git a/src/com/android/launcher3/BaseDraggingActivity.java b/src/com/android/launcher3/BaseDraggingActivity.java
index 0843b635b0..2dd28d644d 100644
--- a/src/com/android/launcher3/BaseDraggingActivity.java
+++ b/src/com/android/launcher3/BaseDraggingActivity.java
@@ -206,7 +206,8 @@ private void startShortcutIntentSafely(Intent intent, Bundle optsBundle, ItemInf
             } finally {
                 StrictMode.setVmPolicy(oldPolicy);
             }
-        } catch (SecurityException e) {
+        } catch (ActivityNotFoundException | SecurityException e) {
+            Toast.makeText(this, R.string.activity_not_found, Toast.LENGTH_SHORT).show();
             if (!onErrorStartingShortcut(intent, info)) {
                 throw e;
             }
diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java
index a008ea44cf..c5f56b2d4a 100644
--- a/src/com/android/launcher3/BubbleTextView.java
+++ b/src/com/android/launcher3/BubbleTextView.java
@@ -28,6 +28,7 @@
 import android.graphics.Rect;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
+import android.text.TextUtils;
 import android.text.TextUtils.TruncateAt;
 import android.util.AttributeSet;
 import android.util.Property;
@@ -47,6 +48,7 @@
 import com.android.launcher3.graphics.IconPalette;
 import com.android.launcher3.graphics.IconShape;
 import com.android.launcher3.graphics.PreloadIconDrawable;
+import com.android.launcher3.icons.BitmapInfo;
 import com.android.launcher3.icons.DotRenderer;
 import com.android.launcher3.icons.IconCache.IconLoadRequest;
 import com.android.launcher3.icons.IconCache.ItemInfoUpdateReceiver;
@@ -54,6 +56,7 @@
 import com.android.launcher3.views.ActivityContext;
 import com.android.launcher3.views.IconLabelDotView;
 import com.saggitt.omega.OmegaPreferences;
+import com.saggitt.omega.override.CustomInfoProvider;
 
 import java.text.NumberFormat;
 
@@ -70,6 +73,7 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
     private static final int DISPLAY_WORKSPACE = 0;
     private static final int DISPLAY_ALL_APPS = 1;
     private static final int DISPLAY_FOLDER = 2;
+    private static final int DISPLAY_DRAWER_FOLDER = 5;
 
     private static final int[] STATE_PRESSED = new int[] {android.R.attr.state_pressed};
 
@@ -105,14 +109,14 @@ public void set(BubbleTextView bubbleTextView, Float alpha) {
     private Drawable mIcon;
     private final boolean mCenterVertically;
 
-    private final int mDisplay;
+    private int mDisplay;
 
     private final CheckLongPressHelper mLongPressHelper;
     private final StylusEventHelper mStylusEventHelper;
     private final float mSlop;
 
     private final boolean mLayoutHorizontal;
-    private final int mIconSize;
+    private int mIconSize;
 
     @ViewDebug.ExportedProperty(category = "launcher")
     private boolean mIsIconVisible = true;
@@ -137,10 +141,12 @@ public void set(BubbleTextView bubbleTextView, Float alpha) {
     private boolean mDisableRelayout = false;
 
     @ViewDebug.ExportedProperty(category = "launcher")
-    private final boolean mIgnorePaddingTouch;
+    private boolean mIgnorePaddingTouch;
 
     private IconLoadRequest mIconLoadRequest;
 
+    private boolean mHideText;
+
     public BubbleTextView(Context context) {
         this(context, null, 0);
     }
@@ -151,7 +157,20 @@ public BubbleTextView(Context context, AttributeSet attrs) {
 
     public BubbleTextView(Context context, AttributeSet attrs, int defStyle) {
         super(context, attrs, defStyle);
-        mActivity = ActivityContext.lookupContext(context);
+        ActivityContext activity;
+        try {
+            activity = ActivityContext.lookupContext(context);
+        } catch (IllegalArgumentException e) {
+            mActivity = null;
+            mLayoutHorizontal = false;
+            mIconSize = 0;
+            mCenterVertically = true;
+            mLongPressHelper = new CheckLongPressHelper(this);
+            mStylusEventHelper = null;
+            mSlop = 0;
+            return;
+        }
+        mActivity = activity;
         mSlop = ViewConfiguration.get(getContext()).getScaledTouchSlop();
 
         TypedArray a = context.obtainStyledAttributes(attrs,
@@ -160,23 +179,45 @@ public BubbleTextView(Context context, AttributeSet attrs, int defStyle) {
 
         mDisplay = a.getInteger(R.styleable.BubbleTextView_iconDisplay, DISPLAY_WORKSPACE);
         final int defaultIconSize;
+        OmegaPreferences prefs = Utilities.getOmegaPrefs(context);
         if (mDisplay == DISPLAY_WORKSPACE) {
             DeviceProfile grid = mActivity.getWallpaperDeviceProfile();
-            setTextSize(TypedValue.COMPLEX_UNIT_PX, grid.iconTextSizePx);
+            mHideText = prefs.getHideAppLabels();
+            setTextSize(TypedValue.COMPLEX_UNIT_PX, isTextHidden() ? 0 : grid.iconTextSizePx);
             setCompoundDrawablePadding(grid.iconDrawablePaddingPx);
             defaultIconSize = grid.iconSizePx;
+            int lines = prefs.getHomeLabelRows();
+            setLineCount(lines);
             mIgnorePaddingTouch = true;
         } else if (mDisplay == DISPLAY_ALL_APPS) {
             DeviceProfile grid = mActivity.getDeviceProfile();
+            mHideText = prefs.getHideAllAppsAppLabels();
+            setTextSize(TypedValue.COMPLEX_UNIT_PX, isTextHidden() ? 0 : grid.allAppsIconTextSizePx);
             setTextSize(TypedValue.COMPLEX_UNIT_PX, grid.allAppsIconTextSizePx);
             setCompoundDrawablePadding(grid.allAppsIconDrawablePaddingPx);
             defaultIconSize = grid.allAppsIconSizePx;
+            int lines = prefs.getDrawerLabelRows();
+            setLineCount(lines);
             mIgnorePaddingTouch = true;
+            setTextColor(prefs.getDrawerLabelColor());
         } else if (mDisplay == DISPLAY_FOLDER) {
+            mHideText = prefs.getHideAppLabels();
             DeviceProfile grid = mActivity.getDeviceProfile();
-            setTextSize(TypedValue.COMPLEX_UNIT_PX, grid.folderChildTextSizePx);
+            setTextSize(TypedValue.COMPLEX_UNIT_PX, isTextHidden() ? 0 : grid.folderChildTextSizePx);
             setCompoundDrawablePadding(grid.folderChildDrawablePaddingPx);
             defaultIconSize = grid.folderChildIconSizePx;
+            int lines = prefs.getHomeLabelRows();
+            setLineCount(lines);
+            mIgnorePaddingTouch = true;
+        } else if (mDisplay == DISPLAY_DRAWER_FOLDER) {
+            mHideText = prefs.getHideAllAppsAppLabels();
+            DeviceProfile grid = mActivity.getDeviceProfile();
+            setTextSize(TypedValue.COMPLEX_UNIT_PX,
+                    isTextHidden() ? 0 : grid.allAppsFolderChildTextSizePx);
+            setCompoundDrawablePadding(grid.allAppsFolderChildDrawablePaddingPx);
+            defaultIconSize = grid.allAppsFolderChildIconSizePx;
+            int lines = prefs.getDrawerLabelRows();
+            setLineCount(lines);
             mIgnorePaddingTouch = true;
         } else {
             // widget_selection or shortcut_popup
@@ -200,6 +241,14 @@ public BubbleTextView(Context context, AttributeSet attrs, int defStyle) {
         setTextAlpha(1f);
     }
 
+    public void setLineCount(int lines) {
+        setMaxLines(lines);
+        setSingleLine(lines == 1);
+        setEllipsize(TextUtils.TruncateAt.END);
+        // This shouldn't even be needed, what is going on?!
+        setLines(lines);
+    }
+
     @Override
     protected void onFocusChanged(boolean focused, int direction, Rect previouslyFocusedRect) {
         // Disable marques when not focused to that, so that updating text does not cause relayout.
@@ -297,7 +346,8 @@ private void applyIconAndLabel(ItemInfoWithIcon info) {
             mDotParams.color = IconPalette.getMutedColor(info.iconColor, 0.54f);
         }
         setIcon(iconDrawable);
-        setText(info.title);
+        if (!isTextHidden())
+            setText(getTitle(info));
         if (info.contentDescription != null) {
             setContentDescription(info.isDisabled()
                     ? getContext().getString(R.string.disabled_app_label, info.contentDescription)
@@ -305,6 +355,15 @@ private void applyIconAndLabel(ItemInfoWithIcon info) {
         }
     }
 
+    private CharSequence getTitle(ItemInfo info) {
+        CustomInfoProvider<ItemInfo> customInfoProvider = CustomInfoProvider.Companion.forItem(getContext(), info);
+        if (customInfoProvider != null) {
+            return customInfoProvider.getTitle(info);
+        } else {
+            return info.title;
+        }
+    }
+
     /**
      * Overrides the default long press timeout.
      */
@@ -672,8 +731,9 @@ public void requestLayout() {
 
     /**
      * Applies the item info if it is same as what the view is pointing to currently.
+     *
+     * @param info
      */
-    @Override
     public void reapplyItemInfo(ItemInfoWithIcon info) {
         if (getTag() == info) {
             mIconLoadRequest = null;
@@ -699,6 +759,10 @@ public void reapplyItemInfo(ItemInfoWithIcon info) {
      * Verifies that the current icon is high-res otherwise posts a request to load the icon.
      */
     public void verifyHighRes() {
+        verifyHighRes(BubbleTextView.this);
+    }
+
+    public void verifyHighRes(ItemInfoUpdateReceiver callback) {
         if (mIconLoadRequest != null) {
             mIconLoadRequest.cancel();
             mIconLoadRequest = null;
@@ -707,7 +771,7 @@ public void verifyHighRes() {
             ItemInfoWithIcon info = (ItemInfoWithIcon) getTag();
             if (info.usingLowResIcon()) {
                 mIconLoadRequest = LauncherAppState.getInstance(getContext()).getIconCache()
-                        .updateIconInBackground(BubbleTextView.this, info);
+                        .updateIconInBackground(callback, info);
             }
         }
     }
@@ -715,4 +779,33 @@ public void verifyHighRes() {
     public int getIconSize() {
         return mIconSize;
     }
+
+    public void setIconSize(int iconSize) {
+        mIconSize = iconSize;
+        setIcon(mIcon);
+    }
+
+    protected boolean isTextHidden() {
+        return mHideText;
+    }
+
+    public void applyIcon(ItemInfoWithIcon info) {
+        FastBitmapDrawable iconDrawable = DrawableFactory.INSTANCE.get(getContext()).newIcon(getContext(), info);
+        mDotParams.color = IconPalette.getMutedColor(info.iconColor, 0.54f);
+
+
+        setIcon(iconDrawable);
+    }
+
+    public void applyIcon(BitmapInfo info) {
+        FastBitmapDrawable iconDrawable = new FastBitmapDrawable(info);
+        mDotParams.color = IconPalette.getMutedColor(info.color, 0.54f);
+
+        setIcon(iconDrawable);
+    }
+
+    public void clearIcon() {
+        mIcon = null;
+        setCompoundDrawables(null, null, null, null);
+    }
 }
diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java
index 976ccd52ed..e8fc5beafd 100644
--- a/src/com/android/launcher3/CellLayout.java
+++ b/src/com/android/launcher3/CellLayout.java
@@ -16,8 +16,6 @@
 
 package com.android.launcher3;
 
-import static com.android.launcher3.anim.Interpolators.DEACCEL_1_5;
-
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.ObjectAnimator;
@@ -78,6 +76,8 @@
 import java.util.Comparator;
 import java.util.Stack;
 
+import static com.android.launcher3.anim.Interpolators.DEACCEL_1_5;
+
 public class CellLayout extends ViewGroup implements Transposable {
     public static final int WORKSPACE_ACCESSIBILITY_DRAG = 2;
     public static final int FOLDER_ACCESSIBILITY_DRAG = 1;
@@ -87,11 +87,13 @@ public class CellLayout extends ViewGroup implements Transposable {
 
     protected final ActivityContext mActivity;
     @ViewDebug.ExportedProperty(category = "launcher")
-    @Thunk int mCellWidth;
+    @Thunk
+    public int mCellWidth;
     @ViewDebug.ExportedProperty(category = "launcher")
-    @Thunk int mCellHeight;
-    private int mFixedCellWidth;
-    private int mFixedCellHeight;
+    @Thunk
+    public int mCellHeight;
+    public int mFixedCellWidth;
+    public int mFixedCellHeight;
 
     @ViewDebug.ExportedProperty(category = "launcher")
     private int mCountX;
@@ -113,21 +115,23 @@ public class CellLayout extends ViewGroup implements Transposable {
     private final ArrayList<PreviewBackground> mFolderBackgrounds = new ArrayList<>();
     final PreviewBackground mFolderLeaveBehind = new PreviewBackground();
 
-    private static final int[] BACKGROUND_STATE_ACTIVE = new int[] { android.R.attr.state_active };
+    private static final int[] BACKGROUND_STATE_ACTIVE = new int[]{android.R.attr.state_active};
     private static final int[] BACKGROUND_STATE_DEFAULT = EMPTY_STATE_SET;
     private final Drawable mBackground;
 
     // These values allow a fixed measurement to be set on the CellLayout.
-    private int mFixedWidth = -1;
-    private int mFixedHeight = -1;
+    public int mFixedWidth = -1;
+    public int mFixedHeight = -1;
 
     // If we're actively dragging something over this screen, mIsDragOverlapping is true
     private boolean mIsDragOverlapping = false;
 
     // These arrays are used to implement the drag visualization on x-large screens.
     // They are used as circular arrays, indexed by mDragOutlineCurrent.
-    @Thunk final Rect[] mDragOutlines = new Rect[4];
-    @Thunk final float[] mDragOutlineAlphas = new float[mDragOutlines.length];
+    @Thunk
+    final Rect[] mDragOutlines = new Rect[4];
+    @Thunk
+    final float[] mDragOutlineAlphas = new float[mDragOutlines.length];
     private final InterruptibleInOutAnimator[] mDragOutlineAnims =
             new InterruptibleInOutAnimator[mDragOutlines.length];
 
@@ -150,15 +154,20 @@ public class CellLayout extends ViewGroup implements Transposable {
 
     @Retention(RetentionPolicy.SOURCE)
     @IntDef({WORKSPACE, HOTSEAT, FOLDER})
-    public @interface ContainerType{}
+    public @interface ContainerType {
+    }
+
     public static final int WORKSPACE = 0;
     public static final int HOTSEAT = 1;
     public static final int FOLDER = 2;
 
-    @ContainerType private final int mContainerType;
+    @ContainerType
+    private final int mContainerType;
 
     private final float mChildScale = 1f;
 
+    private final int mDockIconSize;
+
     public static final int MODE_SHOW_REORDER_HINT = 0;
     public static final int MODE_DRAG_OVER = 1;
     public static final int MODE_ON_DROP = 2;
@@ -211,9 +220,11 @@ public CellLayout(Context context, AttributeSet attrs, int defStyle) {
         mCellWidth = mCellHeight = -1;
         mFixedCellWidth = mFixedCellHeight = -1;
 
+        mDockIconSize = grid.hotseatIconSizePx;
+
         mCountX = grid.inv.numColumns;
         mCountY = grid.inv.numRows;
-        mOccupied =  new GridOccupancy(mCountX, mCountY);
+        mOccupied = new GridOccupancy(mCountX, mCountY);
         mTmpOccupied = new GridOccupancy(mCountX, mCountY);
 
         mPreviousReorderDirection[0] = INVALID_DIRECTION;
@@ -579,7 +590,12 @@ public boolean addViewToCellLayout(View child, int index, int childId, LayoutPar
         // Hotseat icons - remove text
         if (child instanceof BubbleTextView) {
             BubbleTextView bubbleChild = (BubbleTextView) child;
-            bubbleChild.setTextVisibility(mContainerType != HOTSEAT);
+            //bubbleChild.setTextVisibility(mContainerType!=HOTSEAT);
+            if (mContainerType == HOTSEAT) {
+                bubbleChild.setTextVisibility(!Utilities.getOmegaPrefs(getContext()).getHideDockLabels());
+                bubbleChild.setIconSize(mDockIconSize);
+                bubbleChild.setLines(Utilities.getOmegaPrefs(getContext()).getDockLabelRows());
+            }
         }
 
         child.setScaleX(mChildScale);
diff --git a/src/com/android/launcher3/DefaultLayoutParser.java b/src/com/android/launcher3/DefaultLayoutParser.java
index af85594779..8daf59185d 100644
--- a/src/com/android/launcher3/DefaultLayoutParser.java
+++ b/src/com/android/launcher3/DefaultLayoutParser.java
@@ -35,6 +35,7 @@ public class DefaultLayoutParser extends AutoInstallsLayout {
     private static final String TAG_FAVORITES = "favorites";
     protected static final String TAG_FAVORITE = "favorite";
     private static final String TAG_APPWIDGET = "appwidget";
+    private static final String TAG_CUSTOM_APPWIDGET = "custom-appwidget";
     protected static final String TAG_SHORTCUT = "shortcut";
     private static final String TAG_FOLDER = "folder";
     private static final String TAG_PARTNER_FOLDER = "partner-folder";
@@ -71,7 +72,8 @@ protected ArrayMap<String, TagParser> getLayoutElementsMap() {
         ArrayMap<String, TagParser> parsers = new ArrayMap<>();
         parsers.put(TAG_FAVORITE, new AppShortcutWithUriParser());
         parsers.put(TAG_APPWIDGET, new AppWidgetParser());
-        parsers.put(TAG_SEARCH_WIDGET, new SearchWidgetParser());
+        parsers.put(TAG_CUSTOM_APPWIDGET, new CustomAppWidgetParser());
+        //parsers.put(TAG_SEARCH_WIDGET, new SearchWidgetParser());
         parsers.put(TAG_SHORTCUT, new UriShortcutParser(mSourceRes));
         parsers.put(TAG_RESOLVE, new ResolveParser());
         parsers.put(TAG_FOLDER, new MyFolderParser());
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index f5f15286f7..78233ee555 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -37,9 +37,7 @@
 public class DeviceProfile implements OmegaPreferences.OnPreferenceChangeListener {
 
     public final InvariantDeviceProfile inv;
-    // IDP with no grid override values.
-    @Nullable
-    private final InvariantDeviceProfile originalIdp;
+    public final int defaultPageSpacingPx;
 
     // Device properties
     public final boolean isTablet;
@@ -69,22 +67,27 @@ public class DeviceProfile implements OmegaPreferences.OnPreferenceChangeListene
 
     // To evenly space the icons, increase the left/right margins for tablets in portrait mode.
     private static final int PORTRAIT_TABLET_LEFT_RIGHT_PADDING_MULTIPLIER = 4;
-
-    // Workspace
-    public final int desiredWorkspaceLeftRightMarginPx;
-    private final OmegaPreferences prefs;
+    // IDP with no grid override values.
+    @Nullable
+    private final InvariantDeviceProfile originalIdp;
+    private final int topWorkspacePadding;
     public final int cellLayoutBottomPaddingPx;
     public final int edgeMarginPx;
     public float workspaceSpringLoadShrinkFactor;
     public final int workspaceSpringLoadedBottomSpace;
-
+    private final OmegaPreferences prefs;
+    // Workspace
+    public int desiredWorkspaceLeftRightMarginPx;
+    public int cellLayoutPaddingLeftRightPx;
+    public float workspaceOptionsShrinkFactor;
     // Drag handle
-    public final int verticalDragHandleSizePx;
-    private final int verticalDragHandleOverlapWorkspace;
+    public int verticalDragHandleSizePx;
 
     // Workspace icons
     public int iconSizePx;
+    public int iconSizeOriginalPx;
     public int iconTextSizePx;
+    public int iconTextSizeOriginalPx;
     public int iconDrawablePaddingPx;
     public int iconDrawablePaddingOriginalPx;
 
@@ -92,28 +95,47 @@ public class DeviceProfile implements OmegaPreferences.OnPreferenceChangeListene
     public int cellHeightPx;
     public int workspaceCellPaddingXPx;
 
+    public int hotseatIconSizePx;
+    public int hotseatIconSizeOriginalPx;
+
     // Folder
     public int folderIconSizePx;
     public int folderIconOffsetYPx;
 
+    // Drawer folder
+    public int allAppsFolderIconSizePx;
+    public int allAppsFolderIconOffsetYPx;
+
     // Folder cell
     public int folderCellWidthPx;
     public int folderCellHeightPx;
 
+    // Drawer folder cell
+    public int allAppsFolderCellWidthPx;
+
     // Folder child
     public int folderChildIconSizePx;
     public int folderChildTextSizePx;
     public int folderChildDrawablePaddingPx;
+    public int allAppsFolderCellHeightPx;
+
+    // Drawer folder child
+    public int allAppsFolderChildIconSizePx;
+    public int allAppsFolderChildTextSizePx;
+    public int allAppsFolderChildDrawablePaddingPx;
 
     // Hotseat
     public int hotseatCellHeightPx;
+    public int hotseatIconTextSizePx;
+    public int hotseatIconTextSizeOriginalPx;
+
     // In portrait: size = height, in landscape: size = width
     public int hotseatBarSizePx;
-    public final int hotseatBarTopPaddingPx;
+    public int hotseatBarTopPaddingPx;
     public int hotseatBarBottomPaddingPx;
     // Start is the side next to the nav bar, end is the side next to the workspace
-    public final int hotseatBarSidePaddingStartPx;
-    public final int hotseatBarSidePaddingEndPx;
+    public int hotseatBarSidePaddingStartPx;
+    public int hotseatBarSidePaddingEndPx;
 
     // All apps
     public int allAppsCellHeightPx;
@@ -121,6 +143,7 @@ public class DeviceProfile implements OmegaPreferences.OnPreferenceChangeListene
     public int allAppsIconSizePx;
     public int allAppsIconDrawablePaddingPx;
     public float allAppsIconTextSizePx;
+    public float allAppsIconTextSizeOriginalPx;
 
     // Widgets
     public final PointF appWidgetScale = new PointF(1.0f, 1.0f);
@@ -138,12 +161,13 @@ public class DeviceProfile implements OmegaPreferences.OnPreferenceChangeListene
     // Notification dots
     public DotRenderer mDotRendererWorkSpace;
     public DotRenderer mDotRendererAllApps;
-    public int cellLayoutPaddingLeftRightPx;
+    private int verticalDragHandleOverlapWorkspace;
     public Context mContext;
 
     public DeviceProfile(Context context, InvariantDeviceProfile inv,
                          InvariantDeviceProfile originalIDP, Point minSize, Point maxSize,
                          int width, int height, boolean isLandscape, boolean isMultiWindowMode) {
+
         mContext = context;
         prefs = Utilities.getOmegaPrefs(context);
 
@@ -210,18 +234,26 @@ public DeviceProfile(Context context, InvariantDeviceProfile inv,
         workspaceCellPaddingXPx = res.getDimensionPixelSize(R.dimen.dynamic_grid_cell_padding_x);
 
         hotseatBarTopPaddingPx =
-                res.getDimensionPixelSize(R.dimen.dynamic_grid_hotseat_top_padding);
-        hotseatBarBottomPaddingPx = (isTallDevice ? 0
-                : res.getDimensionPixelSize(R.dimen.dynamic_grid_hotseat_bottom_non_tall_padding))
-                + res.getDimensionPixelSize(R.dimen.dynamic_grid_hotseat_bottom_padding);
+                res.getDimensionPixelSize(prefs.getDockSearchBar() ?
+                        R.dimen.dynamic_grid_hotseat_top_padding :
+                        R.dimen.v1_dynamic_grid_hotseat_top_padding);
+        int extraHotseatBottomPadding = res.getDimensionPixelSize(R.dimen.dynamic_grid_hotseat_bottom_non_tall_padding);
+        hotseatBarBottomPaddingPx = extraHotseatBottomPadding
+                + res.getDimensionPixelSize(prefs.getDockSearchBar() ?
+                R.dimen.dynamic_grid_hotseat_bottom_padding :
+                R.dimen.v1_dynamic_grid_hotseat_bottom_padding);
+
         hotseatBarSidePaddingEndPx =
                 res.getDimensionPixelSize(R.dimen.dynamic_grid_hotseat_side_padding);
         // Add a bit of space between nav bar and hotseat in vertical bar layout.
         hotseatBarSidePaddingStartPx = isVerticalBarLayout() ? verticalDragHandleSizePx : 0;
-        hotseatBarSizePx = ResourceUtils.pxFromDp(inv.iconSize, dm) + (isVerticalBarLayout()
-                ? (hotseatBarSidePaddingStartPx + hotseatBarSidePaddingEndPx)
-                : (res.getDimensionPixelSize(R.dimen.dynamic_grid_hotseat_extra_vertical_size)
-                + hotseatBarTopPaddingPx + hotseatBarBottomPaddingPx));
+        hotseatBarSizePx = isVerticalBarLayout()
+                ? hotseatIconSizePx + hotseatBarSidePaddingStartPx
+                + hotseatBarSidePaddingEndPx
+                : res.getDimensionPixelSize(prefs.getDockSearchBar() ?
+                R.dimen.dynamic_grid_hotseat_size :
+                R.dimen.v1_dynamic_grid_hotseat_size)
+                + hotseatBarTopPaddingPx + hotseatBarBottomPaddingPx;
 
         // Calculate all of the remaining variables.
         updateAvailableDimensions(dm, res);
@@ -261,23 +293,135 @@ public DeviceProfile(Context context, InvariantDeviceProfile inv,
             dotSize = 0.228f;
         }
 
-        //mDotRendererWorkSpace = new DotRenderer(iconSizePx, IconShape.getShapePath(), IconShape.DEFAULT_PATH_SIZE);
+        // This is done last, after iconSizePx is calculated above.
         mDotRendererWorkSpace = new DotRenderer(iconSizePx, IconShape.getShapePath(), IconShape.DEFAULT_PATH_SIZE, dotSize);
         mDotRendererAllApps = iconSizePx == allAppsIconSizePx ? mDotRendererWorkSpace :
                 new DotRenderer(allAppsIconSizePx, IconShape.getShapePath(), IconShape.DEFAULT_PATH_SIZE, dotSize);
-        //new DotRenderer(allAppsIconSizePx, IconShape.getShapePath(), IconShape.DEFAULT_PATH_SIZE);
 
-        prefs.addOnPreferenceChangeListener(this, "pref_fullWidthWidgets");
+        defaultPageSpacingPx =
+                res.getDimensionPixelSize(R.dimen.dynamic_grid_workspace_page_spacing);
+        topWorkspacePadding =
+                res.getDimensionPixelSize(R.dimen.dynamic_grid_workspace_top_padding);
+
+        prefs.addOnPreferenceChangeListener(this, "pref_fullWidthWidgets", "pref_dockScale");
     }
 
     @Override
     public void onValueChanged(String key, OmegaPreferences prefs, boolean force) {
+        updateDimensions();
+    }
+
+    public void updateDimensions() {
         Resources res = mContext.getResources();
+        DisplayMetrics dm = res.getDisplayMetrics();
 
-        boolean fullWidthWidgets = Utilities.getOmegaPrefs(mContext).getAllowFullWidthWidgets();
+        boolean fullWidthWidgets = prefs.getAllowFullWidthWidgets();
+        boolean dockSearchBar = prefs.getDockSearchBar();
+        boolean dockHidden = prefs.getDockHide();
+        float dockScale = prefs.getDockScale();
 
         cellLayoutPaddingLeftRightPx = (!isVerticalBarLayout() && fullWidthWidgets) ? 0
                 : res.getDimensionPixelSize(R.dimen.dynamic_grid_cell_layout_padding);
+
+        hotseatBarTopPaddingPx =
+                res.getDimensionPixelSize(dockSearchBar ?
+                        R.dimen.dynamic_grid_hotseat_top_padding :
+                        R.dimen.v1_dynamic_grid_hotseat_top_padding);
+
+        int extraHotseatBottomPadding = res.getDimensionPixelSize(R.dimen.dynamic_grid_hotseat_bottom_non_tall_padding);
+        hotseatBarBottomPaddingPx = extraHotseatBottomPadding
+                + res.getDimensionPixelSize(dockSearchBar ?
+                R.dimen.dynamic_grid_hotseat_bottom_padding :
+                R.dimen.v1_dynamic_grid_hotseat_bottom_padding);
+
+        hotseatBarSidePaddingEndPx =
+                res.getDimensionPixelSize(R.dimen.dynamic_grid_hotseat_side_padding);
+        // Add a bit of space between nav bar and hotseat.
+        hotseatBarSidePaddingStartPx = isVerticalBarLayout() ? verticalDragHandleSizePx : 0;
+
+        hotseatBarSizePx = isVerticalBarLayout()
+                ? hotseatIconSizePx + hotseatBarSidePaddingStartPx
+                + hotseatBarSidePaddingEndPx
+                : res.getDimensionPixelSize(dockSearchBar ?
+                R.dimen.dynamic_grid_hotseat_size :
+                R.dimen.v1_dynamic_grid_hotseat_size)
+                + hotseatBarTopPaddingPx + hotseatBarBottomPaddingPx;
+
+        verticalDragHandleSizePx = res.getDimensionPixelSize(
+                R.dimen.vertical_drag_handle_size);
+        // Calculate all of the remaining variables.
+        updateAvailableDimensions(dm, res);
+
+        iconTextSizePx = (int) (iconTextSizeOriginalPx * prefs.getDesktopTextScale());
+        allAppsIconTextSizePx = (int) (allAppsIconTextSizeOriginalPx * prefs.getDrawerTextScale());
+        float dockTextScale = prefs.getDockTextScale();
+        if (dockTextScale < 0) {
+            hotseatIconTextSizePx = iconTextSizePx;
+        } else {
+            hotseatIconTextSizePx = (int) (hotseatIconTextSizeOriginalPx * dockTextScale);
+        }
+
+        // Calculate again to apply text size
+        updateAvailableDimensions(dm, res);
+
+        int extraSpaceFromY = Math.max(0, getCellSizeOriginal().y - iconSizeOriginalPx
+                - iconDrawablePaddingOriginalPx * 2 - verticalDragHandleSizePx
+                - extraHotseatBottomPadding);
+        int extraSpaceFromScale;
+        if (dockScale < 0f) {
+            extraSpaceFromScale = extraSpaceFromY;
+        } else {
+            extraSpaceFromScale = (int) (hotseatBarSizePx * (dockScale - 1));
+        }
+        // Now that we have all of the variables calculated, we can tune certain sizes.
+        if (!isVerticalBarLayout() && isPhone && isTablet) {
+            // We increase the hotseat size when there is extra space.
+            // ie. For a display with a large aspect ratio, we can keep the icons on the workspace
+            // in portrait mode closer together by adding more height to the hotseat.
+            // Note: This calculation was created after noticing a pattern in the design spec.
+            int extraSpace = Utilities.boundToRange(extraSpaceFromScale, 0, extraSpaceFromY);
+            hotseatBarSizePx += extraSpace;
+
+            hotseatBarBottomPaddingPx += extraSpace / 2;
+            hotseatBarTopPaddingPx += extraSpace / 2;
+
+            // Recalculate the available dimensions using the new hotseat size.
+            updateAvailableDimensions(dm, res);
+            extraSpaceFromScale -= extraSpace;
+        }
+
+        if (dockHidden) {
+            hotseatBarSizePx = 0;
+            verticalDragHandleSizePx = 0;
+
+            updateAvailableDimensions(dm, res);
+        } else if (!isVerticalBarLayout()) {
+            float adjustedDockScale = (float) extraSpaceFromScale / hotseatBarSizePx + 1;
+            int qsbHeight = res.getDimensionPixelSize(R.dimen.qsb_widget_height);
+            verticalDragHandleSizePx *= adjustedDockScale;
+            int bottomPaddingNew = Math.max((int) (hotseatBarBottomPaddingPx * adjustedDockScale), dockSearchBar ? qsbHeight : 0);
+
+            int difference = hotseatBarBottomPaddingPx - bottomPaddingNew;
+            hotseatBarTopPaddingPx -= difference;
+            hotseatBarBottomPaddingPx = bottomPaddingNew;
+
+            int minHeight = hotseatCellHeightPx + hotseatBarBottomPaddingPx + hotseatBarTopPaddingPx;
+            hotseatBarSizePx = Math.max(minHeight, (int) (hotseatBarSizePx * adjustedDockScale));
+        }
+
+        updateWorkspacePadding();
+    }
+
+    public Point getCellSizeOriginal() {
+        Point result = new Point();
+        // Since we are only concerned with the overall padding, layout direction does
+        // not matter.
+        Point padding = getTotalWorkspacePadding();
+        result.x = calculateCellWidth(availableWidthPx - padding.x
+                - cellLayoutPaddingLeftRightPx * 2, inv.numColumnsOriginal);
+        result.y = calculateCellHeight(availableHeightPx - padding.y
+                - cellLayoutBottomPaddingPx, inv.numRowsOriginal);
+        return result;
     }
 
     public DeviceProfile copy(Context context) {
@@ -331,12 +475,14 @@ private void adjustToHideWorkspaceLabels() {
         iconDrawablePaddingPx = 0;
         cellHeightPx = iconSizePx;
 
+        int labelRows = prefs.getDrawerLabelRows();
+
         // In normal cases, All Apps cell height should equal the Workspace cell height.
         // Since we are removing labels from the Workspace, we need to manually compute the
         // All Apps cell height.
         int topBottomPadding = allAppsIconDrawablePaddingPx * (isVerticalBarLayout() ? 2 : 1);
         allAppsCellHeightPx = allAppsIconSizePx + allAppsIconDrawablePaddingPx
-                + Utilities.calculateTextHeight(allAppsIconTextSizePx)
+                + Utilities.calculateTextHeight(allAppsIconTextSizePx) * labelRows
                 + topBottomPadding * 2;
     }
 
@@ -359,15 +505,25 @@ private void updateAvailableDimensions(DisplayMetrics dm, Resources res) {
      * hotseat sizes, workspaceSpringLoadedShrinkFactor, folderIconSizePx, and folderIconOffsetYPx.
      */
     private void updateIconSize(float scale, Resources res, DisplayMetrics dm) {
+        boolean dockVisible = !prefs.getDockHide();
+        int labelRowCount = prefs.getHomeLabelRows();
+        int drawerLabelRowCount = prefs.getDrawerLabelRows();
+        int dockLabelRowCount = prefs.getDockLabelRows();
+
         // Workspace
         final boolean isVerticalLayout = isVerticalBarLayout();
-        float invIconSizeDp = isVerticalLayout ? inv.landscapeIconSize : inv.iconSize;
-        iconSizePx = Math.max(1, (int) (ResourceUtils.pxFromDp(invIconSizeDp, dm) * scale));
-        iconTextSizePx = (int) (Utilities.pxFromSp(inv.iconTextSize, dm) * scale);
-        iconDrawablePaddingPx = (int) (iconDrawablePaddingOriginalPx * scale);
+        float invIconSizePx = isVerticalLayout ? inv.landscapeIconSize : inv.iconSize;
+        iconSizeOriginalPx = Utilities.pxFromDp(invIconSizePx, dm);
+        iconSizePx = (int) (iconSizeOriginalPx * scale);
+        iconTextSizeOriginalPx = (int) (Utilities.pxFromSp(inv.iconTextSize, dm) * scale);
+        iconTextSizePx = (int) (iconTextSizePx * scale);
+        iconDrawablePaddingPx =
+                (int) (iconDrawablePaddingOriginalPx * scale) -
+                        (iconTextSizeOriginalPx - iconTextSizePx);
+
+        int textHeight = Utilities.calculateTextHeight(iconTextSizePx) * labelRowCount;
+        cellHeightPx = iconSizePx + iconDrawablePaddingPx + textHeight;
 
-        cellHeightPx = iconSizePx + iconDrawablePaddingPx
-                + Utilities.calculateTextHeight(iconTextSizePx);
         int cellYPadding = (getCellSize().y - cellHeightPx) / 2;
         if (iconDrawablePaddingPx > cellYPadding && !isVerticalLayout
                 && !isMultiWindowMode) {
@@ -379,27 +535,48 @@ private void updateIconSize(float scale, Resources res, DisplayMetrics dm) {
         }
         cellWidthPx = iconSizePx + iconDrawablePaddingPx;
 
-        allAppsIconSizePx = iconSizePx;
-        allAppsIconTextSizePx = iconTextSizePx;
-        allAppsIconDrawablePaddingPx = iconDrawablePaddingPx;
-        allAppsCellHeightPx = getCellSize().y;
-        allAppsCellWidthPx = allAppsIconSizePx + allAppsIconDrawablePaddingPx;
+        // All apps
+        float invAllAppsIconSizePx = isVerticalLayout ? inv.landscapeAllAppsIconSize : inv.allAppsIconSize;
+        allAppsIconTextSizeOriginalPx = (int) (Utilities.pxFromSp(inv.iconTextSize, dm) * scale);
+        allAppsIconTextSizePx = (int) (allAppsIconTextSizePx * scale);
+        textHeight = Utilities.calculateTextHeight(allAppsIconTextSizePx) * drawerLabelRowCount;
+        allAppsIconSizePx = (int) (Utilities.pxFromDp(invAllAppsIconSizePx, dm) * scale);
+        allAppsIconDrawablePaddingPx = (int) (iconDrawablePaddingOriginalPx * scale) -
+                (int) (allAppsIconTextSizeOriginalPx - allAppsIconTextSizePx);
+
+        int additionalPadding = (int) (
+                res.getDimensionPixelSize(R.dimen.dynamic_grid_drawer_additional_padding) *
+                        prefs.getDrawerPaddingScale());
+        allAppsCellHeightPx = allAppsIconSizePx + allAppsIconDrawablePaddingPx + textHeight
+                + additionalPadding;
 
+        allAppsCellWidthPx = allAppsIconSizePx + allAppsIconDrawablePaddingPx;
         if (isVerticalBarLayout()) {
             // Always hide the Workspace text with vertical bar layout.
             adjustToHideWorkspaceLabels();
         }
 
         // Hotseat
+        float invHotseatIconSizePx = isVerticalLayout ? inv.landscapeHotseatIconSize : inv.hotseatIconSize;
+        hotseatIconTextSizeOriginalPx = (int) (Utilities.pxFromSp(inv.iconTextSize, dm) * scale);
+        hotseatIconTextSizePx = (int) (hotseatIconTextSizeOriginalPx * scale);
+        textHeight = Utilities.calculateTextHeight(hotseatIconTextSizePx) * dockLabelRowCount;
+        hotseatIconSizeOriginalPx = Utilities.pxFromDp(invHotseatIconSizePx, dm);
+        hotseatIconSizePx = (int) (hotseatIconSizeOriginalPx * scale);
+
         if (isVerticalLayout) {
-            hotseatBarSizePx = iconSizePx + hotseatBarSidePaddingStartPx
-                    + hotseatBarSidePaddingEndPx;
+            hotseatBarSizePx =
+                    hotseatIconSizePx
+                            + hotseatBarSidePaddingStartPx + hotseatBarSidePaddingEndPx;
         }
-        hotseatCellHeightPx = iconSizePx;
+        int additionalHeight =
+                prefs.getHideDockLabels() ? 0 : (int) (textHeight + (iconDrawablePaddingOriginalPx
+                        * scale));
+        hotseatCellHeightPx = hotseatIconSizePx + additionalHeight;
 
         if (!isVerticalLayout) {
-            int expectedWorkspaceHeight = availableHeightPx - hotseatBarSizePx
-                    - verticalDragHandleSizePx - edgeMarginPx;
+            int expectedWorkspaceHeight = availableHeightPx - (dockVisible ? hotseatBarSizePx : 0)
+                    - verticalDragHandleSizePx - topWorkspacePadding;
             float minRequiredHeight = dropTargetBarSizePx + workspaceSpringLoadedBottomSpace;
             workspaceSpringLoadShrinkFactor = Math.min(
                     res.getInteger(R.integer.config_workspaceSpringLoadShrinkPercentage) / 100.0f,
@@ -408,10 +585,14 @@ private void updateIconSize(float scale, Resources res, DisplayMetrics dm) {
             workspaceSpringLoadShrinkFactor =
                     res.getInteger(R.integer.config_workspaceSpringLoadShrinkPercentage) / 100.0f;
         }
+        workspaceOptionsShrinkFactor =
+                res.getInteger(R.integer.config_workspaceOptionsShrinkPercentage) / 100.0f;
 
         // Folder icon
         folderIconSizePx = IconNormalizer.getNormalizedCircleSize(iconSizePx);
         folderIconOffsetYPx = (iconSizePx - folderIconSizePx) / 2;
+        allAppsFolderIconSizePx = IconNormalizer.getNormalizedCircleSize(allAppsIconSizePx);
+        allAppsFolderIconOffsetYPx = (allAppsIconSizePx - allAppsFolderIconSizePx) / 2;
     }
 
     private void updateAvailableFolderCellDimensions(DisplayMetrics dm, Resources res) {
@@ -426,19 +607,22 @@ private void updateAvailableFolderCellDimensions(DisplayMetrics dm, Resources re
         Point totalWorkspacePadding = getTotalWorkspacePadding();
 
         // Check if the icons fit within the available height.
-        float contentUsedHeight = folderCellHeightPx * inv.numFolderRows;
+        float contentUsedHeight = allAppsFolderCellHeightPx * inv.numFolderRows + folderBottomPanelSize;
         int contentMaxHeight = availableHeightPx - totalWorkspacePadding.y - folderBottomPanelSize
                 - folderMargin;
         float scaleY = contentMaxHeight / contentUsedHeight;
 
+        // Drawer Folders
+        updateDrawerFolderCellSize(1f, dm, res);
+
         // Check if the icons fit within the available width.
-        float contentUsedWidth = folderCellWidthPx * inv.numFolderColumns;
+        float contentUsedWidth = allAppsFolderCellHeightPx * inv.numFolderColumns;
         int contentMaxWidth = availableWidthPx - totalWorkspacePadding.x - folderMargin;
         float scaleX = contentMaxWidth / contentUsedWidth;
 
         float scale = Math.min(scaleX, scaleY);
         if (scale < 1f) {
-            updateFolderCellSize(scale, dm, res);
+            updateDrawerFolderCellSize(scale, dm, res);
         }
     }
 
@@ -457,6 +641,25 @@ private void updateFolderCellSize(float scale, DisplayMetrics dm, Resources res)
                 (folderCellHeightPx - folderChildIconSizePx - textHeight) / 3);
     }
 
+    private void updateDrawerFolderCellSize(float scale, DisplayMetrics dm, Resources res) {
+        // Drawer folders
+        int folderLabelRowCount = Utilities.getOmegaPrefs(mContext).getHomeLabelRows();
+
+        allAppsFolderChildIconSizePx = (int) (Utilities.pxFromDp(inv.allAppsIconSize, dm) * scale);
+        allAppsFolderChildTextSizePx =
+                (int) (res.getDimensionPixelSize(R.dimen.folder_child_text_size) * scale);
+
+        int textHeight =
+                Utilities.calculateTextHeight(allAppsFolderChildTextSizePx) * folderLabelRowCount;
+        int cellPaddingX = (int) (res.getDimensionPixelSize(R.dimen.folder_cell_x_padding) * scale);
+        int cellPaddingY = (int) (res.getDimensionPixelSize(R.dimen.folder_cell_y_padding) * scale);
+
+        allAppsFolderCellWidthPx = allAppsFolderChildIconSizePx + 2 * cellPaddingX;
+        allAppsFolderCellHeightPx = allAppsFolderChildIconSizePx + 2 * cellPaddingY + textHeight;
+        allAppsFolderChildDrawablePaddingPx = Math.max(0,
+                (allAppsFolderCellHeightPx - allAppsFolderChildIconSizePx - textHeight) / 3);
+    }
+
     public void updateInsets(Rect insets) {
         mInsets.set(insets);
         updateWorkspacePadding();
@@ -519,17 +722,20 @@ private void updateWorkspacePadding() {
                         ((inv.numColumns - 1) * cellWidthPx)));
                 availablePaddingX = (int) Math.min(availablePaddingX,
                         widthPx * MAX_HORIZONTAL_PADDING_PERCENT);
-                int availablePaddingY = Math.max(0, heightPx - edgeMarginPx - paddingBottom
+                int availablePaddingY = Math.max(0, heightPx - topWorkspacePadding - paddingBottom
                         - (2 * inv.numRows * cellHeightPx) - hotseatBarTopPaddingPx
                         - hotseatBarBottomPaddingPx);
-                padding.set(availablePaddingX / 2, edgeMarginPx + availablePaddingY / 2,
+                padding.set(availablePaddingX / 2, topWorkspacePadding + availablePaddingY / 2,
                         availablePaddingX / 2, paddingBottom + availablePaddingY / 2);
             } else {
                 int horizontalPadding = Utilities.getOmegaPrefs(mContext)
                         .getAllowFullWidthWidgets() ? 0 : desiredWorkspaceLeftRightMarginPx;
 
                 // Pad the top and bottom of the workspace with search/hotseat bar sizes
-                padding.set(horizontalPadding, edgeMarginPx, horizontalPadding, paddingBottom);
+                padding.set(horizontalPadding,
+                        topWorkspacePadding,
+                        horizontalPadding,
+                        paddingBottom);
             }
         }
     }
@@ -660,4 +866,4 @@ public interface OnDeviceProfileChangeListener {
          */
         void onDeviceProfileChanged(DeviceProfile dp);
     }
-}
+}
\ No newline at end of file
diff --git a/src/com/android/launcher3/FolderInfo.java b/src/com/android/launcher3/FolderInfo.java
index e2b7b68a97..c384772575 100644
--- a/src/com/android/launcher3/FolderInfo.java
+++ b/src/com/android/launcher3/FolderInfo.java
@@ -16,10 +16,29 @@
 
 package com.android.launcher3;
 
+import android.content.ComponentName;
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
 import android.os.Process;
+import android.text.TextUtils;
+import android.widget.FrameLayout;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.android.launcher3.folder.Folder;
+import com.android.launcher3.folder.FolderIcon;
+import com.android.launcher3.icons.BitmapRenderer;
 import com.android.launcher3.model.ModelWriter;
+import com.android.launcher3.util.ComponentKey;
 import com.android.launcher3.util.ContentWriter;
+import com.saggitt.omega.OmegaLauncher;
+import com.saggitt.omega.folder.FirstItemProvider;
+import com.saggitt.omega.iconpack.IconPack;
+import com.saggitt.omega.iconpack.IconPackManager;
+import com.saggitt.omega.override.CustomInfoProvider;
 
 import java.util.ArrayList;
 
@@ -45,6 +64,8 @@ public class FolderInfo extends ItemInfo {
      */
     public static final int FLAG_MULTI_PAGE_ANIMATION = 0x00000004;
 
+    public static final int FLAG_COVER_MODE = 0x00000008;
+
     public int options;
 
     /**
@@ -53,6 +74,8 @@ public class FolderInfo extends ItemInfo {
     public ArrayList<WorkspaceItemInfo> contents = new ArrayList<>();
 
     private ArrayList<FolderListener> mListeners = new ArrayList<>();
+    public String swipeUpAction;
+    private FirstItemProvider firstItemProvider = new FirstItemProvider(this);
 
     public FolderInfo() {
         itemType = LauncherSettings.Favorites.ITEM_TYPE_FOLDER;
@@ -93,6 +116,22 @@ public void remove(WorkspaceItemInfo item, boolean animate) {
         itemsChanged(animate);
     }
 
+    public void setTitle(CharSequence title) {
+        this.title = title;
+        for (int i = 0; i < mListeners.size(); i++) {
+            mListeners.get(i).onTitleChanged(title);
+        }
+    }
+
+    /**
+     * DO NOT USE OUTSIDE CUSTOM INFO PROVIDER
+     */
+    public void onIconChanged() {
+        for (FolderListener listener : mListeners) {
+            listener.onIconChanged();
+        }
+    }
+
     @Override
     public void onAddToDatabase(ContentWriter writer) {
         super.onAddToDatabase(writer);
@@ -114,11 +153,7 @@ public void itemsChanged(boolean animate) {
         }
     }
 
-    public interface FolderListener {
-        public void onAdd(WorkspaceItemInfo item, int rank);
-        public void onRemove(WorkspaceItemInfo item);
-        public void onItemsChanged(boolean animate);
-    }
+    private String cachedIcon;
 
     public boolean hasOption(int optionFlag) {
         return (options & optionFlag) != 0;
@@ -140,4 +175,134 @@ public void setOption(int option, boolean isEnabled, ModelWriter writer) {
             writer.updateItemInDatabase(this);
         }
     }
+
+    public Drawable getIcon(Context context) {
+        Launcher launcher = OmegaLauncher.getLauncher(context);
+        return getFolderIcon(launcher);
+    }
+
+    private Drawable cached;
+
+    public ComponentKey toComponentKey() {
+        return new ComponentKey(new ComponentName("com.saggitt.omega.folder", String.valueOf(id)), Process.myUserHandle());
+    }
+
+    public Drawable getFolderIcon(Launcher launcher) {
+        int iconSize = launcher.mDeviceProfile.iconSizePx;
+        FrameLayout dummy = new FrameLayout(launcher, null);
+        FolderIcon icon = FolderIcon.fromXml(R.layout.folder_icon, launcher, dummy, this);
+        icon.isCustomIcon = false;
+        icon.getFolderBackground().setStartOpacity(1f);
+        Bitmap b = BitmapRenderer.createHardwareBitmap(iconSize, iconSize, out -> {
+            out.translate(iconSize / 2f, 0);
+            // TODO: make folder icons more visible in front of the bottom sheet
+            // out.drawColor(Color.RED);
+            icon.draw(out);
+        });
+        icon.unbind();
+        return new BitmapDrawable(launcher.getResources(), b);
+    }
+
+    public Drawable getDefaultIcon(Launcher launcher) {
+        //if (isCoverMode()) {
+        //    return new FastBitmapDrawable(getCoverInfo().iconBitmap);
+        //} else {
+        return getFolderIcon(launcher);
+        //}
+    }
+
+    public void setSwipeUpAction(@NonNull Context context, @Nullable String action) {
+        swipeUpAction = action;
+        ModelWriter.modifyItemInDatabase(context, this, null, swipeUpAction, null, null, false, true);
+    }
+
+    public boolean useIconMode(Context context) {
+        return isCoverMode() || hasCustomIcon(context);
+    }
+
+    public boolean usingCustomIcon(Context context) {
+        if (isCoverMode()) return false;
+        Launcher launcher = OmegaLauncher.getLauncher(context);
+        return getIconInternal(launcher) != null;
+    }
+
+    public boolean isCoverMode() {
+        return hasOption(FLAG_COVER_MODE);
+    }
+
+    public void setCoverMode(boolean enable, ModelWriter modelWriter) {
+        setOption(FLAG_COVER_MODE, enable, modelWriter);
+    }
+
+    private boolean hasCustomIcon(Context context) {
+        Launcher launcher = OmegaLauncher.getLauncher(context);
+        return getIconInternal(launcher) != null;
+    }
+
+    public void clearCustomIcon(Context context) {
+        Launcher launcher = OmegaLauncher.getLauncher(context);
+        CustomInfoProvider<FolderInfo> infoProvider = CustomInfoProvider.Companion.forItem(launcher, this);
+        if (infoProvider != null) {
+            infoProvider.setIcon(this, null);
+        }
+    }
+
+    public WorkspaceItemInfo getCoverInfo() {
+        return firstItemProvider.getFirstItem();
+    }
+
+    public CharSequence getIconTitle() {
+        if (!TextUtils.equals(Folder.getDefaultFolderName(), title)) {
+            return title;
+        } else if (isCoverMode()) {
+            WorkspaceItemInfo info = getCoverInfo();
+            if (info.customTitle != null) {
+                return info.customTitle;
+            }
+            return info.title;
+        } else {
+            return Folder.getDefaultFolderName();
+        }
+    }
+
+    private Drawable getIconInternal(Launcher launcher) {
+        CustomInfoProvider<FolderInfo> infoProvider = CustomInfoProvider.Companion.forItem(launcher, this);
+        IconPackManager.CustomIconEntry entry = infoProvider == null ? null : infoProvider.getIcon(this);
+        if (entry != null && entry.getIcon() != null) {
+            if (!entry.getIcon().equals(cachedIcon)) {
+                IconPack pack = IconPackManager.Companion.getInstance(launcher)
+                        .getIconPack(entry.getPackPackageName(), false, true);
+                if (pack != null) {
+                    cached = pack.getIcon(entry, launcher.mDeviceProfile.inv.fillResIconDpi);
+                    cachedIcon = entry.getIcon();
+                }
+            }
+            if (cached != null) {
+                return cached.mutate();
+            }
+        }
+        return null;
+    }
+
+    public void prepareAutoUpdate() {
+        for (int i = 0; i < mListeners.size(); i++) {
+            mListeners.get(i).prepareAutoUpdate();
+        }
+    }
+
+    public interface FolderListener {
+        void onAdd(WorkspaceItemInfo item, int rank);
+
+        void onRemove(WorkspaceItemInfo item);
+
+        void onItemsChanged(boolean animate);
+
+        void onTitleChanged(CharSequence title);
+
+        void prepareAutoUpdate();
+
+        default void onIconChanged() {
+            // do nothing
+        }
+    }
 }
diff --git a/src/com/android/launcher3/Hotseat.java b/src/com/android/launcher3/Hotseat.java
index 03ee707afa..6785397481 100644
--- a/src/com/android/launcher3/Hotseat.java
+++ b/src/com/android/launcher3/Hotseat.java
@@ -113,3 +113,4 @@ public RotationMode getRotationMode() {
         return Launcher.getLauncher(getContext()).getRotationMode();
     }
 }
+
diff --git a/src/com/android/launcher3/InstallShortcutReceiver.java b/src/com/android/launcher3/InstallShortcutReceiver.java
index fe916028b4..563297a066 100644
--- a/src/com/android/launcher3/InstallShortcutReceiver.java
+++ b/src/com/android/launcher3/InstallShortcutReceiver.java
@@ -16,8 +16,6 @@
 
 package com.android.launcher3;
 
-import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
-
 import android.appwidget.AppWidgetManager;
 import android.appwidget.AppWidgetProviderInfo;
 import android.content.BroadcastReceiver;
@@ -66,6 +64,8 @@
 import java.util.List;
 import java.util.Set;
 
+import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
+
 public class InstallShortcutReceiver extends BroadcastReceiver {
 
     public static final int FLAG_ACTIVITY_PAUSED = 1;
@@ -241,6 +241,11 @@ public static WorkspaceItemInfo fromShortcutIntent(Context context, Intent data)
         return info == null ? null : (WorkspaceItemInfo) info.getItemInfo().first;
     }
 
+    public static WorkspaceItemInfo fromActivityInfo(LauncherActivityInfo info, Context context) {
+        return (WorkspaceItemInfo)
+                new PendingInstallShortcutInfo(info, context).getItemInfo().first;
+    }
+
     public static void queueShortcut(ShortcutInfo info, Context context) {
         queuePendingShortcutInfo(new PendingInstallShortcutInfo(info, context), context);
     }
diff --git a/src/com/android/launcher3/InvariantDeviceProfile.java b/src/com/android/launcher3/InvariantDeviceProfile.java
index d66ba73175..7fcbcb8cd6 100644
--- a/src/com/android/launcher3/InvariantDeviceProfile.java
+++ b/src/com/android/launcher3/InvariantDeviceProfile.java
@@ -16,12 +16,6 @@
 
 package com.android.launcher3;
 
-import static com.android.launcher3.Utilities.getDevicePrefs;
-import static com.android.launcher3.config.FeatureFlags.APPLY_CONFIG_AT_RUNTIME;
-import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
-import static com.android.launcher3.settings.SettingsActivity.GRID_OPTIONS_PREFERENCE_KEY;
-import static com.android.launcher3.util.PackageManagerHelper.getPackageFilter;
-
 import android.annotation.TargetApi;
 import android.appwidget.AppWidgetHostView;
 import android.content.BroadcastReceiver;
@@ -51,6 +45,8 @@
 import com.android.launcher3.util.IntArray;
 import com.android.launcher3.util.MainThreadInitializedObject;
 import com.android.launcher3.util.Themes;
+import com.saggitt.omega.OmegaPreferences;
+import com.saggitt.omega.adaptive.IconShapeManager;
 
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
@@ -60,6 +56,13 @@
 import java.util.Collections;
 import java.util.Comparator;
 
+import static com.android.launcher3.Utilities.getDevicePrefs;
+import static com.android.launcher3.config.FeatureFlags.APPLY_CONFIG_AT_RUNTIME;
+import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
+import static com.android.launcher3.util.PackageManagerHelper.getPackageFilter;
+import static com.saggitt.omega.settings.SettingsActivity.GRID_OPTIONS_PREFERENCE_KEY;
+import static java.lang.Math.max;
+
 public class InvariantDeviceProfile {
 
     public static final String TAG = "IDP";
@@ -91,7 +94,17 @@ public class InvariantDeviceProfile {
      * Number of icons per row and column in the workspace.
      */
     public int numRows;
+    public int numRowsOriginal;
     public int numColumns;
+    public int numColumnsOriginal;
+
+    /**
+     * Number of icons per row in the drawer
+     */
+    public int numColsDrawer;
+    public int numColsDrawerOriginal;
+    public int numPredictions;
+    public int numPredictionsOriginal;
 
     /**
      * Number of icons per row and column in the folder.
@@ -99,13 +112,22 @@ public class InvariantDeviceProfile {
     public int numFolderRows;
     public int numFolderColumns;
     public float iconSize;
-    public String iconShapePath;
+    public float iconSizeOriginal;
+    public float hotseatIconSize;
+    public float hotseatIconSizeOriginal;
     public float landscapeIconSize;
+    public float landscapeIconSizeOriginal;
+    public float landscapeHotseatIconSize;
+    public float landscapeHotseatIconSizeOriginal;
+    public float allAppsIconSize;
+    public float allAppsIconSizeOriginal;
+    public float landscapeAllAppsIconSize;
+    public float landscapeAllAppsIconSizeOriginal;
     public int iconBitmapSize;
     public int fillResIconDpi;
     public float iconTextSize;
-    public float allAppsIconSize;
     public float allAppsIconTextSize;
+    public String iconShapePath;
 
     private SparseArray<TypedValue> mExtraAttrs;
 
@@ -113,6 +135,7 @@ public class InvariantDeviceProfile {
      * Number of icons inside the hotseat area.
      */
     public int numHotseatIcons;
+    public int numHotseatIconsOriginal;
 
     /**
      * Number of columns in the all apps list.
@@ -144,9 +167,10 @@ private InvariantDeviceProfile(InvariantDeviceProfile p) {
         iconShapePath = p.iconShapePath;
         landscapeIconSize = p.landscapeIconSize;
         iconTextSize = p.iconTextSize;
+        allAppsIconSize = p.allAppsIconSize;
+        hotseatIconSize = p.hotseatIconSize;
         numHotseatIcons = p.numHotseatIcons;
         numAllAppsColumns = p.numAllAppsColumns;
-        allAppsIconSize = p.allAppsIconSize;
         allAppsIconTextSize = p.allAppsIconTextSize;
         defaultLayoutId = p.defaultLayoutId;
         demoModeLayoutId = p.demoModeLayoutId;
@@ -178,7 +202,17 @@ public InvariantDeviceProfile(Context context, String gridName) {
     /**
      * Retrieve system defined or RRO overriden icon shape.
      */
-    private static String getIconShapePath(Context context) {
+    private static String getIconShapePath(Context context) {/*
+        if (CONFIG_ICON_MASK_RES_ID == 0) {
+            Log.e(TAG, "Icon mask res identifier failed to retrieve.");
+            return "";
+        }
+        return context.getResources().getString(CONFIG_ICON_MASK_RES_ID);*/
+
+        return IconShapeManager.Companion.getInstance(context).getIconShape().getHashString();
+    }
+
+    public static String getSystemIconShapePath(Context context) {
         if (CONFIG_ICON_MASK_RES_ID == 0) {
             Log.e(TAG, "Icon mask res identifier failed to retrieve.");
             return "";
@@ -202,7 +236,7 @@ private String initGrid(Context context, String gridName) {
         // The real size never changes. smallSide and largeSide will remain the
         // same in any orientation.
         int smallSide = Math.min(realSize.x, realSize.y);
-        int largeSide = Math.max(realSize.x, realSize.y);
+        int largeSide = max(realSize.x, realSize.y);
 
         // We want a list of all options as well as the list of filtered options. This allows us
         // to have a consistent UI for areas that the grid size change should not affect
@@ -270,7 +304,7 @@ private String initGrid(Context context, String gridName) {
                     (int) (largeSide * wallpaperTravelToScreenWidthRatio(largeSide, smallSide)),
                     largeSide);
         } else {
-            defaultWallpaperSize = new Point(Math.max(smallSide * 2, largeSide), largeSide);
+            defaultWallpaperSize = new Point(max(smallSide * 2, largeSide), largeSide);
         }
 
         ComponentName cn = new ComponentName(context.getPackageName(), getClass().getName());
@@ -282,9 +316,16 @@ private String initGrid(Context context, String gridName) {
     private void initGridOption(Context context, ArrayList<DisplayOption> options,
             DisplayOption displayOption, DisplayMetrics metrics) {
         GridOption closestProfile = options.get(0).grid;
+        OmegaPreferences prefs = Utilities.getOmegaPrefs(context);
+
         numRows = closestProfile.numRows;
+        numRowsOriginal = numRows;
         numColumns = closestProfile.numColumns;
+        numColumnsOriginal = numColumns;
+        numColsDrawer = numColumns;
+        numColsDrawerOriginal = numColumns;
         numHotseatIcons = closestProfile.numHotseatIcons;
+        numHotseatIconsOriginal = numHotseatIcons;
         defaultLayoutId = closestProfile.defaultLayoutId;
         demoModeLayoutId = closestProfile.demoModeLayoutId;
         numFolderRows = closestProfile.numFolderRows;
@@ -293,10 +334,30 @@ private void initGridOption(Context context, ArrayList<DisplayOption> options,
 
         mExtraAttrs = closestProfile.extraAttrs;
 
-        iconSize = displayOption.iconSize;
+        iconSize = displayOption.iconSize * prefs.getDesktopIconScale();
+        iconSizeOriginal = displayOption.iconSize;
         iconShapePath = getIconShapePath(context);
         landscapeIconSize = displayOption.landscapeIconSize;
-        iconBitmapSize = ResourceUtils.pxFromDp(iconSize, metrics);
+        landscapeIconSizeOriginal = displayOption.landscapeIconSize;
+
+        if (prefs.getDockIconScale() > 0) {
+            hotseatIconSize = displayOption.iconSize * prefs.getDockIconScale();
+        } else {
+            hotseatIconSize = iconSize;
+        }
+        hotseatIconSizeOriginal = displayOption.iconSize;
+        if (prefs.getDockIconScale() > 0) {
+            landscapeHotseatIconSize = displayOption.landscapeIconSize * prefs.getDockIconScale();
+        } else {
+            landscapeHotseatIconSize = landscapeIconSize;
+        }
+        landscapeHotseatIconSizeOriginal = displayOption.landscapeIconSize;
+        allAppsIconSize = displayOption.iconSize * prefs.getAllAppsIconScale();
+        allAppsIconSizeOriginal = displayOption.iconSize;
+        landscapeAllAppsIconSize = displayOption.landscapeIconSize;
+        landscapeAllAppsIconSizeOriginal = displayOption.landscapeIconSize;
+
+        iconBitmapSize = Utilities.pxFromDp(max(max(iconSize, allAppsIconSize), hotseatIconSize), metrics);
         iconTextSize = displayOption.iconTextSize;
         fillResIconDpi = getLauncherIconDensity(iconBitmapSize);
 
@@ -305,7 +366,6 @@ private void initGridOption(Context context, ArrayList<DisplayOption> options,
         applyPartnerDeviceProfileOverrides(context, metrics);
     }
 
-
     @Nullable
     public TypedValue getAttrValue(int attr) {
         return mExtraAttrs == null ? null : mExtraAttrs.get(attr);
@@ -362,8 +422,11 @@ private void onConfigChanged(Context context) {
             changeFlags |= CHANGE_FLAG_GRID;
         }
 
-        if (iconSize != oldProfile.iconSize || iconBitmapSize != oldProfile.iconBitmapSize ||
-                !iconShapePath.equals(oldProfile.iconShapePath)) {
+        if (iconSize != oldProfile.iconSize
+                || allAppsIconSize != oldProfile.allAppsIconSize
+                || hotseatIconSize != oldProfile.hotseatIconSize
+                || iconBitmapSize != oldProfile.iconBitmapSize
+                || !iconShapePath.equals(oldProfile.iconShapePath)) {
             changeFlags |= CHANGE_FLAG_ICON_PARAMS;
         }
         if (!iconShapePath.equals(oldProfile.iconShapePath)) {
diff --git a/src/com/android/launcher3/ItemInfoWithIcon.java b/src/com/android/launcher3/ItemInfoWithIcon.java
index 1550bb080d..90a9662b14 100644
--- a/src/com/android/launcher3/ItemInfoWithIcon.java
+++ b/src/com/android/launcher3/ItemInfoWithIcon.java
@@ -16,12 +16,12 @@
 
 package com.android.launcher3;
 
-import static com.android.launcher3.icons.BitmapInfo.LOW_RES_ICON;
-
 import android.graphics.Bitmap;
 
 import com.android.launcher3.icons.BitmapInfo;
 
+import static com.android.launcher3.icons.BitmapInfo.LOW_RES_ICON;
+
 /**
  * Represents an ItemInfo which also holds an icon.
  */
@@ -116,6 +116,10 @@ public boolean isDisabled() {
         return (runtimeStatusFlags & FLAG_DISABLED_MASK) != 0;
     }
 
+    public boolean isBadgeVisible() {
+        return (runtimeStatusFlags & FLAG_ICON_BADGED) != 0;
+    }
+
     /**
      * Indicates whether we're using a low res icon
      */
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 05b82eabda..eef9137bad 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -94,7 +94,6 @@
 import com.android.launcher3.notification.NotificationListener;
 import com.android.launcher3.popup.PopupContainerWithArrow;
 import com.android.launcher3.popup.PopupDataProvider;
-import com.android.launcher3.qsb.QsbContainerView;
 import com.android.launcher3.states.InternalStateHandler;
 import com.android.launcher3.states.RotationHelper;
 import com.android.launcher3.touch.ItemClickHandler;
@@ -131,7 +130,9 @@
 import com.android.launcher3.widget.WidgetHostViewLoader;
 import com.android.launcher3.widget.WidgetListRowEntry;
 import com.android.launcher3.widget.WidgetsFullSheet;
-import com.android.launcher3.widget.custom.CustomWidgetManager;
+import com.android.launcher3.widget.custom.CustomWidgetParser;
+import com.saggitt.omega.OmegaLauncher;
+import com.saggitt.omega.OmegaPreferences;
 
 import java.io.FileDescriptor;
 import java.io.PrintWriter;
@@ -221,11 +222,12 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns,
     private Configuration mOldConfig;
 
     @Thunk
-    Workspace mWorkspace;
+    public Workspace mWorkspace;
     private View mLauncherView;
     @Thunk
     DragLayer mDragLayer;
     private DragController mDragController;
+    private View mQsbContainer;
 
     private AppWidgetManagerCompat mAppWidgetManager;
     private LauncherAppWidgetHost mAppWidgetHost;
@@ -235,6 +237,9 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns,
     @Thunk
     Hotseat mHotseat;
 
+    @Nullable
+    private View mHotseatSearchBox;
+
     private DropTargetBar mDropTargetBar;
 
     // Main container view for the all apps screen.
@@ -293,7 +298,6 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns,
     private DeviceProfile mStableDeviceProfile;
     private RotationMode mRotationMode = RotationMode.NORMAL;
 
-    public static Context mContext;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         RaceConditionTracker.onEvent(ON_CREATE_EVT, ENTER);
@@ -315,9 +319,14 @@ protected void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
         TraceHelper.partitionSection("Launcher-onCreate", "super call");
-        mContext = this;
 
         LauncherAppState app = LauncherAppState.getInstance(this);
+
+        OmegaPreferences prefs = Utilities.getOmegaPrefs(this);
+        prefs.getDrawerGridSize();
+        prefs.getGridSize();
+        prefs.getDockGridSize();
+
         mOldConfig = new Configuration(getResources().getConfiguration());
         mModel = app.setLauncher(this);
         mRotationHelper = new RotationHelper(this);
@@ -575,7 +584,7 @@ public void onAppWidgetHostReset() {
         }
     }
 
-    private LauncherCallbacks mLauncherCallbacks;
+    protected LauncherCallbacks mLauncherCallbacks;
 
     /**
      * Call this after onCreate to set or clear overlay.
@@ -1106,8 +1115,12 @@ private void setupViews() {
         mFocusHandler = mDragLayer.getFocusIndicatorHelper();
         mWorkspace = mDragLayer.findViewById(R.id.workspace);
         mWorkspace.initParentViews(mDragLayer);
+        if (Utilities.getOmegaPrefs(this).getUsePillQsb()) {
+            mQsbContainer = mDragLayer.findViewById(R.id.workspace_blocked_row);
+        }
         mOverviewPanel = findViewById(R.id.overview_panel);
         mHotseat = findViewById(R.id.hotseat);
+        mHotseatSearchBox = findViewById(R.id.search_container_hotseat);
 
         mLauncherView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
                 | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
@@ -1346,10 +1359,18 @@ public Workspace getWorkspace() {
         return mWorkspace;
     }
 
+    public View getQsbContainer() {
+        return mQsbContainer;
+    }
+
     public Hotseat getHotseat() {
         return mHotseat;
     }
 
+    public View getHotseatSearchBox() {
+        return mHotseatSearchBox;
+    }
+
     public <T extends View> T getOverviewPanel() {
         return (T) mOverviewPanel;
     }
@@ -1394,6 +1415,7 @@ protected void onNewIntent(Intent intent) {
         boolean internalStateHandled = InternalStateHandler
                 .handleNewIntent(this, intent, isStarted());
 
+        boolean handled = false;
         if (isActionMain) {
             if (!internalStateHandled) {
                 // In all these cases, only animate if we're already on home
@@ -1408,10 +1430,16 @@ protected void onNewIntent(Intent intent) {
                 // Reset the apps view
                 if (!alreadyOnHome) {
                     mAppsView.reset(isStarted() /* animate */);
+                    handled = true;
                 }
 
                 if (shouldMoveToDefaultScreen && !mWorkspace.isHandlingTouch()) {
                     mWorkspace.post(mWorkspace::moveToDefaultScreen);
+                    handled = true;
+                }
+
+                if (!handled && this instanceof OmegaLauncher) {
+                    ((OmegaLauncher) this).getGestureController().onPressHome();
                 }
             }
 
@@ -1462,7 +1490,8 @@ protected void onSaveInstanceState(Bundle outState) {
 
         // We close any open folders and shortcut containers that are not safe for rebind,
         // and we need to make sure this state is reflected.
-        AbstractFloatingView.closeOpenViews(this, false, TYPE_ALL & ~TYPE_REBIND_SAFE);
+        AbstractFloatingView.closeOpenViews(this, false,
+                AbstractFloatingView.TYPE_ALL & ~AbstractFloatingView.TYPE_SETTINGS_SHEET);
         finishAutoCancelActionMode();
 
         if (mPendingRequestArgs != null) {
@@ -1674,9 +1703,12 @@ private void addAppWidgetFromDrop(PendingAddWidgetInfo info) {
         } else {
             // In this case, we either need to start an activity to get permission to bind
             // the widget, or we need to start an activity to configure the widget, or both.
-            if (info.itemType == LauncherSettings.Favorites.ITEM_TYPE_CUSTOM_APPWIDGET) {
-                appWidgetId = CustomWidgetManager.INSTANCE.get(this).getWidgetIdForCustomProvider(
-                        info.componentName);
+            if (FeatureFlags.ENABLE_CUSTOM_WIDGETS &&
+                    info.itemType == LauncherSettings.Favorites.ITEM_TYPE_CUSTOM_APPWIDGET) {
+                //appWidgetId = CustomWidgetManager.INSTANCE.get(this).getWidgetIdForCustomProvider(
+                //        info.componentName);
+                appWidgetId = CustomWidgetParser.getWidgetIdForCustomProvider(
+                        this, info.componentName);
             } else {
                 appWidgetId = getAppWidgetHost().allocateAppWidgetId();
             }
@@ -1959,7 +1991,7 @@ public void startBinding() {
         mAppWidgetHost.clearViews();
 
         if (mHotseat != null) {
-            mHotseat.resetLayout(getWallpaperDeviceProfile().isVerticalBarLayout());
+            mHotseat.resetLayout(getDeviceProfile().isVerticalBarLayout());
         }
         TraceHelper.endSection("startBinding");
     }
@@ -2147,13 +2179,13 @@ public void bindAppWidget(LauncherAppWidgetInfo item) {
     }
 
     private View inflateAppWidget(LauncherAppWidgetInfo item) {
-        if (item.hasOptionFlag(LauncherAppWidgetInfo.OPTION_SEARCH_WIDGET)) {
+        /*if (item.hasOptionFlag(LauncherAppWidgetInfo.OPTION_SEARCH_WIDGET)) {
             item.providerName = QsbContainerView.getSearchComponentName(this);
             if (item.providerName == null) {
                 getModelWriter().deleteItemFromDatabase(item);
                 return null;
             }
-        }
+        }*/
 
         if (mIsSafeModeEnabled) {
             PendingAppWidgetHostView view =
@@ -2598,6 +2630,10 @@ public boolean onKeyUp(int keyCode, KeyEvent event) {
         return super.onKeyUp(keyCode, event);
     }
 
+    public boolean useVerticalBarLayout() {
+        return mDeviceProfile.isVerticalBarLayout();
+    }
+
     public static Launcher getLauncher(Context context) {
         return (Launcher) fromContext(context);
     }
diff --git a/src/com/android/launcher3/LauncherAppState.java b/src/com/android/launcher3/LauncherAppState.java
index 96ed7f168f..68b22d2422 100644
--- a/src/com/android/launcher3/LauncherAppState.java
+++ b/src/com/android/launcher3/LauncherAppState.java
@@ -22,7 +22,6 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Handler;
-import android.os.Looper;
 import android.util.Log;
 
 import com.android.launcher3.compat.LauncherAppsCompat;
@@ -32,14 +31,12 @@
 import com.android.launcher3.icons.IconCache;
 import com.android.launcher3.icons.LauncherIcons;
 import com.android.launcher3.notification.NotificationListener;
-import com.android.launcher3.util.Executors;
+import com.android.launcher3.util.MainThreadInitializedObject;
 import com.android.launcher3.util.Preconditions;
 import com.android.launcher3.util.SecureSettingsObserver;
 import com.android.launcher3.widget.custom.CustomWidgetManager;
 import com.saggitt.omega.OmegaAppKt;
 
-import java.util.concurrent.ExecutionException;
-
 import static com.android.launcher3.InvariantDeviceProfile.CHANGE_FLAG_ICON_PARAMS;
 import static com.android.launcher3.util.SecureSettingsObserver.newNotificationSettingsObserver;
 
@@ -48,9 +45,14 @@ public class LauncherAppState {
     public static final String ACTION_FORCE_ROLOAD = "force-reload-launcher";
 
     // We do not need any synchronization for this variable as its only written on UI thread.
-    //private static MainThreadInitializedObject<LauncherAppState> INSTANCE =
-    //        new MainThreadInitializedObject<>(LauncherAppState::new);
-    private static LauncherAppState INSTANCE;
+    private static final MainThreadInitializedObject<LauncherAppState> INSTANCE =
+            new MainThreadInitializedObject<LauncherAppState>(LauncherAppState::new) {
+                @Override
+                protected void onPostInit(Context context) {
+                    super.onPostInit(context);
+                    OmegaAppKt.getOmegaApp(context).onLauncherAppStateCreated();
+                }
+            };
     private final Context mContext;
     private final LauncherModel mModel;
     private final IconCache mIconCache;
@@ -60,25 +62,11 @@ public class LauncherAppState {
     private Launcher mLauncher;
 
     public static LauncherAppState getInstance(final Context context) {
-        //return INSTANCE.get(context);
-        if (INSTANCE == null) {
-            if (Looper.myLooper() == Looper.getMainLooper()) {
-                INSTANCE = new LauncherAppState(context.getApplicationContext());
-                OmegaAppKt.getOmegaApp(context).onLauncherAppStateCreated();
-            } else {
-                try {
-                    return new Executors().MAIN_EXECUTOR.submit(() -> LauncherAppState.getInstance(context)).get();
-                } catch (InterruptedException | ExecutionException e) {
-                    throw new RuntimeException(e);
-                }
-            }
-        }
-        return INSTANCE;
+        return INSTANCE.get(context);
     }
 
     public static LauncherAppState getInstanceNoCreate() {
-        return INSTANCE;
-        //return INSTANCE.getNoCreate();
+        return INSTANCE.getNoCreate();
     }
 
     public Context getContext() {
@@ -195,6 +183,11 @@ public InvariantDeviceProfile getInvariantDeviceProfile() {
         return mInvariantDeviceProfile;
     }
 
+    public void reloadIconCache() {
+        mIconCache.removeAllIcons();
+        mModel.forceReloadOnNextLaunch();
+    }
+
     /**
      * Shorthand for {@link #getInvariantDeviceProfile()}
      */
diff --git a/src/com/android/launcher3/LauncherAppWidgetHost.java b/src/com/android/launcher3/LauncherAppWidgetHost.java
index 1215d4321f..b58a76ab82 100644
--- a/src/com/android/launcher3/LauncherAppWidgetHost.java
+++ b/src/com/android/launcher3/LauncherAppWidgetHost.java
@@ -16,8 +16,6 @@
 
 package com.android.launcher3;
 
-import static android.app.Activity.RESULT_CANCELED;
-
 import android.appwidget.AppWidgetHost;
 import android.appwidget.AppWidgetHostView;
 import android.appwidget.AppWidgetManager;
@@ -27,16 +25,18 @@
 import android.content.Intent;
 import android.os.Handler;
 import android.util.SparseArray;
+import android.view.LayoutInflater;
 import android.widget.Toast;
 
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.widget.DeferredAppWidgetHostView;
 import com.android.launcher3.widget.LauncherAppWidgetHostView;
-import com.android.launcher3.widget.custom.CustomWidgetManager;
 
 import java.util.ArrayList;
 import java.util.function.IntConsumer;
 
+import static android.app.Activity.RESULT_CANCELED;
+
 
 /**
  * Specific {@link AppWidgetHost} that creates our {@link LauncherAppWidgetHostView}
@@ -192,9 +192,15 @@ protected void onProvidersChanged() {
     public AppWidgetHostView createView(Context context, int appWidgetId,
             LauncherAppWidgetProviderInfo appWidget) {
         if (appWidget.isCustomWidget()) {
-            LauncherAppWidgetHostView lahv = new LauncherAppWidgetHostView(context);
+            /*LauncherAppWidgetHostView lahv = new LauncherAppWidgetHostView(context);
             lahv.setAppWidget(0, appWidget);
             CustomWidgetManager.INSTANCE.get(context).onViewCreated(lahv);
+            return lahv;*/
+            LauncherAppWidgetHostView lahv = new LauncherAppWidgetHostView(context);
+            LayoutInflater inflater = (LayoutInflater)
+                    context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+            inflater.inflate(appWidget.initialLayout, lahv);
+            lahv.setAppWidget(0, appWidget);
             return lahv;
         } else if ((mFlags & FLAG_LISTENING) == 0) {
             DeferredAppWidgetHostView view = new DeferredAppWidgetHostView(context);
diff --git a/src/com/android/launcher3/LauncherCallbacks.java b/src/com/android/launcher3/LauncherCallbacks.java
index dfe75ec34a..e58879de89 100644
--- a/src/com/android/launcher3/LauncherCallbacks.java
+++ b/src/com/android/launcher3/LauncherCallbacks.java
@@ -19,6 +19,9 @@
 import android.content.Intent;
 import android.os.Bundle;
 
+import com.google.android.libraries.gsa.launcherclient.LauncherClient;
+import com.saggitt.omega.qsb.QsbAnimationController;
+
 import java.io.FileDescriptor;
 import java.io.PrintWriter;
 
@@ -67,4 +70,14 @@ default void onStateChanged() { }
      */
     boolean startSearch(
             String initialQuery, boolean selectInitialQuery, Bundle appSearchData);
+
+    /*
+     * Retrieves the current Launcher Client
+     */
+    LauncherClient getClient();
+
+    /*
+     * Retrieves the QSB Animation Controller
+     */
+    QsbAnimationController getQsbController();
 }
diff --git a/src/com/android/launcher3/LauncherFiles.java b/src/com/android/launcher3/LauncherFiles.java
index ddc0fbdeec..496ba292c3 100644
--- a/src/com/android/launcher3/LauncherFiles.java
+++ b/src/com/android/launcher3/LauncherFiles.java
@@ -30,6 +30,7 @@ public class LauncherFiles {
 
     public static final List<String> ALL_FILES = Collections.unmodifiableList(Arrays.asList(
             LAUNCHER_DB,
+            LAUNCHER_DB2,
             SHARED_PREFERENCES_KEY + XML,
             WIDGET_PREVIEWS_DB,
             MANAGED_USER_PREFERENCES_KEY + XML,
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index b971439bac..dd38ffd413 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -20,6 +20,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ShortcutInfo;
+import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.Looper;
 import android.os.UserHandle;
@@ -85,6 +86,7 @@ public class LauncherModel extends BroadcastReceiver
     final LauncherAppState mApp;
     @Thunk
     final Object mLock = new Object();
+
     @Thunk
     LoaderTask mLoaderTask;
     @Thunk
@@ -92,11 +94,24 @@ public class LauncherModel extends BroadcastReceiver
 
     @Thunk
     static final HandlerThread sUiWorkerThread = new HandlerThread("launcher-ui-loader");
+    @Thunk
+    static final HandlerThread sIconPackThread = new HandlerThread("launcher-icon-pack");
+    @Thunk
+    static final HandlerThread sIconPackUiThread = new HandlerThread("launcher-icon-pack-ui");
 
     static {
         sUiWorkerThread.start();
+        sIconPackThread.start();
+        sIconPackUiThread.start();
     }
 
+    @Thunk
+    static final Handler sWorker = new Handler(MODEL_EXECUTOR.getLooper());
+    @Thunk
+    static final Handler sUiWorker = new Handler(sUiWorkerThread.getLooper());
+    @Thunk
+    static final Handler sIconPack = new Handler(sIconPackThread.getLooper());
+
     // Indicates whether the current model data is valid or not.
     // We start off with everything not loaded. After that, we assume that
     // our monitoring of the package manager provides all updates and we never
@@ -132,6 +147,7 @@ public void run() {
                 }
             }
         }
+
     };
 
     LauncherModel(LauncherAppState app, IconCache iconCache, AppFilter appFilter) {
@@ -216,7 +232,7 @@ public void onPackageRemoved(String packageName, UserHandle user) {
 
     public void onPackagesRemoved(UserHandle user, String... packages) {
         int op = PackageUpdatedTask.OP_REMOVE;
-        FileLog.d(TAG, "package removed received " + String.join("," + packages));
+        FileLog.d(TAG, "package removed received " + packages);
         enqueueModelUpdateTask(new PackageUpdatedTask(op, user, packages));
     }
 
@@ -265,8 +281,7 @@ public void updatePinnedShortcuts(String packageName, List<ShortcutInfo> shortcu
     }
 
     public void onPackagesReload(UserHandle user) {
-        int op = PackageUpdatedTask.OP_RELOAD;
-        enqueueModelUpdateTask(new PackageUpdatedTask(op, user));
+        enqueueModelUpdateTask(new PackageUpdatedTask(PackageUpdatedTask.OP_RELOAD, user));
     }
 
     /**
@@ -308,6 +323,13 @@ public void onReceive(Context context, Intent intent) {
         }
     }
 
+    public void forceReloadOnNextLaunch() {
+        synchronized (this.mLock) {
+            stopLoader();
+            mModelLoaded = false;
+        }
+    }
+
     public void forceReload() {
         forceReload(-1);
     }
@@ -315,6 +337,7 @@ public void forceReload() {
     /**
      * Reloads the workspace items from the DB and re-binds the workspace. This should generally
      * not be called as DB updates are automatically followed by UI update
+     *
      * @param synchronousBindPage The page to bind first. Can pass -1 to use the current page.
      */
     public void forceReload(int synchronousBindPage) {
@@ -462,8 +485,8 @@ public LoaderTransaction beginLoader(LoaderTask task) throws CancellationExcepti
      * use partial updates similar to {@link UserManagerCompat}
      */
     public void refreshShortcutsIfRequired() {
-        MODEL_EXECUTOR.getHandler().removeCallbacks(mShortcutPermissionCheckRunnable);
-        MODEL_EXECUTOR.post(mShortcutPermissionCheckRunnable);
+        sWorker.removeCallbacks(mShortcutPermissionCheckRunnable);
+        sWorker.post(mShortcutPermissionCheckRunnable);
     }
 
     /**
@@ -552,6 +575,13 @@ public void execute(LauncherAppState app, BgDataModel dataModel, AllAppsList app
         });
     }
 
+    public List<LauncherAppWidgetInfo> getLoadedWidgets() {
+        synchronized (sBgDataModel) {
+            return new ArrayList<>(sBgDataModel.appWidgets);
+        }
+    }
+
+
     public void dumpState(String prefix, FileDescriptor fd, PrintWriter writer, String[] args) {
         if (args.length > 0 && TextUtils.equals(args[0], "--all")) {
             writer.println(prefix + "All apps list: size=" + mBgAllAppsList.data.size());
@@ -563,6 +593,10 @@ public void dumpState(String prefix, FileDescriptor fd, PrintWriter writer, Stri
         sBgDataModel.dump(prefix, fd, writer, args);
     }
 
+    public Callbacks getCallback() {
+        return mCallbacks != null ? mCallbacks.get() : null;
+    }
+
     /**
      * @return the looper for the ui worker thread which can be used to start background tasksfor ui.
      */
@@ -570,7 +604,17 @@ public static Looper getUiWorkerLooper() {
         return sUiWorkerThread.getLooper();
     }
 
-    public Callbacks getCallback() {
-        return mCallbacks != null ? mCallbacks.get() : null;
+    /**
+     * @return the looper for the icon pack thread which can be used to load icon packs.
+     */
+    public static Looper getIconPackLooper() {
+        return sIconPackThread.getLooper();
+    }
+
+    /**
+     * @return the looper for the icon pack ui thread which can be used to load icon pickers.
+     */
+    public static Looper getIconPackUiLooper() {
+        return sIconPackUiThread.getLooper();
     }
 }
diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java
index 6081300ced..0534fb44a6 100644
--- a/src/com/android/launcher3/LauncherProvider.java
+++ b/src/com/android/launcher3/LauncherProvider.java
@@ -16,9 +16,6 @@
 
 package com.android.launcher3;
 
-import static com.android.launcher3.provider.LauncherDbUtils.dropTable;
-import static com.android.launcher3.provider.LauncherDbUtils.tableExists;
-
 import android.annotation.TargetApi;
 import android.app.backup.BackupManager;
 import android.appwidget.AppWidgetHost;
@@ -84,6 +81,9 @@
 import java.util.Arrays;
 import java.util.Locale;
 
+import static com.android.launcher3.provider.LauncherDbUtils.dropTable;
+import static com.android.launcher3.provider.LauncherDbUtils.tableExists;
+
 public class LauncherProvider extends ContentProvider {
     private static final String TAG = "LauncherProvider";
     private static final boolean LOGD = false;
@@ -94,7 +94,7 @@ public class LauncherProvider extends ContentProvider {
      * Represents the schema of the database. Changes in scheme need not be backwards compatible.
      * When increasing the scheme version, ensure that downgrade_schema.json is updated
      */
-    public static final int SCHEMA_VERSION = 28;
+    public static final int SCHEMA_VERSION = 32;
 
     public static final String AUTHORITY = BuildConfig.APPLICATION_ID + ".settings";
 
@@ -754,7 +754,20 @@ public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
                             !LauncherDbUtils.prepareScreenZeroToHostQsb(mContext, db)) {
                         break;
                     }
-                case 27: {
+
+                case 27:
+                    db.execSQL("ALTER TABLE " + Favorites.TABLE_NAME + " ADD COLUMN " + Favorites.TITLE_ALIAS + " TEXT;");
+                    db.execSQL("ALTER TABLE " + Favorites.TABLE_NAME + " ADD COLUMN " + Favorites.CUSTOM_ICON + " BLOB;");
+                case 28:
+                    // DB Upgraded successfully
+                    return;
+
+                case 29:
+                    db.execSQL("ALTER TABLE " + Favorites.TABLE_NAME + " ADD COLUMN " + Favorites.CUSTOM_ICON_ENTRY + " TEXT;");
+                case 30:
+                    db.execSQL("ALTER TABLE " + Favorites.TABLE_NAME + " ADD COLUMN " + Favorites.SWIPE_UP_ACTION + " TEXT;");
+
+                case 31: {
                     // Update the favorites table so that the screen ids are ordered based on
                     // workspace page rank.
                     IntArray finalScreens = LauncherDbUtils.queryIntArray(db, "workspaceScreens",
@@ -777,9 +790,9 @@ public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
                     }
                     dropTable(db, "workspaceScreens");
                 }
-                case 28:
-                    // DB Upgraded successfully
-                    return;
+
+                case 32:
+                    // No-op
             }
 
             // DB was not upgraded
diff --git a/src/com/android/launcher3/LauncherSettings.java b/src/com/android/launcher3/LauncherSettings.java
index c509680981..14fa7c2ca3 100644
--- a/src/com/android/launcher3/LauncherSettings.java
+++ b/src/com/android/launcher3/LauncherSettings.java
@@ -26,69 +26,73 @@
  * Settings related utilities.
  */
 public class LauncherSettings {
-
-    /**
-     * Favorites.
-     */
-    public static final class Favorites implements BaseColumns {
-        /**
-         * The time of the last update to this row.
-         * <P>Type: INTEGER</P>
-         */
-        public static final String MODIFIED = "modified";
-
-        /**
-         * Descriptive name of the gesture that can be displayed to the user.
-         * <P>Type: TEXT</P>
-         */
-        public static final String TITLE = "title";
-
-        /**
-         * The Intent URL of the gesture, describing what it points to. This
-         * value is given to {@link android.content.Intent#parseUri(String, int)} to create
-         * an Intent that can be launched.
-         * <P>Type: TEXT</P>
-         */
-        public static final String INTENT = "intent";
-
-        /**
-         * The type of the gesture
-         *
-         * <P>Type: INTEGER</P>
-         */
-        public static final String ITEM_TYPE = "itemType";
-
-        /**
-         * The gesture is a package
-         */
-        public static final int ITEM_TYPE_NON_ACTIONABLE = -1;
-        /**
-         * The gesture is an application
-         */
-        public static final int ITEM_TYPE_APPLICATION = 0;
-
-        /**
-         * The gesture is an application created shortcut
-         */
-        public static final int ITEM_TYPE_SHORTCUT = 1;
-
-        /**
-         * The icon package name in Intent.ShortcutIconResource
-         * <P>Type: TEXT</P>
-         */
-        public static final String ICON_PACKAGE = "iconPackage";
-
-        /**
-         * The icon resource name in Intent.ShortcutIconResource
-         * <P>Type: TEXT</P>
-         */
-        public static final String ICON_RESOURCE = "iconResource";
-
-        /**
-         * The custom icon bitmap.
-         * <P>Type: BLOB</P>
-         */
-        public static final String ICON = "icon";
+     /**
+      * Favorites.
+      */
+     public static final class Favorites implements BaseColumns {
+
+         /**
+          * Descriptive name of the gesture that can be displayed to the user.
+          * <P>Type: TEXT</P>
+          */
+         public static final String TITLE = "title";
+
+         /**
+          * The Intent URL of the gesture, describing what it points to. This
+          * value is given to {@link android.content.Intent#parseUri(String, int)} to create
+          * an Intent that can be launched.
+          * <P>Type: TEXT</P>
+          */
+         public static final String INTENT = "intent";
+
+         /**
+          * The type of the gesture
+          *
+          * <P>Type: INTEGER</P>
+          */
+         public static final String ITEM_TYPE = "itemType";
+
+         /**
+          * The gesture is an application
+          */
+         public static final int ITEM_TYPE_APPLICATION = 0;
+
+         /**
+          * The gesture is an application created shortcut
+          */
+         public static final int ITEM_TYPE_SHORTCUT = 1;
+
+         /**
+          * The icon package name in Intent.ShortcutIconResource
+          * <P>Type: TEXT</P>
+          */
+         public static final String ICON_PACKAGE = "iconPackage";
+
+         /**
+          * The icon resource name in Intent.ShortcutIconResource
+          * <P>Type: TEXT</P>
+          */
+         public static final String ICON_RESOURCE = "iconResource";
+
+         /**
+          * The custom icon bitmap.
+          * <P>Type: BLOB</P>
+          */
+         public static final String ICON = "icon";
+
+         public static final String CUSTOM_ICON = "customIcon";
+
+         public static final String CUSTOM_ICON_ENTRY = "customIconEntry";
+         /**
+          * The time of the last update to this row.
+          * <P>Type: INTEGER</P>
+          */
+         public static final String MODIFIED = "modified";
+
+         /**
+          * The gesture is a package
+          */
+         public static final int ITEM_TYPE_NON_ACTIONABLE = -1;
 
         public static final String TABLE_NAME = "favorites";
 
@@ -239,14 +243,18 @@ static final String itemTypeToString(int type) {
          * Stores general flag based options for {@link ItemInfo}s.
          * <p>Type: INTEGER</p>
          */
+
         public static final String OPTIONS = "options";
+        public static final String TITLE_ALIAS = "titleAlias";
+
+        public static final String SWIPE_UP_ACTION = "swipeUpAction";
 
         public static void addTableToDb(SQLiteDatabase db, long myProfileId, boolean optional) {
             addTableToDb(db, myProfileId, optional, TABLE_NAME);
         }
 
         public static void addTableToDb(SQLiteDatabase db, long myProfileId, boolean optional,
-                String tableName) {
+                                        String tableName) {
             String ifNotExists = optional ? " IF NOT EXISTS " : "";
             db.execSQL("CREATE TABLE " + ifNotExists + tableName + " (" +
                     "_id INTEGER PRIMARY KEY," +
@@ -263,6 +271,10 @@ public static void addTableToDb(SQLiteDatabase db, long myProfileId, boolean opt
                     "iconPackage TEXT," +
                     "iconResource TEXT," +
                     "icon BLOB," +
+                    "customIcon BLOB," +
+                    "customIconEntry TEXT," +
+                    "titleAlias TEXT," +
+                    "swipeUpAction TEXT," +
                     "appWidgetProvider TEXT," +
                     "modified INTEGER NOT NULL DEFAULT 0," +
                     "restored INTEGER NOT NULL DEFAULT 0," +
diff --git a/src/com/android/launcher3/LauncherState.java b/src/com/android/launcher3/LauncherState.java
index 6e2626b615..b4001c4aae 100644
--- a/src/com/android/launcher3/LauncherState.java
+++ b/src/com/android/launcher3/LauncherState.java
@@ -15,20 +15,34 @@
  */
 package com.android.launcher3;
 
+import android.view.animation.Interpolator;
+
+import com.android.launcher3.anim.AnimatorSetBuilder;
+import com.android.launcher3.states.SpringLoadedState;
+import com.android.launcher3.uioverrides.UiFactory;
+import com.android.launcher3.uioverrides.states.AllAppsState;
+import com.android.launcher3.uioverrides.states.OverviewState;
+import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
+import com.saggitt.omega.states.HomeState;
+import com.saggitt.omega.states.OptionsState;
+
+import java.util.Arrays;
+
 import static android.view.View.IMPORTANT_FOR_ACCESSIBILITY_AUTO;
 import static android.view.View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS;
 import static android.view.View.VISIBLE;
 import static android.view.accessibility.AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED;
-
 import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_OVERVIEW_FADE;
 import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_OVERVIEW_SCALE;
 import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_OVERVIEW_TRANSLATE_X;
 import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_WORKSPACE_FADE;
 import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_WORKSPACE_SCALE;
 import static com.android.launcher3.anim.Interpolators.ACCEL;
+import static com.android.launcher3.anim.Interpolators.ACCEL_2;
 import static com.android.launcher3.anim.Interpolators.DEACCEL;
 import static com.android.launcher3.anim.Interpolators.DEACCEL_1_7;
 import static com.android.launcher3.anim.Interpolators.clampToProgress;
+import static com.android.launcher3.states.RotationHelper.REQUEST_NONE;
 import static com.android.launcher3.testing.TestProtocol.ALL_APPS_STATE_ORDINAL;
 import static com.android.launcher3.testing.TestProtocol.BACKGROUND_APP_STATE_ORDINAL;
 import static com.android.launcher3.testing.TestProtocol.NORMAL_STATE_ORDINAL;
@@ -36,19 +50,6 @@
 import static com.android.launcher3.testing.TestProtocol.OVERVIEW_STATE_ORDINAL;
 import static com.android.launcher3.testing.TestProtocol.QUICK_SWITCH_STATE_ORDINAL;
 import static com.android.launcher3.testing.TestProtocol.SPRING_LOADED_STATE_ORDINAL;
-import static com.android.launcher3.anim.Interpolators.ACCEL_2;
-import static com.android.launcher3.states.RotationHelper.REQUEST_NONE;
-
-import android.view.animation.Interpolator;
-
-import com.android.launcher3.anim.AnimatorSetBuilder;
-import com.android.launcher3.states.SpringLoadedState;
-import com.android.launcher3.uioverrides.UiFactory;
-import com.android.launcher3.uioverrides.states.AllAppsState;
-import com.android.launcher3.uioverrides.states.OverviewState;
-import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
-
-import java.util.Arrays;
 
 
 /**
@@ -70,6 +71,8 @@ public class LauncherState {
     public static final int VERTICAL_SWIPE_INDICATOR = 1 << 5;
     public static final int RECENTS_CLEAR_ALL_BUTTON = 1 << 6;
 
+    public static final int OPTIONS_VIEW = 1 << 7;
+
     protected static final int FLAG_MULTI_PAGE = 1 << 0;
     protected static final int FLAG_DISABLE_ACCESSIBILITY = 1 << 1;
     protected static final int FLAG_DISABLE_RESTORE = 1 << 2;
@@ -88,31 +91,25 @@ public float getPageAlpha(int pageIndex) {
                     return 1;
                 }
             };
-
-    private static final LauncherState[] sAllStates = new LauncherState[7];
+    private static final LauncherState[] sAllStates = new LauncherState[9];
 
     /**
      * TODO: Create a separate class for NORMAL state.
      */
-    public static final LauncherState NORMAL = new LauncherState(NORMAL_STATE_ORDINAL,
+    public static final LauncherState NORMAL = new HomeState(NORMAL_STATE_ORDINAL,
             ContainerType.WORKSPACE, 0,
             FLAG_DISABLE_RESTORE | FLAG_WORKSPACE_ICONS_CAN_BE_DRAGGED | FLAG_HIDE_BACK_BUTTON |
-            FLAG_HAS_SYS_UI_SCRIM);
-
+                    FLAG_HAS_SYS_UI_SCRIM);
+    public static final LauncherState OPTIONS = new OptionsState(7);
     /**
      * Various Launcher states arranged in the increasing order of UI layers
      */
-    public static final LauncherState SPRING_LOADED = new SpringLoadedState(
-            SPRING_LOADED_STATE_ORDINAL);
+    public static final LauncherState SPRING_LOADED = new SpringLoadedState(SPRING_LOADED_STATE_ORDINAL);
     public static final LauncherState ALL_APPS = new AllAppsState(ALL_APPS_STATE_ORDINAL);
-
+    public static final LauncherState OVERVIEW_PEEK = OverviewState.newPeekState(OVERVIEW_PEEK_STATE_ORDINAL);
     public static final LauncherState OVERVIEW = new OverviewState(OVERVIEW_STATE_ORDINAL);
-    public static final LauncherState OVERVIEW_PEEK =
-            OverviewState.newPeekState(OVERVIEW_PEEK_STATE_ORDINAL);
-    public static final LauncherState QUICK_SWITCH =
-            OverviewState.newSwitchState(QUICK_SWITCH_STATE_ORDINAL);
-    public static final LauncherState BACKGROUND_APP =
-            OverviewState.newBackgroundState(BACKGROUND_APP_STATE_ORDINAL);
+    public static final LauncherState QUICK_SWITCH = OverviewState.newSwitchState(QUICK_SWITCH_STATE_ORDINAL);
+    public static final LauncherState BACKGROUND_APP = OverviewState.newBackgroundState(BACKGROUND_APP_STATE_ORDINAL);
 
     public final int ordinal;
 
@@ -193,6 +190,7 @@ public LauncherState(int id, int containerType, int transitionDuration, int flag
         this.hasSysUiScrim = (flags & FLAG_HAS_SYS_UI_SCRIM) != 0;
 
         this.ordinal = id;
+
         sAllStates[id] = this;
     }
 
@@ -235,6 +233,11 @@ public int getVisibleElements(Launcher launcher) {
      *
      * @see com.android.launcher3.allapps.AllAppsTransitionController
      */
+
+    public float getScrimProgress(Launcher launcher) {
+        return getVerticalProgress(launcher);
+    }
+
     public float getVerticalProgress(Launcher launcher) {
         return 1f;
     }
@@ -243,6 +246,10 @@ public float getWorkspaceScrimAlpha(Launcher launcher) {
         return 0;
     }
 
+    public float getWorkspaceBlurAlpha(Launcher launcher) {
+        return 0;
+    }
+
     public float getOverviewScrimAlpha(Launcher launcher) {
         return 0;
     }
diff --git a/src/com/android/launcher3/LauncherStateManager.java b/src/com/android/launcher3/LauncherStateManager.java
index f673508844..4f7643d4c1 100644
--- a/src/com/android/launcher3/LauncherStateManager.java
+++ b/src/com/android/launcher3/LauncherStateManager.java
@@ -16,9 +16,6 @@
 
 package com.android.launcher3;
 
-import static com.android.launcher3.LauncherState.NORMAL;
-import static com.android.launcher3.anim.PropertySetter.NO_ANIM_PROPERTY_SETTER;
-
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
@@ -40,6 +37,9 @@
 import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayList;
 
+import static com.android.launcher3.LauncherState.NORMAL;
+import static com.android.launcher3.anim.PropertySetter.NO_ANIM_PROPERTY_SETTER;
+
 /**
  * TODO: figure out what kind of tests we can write for this
  *
@@ -118,6 +118,8 @@ public class LauncherStateManager {
     private LauncherState mLastStableState = NORMAL;
     private LauncherState mCurrentStableState = NORMAL;
 
+    private LauncherState mToState = mState;
+
     private LauncherState mRestState;
 
     public LauncherStateManager(Launcher l) {
@@ -129,6 +131,10 @@ public LauncherState getState() {
         return mState;
     }
 
+    public LauncherState getToState() {
+        return mToState;
+    }
+
     public LauncherState getCurrentStableState() {
         return mCurrentStableState;
     }
@@ -249,6 +255,7 @@ public void onAnimationSuccess(Animator animator) {
 
         // Cancel the current animation. This will reset mState to mCurrentStableState, so store it.
         LauncherState fromState = mState;
+        mToState = state;
         mConfig.reset();
 
         if (!animated) {
diff --git a/src/com/android/launcher3/MainProcessInitializer.java b/src/com/android/launcher3/MainProcessInitializer.java
index 95ee687319..e47b1d7869 100644
--- a/src/com/android/launcher3/MainProcessInitializer.java
+++ b/src/com/android/launcher3/MainProcessInitializer.java
@@ -22,6 +22,7 @@
 import com.android.launcher3.graphics.IconShape;
 import com.android.launcher3.logging.FileLog;
 import com.android.launcher3.util.ResourceBasedOverride;
+import com.saggitt.omega.adaptive.IconShapeManager;
 
 /**
  * Utility class to handle one time initializations of the main process
@@ -36,6 +37,7 @@ public static void initialize(Context context) {
 
     protected void init(Context context) {
         FileLog.setDir(context.getApplicationContext().getFilesDir());
+        IconShapeManager.Companion.getInstance(context);
         FeatureFlags.initialize(context);
         SessionCommitReceiver.applyDefaultUserPrefs(context);
         IconShape.init(context);
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index ff2b400387..9d24c075b0 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -16,11 +16,6 @@
 
 package com.android.launcher3;
 
-import static com.android.launcher3.compat.AccessibilityManagerCompat.isAccessibilityEnabled;
-import static com.android.launcher3.compat.AccessibilityManagerCompat.isObservedEventType;
-import static com.android.launcher3.config.FeatureFlags.QUICKSTEP_SPRINGS;
-import static com.android.launcher3.touch.OverScroll.OVERSCROLL_DAMP_FACTOR;
-
 import android.animation.LayoutTransition;
 import android.animation.TimeInterpolator;
 import android.annotation.SuppressLint;
@@ -56,6 +51,11 @@
 
 import java.util.ArrayList;
 
+import static com.android.launcher3.compat.AccessibilityManagerCompat.isAccessibilityEnabled;
+import static com.android.launcher3.compat.AccessibilityManagerCompat.isObservedEventType;
+import static com.android.launcher3.config.FeatureFlags.QUICKSTEP_SPRINGS;
+import static com.android.launcher3.touch.OverScroll.OVERSCROLL_DAMP_FACTOR;
+
 /**
  * An abstraction of the original Workspace which supports browsing through a
  * sequential list of "pages"
@@ -143,6 +143,13 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
 
     private int[] mTmpIntPair = new int[2];
 
+    protected final static int TOUCH_STATE_REST = 0;
+    protected final static int TOUCH_STATE_SCROLLING = 1;
+    protected final static int TOUCH_STATE_PREV_PAGE = 2;
+    protected final static int TOUCH_STATE_NEXT_PAGE = 3;
+
+    protected int mTouchState = TOUCH_STATE_REST;
+
     public PagedView(Context context) {
         this(context, null);
     }
@@ -1710,4 +1717,8 @@ public int[] getVisibleChildrenRange() {
         mTmpIntPair[1] = rightChild;
         return mTmpIntPair;
     }
+
+    public boolean isScrollerFinished() {
+        return mScroller.isFinished();
+    }
 }
diff --git a/src/com/android/launcher3/SecondaryDropTarget.java b/src/com/android/launcher3/SecondaryDropTarget.java
index c8c590d9de..9a6d18f592 100644
--- a/src/com/android/launcher3/SecondaryDropTarget.java
+++ b/src/com/android/launcher3/SecondaryDropTarget.java
@@ -1,14 +1,5 @@
 package com.android.launcher3;
 
-import static android.appwidget.AppWidgetManager.INVALID_APPWIDGET_ID;
-import static android.appwidget.AppWidgetProviderInfo.WIDGET_FEATURE_RECONFIGURABLE;
-
-import static com.android.launcher3.ItemInfoWithIcon.FLAG_SYSTEM_MASK;
-import static com.android.launcher3.ItemInfoWithIcon.FLAG_SYSTEM_NO;
-import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_DESKTOP;
-import static com.android.launcher3.accessibility.LauncherAccessibilityDelegate.RECONFIGURE;
-import static com.android.launcher3.accessibility.LauncherAccessibilityDelegate.UNINSTALL;
-
 import android.appwidget.AppWidgetHostView;
 import android.appwidget.AppWidgetProviderInfo;
 import android.content.ComponentName;
@@ -35,9 +26,20 @@
 import com.android.launcher3.userevent.nano.LauncherLogProto.ControlType;
 import com.android.launcher3.userevent.nano.LauncherLogProto.Target;
 import com.android.launcher3.util.Themes;
+import com.android.launcher3.widget.custom.CustomAppWidgetProviderInfo;
+import com.saggitt.omega.settings.SettingsActivity;
 
 import java.net.URISyntaxException;
 
+import static android.appwidget.AppWidgetManager.INVALID_APPWIDGET_ID;
+import static android.appwidget.AppWidgetProviderInfo.WIDGET_FEATURE_RECONFIGURABLE;
+import static com.android.launcher3.ItemInfoWithIcon.FLAG_SYSTEM_MASK;
+import static com.android.launcher3.ItemInfoWithIcon.FLAG_SYSTEM_NO;
+import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_DESKTOP;
+import static com.android.launcher3.accessibility.LauncherAccessibilityDelegate.CUSTOMIZE;
+import static com.android.launcher3.accessibility.LauncherAccessibilityDelegate.RECONFIGURE;
+import static com.android.launcher3.accessibility.LauncherAccessibilityDelegate.UNINSTALL;
+
 /**
  * Drop target which provides a secondary option for an item.
  *    For app targets: shows as uninstall
@@ -80,6 +82,10 @@ protected void setupUi(int action) {
             mHoverColor = getResources().getColor(R.color.uninstall_target_hover_tint);
             setDrawable(R.drawable.ic_uninstall_shadow);
             updateText(R.string.uninstall_drop_target_label);
+        } else if (action == CUSTOMIZE) {
+            mHoverColor = Themes.getColorAccent(getContext());
+            setDrawable(R.drawable.ic_smartspace_preferences);
+            updateText(R.string.customize);
         } else {
             mHoverColor = Themes.getColorAccent(getContext());
             setDrawable(R.drawable.ic_setup_shadow);
@@ -116,6 +122,9 @@ public boolean supportsAccessibilityDrop(ItemInfo info, View view) {
             if (getReconfigurableWidgetId(view) != INVALID_APPWIDGET_ID) {
                 setupUi(RECONFIGURE);
                 return true;
+            } else if (getWidgetCustomizeIntent(view) != null) {
+                setupUi(CUSTOMIZE);
+                return true;
             }
             return false;
         }
@@ -209,13 +218,30 @@ private int getReconfigurableWidgetId(View view) {
         if (widgetInfo == null || widgetInfo.configure == null) {
             return INVALID_APPWIDGET_ID;
         }
-        if ( (LauncherAppWidgetProviderInfo.fromProviderInfo(getContext(), widgetInfo)
+        if ((LauncherAppWidgetProviderInfo.fromProviderInfo(getContext(), widgetInfo)
                 .getWidgetFeatures() & WIDGET_FEATURE_RECONFIGURABLE) == 0) {
             return INVALID_APPWIDGET_ID;
         }
         return hostView.getAppWidgetId();
     }
 
+    private Intent getWidgetCustomizeIntent(View view) {
+        if (!(view instanceof AppWidgetHostView)) {
+            return null;
+        }
+        AppWidgetHostView hostView = (AppWidgetHostView) view;
+        AppWidgetProviderInfo widgetInfo = hostView.getAppWidgetInfo();
+        if (widgetInfo instanceof CustomAppWidgetProviderInfo) {
+            CustomAppWidgetProviderInfo customInfo = (CustomAppWidgetProviderInfo) widgetInfo;
+            Context context = getContext();
+            return new Intent(context, SettingsActivity.class)
+                    .putExtra(SettingsActivity.SubSettingsFragment.TITLE, context.getString(customInfo.customizeTitle))
+                    .putExtra(SettingsActivity.SubSettingsFragment.CONTENT_RES_ID, customInfo.customizeScreen)
+                    .putExtra(SettingsActivity.SubSettingsFragment.HAS_PREVIEW, customInfo.customizeHasPreview);
+        }
+        return null;
+    }
+
     /**
      * Performs the drop action and returns the target component for the dragObject or null if
      * the action was not performed.
@@ -227,6 +253,13 @@ protected ComponentName performDropAction(View view, ItemInfo info) {
                 mLauncher.getAppWidgetHost().startConfigActivity(mLauncher, widgetId, -1);
             }
             return null;
+        } else if (mCurrentAccessibilityAction == CUSTOMIZE) {
+            Intent customizeIntent = getWidgetCustomizeIntent(view);
+            if (customizeIntent != null) {
+                Launcher launcher = Launcher.getLauncher(view.getContext());
+                launcher.startActivitySafely(view, customizeIntent, null, null);
+            }
+            return null;
         }
         // else: mCurrentAccessibilityAction == UNINSTALL
 
diff --git a/src/com/android/launcher3/SessionCommitReceiver.java b/src/com/android/launcher3/SessionCommitReceiver.java
index a87c446585..ee35af1ff8 100644
--- a/src/com/android/launcher3/SessionCommitReceiver.java
+++ b/src/com/android/launcher3/SessionCommitReceiver.java
@@ -38,10 +38,11 @@
 import android.util.Log;
 
 import com.android.launcher3.compat.LauncherAppsCompat;
-import com.android.launcher3.util.Executors;
 import com.android.launcher3.compat.PackageInstallerCompat;
+import com.android.launcher3.util.Executors;
 
 import java.util.List;
+import java.util.Objects;
 
 import static com.android.launcher3.compat.PackageInstallerCompat.getUserHandle;
 
@@ -50,43 +51,14 @@
  */
 @TargetApi(Build.VERSION_CODES.O)
 public class SessionCommitReceiver extends BroadcastReceiver {
-
-    private static final String TAG = "SessionCommitReceiver";
-
-    // The content provider for the add to home screen setting. It should be of the format:
-    // <package name>.addtohomescreen
-    private static final String MARKER_PROVIDER_PREFIX = ".addtohomescreen";
-
     // Preference key for automatically adding icon to homescreen.
     public static final String ADD_ICON_PREFERENCE_KEY = "pref_add_icon_to_home";
     public static final String ADD_ICON_PREFERENCE_INITIALIZED_KEY =
             "pref_add_icon_to_home_initialized";
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        if (!isEnabled(context) || !Utilities.ATLEAST_OREO) {
-            // User has decided to not add icons on homescreen.
-            return;
-        }
-
-        SessionInfo info = intent.getParcelableExtra(PackageInstaller.EXTRA_SESSION);
-        UserHandle user = intent.getParcelableExtra(Intent.EXTRA_USER);
-        if (!PackageInstaller.ACTION_SESSION_COMMITTED.equals(intent.getAction())
-                || info == null || user == null) {
-            // Invalid intent.
-            return;
-        }
-
-        PackageInstallerCompat packageInstallerCompat = PackageInstallerCompat.getInstance(context);
-        if (TextUtils.isEmpty(info.getAppPackageName())
-                || info.getInstallReason() != PackageManager.INSTALL_REASON_USER
-                || packageInstallerCompat.promiseIconAddedForId(info.getSessionId())) {
-            packageInstallerCompat.removePromiseIconId(info.getSessionId());
-            return;
-        }
-
-        queueAppIconAddition(context, info.getAppPackageName(), user);
-    }
+    private static final String TAG = "SessionCommitReceiver";
+    // The content provider for the add to home screen setting. It should be of the format:
+    // <package name>.addtohomescreen
+    private static final String MARKER_PROVIDER_PREFIX = ".addtohomescreen";
 
     public static void queuePromiseAppIconAddition(Context context, SessionInfo sessionInfo) {
         String packageName = sessionInfo.getAppPackageName();
@@ -110,7 +82,7 @@ public static void queueAppIconAddition(Context context, String packageName, Use
     }
 
     private static void queueAppIconAddition(Context context, String packageName,
-            CharSequence label, Bitmap icon, UserHandle user) {
+                                             CharSequence label, Bitmap icon, UserHandle user) {
         Intent data = new Intent();
         data.putExtra(Intent.EXTRA_SHORTCUT_INTENT, new Intent().setComponent(
                 new ComponentName(packageName, "")).setPackage(packageName));
@@ -142,6 +114,32 @@ public static void applyDefaultUserPrefs(final Context context) {
         }
     }
 
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        if (!isEnabled(context) || !Utilities.ATLEAST_OREO) {
+            // User has decided to not add icons on homescreen.
+            return;
+        }
+
+        SessionInfo info = intent.getParcelableExtra(PackageInstaller.EXTRA_SESSION);
+        UserHandle user = intent.getParcelableExtra(Intent.EXTRA_USER);
+        if (!PackageInstaller.ACTION_SESSION_COMMITTED.equals(intent.getAction())
+                || info == null || user == null) {
+            // Invalid intent.
+            return;
+        }
+
+        PackageInstallerCompat packageInstallerCompat = PackageInstallerCompat.getInstance(context);
+        if (TextUtils.isEmpty(info.getAppPackageName())
+                || info.getInstallReason() != PackageManager.INSTALL_REASON_USER
+                || packageInstallerCompat.promiseIconAddedForId(info.getSessionId())) {
+            packageInstallerCompat.removePromiseIconId(info.getSessionId());
+            return;
+        }
+
+        queueAppIconAddition(context, info.getAppPackageName(), user);
+    }
+
     private static class PrefInitTask extends AsyncTask<Void, Void, Void> {
         private final Context mContext;
 
@@ -168,21 +166,15 @@ public boolean readValueFromMarketApp() {
                 return true;
             }
 
-            Cursor c = null;
-            try {
-                c = mContext.getContentResolver().query(
-                        Uri.parse("content://" + ri.activityInfo.packageName
-                                + MARKER_PROVIDER_PREFIX),
-                        null, null, null, null);
-                if (c.moveToNext()) {
+            try (Cursor c = mContext.getContentResolver().query(
+                    Uri.parse("content://" + ri.activityInfo.packageName
+                            + MARKER_PROVIDER_PREFIX),
+                    null, null, null, null)) {
+                if (Objects.requireNonNull(c).moveToNext()) {
                     return c.getInt(c.getColumnIndexOrThrow(Settings.NameValueTable.VALUE)) != 0;
                 }
             } catch (Exception e) {
                 Log.d(TAG, "Error reading add to homescreen preference", e);
-            } finally {
-                if (c != null) {
-                    c.close();
-                }
             }
             return true;
         }
diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java
index 34fe54ecfc..e143e776a5 100644
--- a/src/com/android/launcher3/Utilities.java
+++ b/src/com/android/launcher3/Utilities.java
@@ -23,12 +23,15 @@
 import android.app.AlarmManager;
 import android.app.PendingIntent;
 import android.app.WallpaperManager;
+import android.content.ActivityNotFoundException;
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.content.pm.ApplicationInfo;
 import android.content.pm.LauncherActivityInfo;
+import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.content.pm.ShortcutInfo;
@@ -45,12 +48,16 @@
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.InsetDrawable;
+import android.net.Uri;
 import android.os.Build;
+import android.os.Bundle;
 import android.os.DeadObjectException;
 import android.os.Handler;
 import android.os.Message;
 import android.os.PowerManager;
+import android.os.Process;
 import android.os.TransactionTooLargeException;
+import android.os.UserHandle;
 import android.provider.Settings;
 import android.text.Spannable;
 import android.text.SpannableString;
@@ -58,31 +65,40 @@
 import android.text.style.TtsSpan;
 import android.util.DisplayMetrics;
 import android.util.Log;
+import android.util.SparseArray;
 import android.util.TypedValue;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewConfiguration;
 import android.view.animation.Interpolator;
+import android.widget.Toast;
 
+import androidx.annotation.Nullable;
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
 
 import com.android.launcher3.compat.LauncherAppsCompat;
 import com.android.launcher3.compat.ShortcutConfigActivityInfo;
+import com.android.launcher3.compat.UserManagerCompat;
 import com.android.launcher3.dragndrop.FolderAdaptiveIcon;
 import com.android.launcher3.graphics.RotationMode;
 import com.android.launcher3.graphics.TintedDrawableSpan;
 import com.android.launcher3.icons.LauncherIcons;
 import com.android.launcher3.shortcuts.DeepShortcutManager;
 import com.android.launcher3.shortcuts.ShortcutKey;
+import com.android.launcher3.util.ComponentKey;
 import com.android.launcher3.util.IntArray;
 import com.android.launcher3.util.PackageManagerHelper;
 import com.android.launcher3.views.Transposable;
 import com.android.launcher3.widget.PendingAddShortcutInfo;
+import com.saggitt.omega.OmegaAppKt;
 import com.saggitt.omega.OmegaPreferences;
+import com.saggitt.omega.backup.RestoreBackupActivity;
+import com.saggitt.omega.iconpack.IconPackManager;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
@@ -116,6 +132,7 @@ public final class Utilities {
     public static final String[] EMPTY_PERSON_ARRAY = new String[0];
 
     public static final boolean ATLEAST_R = false;//Build.VERSION.SDK_INT >= Build.VERSION_CODES.R;
+
     public static final boolean ATLEAST_Q = Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q;
 
     public static final boolean ATLEAST_P = Build.VERSION.SDK_INT >= Build.VERSION_CODES.P;
@@ -137,7 +154,6 @@ public final class Utilities {
     public static final int COLOR_EXTRACTION_JOB_ID = 1;
     public static final int WALLPAPER_COMPAT_JOB_ID = 2;
 
-
     public static final String ALLOW_ROTATION_PREFERENCE_KEY = "pref_allowRotation";
     /**
      * Indicates if the device has a debug build. Should only be used to store additional info or
@@ -550,7 +566,9 @@ public static void unregisterReceiverSafely(Context context, BroadcastReceiver r
     public static Drawable getFullDrawable(Launcher launcher, ItemInfo info, int width, int height,
             boolean flattenDrawable, Object[] outObj) {
         LauncherAppState appState = LauncherAppState.getInstance(launcher);
-        if (info.itemType == LauncherSettings.Favorites.ITEM_TYPE_APPLICATION) {
+        IconPackManager.CustomIconEntry customIconEntry = (info instanceof WorkspaceItemInfo) ?
+                ((WorkspaceItemInfo) info).customIconEntry : null;
+        if (info.itemType == LauncherSettings.Favorites.ITEM_TYPE_APPLICATION || customIconEntry != null) {
             LauncherActivityInfo activityInfo = LauncherAppsCompat.getInstance(launcher)
                     .resolveActivity(info.getIntent(), info.user);
             outObj[0] = activityInfo;
@@ -630,7 +648,6 @@ public static float squaredTouchSlop(Context context) {
         return slop * slop;
     }
 
-
     /*INICIO CUSTOM*/
 
     public static OmegaPreferences getOmegaPrefs(Context context) {
@@ -668,39 +685,32 @@ public static <T> T getOverrideObject(Class<T> clazz, Context context, int resId
             CORE_POOL_SIZE, MAXIMUM_POOL_SIZE, KEEP_ALIVE,
             TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>());
 
+    @Nullable
     public static Bitmap drawableToBitmap(Drawable drawable) {
-        if (drawable instanceof BitmapDrawable) {
-            return ((BitmapDrawable) drawable).getBitmap();
-        }
-
-        if (drawable.getIntrinsicWidth() <= 0 || drawable.getIntrinsicHeight() <= 0) {
-            return null;
-        }
-
-        Bitmap bitmap = Bitmap.createBitmap(
-                drawable.getIntrinsicWidth(),
-                drawable.getIntrinsicHeight(),
-                Bitmap.Config.ARGB_8888);
-
-        Canvas canvas = new Canvas(bitmap);
-        drawable.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());
-        drawable.draw(canvas);
-        return bitmap;
+        return Utilities.drawableToBitmap(drawable, true);
     }
 
     public static Bitmap drawableToBitmap(Drawable drawable, boolean forceCreate) {
+        return drawableToBitmap(drawable, forceCreate, 0);
+    }
+
+    public static Bitmap drawableToBitmap(Drawable drawable, boolean forceCreate, int fallbackSize) {
         if (!forceCreate && drawable instanceof BitmapDrawable) {
             return ((BitmapDrawable) drawable).getBitmap();
         }
 
-        if (drawable.getIntrinsicWidth() <= 0 || drawable.getIntrinsicHeight() <= 0) {
-            return null;
+        int width = drawable.getIntrinsicWidth();
+        int height = drawable.getIntrinsicHeight();
+
+        if (width <= 0 || height <= 0) {
+            if (fallbackSize > 0) {
+                width = height = fallbackSize;
+            } else {
+                return null;
+            }
         }
 
-        Bitmap bitmap = Bitmap.createBitmap(
-                drawable.getIntrinsicWidth(),
-                drawable.getIntrinsicHeight(),
-                Bitmap.Config.ARGB_8888);
+        Bitmap bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
 
         Canvas canvas = new Canvas(bitmap);
         drawable.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());
@@ -787,9 +797,307 @@ public static boolean getAllowRotationDefaultValue(Context context) {
         return false;
     }
 
-    public static SharedPreferences getReflectionPrefs(Context context) {
-        return context.getSharedPreferences(
-                LauncherFiles.REFLECTION_PREFERENCES_KEY, Context.MODE_PRIVATE);
+    public static void openURLinBrowser(Context context, String url) {
+        openURLinBrowser(context, url, null, null);
+    }
+
+    public static void openURLinBrowser(Context context, String url, Rect sourceBounds, Bundle options) {
+        try {
+            Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
+            if (!(context instanceof Activity)) {
+                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            }
+            intent.setSourceBounds(sourceBounds);
+            if (options == null) {
+                context.startActivity(intent);
+            } else {
+                context.startActivity(intent, options);
+            }
+        } catch (ActivityNotFoundException exc) {
+            Toast.makeText(context, R.string.error_no_browser, Toast.LENGTH_SHORT).show();
+        }
+    }
+
+    public static boolean isSystemApp(Context context, Intent intent) {
+        PackageManager pm = context.getPackageManager();
+        ComponentName cn = intent.getComponent();
+        String packageName = null;
+        if (cn == null) {
+            ResolveInfo info = pm.resolveActivity(intent, PackageManager.MATCH_DEFAULT_ONLY);
+            if ((info != null) && (info.activityInfo != null)) {
+                packageName = info.activityInfo.packageName;
+            }
+        } else {
+            packageName = cn.getPackageName();
+        }
+        if (packageName != null) {
+            try {
+                PackageInfo info = pm.getPackageInfo(packageName, 0);
+                return (info != null) && (info.applicationInfo != null) &&
+                        ((info.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0);
+            } catch (PackageManager.NameNotFoundException e) {
+                return false;
+            }
+        } else {
+            return false;
+        }
+    }
+
+    public static <T> T notNullOrDefault(T value, T defValue) {
+        return (value == null) ? defValue : value;
+    }
+
+    private static List<Runnable> onStart = new ArrayList<>();
+
+    /**
+     * ATTENTION: Only ever call this from within LawnchairLauncher.kt
+     */
+    public /* private */ static void onLauncherStart() {
+        Log.d(TAG, "onLauncherStart: " + onStart.size());
+        for (Runnable r : onStart)
+            r.run();
+        onStart.clear();
+    }
+
+    /**
+     * Cues a runnable to be executed after binding all launcher elements the next time
+     */
+    public static void cueAfterNextStart(Runnable runnable) {
+        Log.d(TAG, "cueAfterNextStart: " + runnable);
+        onStart.add(runnable);
+    }
+
+    public static void goToHome(Context context) {
+        PackageManager pm = context.getPackageManager();
+
+        Intent intent = new Intent(Intent.ACTION_MAIN);
+        intent.addCategory(Intent.CATEGORY_HOME);
+        ComponentName componentName = intent.resolveActivity(pm);
+        if (!context.getPackageName().equals(componentName.getPackageName())) {
+            intent = pm.getLaunchIntentForPackage(context.getPackageName());
+        }
+        context.startActivity(intent);
+    }
+
+    public static int parseResourceIdentifier(Resources res, String identifier, String packageName) {
+        try {
+            return Integer.parseInt(identifier.substring(1));
+        } catch (NumberFormatException e) {
+            return res.getIdentifier(identifier.substring(1), null, packageName);
+        }
+    }
+
+    /**
+     * Creates a new component key from an encoded component key string in the form of
+     * [flattenedComponentString#userId].  If the userId is not present, then it defaults
+     * to the current user.
+     */
+    public static ComponentKey makeComponentKey(Context context, String componentKeyStr) {
+        ComponentName componentName;
+        UserHandle user;
+        int userDelimiterIndex = componentKeyStr.indexOf("#");
+        if (userDelimiterIndex != -1) {
+            String componentStr = componentKeyStr.substring(0, userDelimiterIndex);
+            long componentUser = Long.parseLong(componentKeyStr.substring(userDelimiterIndex + 12, componentKeyStr.length() - 1));
+            componentName = ComponentName.unflattenFromString(componentStr);
+            user = Utilities.notNullOrDefault(UserManagerCompat.getInstance(context)
+                    .getUserForSerialNumber(componentUser), Process.myUserHandle());
+        } else {
+            // No user provided, default to the current user
+            componentName = ComponentName.unflattenFromString(componentKeyStr);
+            user = Process.myUserHandle();
+        }
+        try {
+            return new ComponentKey(componentName, user);
+        } catch (NullPointerException e) {
+            throw new NullPointerException("Trying to create invalid component key: " + componentKeyStr);
+        }
+    }
+
+    public static boolean isRecentsEnabled() {
+        LauncherAppState las = LauncherAppState.getInstanceNoCreate();
+        if (las != null) {
+            Context context = las.getContext();
+            return OmegaAppKt.getOmegaApp(context).getRecentsEnabled();
+        }
+        return false;
+    }
+
+    public static Boolean isEmui() {
+        return !TextUtils.isEmpty(getSystemProperty("ro.build.version.emui", ""));
+    }
+
+    /**
+     * @param bitmap                the Bitmap to be scaled
+     * @param threshold             the maxium dimension (either width or height) of the scaled bitmap
+     * @param isNecessaryToKeepOrig is it necessary to keep the original bitmap? If not recycle the original bitmap to prevent memory leak.
+     *                              <p>
+     *                              Credit: https://gist.github.com/vxhviet/873d142b41217739a1302d337b7285ba
+     */
+    public static Bitmap getScaledDownBitmap(Bitmap bitmap, int threshold, boolean isNecessaryToKeepOrig) {
+        if (bitmap == null) return null;
+
+        int width = bitmap.getWidth();
+        int height = bitmap.getHeight();
+        int newWidth = width;
+        int newHeight = height;
+
+        if (width > height && width > threshold) {
+            newWidth = threshold;
+            newHeight = (int) (height * (float) newWidth / width);
+        }
+
+        if (width > height && width <= threshold) {
+            //the bitmap is already smaller than our required dimension, no need to resize it
+            return bitmap;
+        }
+
+        if (width < height && height > threshold) {
+            newHeight = threshold;
+            newWidth = (int) (width * (float) newHeight / height);
+        }
+
+        if (width < height && height <= threshold) {
+            //the bitmap is already smaller than our required dimension, no need to resize it
+            return bitmap;
+        }
+
+        if (width == height && width > threshold) {
+            newWidth = threshold;
+            newHeight = newWidth;
+        }
+
+        if (width == height && width <= threshold) {
+            //the bitmap is already smaller than our required dimension, no need to resize it
+            return bitmap;
+        }
+
+        return getResizedBitmap(bitmap, newWidth, newHeight, isNecessaryToKeepOrig);
+    }
+
+    private static Bitmap getResizedBitmap(Bitmap bm, int newWidth, int newHeight, boolean isNecessaryToKeepOrig) {
+        int width = bm.getWidth();
+        int height = bm.getHeight();
+        float scaleWidth = ((float) newWidth) / width;
+        float scaleHeight = ((float) newHeight) / height;
+        // CREATE A MATRIX FOR THE MANIPULATION
+        Matrix matrix = new Matrix();
+        // RESIZE THE BIT MAP
+        matrix.postScale(scaleWidth, scaleHeight);
+
+        // "RECREATE" THE NEW BITMAP
+        Bitmap resizedBitmap = Bitmap.createBitmap(bm, 0, 0, width, height, matrix, false);
+        if (!isNecessaryToKeepOrig) {
+            bm.recycle();
+        }
+        return resizedBitmap;
+    }
+
+    public static void checkRestoreSuccess(Context context) {
+        OmegaPreferences prefs = Utilities.getOmegaPrefs(context);
+        if (prefs.getRestoreSuccess()) {
+            prefs.setRestoreSuccess(false);
+            context.startActivity(new Intent(context, RestoreBackupActivity.class)
+                    .putExtra(RestoreBackupActivity.EXTRA_SUCCESS, true));
+        }
+    }
+
+    /**
+     * Returns true if {@param original} contains all entries defined in {@param updates} and
+     * have the same value.
+     * The comparison uses {@link Object#equals(Object)} to compare the values.
+     */
+    public static boolean containsAll(Bundle original, Bundle updates) {
+        for (String key : updates.keySet()) {
+            Object value1 = updates.get(key);
+            Object value2 = original.get(key);
+            if (value1 == null) {
+                if (value2 != null) {
+                    return false;
+                }
+            } else if (!value1.equals(value2)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public static int findDominantColorByHue(Bitmap bitmap, int samples) {
+        final int height = bitmap.getHeight();
+        final int width = bitmap.getWidth();
+        int sampleStride = (int) Math.sqrt((height * width) / samples);
+        if (sampleStride < 1) {
+            sampleStride = 1;
+        }
+
+        // This is an out-param, for getting the hsv values for an rgb
+        float[] hsv = new float[3];
+
+        // First get the best hue, by creating a histogram over 360 hue buckets,
+        // where each pixel contributes a score weighted by saturation, value, and alpha.
+        float[] hueScoreHistogram = new float[360];
+        float highScore = -1;
+        int bestHue = -1;
+
+        int[] pixels = new int[samples];
+        int pixelCount = 0;
+
+        for (int y = 0; y < height; y += sampleStride) {
+            for (int x = 0; x < width; x += sampleStride) {
+                int argb = bitmap.getPixel(x, y);
+                int alpha = 0xFF & (argb >> 24);
+                if (alpha < 0x80) {
+                    // Drop mostly-transparent pixels.
+                    continue;
+                }
+                // Remove the alpha channel.
+                int rgb = argb | 0xFF000000;
+                Color.colorToHSV(rgb, hsv);
+                // Bucket colors by the 360 integer hues.
+                int hue = (int) hsv[0];
+                if (hue < 0 || hue >= hueScoreHistogram.length) {
+                    // Defensively avoid array bounds violations.
+                    continue;
+                }
+                if (pixelCount < samples) {
+                    pixels[pixelCount++] = rgb;
+                }
+                float score = hsv[1] * hsv[2];
+                hueScoreHistogram[hue] += score;
+                if (hueScoreHistogram[hue] > highScore) {
+                    highScore = hueScoreHistogram[hue];
+                    bestHue = hue;
+                }
+            }
+        }
+
+        SparseArray<Float> rgbScores = new SparseArray<>();
+        int bestColor = 0xff000000;
+        highScore = -1;
+        // Go back over the RGB colors that match the winning hue,
+        // creating a histogram of weighted s*v scores, for up to 100*100 [s,v] buckets.
+        // The highest-scoring RGB color wins.
+        for (int i = 0; i < pixelCount; i++) {
+            int rgb = pixels[i];
+            Color.colorToHSV(rgb, hsv);
+            int hue = (int) hsv[0];
+            if (hue == bestHue) {
+                float s = hsv[1];
+                float v = hsv[2];
+                int bucket = (int) (s * 100) + (int) (v * 10000);
+                // Score by cumulative saturation * value.
+                float score = s * v;
+                Float oldTotal = rgbScores.get(bucket);
+                float newTotal = oldTotal == null ? score : oldTotal + score;
+                rgbScores.put(bucket, newTotal);
+                if (newTotal > highScore) {
+                    highScore = newTotal;
+                    // All the colors in the winning bucket are very similar. Last in wins.
+                    bestColor = rgb;
+                }
+            }
+        }
+        return bestColor;
     }
 
     /*FIN CUSTOM*/
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 9eeb2866b3..1018547c31 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -16,16 +16,6 @@
 
 package com.android.launcher3;
 
-import static com.android.launcher3.LauncherAnimUtils.OVERVIEW_TRANSITION_MS;
-import static com.android.launcher3.LauncherAnimUtils.SPRING_LOADED_EXIT_DELAY;
-import static com.android.launcher3.LauncherAnimUtils.SPRING_LOADED_TRANSITION_MS;
-import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_APPLICATION;
-import static com.android.launcher3.LauncherState.ALL_APPS;
-import static com.android.launcher3.LauncherState.NORMAL;
-import static com.android.launcher3.LauncherState.SPRING_LOADED;
-import static com.android.launcher3.config.FeatureFlags.ADAPTIVE_ICON_WINDOW_ANIM;
-import static com.android.launcher3.dragndrop.DragLayer.ALPHA_INDEX_OVERLAY;
-
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.LayoutTransition;
@@ -101,11 +91,23 @@
 import com.android.launcher3.widget.PendingAddShortcutInfo;
 import com.android.launcher3.widget.PendingAddWidgetInfo;
 import com.android.launcher3.widget.PendingAppWidgetHostView;
+import com.saggitt.omega.OmegaLauncher;
+import com.saggitt.omega.views.OmegaBackgroundView;
 
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.function.Predicate;
 
+import static com.android.launcher3.LauncherAnimUtils.OVERVIEW_TRANSITION_MS;
+import static com.android.launcher3.LauncherAnimUtils.SPRING_LOADED_EXIT_DELAY;
+import static com.android.launcher3.LauncherAnimUtils.SPRING_LOADED_TRANSITION_MS;
+import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_APPLICATION;
+import static com.android.launcher3.LauncherState.ALL_APPS;
+import static com.android.launcher3.LauncherState.NORMAL;
+import static com.android.launcher3.LauncherState.SPRING_LOADED;
+import static com.android.launcher3.config.FeatureFlags.ADAPTIVE_ICON_WINDOW_ANIM;
+import static com.android.launcher3.dragndrop.DragLayer.ALPHA_INDEX_OVERLAY;
+
 /**
  * The workspace is a wide area with a wallpaper and a finite number of pages.
  * Each page contains a number of icons, folders or widgets the user can
@@ -253,17 +255,20 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
      * Used to inflate the Workspace from XML.
      *
      * @param context The application's context.
-     * @param attrs The attributes set containing the Workspace's customization values.
+     * @param attrs   The attributes set containing the Workspace's customization values.
      */
     public Workspace(Context context, AttributeSet attrs) {
         this(context, attrs, 0);
     }
 
+    public boolean mPillQsb;
+    private int mFirstPageScrollX;
+
     /**
      * Used to inflate the Workspace from XML.
      *
-     * @param context The application's context.
-     * @param attrs The attributes set containing the Workspace's customization values.
+     * @param context  The application's context.
+     * @param attrs    The attributes set containing the Workspace's customization values.
      * @param defStyle Unused.
      */
     public Workspace(Context context, AttributeSet attrs, int defStyle) {
@@ -275,6 +280,8 @@ public Workspace(Context context, AttributeSet attrs, int defStyle) {
 
         mWallpaperOffset = new WallpaperOffsetInterpolator(this);
 
+        mPillQsb = FeatureFlags.QSB_ON_FIRST_SCREEN && Utilities.getOmegaPrefs(context).getUsePillQsb();
+
         setHapticFeedbackEnabled(false);
         initWorkspace();
 
@@ -485,8 +492,29 @@ public void onViewAdded(View child) {
         super.onViewAdded(child);
     }
 
+    public boolean isTouchActive() {
+        return mTouchState != TOUCH_STATE_REST;
+    }
+
+    private int getEmbeddedQsbId() {
+        if (mPillQsb) {
+            return R.id.qsb_container;
+        } else {
+            return R.id.search_container_workspace;
+        }
+    }
+
+    private int getEmbeddedQsbLayout() {
+        if (mPillQsb) {
+            return R.layout.qsb_container;
+        } else {
+            return R.layout.search_container_workspace;
+        }
+    }
+
     /**
      * Initializes and binds the first page
+     *
      * @param qsb an existing qsb to recycle or null.
      */
     public void bindAndInitFirstWorkspaceScreen(View qsb) {
@@ -499,17 +527,41 @@ public void bindAndInitFirstWorkspaceScreen(View qsb) {
         if (qsb == null) {
             // In transposed layout, we add the QSB in the Grid. As workspace does not touch the
             // edges, we do not need a full width QSB.
+            //qsb = LayoutInflater.from(getContext())
+            //        .inflate(R.layout.search_container_workspace,firstPage, false);
             qsb = LayoutInflater.from(getContext())
-                    .inflate(R.layout.search_container_workspace,firstPage, false);
+                    .inflate(getEmbeddedQsbLayout(), firstPage, false);
         }
 
         CellLayout.LayoutParams lp = new CellLayout.LayoutParams(0, 0, firstPage.getCountX(), 1);
         lp.canReorder = false;
-        if (!firstPage.addViewToCellLayout(qsb, 0, R.id.search_container_workspace, lp, true)) {
+        if (!firstPage.addViewToCellLayout(qsb, 0, getEmbeddedQsbId(), lp, true)) {
             Log.e(TAG, "Failed to add to item at (0, 0) to CellLayout");
         }
     }
 
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+
+        // Update the QSB to match the cell height. This is treating the QSB essentially as a child
+        // of workspace despite that it's not a true child.
+        // Note that it relies on the strict ordering of measuring the workspace before the QSB
+        // at the dragLayer level.
+        // Only measure the QSB when the view is enabled
+        if (mPillQsb && getChildCount() > 0) {
+            CellLayout firstPage = (CellLayout) getChildAt(0);
+            int cellHeight = firstPage.getCellHeight();
+
+            View qsbContainer = mLauncher.getQsbContainer();
+            ViewGroup.LayoutParams lp = qsbContainer.getLayoutParams();
+            if (cellHeight > 0 && lp.height != cellHeight) {
+                lp.height = cellHeight;
+                qsbContainer.setLayoutParams(lp);
+            }
+        }
+    }
+
     public void removeAllWorkspaceScreens() {
         // Disable all layout transitions before removing all pages to ensure that we don't get the
         // transition animations competing with us changing the scroll when we add pages
@@ -636,12 +688,85 @@ private void convertFinalScreenToEmptyScreenIfNecessary() {
         }
     }
 
+    public void removeScreen(int index, final boolean animate) {
+        if (mLauncher.isWorkspaceLoading()) {
+            return;
+        }
+
+        int currentPage = getNextPage();
+        snapToPage(index, SNAP_OFF_EMPTY_SCREEN_DURATION);
+        int id = getScreenIdForPageIndex(index);
+        fadeAndRemoveScreen(id, SNAP_OFF_EMPTY_SCREEN_DURATION,
+                FADE_EMPTY_SCREEN_DURATION, null, false);
+
+        CellLayout cl = mWorkspaceScreens.get(id);
+        mWorkspaceScreens.remove(id);
+        mScreenOrder.removeValue(id);
+
+        boolean isInAccessibleDrag = mLauncher.getAccessibilityDelegate().isInAccessibleDrag();
+
+        boolean pageShift = indexOfChild(cl) < currentPage;
+
+        if (isInAccessibleDrag) {
+            cl.enableAccessibleDrag(false, CellLayout.WORKSPACE_ACCESSIBILITY_DRAG);
+        }
+
+        removeView(cl);
+
+        if (getChildCount() == 0) {
+            addExtraEmptyScreen();
+        }
+
+        if (pageShift) {
+            setCurrentPage(currentPage - 1);
+        }
+    }
+
+    private void fadeAndRemoveScreen(int id, int delay, int duration, final Runnable onComplete,
+                                     final boolean stripEmptyScreens) {
+        // XXX: Do we need to update LM workspace screens below?
+        final CellLayout cl = mWorkspaceScreens.get(id);
+
+        mRemoveEmptyScreenRunnable = new Runnable() {
+            @Override
+            public void run() {
+                if (hasExtraEmptyScreen()) {
+                    mWorkspaceScreens.remove(id);
+                    mScreenOrder.removeValue(id);
+                    removeView(cl);
+                    if (stripEmptyScreens) {
+                        stripEmptyScreens();
+                    }
+                    // Update the page indicator to reflect the removed page.
+                    showPageIndicatorAtCurrentScroll();
+                }
+            }
+        };
+
+        ObjectAnimator oa = ObjectAnimator.ofFloat(cl, ALPHA, 0f);
+        oa.setDuration(duration);
+        oa.setStartDelay(delay);
+        oa.addListener(new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                if (mRemoveEmptyScreenRunnable != null) {
+                    mRemoveEmptyScreenRunnable.run();
+                }
+                if (onComplete != null) {
+                    onComplete.run();
+                }
+            }
+        });
+        oa.start();
+    }
+
+
     public void removeExtraEmptyScreen(final boolean animate, boolean stripEmptyScreens) {
         removeExtraEmptyScreenDelayed(animate, null, 0, stripEmptyScreens);
     }
 
     public void removeExtraEmptyScreenDelayed(final boolean animate, final Runnable onComplete,
-            final int delay, final boolean stripEmptyScreens) {
+                                              final int delay, final boolean stripEmptyScreens) {
         if (mLauncher.isWorkspaceLoading()) {
             // Don't strip empty screens if the workspace is still loading
             return;
@@ -787,6 +912,12 @@ public void stripEmptyScreens() {
             return;
         }
 
+        //TODO: PREFERENCE TO KEEP EMPTY SCREEN
+        /*if (OmegaPreferences.Companion.getInstance(mLauncher).getKeepEmptyScreens()) {
+            // Don't strip empty screens if we should keep them
+            return;
+        }*/
+
         if (isPageInTransition()) {
             mStripScreensOnPageStopMoving = true;
             return;
@@ -958,6 +1089,10 @@ protected void onScrollInteractionEnd() {
         }
     }
 
+    public boolean duringScrollInteraction() {
+        return mScrollInteractionBegan;
+    }
+
     public void setLauncherOverlay(LauncherOverlay overlay) {
         mLauncherOverlay = overlay;
         // A new overlay has been set. Reset event tracking
@@ -988,10 +1123,17 @@ protected void snapToDestination() {
         }
     }
 
+    private void onWorkspaceOverallScrollChanged() {
+        if (mPillQsb) {
+            mLauncher.getQsbContainer().setTranslationX(mOverlayTranslation + mFirstPageScrollX - getScrollX());
+        }
+    }
+
     @Override
     protected void onScrollChanged(int l, int t, int oldl, int oldt) {
         super.onScrollChanged(l, t, oldl, oldt);
 
+        onWorkspaceOverallScrollChanged();
         // Update the page indicator progress.
         boolean isTransitioning = mIsSwitchingState
                 || (getLayoutTransition() != null && getLayoutTransition().isRunning());
@@ -1011,11 +1153,13 @@ public void showPageIndicatorAtCurrentScroll() {
 
     @Override
     protected void overScroll(int amount) {
+        boolean inOptionsState = mLauncher.isInState(LauncherState.OPTIONS);
+
         boolean shouldScrollOverlay = mLauncherOverlay != null && !mScroller.isSpringing() &&
-                ((amount <= 0 && !mIsRtl) || (amount >= 0 && mIsRtl));
+                ((amount <= 0 && !mIsRtl) || (amount >= 0 && mIsRtl)) && !inOptionsState;
 
         boolean shouldZeroOverlay = mLauncherOverlay != null && mLastOverlayScroll != 0 &&
-                ((amount >= 0 && !mIsRtl) || (amount <= 0 && mIsRtl));
+                ((amount >= 0 && !mIsRtl) || (amount <= 0 && mIsRtl) || inOptionsState);
 
         if (shouldScrollOverlay) {
             if (!mStartedSendingScrollEvents && mScrollInteractionBegan) {
@@ -1025,7 +1169,7 @@ protected void overScroll(int amount) {
 
             mLastOverlayScroll = Math.abs(((float) amount) / getMeasuredWidth());
             mLauncherOverlay.onScrollChange(mLastOverlayScroll, mIsRtl);
-        } else {
+        } else if (!inOptionsState) {
             dampedOverScroll(amount);
         }
 
@@ -1056,7 +1200,7 @@ public void onOverlayScrollChanged(float scroll) {
             if (!mOverlayShown) {
                 mLauncher.getUserEventDispatcher().logActionOnContainer(Action.Touch.SWIPE,
                         Action.Direction.LEFT, ContainerType.WORKSPACE, 0);
-                mLauncher.getStatsLogManager().logSwipeOnContainer(true, 0);
+                //mLauncher.getStatsLogManager().logSwipeOnContainer(true, 0);
             }
             mOverlayShown = true;
             // Not announcing the overlay page for accessibility since it announces itself.
@@ -1066,7 +1210,7 @@ public void onOverlayScrollChanged(float scroll) {
                 if (!ued.isPreviousHomeGesture()) {
                     mLauncher.getUserEventDispatcher().logActionOnContainer(Action.Touch.SWIPE,
                         Action.Direction.RIGHT, ContainerType.WORKSPACE, -1);
-                    mLauncher.getStatsLogManager().logSwipeOnContainer(false, -1);
+                    //mLauncher.getStatsLogManager().logSwipeOnContainer(false, -1);
                 }
             } else if (Float.compare(mOverlayTranslation, 0f) != 0) {
                 // When arriving to 0 overscroll from non-zero overscroll, announce page for
@@ -1099,6 +1243,12 @@ public void onOverlayScrollChanged(float scroll) {
         // device I've tried, translating the launcher causes things to get quite laggy.
         mLauncher.getDragLayer().setTranslationX(transX);
         mLauncher.getDragLayer().getAlphaProperty(ALPHA_INDEX_OVERLAY).setValue(alpha);
+
+        if (mLauncher instanceof OmegaLauncher) {
+            ((OmegaLauncher) mLauncher).getBackground().getBlurAlphas().getProperty(
+                    OmegaBackgroundView.ALPHA_INDEX_OVERLAY).setValue(1 - alpha);
+        }
+        mLauncher.mAllAppsController.setOverlayScroll(transX);
     }
 
     /**
@@ -1260,7 +1410,9 @@ protected void onLayout(boolean changed, int left, int top, int right, int botto
             mWallpaperOffset.jumpToFinal();
         }
         super.onLayout(changed, left, top, right, bottom);
+        mFirstPageScrollX = getScrollForPage(0);
         updatePageAlphaValues();
+        onWorkspaceOverallScrollChanged();
     }
 
     @Override
@@ -1428,7 +1580,10 @@ public AccessibilityNodeInfo createAccessibilityNodeInfo() {
             // IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS.
             return null;
         }
-        return super.createAccessibilityNodeInfo();
+        if (Utilities.ATLEAST_Q)
+            return super.createAccessibilityNodeInfo();
+        else
+            return null;
     }
 
     private void updateAccessibilityFlags(int accessibilityFlag, CellLayout page) {
@@ -2836,14 +2991,11 @@ public void removeWidget(int appWidgetId) {
      * Removes all folder listeners
      */
     public void removeFolderListeners() {
-        mapOverItems(new ItemOperator() {
-            @Override
-            public boolean evaluate(ItemInfo info, View view) {
-                if (view instanceof FolderIcon) {
-                    ((FolderIcon) view).removeListeners();
-                }
-                return false;
+        mapOverItems((info, view) -> {
+            if (view instanceof FolderIcon) {
+                ((FolderIcon) view).removeListeners();
             }
+            return false;
         });
     }
 
@@ -3036,15 +3188,12 @@ private View getFirstMatch(CellLayout[] cellLayouts, final ItemOperator... opera
     }
 
     void clearDropTargets() {
-        mapOverItems(new ItemOperator() {
-            @Override
-            public boolean evaluate(ItemInfo info, View v) {
-                if (v instanceof DropTarget) {
-                    mDragController.removeDropTarget((DropTarget) v);
-                }
-                // not done, process all the shortcuts
-                return false;
+        mapOverItems((info, v) -> {
+            if (v instanceof DropTarget) {
+                mDragController.removeDropTarget((DropTarget) v);
             }
+            // not done, process all the shortcuts
+            return false;
         });
     }
 
@@ -3331,6 +3480,23 @@ public void fillInLogContainerData(View v, ItemInfo info, Target target, Target
         }
     }
 
+    public void refreshChildren() {
+        final int screenCount = getChildCount();
+        int x = mLauncher.getDeviceProfile().inv.numColumns;
+        int y = mLauncher.getDeviceProfile().inv.numRows;
+        for (int i = 0; i < screenCount; i++) {
+            final CellLayout layout = (CellLayout) getChildAt(i);
+            layout.setGridSize(x, y);
+        }
+
+        View qsb = findViewById(R.id.search_container_workspace);
+        if (qsb != null && qsb.getLayoutParams() instanceof CellLayout.LayoutParams) {
+            ((CellLayout.LayoutParams) qsb.getLayoutParams()).cellHSpan = x;
+        }
+
+        requestLayout();
+    }
+
     /**
      * Used as a workaround to ensure that the AppWidgetService receives the
      * PACKAGE_ADDED broadcast before updating widgets.
@@ -3387,6 +3553,14 @@ public void notifyWidgetProvidersChanged() {
         }
     }
 
+    public interface OnStateChangeListener {
+
+        /**
+         * Called when the workspace state is changing.
+         */
+        void prepareStateChange(AnimatorSetBuilder builder);
+    }
+
     private class StateTransitionListener extends AnimatorListenerAdapter
             implements AnimatorUpdateListener {
 
diff --git a/src/com/android/launcher3/WorkspaceItemInfo.java b/src/com/android/launcher3/WorkspaceItemInfo.java
index d282ae4705..4644c3778d 100644
--- a/src/com/android/launcher3/WorkspaceItemInfo.java
+++ b/src/com/android/launcher3/WorkspaceItemInfo.java
@@ -16,22 +16,25 @@
 
 package com.android.launcher3;
 
-import android.app.Person;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ShortcutInfo;
+import android.graphics.Bitmap;
 import android.text.TextUtils;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.android.launcher3.LauncherSettings.Favorites;
 import com.android.launcher3.icons.IconCache;
+import com.android.launcher3.model.ModelWriter;
+import com.android.launcher3.shortcuts.ShortcutInfoCompat;
 import com.android.launcher3.shortcuts.ShortcutKey;
-import com.android.launcher3.uioverrides.UiFactory;
 import com.android.launcher3.util.ContentWriter;
+import com.saggitt.omega.iconpack.IconPackManager;
 
-import java.util.Arrays;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Represents a launchable icon on the workspaces and in folders.
@@ -94,14 +97,20 @@ public class WorkspaceItemInfo extends ItemInfoWithIcon {
      * A set of person's Id associated with the WorkspaceItemInfo, this is only used if the item
      * represents a deep shortcut.
      */
-    @NonNull private String[] personKeys = Utilities.EMPTY_STRING_ARRAY;
+    @NonNull
+    private String[] personKeys = Utilities.EMPTY_STRING_ARRAY;
+
+    public String swipeUpAction;
+    public CharSequence customTitle;
+    public Bitmap customIcon;
+    public IconPackManager.CustomIconEntry customIconEntry;
 
+    public ShortcutInfoCompat shortcutInfo;
     /**
      * The installation progress [0-100] of the package that this shortcut represents.
      */
     private int mInstallProgress;
 
-
     public WorkspaceItemInfo() {
         itemType = LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT;
     }
@@ -213,7 +222,7 @@ public String[] getPersonKeys() {
     public ComponentName getTargetComponent() {
         ComponentName cn = super.getTargetComponent();
         if (cn == null && (itemType == Favorites.ITEM_TYPE_SHORTCUT
-                || hasStatusFlag(FLAG_SUPPORTS_WEB_UI|FLAG_AUTOINSTALL_ICON|FLAG_RESTORED_ICON))) {
+                || hasStatusFlag(FLAG_SUPPORTS_WEB_UI | FLAG_AUTOINSTALL_ICON | FLAG_RESTORED_ICON))) {
             // Legacy shortcuts and promise icons with web UI may not have a componentName but just
             // a packageName. In that case create a dummy componentName instead of adding additional
             // check everywhere.
@@ -223,6 +232,43 @@ public ComponentName getTargetComponent() {
         return cn;
     }
 
+    private void updateDatabase(Context context, boolean updateIcon, boolean reload) {
+        if (updateIcon)
+            ModelWriter.modifyItemInDatabase(context, this, (String) customTitle, swipeUpAction,
+                    customIconEntry, customIcon, true, reload);
+        else
+            ModelWriter.modifyItemInDatabase(context, this, (String) customTitle, swipeUpAction,
+                    null, null, false, reload);
+    }
+
+    public void onLoadCustomizations(String titleAlias, String swipeUpAction,
+                                     IconPackManager.CustomIconEntry customIcon, Bitmap icon) {
+        customTitle = titleAlias;
+        customIconEntry = customIcon;
+        this.customIcon = icon;
+        this.swipeUpAction = swipeUpAction;
+    }
+
+    public void setTitle(@NotNull Context context, @Nullable String title) {
+        customTitle = title;
+        updateDatabase(context, false, true);
+    }
+
+    public void setIconEntry(@NotNull Context context, @Nullable IconPackManager.CustomIconEntry iconEntry) {
+        customIconEntry = iconEntry;
+        updateDatabase(context, true, false);
+    }
+
+    public void setIcon(@NotNull Context context, @Nullable Bitmap icon) {
+        customIcon = icon;
+        updateDatabase(context, true, true);
+    }
+
+    public void setSwipeUpAction(@NonNull Context context, @Nullable String action) {
+        swipeUpAction = action;
+        updateDatabase(context, false, true);
+    }
+
     @Override
     public ItemInfoWithIcon clone() {
         return new WorkspaceItemInfo(this);
diff --git a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java
index 7a7e1fee6c..bf87126541 100644
--- a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java
+++ b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java
@@ -16,9 +16,25 @@
 
 package com.android.launcher3;
 
+import android.view.View;
+import android.view.animation.Interpolator;
+
+import com.android.launcher3.LauncherState.PageAlphaProvider;
+import com.android.launcher3.LauncherState.ScaleAndTranslation;
+import com.android.launcher3.LauncherStateManager.AnimationConfig;
+import com.android.launcher3.anim.AnimatorSetBuilder;
+import com.android.launcher3.anim.PropertySetter;
+import com.android.launcher3.dragndrop.DragLayer;
+import com.android.launcher3.graphics.WorkspaceAndHotseatScrim;
+import com.saggitt.omega.OmegaLauncher;
+import com.saggitt.omega.util.InvertedMultiValueAlpha;
+import com.saggitt.omega.views.OmegaBackgroundView;
+import com.saggitt.omega.views.OptionsPanel;
+
 import static com.android.launcher3.LauncherAnimUtils.DRAWABLE_ALPHA;
 import static com.android.launcher3.LauncherAnimUtils.SCALE_PROPERTY;
 import static com.android.launcher3.LauncherState.HOTSEAT_ICONS;
+import static com.android.launcher3.LauncherState.OPTIONS_VIEW;
 import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_HOTSEAT_SCALE;
 import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_HOTSEAT_TRANSLATE;
 import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_WORKSPACE_FADE;
@@ -29,16 +45,7 @@
 import static com.android.launcher3.anim.PropertySetter.NO_ANIM_PROPERTY_SETTER;
 import static com.android.launcher3.graphics.WorkspaceAndHotseatScrim.SCRIM_PROGRESS;
 import static com.android.launcher3.graphics.WorkspaceAndHotseatScrim.SYSUI_PROGRESS;
-
-import android.view.View;
-import android.view.animation.Interpolator;
-
-import com.android.launcher3.LauncherState.PageAlphaProvider;
-import com.android.launcher3.LauncherState.ScaleAndTranslation;
-import com.android.launcher3.LauncherStateManager.AnimationConfig;
-import com.android.launcher3.anim.AnimatorSetBuilder;
-import com.android.launcher3.anim.PropertySetter;
-import com.android.launcher3.graphics.WorkspaceAndHotseatScrim;
+import static com.saggitt.omega.views.OmegaBackgroundView.ALPHA_INDEX_STATE;
 
 /**
  * Manages the animations between each of the workspace states.
@@ -99,9 +106,16 @@ private void setWorkspaceProperty(LauncherState state, PropertySetter propertySe
                 // together. Since both hotseat and workspace can move, transform the point
                 // manually instead of using dragLayer.getDescendantCoordRelativeToSelf and
                 // related methods.
-                hotseat.setPivotY(mWorkspace.getPivotY() + mWorkspace.getTop() - hotseat.getTop());
+                /*hotseat.setPivotY(mWorkspace.getPivotY() + mWorkspace.getTop() - hotseat.getTop());
                 hotseat.setPivotX(mWorkspace.getPivotX()
-                        + mWorkspace.getLeft() - hotseat.getLeft());
+                        + mWorkspace.getLeft() - hotseat.getLeft());*/
+                DragLayer dragLayer = mLauncher.getDragLayer();
+                float[] workspacePivot =
+                        new float[]{mWorkspace.getPivotX(), mWorkspace.getPivotY()};
+                dragLayer.getDescendantCoordRelativeToSelf(mWorkspace, workspacePivot);
+                dragLayer.mapCoordInSelfToDescendant(hotseat, workspacePivot);
+                hotseat.setPivotX(workspacePivot[0]);
+                hotseat.setPivotY(workspacePivot[1]);
             }
             float hotseatScale = hotseatScaleAndTranslation.scale;
             Interpolator hotseatScaleInterpolator = builder.getInterpolator(ANIM_HOTSEAT_SCALE,
@@ -114,6 +128,9 @@ private void setWorkspaceProperty(LauncherState state, PropertySetter propertySe
             propertySetter.setViewAlpha(mLauncher.getWorkspace().getPageIndicator(),
                     hotseatIconsAlpha, fadeInterpolator);
         }
+        // Set options view
+        OptionsPanel optionsPanel = OmegaLauncher.getLauncher(mLauncher).getOptionsView();
+        propertySetter.setViewAlpha(optionsPanel, (elements & OPTIONS_VIEW) != 0 ? 1 : 0, fadeInterpolator);
 
         if (!config.playNonAtomicComponent()) {
             // Only the alpha and scale, handled above, are included in the atomic animation.
@@ -143,6 +160,10 @@ public void setScrim(PropertySetter propertySetter, LauncherState state) {
         propertySetter.setFloat(scrim, SCRIM_PROGRESS, state.getWorkspaceScrimAlpha(mLauncher),
                 LINEAR);
         propertySetter.setFloat(scrim, SYSUI_PROGRESS, state.hasSysUiScrim ? 1 : 0, LINEAR);
+
+        OmegaBackgroundView background = OmegaLauncher.getLauncher(mLauncher).getBackground();
+        propertySetter.setFloat(background.getBlurAlphas().getProperty(ALPHA_INDEX_STATE),
+                InvertedMultiValueAlpha.VALUE, state.getWorkspaceBlurAlpha(mLauncher), LINEAR);
     }
 
     public void applyChildState(LauncherState state, CellLayout cl, int childIndex) {
diff --git a/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java b/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java
index 0c12c60a08..94b38159c3 100644
--- a/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java
+++ b/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java
@@ -1,9 +1,5 @@
 package com.android.launcher3.accessibility;
 
-import static android.view.accessibility.AccessibilityNodeInfo.ACTION_LONG_CLICK;
-
-import static com.android.launcher3.LauncherState.NORMAL;
-
 import android.app.AlertDialog;
 import android.appwidget.AppWidgetProviderInfo;
 import android.content.DialogInterface;
@@ -48,6 +44,9 @@
 
 import java.util.ArrayList;
 
+import static android.view.accessibility.AccessibilityNodeInfo.ACTION_LONG_CLICK;
+import static com.android.launcher3.LauncherState.NORMAL;
+
 public class LauncherAccessibilityDelegate extends AccessibilityDelegate implements DragListener {
 
     private static final String TAG = "LauncherAccessibilityDelegate";
@@ -61,6 +60,7 @@ public class LauncherAccessibilityDelegate extends AccessibilityDelegate impleme
     protected static final int RESIZE = R.id.action_resize;
     public static final int DEEP_SHORTCUTS = R.id.action_deep_shortcuts;
     public static final int SHORTCUTS_AND_NOTIFICATIONS = R.id.action_shortcuts_and_notifications;
+    public static final int CUSTOMIZE = R.id.action_customize;
 
     public enum DragType {
         ICON,
diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index 3c7c81272c..b13b914daf 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -65,7 +65,11 @@
 import com.android.launcher3.views.BottomUserEducationView;
 import com.android.launcher3.views.RecyclerViewFastScroller;
 import com.android.launcher3.views.SpringRelativeLayout;
-import com.saggitt.omega.allapps.PredictionsFloatingHeader;
+import com.saggitt.omega.OmegaPreferences;
+import com.saggitt.omega.allapps.AllAppsTabs;
+import com.saggitt.omega.allapps.AllAppsTabsController;
+import com.saggitt.omega.qsb.AllAppsQsbLayout;
+import com.saggitt.omega.util.OmegaUtilsKt;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -83,28 +87,29 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
     private static final int ALPHA_CHANNEL_COUNT = 2;
 
     private final Launcher mLauncher;
-    private final AdapterHolder[] mAH;
     private final ItemInfoMatcher mPersonalMatcher = ItemInfoMatcher.ofUser(Process.myUserHandle());
     private final ItemInfoMatcher mWorkMatcher = ItemInfoMatcher.not(mPersonalMatcher);
     private final AllAppsStore mAllAppsStore = new AllAppsStore();
 
-    private final Paint mNavBarScrimPaint;
-    private int mNavBarScrimHeight = 0;
+    protected final Paint mNavBarScrimPaint;
+    protected int mNavBarScrimHeight = 0;
+    protected int mNavBarScrimColor;
 
     private SearchUiManager mSearchUiManager;
     private View mSearchContainer;
     private AllAppsPagedView mViewPager;
-    private PredictionsFloatingHeader mHeader;
+    private FloatingHeaderView mHeader;
+    private AdapterHolder[] mAH;
 
-    private SpannableStringBuilder mSearchQueryBuilder = null;
-
-    private boolean mUsingTabs;
+    public boolean mUsingTabs;
     private boolean mSearchModeWhileUsingTabs = false;
 
     private RecyclerViewFastScroller mTouchHandler;
     private final Point mFastScrollerOffset = new Point();
 
     private final MultiValueAlpha mMultiValueAlpha;
+    private SpannableStringBuilder mSearchQueryBuilder;
+    protected AllAppsTabsController mTabsController;
 
     public AllAppsContainerView(Context context) {
         this(context, null);
@@ -123,12 +128,13 @@ public AllAppsContainerView(Context context, AttributeSet attrs, int defStyleAtt
         mSearchQueryBuilder = new SpannableStringBuilder();
         Selection.setSelection(mSearchQueryBuilder, 0);
 
-        mAH = new AdapterHolder[2];
-        mAH[AdapterHolder.MAIN] = new AdapterHolder(false /* isWork */);
-        mAH[AdapterHolder.WORK] = new AdapterHolder(true /* isWork */);
+        AllAppsTabs allAppsTabs = new AllAppsTabs(context);
+        mTabsController = new AllAppsTabsController(allAppsTabs, this);
+        createHolders();
 
         mNavBarScrimPaint = new Paint();
-        mNavBarScrimPaint.setColor(Themes.getAttrColor(context, R.attr.allAppsNavBarScrimColor));
+        mNavBarScrimColor = Themes.getAttrColor(context, R.attr.allAppsNavBarScrimColor);
+        mNavBarScrimPaint.setColor(mNavBarScrimColor);
 
         mAllAppsStore.addUpdateListener(this::onAppsUpdated);
 
@@ -139,6 +145,10 @@ public AllAppsContainerView(Context context, AttributeSet attrs, int defStyleAtt
         mMultiValueAlpha = new MultiValueAlpha(this, ALPHA_CHANNEL_COUNT);
     }
 
+    public void createHolders() {
+        mAH = mTabsController.createHolders();
+    }
+
     public AllAppsStore getAppsStore() {
         return mAllAppsStore;
     }
@@ -167,6 +177,7 @@ public void onDeviceProfileChanged(DeviceProfile dp) {
     }
 
     private void onAppsUpdated() {
+        boolean force = false;
         if (FeatureFlags.ALL_APPS_TABS_ENABLED) {
             boolean hasWorkApps = false;
             for (AppInfo app : mAllAppsStore.getApps()) {
@@ -175,8 +186,11 @@ private void onAppsUpdated() {
                     break;
                 }
             }
-            rebindAdapters(hasWorkApps);
+            AllAppsTabs allAppsTabs = mTabsController.getTabs();
+            force = allAppsTabs.getHasWorkApps() != hasWorkApps;
+            allAppsTabs.setHasWorkApps(hasWorkApps);
         }
+        rebindAdapters(mTabsController.getShouldShowTabs(), force);
     }
 
     /**
@@ -316,11 +330,12 @@ public void setInsets(Rect insets) {
                 + grid.cellLayoutPaddingLeftRightPx;
 
         for (int i = 0; i < mAH.length; i++) {
-            mAH[i].adapter.setAppsPerRow(grid.inv.numAllAppsColumns);
+            mAH[i].adapter.setAppsPerRow(grid.inv.numColsDrawer);
             mAH[i].padding.bottom = insets.bottom;
             mAH[i].padding.left = mAH[i].padding.right = leftRightPadding;
             mAH[i].applyPadding();
         }
+        mTabsController.setPadding(leftRightPadding, insets.bottom);
 
         ViewGroup.MarginLayoutParams mlp = (MarginLayoutParams) getLayoutParams();
         if (grid.isVerticalBarLayout()) {
@@ -331,6 +346,11 @@ public void setInsets(Rect insets) {
             mlp.leftMargin = mlp.rightMargin = 0;
             setPadding(0, 0, 0, 0);
         }
+        if (!OmegaPreferences.Companion.getInstance(getContext()).getAllAppsSearch()) {
+            AllAppsQsbLayout qsb = (AllAppsQsbLayout) mSearchContainer;
+            mlp.topMargin = -(qsb.getTopMargin(insets) + qsb.getLayoutParams().height);
+        }
+
         setLayoutParams(mlp);
 
         InsettableFrameLayout.dispatchInsets(this, insets);
@@ -364,6 +384,11 @@ public int getCanvasClipTopForOverscroll() {
         return mSpringViews.get(getSearchView().getId()) ? 0 : mHeader.getTop();
     }
 
+    public void reloadTabs() {
+        mTabsController.reloadTabs();
+        rebindAdapters(mTabsController.getShouldShowTabs(), true);
+    }
+
     private void rebindAdapters(boolean showTabs) {
         rebindAdapters(showTabs, false /* force */);
     }
@@ -372,24 +397,36 @@ private void rebindAdapters(boolean showTabs, boolean force) {
         if (showTabs == mUsingTabs && !force) {
             return;
         }
+        int currentTab = mViewPager != null ? mViewPager.getNextPage() : 0;
+        mTabsController.unregisterIconContainers(mAllAppsStore);
+
+        createHolders();
         replaceRVContainer(showTabs);
         mUsingTabs = showTabs;
 
-        mAllAppsStore.unregisterIconContainer(mAH[AdapterHolder.MAIN].recyclerView);
-        mAllAppsStore.unregisterIconContainer(mAH[AdapterHolder.WORK].recyclerView);
-
         if (mUsingTabs) {
-            mAH[AdapterHolder.MAIN].setup(mViewPager.getChildAt(0), mPersonalMatcher);
-            mAH[AdapterHolder.WORK].setup(mViewPager.getChildAt(1), mWorkMatcher);
-            onTabChanged(mViewPager.getNextPage());
+            mTabsController.setup(mViewPager);
+            PersonalWorkSlidingTabStrip tabStrip = findViewById(R.id.tabs);
+            tabStrip.inflateButtons(mTabsController.getTabs());
+            if (currentTab == 0) {
+                tabStrip.setScroll(0, 1);
+            }
+            onTabChanged(currentTab);
         } else {
-            mAH[AdapterHolder.MAIN].setup(findViewById(R.id.apps_list_view), null);
-            mAH[AdapterHolder.WORK].recyclerView = null;
+            mTabsController.setup((View) findViewById(R.id.apps_list_view));
+            AllAppsRecyclerView recyclerView = mAH[AdapterHolder.MAIN].recyclerView;
+            if (recyclerView != null) {
+                OmegaUtilsKt.runOnAttached(recyclerView, () ->
+                        recyclerView.setScrollbarColor(Utilities.getOmegaPrefs(getContext()).getAccentColor()));
+            }
         }
         setupHeader();
 
-        mAllAppsStore.registerIconContainer(mAH[AdapterHolder.MAIN].recyclerView);
-        mAllAppsStore.registerIconContainer(mAH[AdapterHolder.WORK].recyclerView);
+        mTabsController.registerIconContainers(mAllAppsStore);
+        if (mViewPager != null) {
+            mViewPager.snapToPage(Math.min(mTabsController.getTabsCount() - 1, currentTab), 0);
+        }
+
     }
 
     private void replaceRVContainer(boolean showTabs) {
@@ -401,16 +438,39 @@ private void replaceRVContainer(boolean showTabs) {
         View oldView = getRecyclerViewContainer();
         int index = indexOfChild(oldView);
         removeView(oldView);
+
+        //PREPARE FOR PAGED VIEW
+        /*switch (drawerMode){
+            case Config.DRAWER_VERTICAL:
+                layout = showTabs ? R.layout.all_apps_tabs : R.layout.all_apps_rv_layout;
+                break;
+            case Config.DRAWER_HORIZONTAL:
+                layout = R.layout.all_apps_paged_layout;
+                break;
+            default:
+                layout = R.layout.all_apps_rv_layout;;
+        }*/
+
         int layout = showTabs ? R.layout.all_apps_tabs : R.layout.all_apps_rv_layout;
         View newView = LayoutInflater.from(getContext()).inflate(layout, this, false);
         addView(newView, index);
+
+        /*if(drawerMode==Config.DRAWER_HORIZONTAL){
+            mViewPager = (AllAppsPagedView) newView;
+            mViewPager.addPages(mTabsController.getTabsCount());
+            mViewPager.initParentViews(this);
+            mViewPager.getPageIndicator().setContainerView(this);
+        }*/
+
         if (showTabs) {
             mViewPager = (AllAppsPagedView) newView;
+            mViewPager.addTabs(mTabsController.getTabsCount());
             mViewPager.initParentViews(this);
             mViewPager.getPageIndicator().setContainerView(this);
         } else {
             mViewPager = null;
         }
+
     }
 
     public View getRecyclerViewContainer() {
@@ -418,24 +478,22 @@ public View getRecyclerViewContainer() {
     }
 
     public void onTabChanged(int pos) {
-        mHeader.setMainActive(pos == 0);
-        reset(true /* animate */);
+        pos = Utilities.boundToRange(pos, 0, mTabsController.getTabsCount() - 1);
+        mHeader.setCurrentActive(pos);
+        reset(true);
         if (mAH[pos].recyclerView != null) {
             mAH[pos].recyclerView.bindFastScrollbar();
+            mAH[pos].recyclerView.setScrollbarColor(Utilities.getOmegaPrefs(getContext()).getAccentColor());
 
-            findViewById(R.id.tab_personal)
-                    .setOnClickListener((View view) -> mViewPager.snapToPage(AdapterHolder.MAIN));
-            findViewById(R.id.tab_work)
-                    .setOnClickListener((View view) -> mViewPager.snapToPage(AdapterHolder.WORK));
-
+            mTabsController.bindButtons(findViewById(R.id.tabs), mViewPager);
         }
-        if (pos == AdapterHolder.WORK) {
+        if (mAH[pos].isWork) {
             BottomUserEducationView.showIfNeeded(mLauncher);
         }
     }
 
     // Used by tests only
-    private boolean isDescendantViewVisible(int viewId) {
+/*    private boolean isDescendantViewVisible(int viewId) {
         final View view = findViewById(viewId);
         if (view == null) return false;
 
@@ -443,16 +501,17 @@ private boolean isDescendantViewVisible(int viewId) {
 
         return view.getGlobalVisibleRect(new Rect());
     }
-
+*/
     // Used by tests only
-    public boolean isPersonalTabVisible() {
+    /*public boolean isPersonalTabVisible() {
         return isDescendantViewVisible(R.id.tab_personal);
-    }
+    }*/
 
     // Used by tests only
-    public boolean isWorkTabVisible() {
+    /*public boolean isWorkTabVisible() {
         return isDescendantViewVisible(R.id.tab_work);
     }
+    */
 
     public AlphabeticalAppsList getApps() {
         return mAH[AdapterHolder.MAIN].appsList;
@@ -466,7 +525,7 @@ public Collection<AlphabeticalAppsList> getAppsLists() {
         return results;
     }
 
-    public PredictionsFloatingHeader getFloatingHeaderView() {
+    public FloatingHeaderView getFloatingHeaderView() {
         return mHeader;
     }
 
@@ -485,19 +544,18 @@ public RecyclerViewFastScroller getScrollBar() {
 
     public void setupHeader() {
         mHeader.setVisibility(View.VISIBLE);
-        //mHeader.setup(mAH, mAH[AllAppsContainerView.AdapterHolder.WORK].recyclerView == null);
         mHeader.setup(mAH, !mUsingTabs);
 
         int padding = mHeader.getMaxTranslation();
-        for (int i = 0; i < mAH.length; i++) {
-            mAH[i].padding.top = padding;
-            mAH[i].applyPadding();
+        for (AdapterHolder adapterHolder : mAH) {
+            adapterHolder.padding.top = padding;
+            adapterHolder.applyPadding();
         }
     }
 
     public void setLastSearchQuery(String query) {
-        for (int i = 0; i < mAH.length; i++) {
-            mAH[i].adapter.setLastSearchQuery(query);
+        for (AdapterHolder adapterHolder : mAH) {
+            adapterHolder.adapter.setLastSearchQuery(query);
         }
         if (mUsingTabs) {
             mSearchModeWhileUsingTabs = true;
@@ -582,6 +640,10 @@ public void getDrawingRect(Rect outRect) {
         outRect.offset(0, (int) getTranslationY());
     }
 
+    public AdapterHolder createHolder(boolean isWork) {
+        return new AdapterHolder(isWork);
+    }
+
     public class AdapterHolder {
         public static final int MAIN = 0;
         public static final int WORK = 1;
@@ -589,18 +651,20 @@ public class AdapterHolder {
         public final AllAppsGridAdapter adapter;
         final LinearLayoutManager layoutManager;
         final AlphabeticalAppsList appsList;
-        final Rect padding = new Rect();
-        AllAppsRecyclerView recyclerView;
+        public final Rect padding = new Rect();
+        public AllAppsRecyclerView recyclerView;
         boolean verticalFadingEdge;
 
-        AdapterHolder(boolean isWork) {
+        private boolean isWork;
+
+        public AdapterHolder(boolean isWork) {
             appsList = new AlphabeticalAppsList(mLauncher, mAllAppsStore, isWork);
             adapter = new AllAppsGridAdapter(mLauncher, appsList);
             appsList.setAdapter(adapter);
             layoutManager = adapter.getLayoutManager();
         }
 
-        void setup(@NonNull View rv, @Nullable ItemInfoMatcher matcher) {
+        public void setup(@NonNull View rv, @Nullable ItemInfoMatcher matcher) {
             appsList.updateItemFilter(matcher);
             recyclerView = (AllAppsRecyclerView) rv;
             recyclerView.setEdgeEffectFactory(createEdgeEffectFactory());
@@ -617,7 +681,7 @@ void setup(@NonNull View rv, @Nullable ItemInfoMatcher matcher) {
             applyPadding();
         }
 
-        void applyPadding() {
+        public void applyPadding() {
             if (recyclerView != null) {
                 recyclerView.setPadding(padding.left, padding.top, padding.right, padding.bottom);
             }
@@ -628,6 +692,15 @@ public void applyVerticalFadingEdgeEnabled(boolean enabled) {
             mAH[AdapterHolder.MAIN].recyclerView.setVerticalFadingEdgeEnabled(!mUsingTabs
                     && verticalFadingEdge);
         }
+
+        public void setIsWork(boolean isWork) {
+            this.isWork = isWork;
+            appsList.setIsWork(isWork);
+        }
+
+        public boolean isWork() {
+            return isWork;
+        }
     }
 
     @Override
diff --git a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
index bb212686e9..28e977f2ff 100644
--- a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
+++ b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
@@ -24,27 +24,34 @@
 import android.view.View.OnFocusChangeListener;
 import android.view.ViewGroup;
 import android.view.accessibility.AccessibilityEvent;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.core.view.accessibility.AccessibilityEventCompat;
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
+import androidx.core.view.accessibility.AccessibilityRecordCompat;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.android.launcher3.AppInfo;
 import com.android.launcher3.BubbleTextView;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.R;
+import com.android.launcher3.Utilities;
 import com.android.launcher3.allapps.AlphabeticalAppsList.AdapterItem;
 import com.android.launcher3.compat.UserManagerCompat;
+import com.android.launcher3.folder.FolderIcon;
 import com.android.launcher3.model.AppLaunchTracker;
 import com.android.launcher3.touch.ItemClickHandler;
 import com.android.launcher3.touch.ItemLongClickListener;
 import com.android.launcher3.util.PackageManagerHelper;
+import com.saggitt.omega.search.SearchProvider;
+import com.saggitt.omega.search.SearchProviderController;
+import com.saggitt.omega.search.webproviders.WebSearchProvider;
 
 import java.util.List;
 
-import androidx.core.view.accessibility.AccessibilityEventCompat;
-import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
-import androidx.core.view.accessibility.AccessibilityRecordCompat;
-import androidx.recyclerview.widget.GridLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
 /**
  * The grid view adapter of all the apps.
  */
@@ -66,9 +73,15 @@ public class AllAppsGridAdapter extends RecyclerView.Adapter<AllAppsGridAdapter.
     public static final int VIEW_TYPE_ALL_APPS_DIVIDER = 1 << 4;
     public static final int VIEW_TYPE_WORK_TAB_FOOTER = 1 << 5;
 
+    // Drawer folders
+    public static final int VIEW_TYPE_FOLDER = 1 << 6;
+
+    // Web search suggestions
+    public static final int VIEW_TYPE_SEARCH_SUGGESTION = 1 << 7;
+
     // Common view type masks
     public static final int VIEW_TYPE_MASK_DIVIDER = VIEW_TYPE_ALL_APPS_DIVIDER;
-    public static final int VIEW_TYPE_MASK_ICON = VIEW_TYPE_ICON;
+    public static final int VIEW_TYPE_MASK_ICON = VIEW_TYPE_ICON | VIEW_TYPE_FOLDER;
 
 
     public interface BindViewCallback {
@@ -200,7 +213,7 @@ public AllAppsGridAdapter(Launcher launcher, AlphabeticalAppsList apps) {
         mGridLayoutMgr.setSpanSizeLookup(mGridSizer);
         mLayoutInflater = LayoutInflater.from(launcher);
 
-        setAppsPerRow(mLauncher.getDeviceProfile().inv.numAllAppsColumns);
+        setAppsPerRow(mLauncher.getDeviceProfile().inv.numColsDrawer);
     }
 
     public void setAppsPerRow(int appsPerRow) {
@@ -277,6 +290,19 @@ public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
             case VIEW_TYPE_WORK_TAB_FOOTER:
                 View footer = mLayoutInflater.inflate(R.layout.work_tab_footer, parent, false);
                 return new ViewHolder(footer);
+
+            case VIEW_TYPE_FOLDER:
+                FrameLayout layout = new FrameLayout(mLauncher);
+
+                ViewGroup.MarginLayoutParams lp = new ViewGroup.MarginLayoutParams(
+                        ViewGroup.LayoutParams.MATCH_PARENT,
+                        mLauncher.getDeviceProfile().allAppsCellHeightPx);
+                layout.setLayoutParams(lp);
+                return new ViewHolder(layout);
+
+            case VIEW_TYPE_SEARCH_SUGGESTION:
+                return new ViewHolder(mLayoutInflater.inflate(R.layout.all_apps_search_suggestion, parent, false));
+
             default:
                 throw new RuntimeException("Unexpected view type");
         }
@@ -317,6 +343,33 @@ public void onBindViewHolder(ViewHolder holder, int position) {
                 managedByLabel.setText(anyProfileQuietModeEnabled
                         ? R.string.work_mode_off_label : R.string.work_mode_on_label);
                 break;
+
+            case VIEW_TYPE_FOLDER:
+                ViewGroup container = (ViewGroup) holder.itemView;
+                FolderIcon folderIcon = mApps.getAdapterItems().get(position)
+                        .folderItem.getFolderIcon(mLauncher, container);
+
+                container.removeAllViews();
+                container.addView(folderIcon);
+
+                folderIcon.verifyHighRes();
+                break;
+
+            case VIEW_TYPE_SEARCH_SUGGESTION:
+                int color = getDrawerTextColor();
+                ViewGroup group = (ViewGroup) holder.itemView;
+                TextView textView = group.findViewById(R.id.suggestion);
+                String suggestion = mApps.getAdapterItems().get(position).suggestion;
+                textView.setText(suggestion);
+                textView.setTextColor(color);
+                ((ImageView) group.findViewById(android.R.id.icon)).getDrawable().setTint(color);
+                group.setOnClickListener(v -> {
+                    SearchProvider provider = getSearchProvider();
+                    if (provider instanceof WebSearchProvider) {
+                        ((WebSearchProvider) provider).openResults(suggestion);
+                    }
+                });
+                break;
         }
         if (mBindViewCallback != null) {
             mBindViewCallback.onBindView(holder);
@@ -340,4 +393,13 @@ public int getItemViewType(int position) {
         return item.viewType;
     }
 
+    public int getDrawerTextColor() {
+        return Utilities.getOmegaPrefs(mLauncher.getApplicationContext()).getDrawerLabelColor();
+    }
+
+
+    private SearchProvider getSearchProvider() {
+        return SearchProviderController.Companion.getInstance(mLauncher).getSearchProvider();
+    }
+
 }
diff --git a/src/com/android/launcher3/allapps/AllAppsPagedView.java b/src/com/android/launcher3/allapps/AllAppsPagedView.java
index 5b73940488..b9ef6fd39d 100644
--- a/src/com/android/launcher3/allapps/AllAppsPagedView.java
+++ b/src/com/android/launcher3/allapps/AllAppsPagedView.java
@@ -17,9 +17,11 @@
 
 import android.content.Context;
 import android.util.AttributeSet;
+import android.view.LayoutInflater;
 import android.view.MotionEvent;
 
 import com.android.launcher3.PagedView;
+import com.android.launcher3.R;
 
 public class AllAppsPagedView extends PagedView<PersonalWorkSlidingTabStrip> {
 
@@ -27,7 +29,7 @@ public class AllAppsPagedView extends PagedView<PersonalWorkSlidingTabStrip> {
   final static float MAX_SWIPE_ANGLE = (float) Math.PI / 3;
   final static float TOUCH_SLOP_DAMPING_FACTOR = 4;
 
-  public AllAppsPagedView(Context context) {
+    public AllAppsPagedView(Context context) {
         this(context, null);
     }
 
@@ -86,4 +88,15 @@ public boolean hasOverlappingRendering() {
     protected boolean isVerticalScrollable() {
         return false;
     }
+
+    public void addTabs(int count) {
+        int childCount = getChildCount();
+        LayoutInflater inflater = LayoutInflater.from(getContext());
+        for (int i = childCount; i < count; i++) {
+            inflater.inflate(R.layout.all_apps_rv_layout, this);
+        }
+        while (getChildCount() > count) {
+            removeViewAt(0);
+        }
+    }
 }
diff --git a/src/com/android/launcher3/allapps/AllAppsRecyclerView.java b/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
index f82e380f88..89d52d64e9 100644
--- a/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
@@ -15,11 +15,10 @@
  */
 package com.android.launcher3.allapps;
 
-import static android.view.View.MeasureSpec.UNSPECIFIED;
-
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Canvas;
+import android.graphics.Color;
 import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
 import android.util.SparseIntArray;
@@ -35,7 +34,6 @@
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.R;
 import com.android.launcher3.allapps.AllAppsGridAdapter.AppsGridLayoutManager;
-import com.android.launcher3.compat.AccessibilityManagerCompat;
 import com.android.launcher3.logging.StatsLogUtils.LogContainerProvider;
 import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
 import com.android.launcher3.userevent.nano.LauncherLogProto.Target;
@@ -43,6 +41,8 @@
 
 import java.util.List;
 
+import static android.view.View.MeasureSpec.UNSPECIFIED;
+
 /**
  * A RecyclerView with custom fast scroll support for the all apps view.
  */
@@ -78,7 +78,7 @@ public AllAppsRecyclerView(Context context, AttributeSet attrs, int defStyleAttr
         Resources res = getResources();
         mEmptySearchBackgroundTopOffset = res.getDimensionPixelSize(
                 R.dimen.all_apps_empty_search_bg_top_offset);
-        mNumAppsPerRow = LauncherAppState.getIDP(context).numColumns;
+        mNumAppsPerRow = LauncherAppState.getIDP(context).numColsDrawer;
     }
 
     /**
@@ -104,6 +104,7 @@ private void updatePoolSize() {
 
         mViewHeights.clear();
         mViewHeights.put(AllAppsGridAdapter.VIEW_TYPE_ICON, grid.allAppsCellHeightPx);
+        mViewHeights.put(AllAppsGridAdapter.VIEW_TYPE_FOLDER, grid.allAppsCellHeightPx);
     }
 
     /**
@@ -427,4 +428,8 @@ private void updateEmptySearchBackgroundBounds() {
     public boolean hasOverlappingRendering() {
         return false;
     }
+
+    public void setScrollbarColor(int color) {
+        mScrollbar.setColor(color, Color.WHITE);
+    }
 }
diff --git a/src/com/android/launcher3/allapps/AllAppsStore.java b/src/com/android/launcher3/allapps/AllAppsStore.java
index c4b2f68c94..f73bbc28c7 100644
--- a/src/com/android/launcher3/allapps/AllAppsStore.java
+++ b/src/com/android/launcher3/allapps/AllAppsStore.java
@@ -15,9 +15,6 @@
  */
 package com.android.launcher3.allapps;
 
-import static com.android.launcher3.AppInfo.COMPONENT_KEY_COMPARATOR;
-import static com.android.launcher3.AppInfo.EMPTY_ARRAY;
-
 import android.view.View;
 import android.view.ViewGroup;
 
@@ -25,15 +22,22 @@
 import com.android.launcher3.BubbleTextView;
 import com.android.launcher3.ItemInfo;
 import com.android.launcher3.PromiseAppInfo;
+import com.android.launcher3.folder.FolderIcon;
 import com.android.launcher3.util.ComponentKey;
 import com.android.launcher3.util.PackageUserKey;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
+import java.util.Set;
+import java.util.WeakHashMap;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 
+import static com.android.launcher3.AppInfo.COMPONENT_KEY_COMPARATOR;
+import static com.android.launcher3.AppInfo.EMPTY_ARRAY;
+
 /**
  * A utility class to maintain the collection of all apps.
  */
@@ -51,6 +55,7 @@ public class AllAppsStore {
 
     private final List<OnUpdateListener> mUpdateListeners = new ArrayList<>();
     private final ArrayList<ViewGroup> mIconContainers = new ArrayList<>();
+    private final Set<FolderIcon> mFolderIcons = Collections.newSetFromMap(new WeakHashMap<>());
 
     private int mDeferUpdatesFlags = 0;
     private boolean mUpdatePending = false;
@@ -99,9 +104,9 @@ private void notifyUpdate() {
             mUpdatePending = true;
             return;
         }
-        int count = mUpdateListeners.size();
-        for (int i = 0; i < count; i++) {
-            mUpdateListeners.get(i).onAppsUpdated();
+        List<OnUpdateListener> listeners = new ArrayList<>(mUpdateListeners);
+        for (OnUpdateListener listener : listeners) {
+            listener.onAppsUpdated();
         }
     }
 
@@ -123,6 +128,10 @@ public void unregisterIconContainer(ViewGroup container) {
         mIconContainers.remove(container);
     }
 
+    public void registerFolderIcon(FolderIcon folderIcon) {
+        mFolderIcons.add(folderIcon);
+    }
+
     public void updateNotificationDots(Predicate<PackageUserKey> updatedDots) {
         updateAllIcons((child) -> {
             if (child.getTag() instanceof ItemInfo) {
diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
index 08ce9c24f8..afe1975b4d 100644
--- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java
+++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
@@ -1,21 +1,9 @@
 package com.android.launcher3.allapps;
 
-import static com.android.launcher3.LauncherState.ALL_APPS_CONTENT;
-import static com.android.launcher3.LauncherState.ALL_APPS_HEADER_EXTRA;
-import static com.android.launcher3.LauncherState.OVERVIEW;
-import static com.android.launcher3.LauncherState.VERTICAL_SWIPE_INDICATOR;
-import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_ALL_APPS_FADE;
-import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_ALL_APPS_HEADER_FADE;
-import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_OVERVIEW_SCALE;
-import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_VERTICAL_PROGRESS;
-import static com.android.launcher3.anim.Interpolators.FAST_OUT_SLOW_IN;
-import static com.android.launcher3.anim.Interpolators.LINEAR;
-import static com.android.launcher3.anim.PropertySetter.NO_ANIM_PROPERTY_SETTER;
-import static com.android.launcher3.util.SystemUiController.UI_STATE_ALL_APPS;
-
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.util.FloatProperty;
+import android.view.View;
 import android.view.animation.Interpolator;
 
 import com.android.launcher3.DeviceProfile;
@@ -31,6 +19,23 @@
 import com.android.launcher3.anim.SpringObjectAnimator;
 import com.android.launcher3.util.Themes;
 import com.android.launcher3.views.ScrimView;
+import com.saggitt.omega.allapps.BlurQsbLayout;
+import com.saggitt.omega.blur.BlurScrimView;
+
+import static com.android.launcher3.LauncherState.ALL_APPS_CONTENT;
+import static com.android.launcher3.LauncherState.ALL_APPS_HEADER_EXTRA;
+import static com.android.launcher3.LauncherState.BACKGROUND_APP;
+import static com.android.launcher3.LauncherState.HOTSEAT_ICONS;
+import static com.android.launcher3.LauncherState.OVERVIEW;
+import static com.android.launcher3.LauncherState.VERTICAL_SWIPE_INDICATOR;
+import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_ALL_APPS_FADE;
+import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_ALL_APPS_HEADER_FADE;
+import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_OVERVIEW_SCALE;
+import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_VERTICAL_PROGRESS;
+import static com.android.launcher3.anim.Interpolators.FAST_OUT_SLOW_IN;
+import static com.android.launcher3.anim.Interpolators.LINEAR;
+import static com.android.launcher3.anim.PropertySetter.NO_ANIM_PROPERTY_SETTER;
+import static com.android.launcher3.util.SystemUiController.UI_STATE_ALL_APPS;
 
 /**
  * Handles AllApps view transition.
@@ -132,12 +137,22 @@ public void setProgress(float progress) {
         } else {
             mLauncher.getSystemUiController().updateUiState(UI_STATE_ALL_APPS, 0);
         }
+
+        if ((OVERVIEW.getVisibleElements(mLauncher) & HOTSEAT_ICONS) != 0) {
+            // Translate hotseat with the shelf until reaching overview.
+            float overviewProgress = OVERVIEW.getVerticalProgress(mLauncher);
+            if (progress >= overviewProgress || mLauncher.isInState(BACKGROUND_APP)) {
+                float hotseatShift = (progress - overviewProgress) * mShiftRange;
+                mLauncher.getHotseat().setTranslationY(hotseatShift);
+            }
+        }
     }
 
     public float getProgress() {
         return mProgress;
     }
 
+
     /**
      * Sets the vertical transition progress to {@param state} and updates all the dependent UI
      * accordingly.
@@ -195,6 +210,7 @@ private void setAlphas(LauncherState toState, AnimationConfig config,
     public void setAlphas(int visibleElements, AnimationConfig config, AnimatorSetBuilder builder) {
         PropertySetter setter = config == null ? NO_ANIM_PROPERTY_SETTER
                 : config.getPropertySetter(builder);
+
         boolean hasHeaderExtra = (visibleElements & ALL_APPS_HEADER_EXTRA) != 0;
         boolean hasAllAppsContent = (visibleElements & ALL_APPS_CONTENT) != 0;
 
@@ -205,7 +221,6 @@ public void setAlphas(int visibleElements, AnimationConfig config, AnimatorSetBu
         mAppsView.getFloatingHeaderView().setContentVisibility(hasHeaderExtra, hasAllAppsContent,
                 setter, headerFade, allAppsFade);
         mAppsView.getSearchUiManager().setContentVisibility(visibleElements, setter, allAppsFade);
-
         setter.setInt(mScrimView, ScrimView.DRAG_HANDLE_ALPHA,
                 (visibleElements & VERTICAL_SWIPE_INDICATOR) != 0 ? 255 : 0, allAppsFade);
     }
@@ -222,12 +237,13 @@ public void onAnimationSuccess(Animator animator) {
     public void setupViews(AllAppsContainerView appsView) {
         mAppsView = appsView;
         mScrimView = mLauncher.findViewById(R.id.scrim_view);
+        ((BlurQsbLayout) mAppsView.getSearchView()).setScrimView((BlurScrimView) mScrimView);
     }
 
     /**
      * Updates the total scroll range but does not update the UI.
      */
-    void setScrollRangeDelta(float delta) {
+    public void setScrollRangeDelta(float delta) {
         mScrollRangeDelta = delta;
         mShiftRange = mLauncher.getDeviceProfile().heightPx - mScrollRangeDelta;
 
@@ -257,4 +273,22 @@ public void highlightWorkTabIfNecessary() {
             mAppsView.highlightWorkTabIfNecessary();
         }
     }
+
+    public void reset() {
+        setProgress(1f);
+    }
+
+    public AllAppsContainerView getAppsView() {
+        return mAppsView;
+    }
+
+    public void setOverlayScroll(float scroll) {
+        if (mScrimView instanceof BlurScrimView) {
+            ((BlurScrimView) mScrimView).setOverlayScroll(scroll);
+        }
+        View searchView = mAppsView.getSearchView();
+        if (searchView instanceof BlurQsbLayout) {
+            ((BlurQsbLayout) searchView).setOverlayScroll(scroll);
+        }
+    }
 }
diff --git a/src/com/android/launcher3/allapps/AlphabeticalAppsList.java b/src/com/android/launcher3/allapps/AlphabeticalAppsList.java
index c25d499df2..79840b0894 100644
--- a/src/com/android/launcher3/allapps/AlphabeticalAppsList.java
+++ b/src/com/android/launcher3/allapps/AlphabeticalAppsList.java
@@ -16,11 +16,22 @@
 package com.android.launcher3.allapps;
 
 import android.content.Context;
+import android.content.pm.LauncherActivityInfo;
 import android.content.pm.PackageManager;
+import android.graphics.Color;
+import android.os.Process;
+import android.os.UserHandle;
+
+import androidx.core.graphics.ColorUtils;
 
 import com.android.launcher3.AppInfo;
 import com.android.launcher3.Launcher;
+import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.Utilities;
+import com.android.launcher3.compat.AlphabeticIndexCompat;
+import com.android.launcher3.compat.LauncherAppsCompat;
+import com.android.launcher3.compat.UserManagerCompat;
+import com.android.launcher3.icons.IconCache;
 import com.android.launcher3.shortcuts.DeepShortcutManager;
 import com.android.launcher3.util.ComponentKey;
 import com.android.launcher3.util.ItemInfoMatcher;
@@ -29,15 +40,19 @@
 import com.saggitt.omega.allapps.AppColorComparator;
 import com.saggitt.omega.allapps.InstallTimeComparator;
 import com.saggitt.omega.allapps.MostUsedComparator;
+import com.saggitt.omega.groups.DrawerFolderInfo;
+import com.saggitt.omega.groups.DrawerFolderItem;
 import com.saggitt.omega.model.AppCountInfo;
 import com.saggitt.omega.util.DbHelper;
 
 import java.text.Collator;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Set;
 import java.util.TreeMap;
 
 import static com.saggitt.omega.util.Config.SORT_AZ;
@@ -58,85 +73,9 @@ public class AlphabeticalAppsList implements AllAppsStore.OnUpdateListener {
 
     private final int mFastScrollDistributionMode = FAST_SCROLL_FRACTION_DISTRIBUTE_BY_NUM_SECTIONS;
 
-    /**
-     * Info about a fast scroller section, depending if sections are merged, the fast scroller
-     * sections will not be the same set as the section headers.
-     */
-    public static class FastScrollSectionInfo {
-        // The section name
-        public String sectionName;
-        // The AdapterItem to scroll to for this section
-        public AdapterItem fastScrollToItem;
-        // The touch fraction that should map to this fast scroll section info
-        public float touchFraction;
-
-        public FastScrollSectionInfo(String sectionName) {
-            this.sectionName = sectionName;
-        }
-    }
-
-    /**
-     * Info about a particular adapter item (can be either section or app)
-     */
-    public static class AdapterItem {
-        /** Common properties */
-        // The index of this adapter item in the list
-        public int position;
-        // The type of this item
-        public int viewType;
-
-        /** App-only properties */
-        // The section name of this app.  Note that there can be multiple items with different
-        // sectionNames in the same section
-        public String sectionName = null;
-        // The row that this item shows up on
-        public int rowIndex;
-        // The index of this app in the row
-        public int rowAppIndex;
-        // The associated AppInfo for the app
-        public AppInfo appInfo = null;
-        // The index of this app not including sections
-        public int appIndex = -1;
-
-        public static AdapterItem asApp(int pos, String sectionName, AppInfo appInfo,
-                int appIndex) {
-            AdapterItem item = new AdapterItem();
-            item.viewType = AllAppsGridAdapter.VIEW_TYPE_ICON;
-            item.position = pos;
-            item.sectionName = sectionName;
-            item.appInfo = appInfo;
-            item.appIndex = appIndex;
-            return item;
-        }
-
-        public static AdapterItem asEmptySearch(int pos) {
-            AdapterItem item = new AdapterItem();
-            item.viewType = AllAppsGridAdapter.VIEW_TYPE_EMPTY_SEARCH;
-            item.position = pos;
-            return item;
-        }
-
-        public static AdapterItem asAllAppsDivider(int pos) {
-            AdapterItem item = new AdapterItem();
-            item.viewType = AllAppsGridAdapter.VIEW_TYPE_ALL_APPS_DIVIDER;
-            item.position = pos;
-            return item;
-        }
+    private HashMap<AppInfo, String> mCachedSectionNames = new HashMap<>();
 
-        public static AdapterItem asMarketSearch(int pos) {
-            AdapterItem item = new AdapterItem();
-            item.viewType = AllAppsGridAdapter.VIEW_TYPE_SEARCH_MARKET;
-            item.position = pos;
-            return item;
-        }
-
-        public static AdapterItem asWorkTabFooter(int pos) {
-            AdapterItem item = new AdapterItem();
-            item.viewType = AllAppsGridAdapter.VIEW_TYPE_WORK_TAB_FOOTER;
-            item.position = pos;
-            return item;
-        }
-    }
+    private List<String> mSearchSuggestions;
 
     private final Launcher mLauncher;
 
@@ -151,11 +90,13 @@ public static AdapterItem asWorkTabFooter(int pos) {
     // The set of sections that we allow fast-scrolling to (includes non-merged sections)
     private final List<FastScrollSectionInfo> mFastScrollerSections = new ArrayList<>();
     // Is it the work profile app list.
-    private final boolean mIsWork;
+    private boolean mIsWork;
 
     // The of ordered component names as a result of a search query
     private ArrayList<ComponentKey> mSearchResults;
+    private AlphabeticIndexCompat mIndexer;
     private AllAppsGridAdapter mAdapter;
+    private OmegaPreferences prefs;
     private AppInfoComparator mAppNameComparator;
     private AppColorComparator mAppColorComparator;
     private final int mNumAppsPerRow;
@@ -165,11 +106,164 @@ public static AdapterItem asWorkTabFooter(int pos) {
     public AlphabeticalAppsList(Context context, AllAppsStore appsStore, boolean isWork) {
         mAllAppsStore = appsStore;
         mLauncher = Launcher.getLauncher(context);
+        mIndexer = new AlphabeticIndexCompat(context);
         mAppNameComparator = new AppInfoComparator(context);
         mAppColorComparator = new AppColorComparator(context);
         mIsWork = isWork;
-        mNumAppsPerRow = mLauncher.getDeviceProfile().inv.numColumns;
+        mNumAppsPerRow = mLauncher.getDeviceProfile().inv.numColsDrawer;
         mAllAppsStore.addUpdateListener(this);
+
+        prefs = Utilities.getOmegaPrefs(context);
+    }
+
+    /**
+     * Returns whether there are suggestions.
+     */
+    public boolean hasSuggestions() {
+        return mSearchSuggestions != null && !mSearchSuggestions.isEmpty();
+    }
+
+    private void refillAdapterItems() {
+        String lastSectionName = null;
+        FastScrollSectionInfo lastFastScrollerSectionInfo = null;
+        int position = 0;
+        int appIndex = 0;
+        int folderIndex = 0;
+
+        // Prepare to update the list of sections, filtered apps, etc.
+        mFilteredApps.clear();
+        mFastScrollerSections.clear();
+        mAdapterItems.clear();
+
+        // Search suggestions should be all the way to the top
+        if (hasFilter() && hasSuggestions()) {
+            for (String suggestion : mSearchSuggestions) {
+                mAdapterItems.add(AdapterItem.asSearchSuggestion(position++, suggestion));
+            }
+        }
+
+        // Drawer folders are arranged before all the apps
+        if (!hasFilter()) {
+            for (DrawerFolderInfo info : getFolderInfos()) {
+                String sectionName = "#";
+
+                // Create a new section if the section names do not match
+                if (!sectionName.equals(lastSectionName)) {
+                    lastSectionName = sectionName;
+                    lastFastScrollerSectionInfo = new FastScrollSectionInfo(sectionName,
+                            Color.WHITE);
+                    mFastScrollerSections.add(lastFastScrollerSectionInfo);
+                }
+
+                info.setAppsStore(mAllAppsStore);
+                // Create an folder item
+                AdapterItem appItem = AdapterItem
+                        .asFolder(position++, sectionName, info, folderIndex++);
+                if (lastFastScrollerSectionInfo.fastScrollToItem == null) {
+                    lastFastScrollerSectionInfo.fastScrollToItem = appItem;
+                }
+                mAdapterItems.add(appItem);
+            }
+        }
+
+        Set<ComponentKey> folderFilters = getFolderFilteredApps();
+
+        // Recreate the filtered and sectioned apps (for convenience for the grid layout) from the
+        // ordered set of sections
+        for (AppInfo info : getFiltersAppInfos()) {
+            if (!hasFilter() && folderFilters.contains(info.toComponentKey())) {
+                continue;
+            }
+            String sectionName = getAndUpdateCachedSectionName(info);
+
+            // Create a new section if the section names do not match
+            if (!sectionName.equals(lastSectionName)) {
+                lastSectionName = sectionName;
+                int color = 0;
+                if (prefs.getSortMode() == SORT_BY_COLOR) {
+                    color = info.iconColor;
+                }
+                lastFastScrollerSectionInfo = new FastScrollSectionInfo(sectionName, color);
+                mFastScrollerSections.add(lastFastScrollerSectionInfo);
+            }
+
+            // Create an app item
+            AdapterItem appItem = AdapterItem.asApp(position++, sectionName, info, appIndex++);
+            if (lastFastScrollerSectionInfo.fastScrollToItem == null) {
+                lastFastScrollerSectionInfo.fastScrollToItem = appItem;
+            }
+            mAdapterItems.add(appItem);
+            mFilteredApps.add(info);
+        }
+
+        if (hasFilter()) {
+            // Append the search market item
+            if (hasNoFilteredResults() && !hasSuggestions()) {
+                mAdapterItems.add(AdapterItem.asEmptySearch(position++));
+            } else {
+                mAdapterItems.add(AdapterItem.asAllAppsDivider(position++));
+            }
+            mAdapterItems.add(AdapterItem.asMarketSearch(position++));
+        }
+
+        if (mNumAppsPerRow != 0) {
+            // Update the number of rows in the adapter after we do all the merging (otherwise, we
+            // would have to shift the values again)
+            int numAppsInSection = 0;
+            int numAppsInRow = 0;
+            int rowIndex = -1;
+            for (AdapterItem item : mAdapterItems) {
+                item.rowIndex = 0;
+                if (AllAppsGridAdapter.isDividerViewType(item.viewType)) {
+                    numAppsInSection = 0;
+                } else if (AllAppsGridAdapter.isIconViewType(item.viewType)) {
+                    if (numAppsInSection % mNumAppsPerRow == 0) {
+                        numAppsInRow = 0;
+                        rowIndex++;
+                    }
+                    item.rowIndex = rowIndex;
+                    item.rowAppIndex = numAppsInRow;
+                    numAppsInSection++;
+                    numAppsInRow++;
+                }
+            }
+            mNumAppRowsInAdapter = rowIndex + 1;
+
+            // Pre-calculate all the fast scroller fractions
+            switch (mFastScrollDistributionMode) {
+                case FAST_SCROLL_FRACTION_DISTRIBUTE_BY_ROWS_FRACTION:
+                    float rowFraction = 1f / mNumAppRowsInAdapter;
+                    for (FastScrollSectionInfo info : mFastScrollerSections) {
+                        AdapterItem item = info.fastScrollToItem;
+                        if (!AllAppsGridAdapter.isIconViewType(item.viewType)) {
+                            info.touchFraction = 0f;
+                            continue;
+                        }
+
+                        float subRowFraction = item.rowAppIndex * (rowFraction / mNumAppsPerRow);
+                        info.touchFraction = item.rowIndex * rowFraction + subRowFraction;
+                    }
+                    break;
+                case FAST_SCROLL_FRACTION_DISTRIBUTE_BY_NUM_SECTIONS:
+                    float perSectionTouchFraction = 1f / mFastScrollerSections.size();
+                    float cumulativeTouchFraction = 0f;
+                    for (FastScrollSectionInfo info : mFastScrollerSections) {
+                        AdapterItem item = info.fastScrollToItem;
+                        if (!AllAppsGridAdapter.isIconViewType(item.viewType)) {
+                            info.touchFraction = 0f;
+                            continue;
+                        }
+                        info.touchFraction = cumulativeTouchFraction;
+                        cumulativeTouchFraction += perSectionTouchFraction;
+                    }
+                    break;
+            }
+        }
+
+        // Add the work profile footer if required.
+        if (shouldShowWorkFooter()) {
+            mAdapterItems.add(AdapterItem.asWorkTabFooter(position++));
+        }
     }
 
     public void updateItemFilter(ItemInfoMatcher itemFilter) {
@@ -266,11 +360,26 @@ public boolean hasFilter() {
         return (mSearchResults != null);
     }
 
+    public List<AppInfo> getFilteredApps() {
+        return mFilteredApps;
+    }
+
     /**
      * Returns whether there are no filtered results.
      */
     public boolean hasNoFilteredResults() {
-        return (mSearchResults != null) && mFilteredApps.isEmpty();
+        return (mSearchResults != null) && mFilteredApps.isEmpty() && (mSearchSuggestions != null) && mSearchSuggestions.isEmpty();
+
+    }
+
+    public boolean setSearchSuggestions(List<String> suggestions) {
+        if (mSearchSuggestions != suggestions) {
+            boolean same = mSearchSuggestions != null && mSearchSuggestions.equals(suggestions);
+            mSearchSuggestions = suggestions;
+            onAppsUpdated();
+            return !same;
+        }
+        return false;
     }
 
     /**
@@ -314,7 +423,7 @@ public void onAppsUpdated() {
             TreeMap<String, ArrayList<AppInfo>> sectionMap = new TreeMap<>(new LabelComparator());
             for (AppInfo info : mApps) {
                 // Add the section to the cache
-                String sectionName = info.sectionName;
+                String sectionName = getAndUpdateCachedSectionName(info);
 
                 // Add it to the mapping
                 ArrayList<AppInfo> sectionApps = sectionMap.get(sectionName);
@@ -336,6 +445,39 @@ public void onAppsUpdated() {
         updateAdapterItems();
     }
 
+    /**
+     * Returns the cached section name for the given title, recomputing and updating the cache if
+     * the title has no cached section name.
+     */
+    private String getAndUpdateCachedSectionName(AppInfo info) {
+        String sectionName = mCachedSectionNames.get(info);
+        if (sectionName == null) {
+            if (prefs.getSortMode() == SORT_BY_COLOR) {
+                float[] hsl = new float[3];
+                ColorUtils.colorToHSL(info.iconColor, hsl);
+                sectionName = String.format("%d:%d:%d", AppColorComparator.remapHue(hsl[0]), AppColorComparator.remap(hsl[2]), AppColorComparator.remap(hsl[1]));
+            } else {
+                sectionName = mIndexer.computeSectionName(info.title);
+            }
+            mCachedSectionNames.put(info, sectionName);
+        }
+        return sectionName;
+    }
+
+    private List<DrawerFolderInfo> getFolderInfos() {
+        return Utilities.getOmegaPrefs(mLauncher)
+                .getAppGroupsManager()
+                .getDrawerFolders()
+                .getFolderInfos(this);
+    }
+
+    private Set<ComponentKey> getFolderFilteredApps() {
+        return Utilities.getOmegaPrefs(mLauncher)
+                .getAppGroupsManager()
+                .getDrawerFolders()
+                .getHiddenComponents();
+    }
+
     /**
      * Updates the set of filtered apps with the current filter.  At this point, we expect
      * mCachedSectionNames to have been calculated for the set of all apps in mApps.
@@ -351,105 +493,99 @@ private void refreshRecyclerView() {
         }
     }
 
-    private void refillAdapterItems() {
-        String lastSectionName = null;
-        FastScrollSectionInfo lastFastScrollerSectionInfo = null;
-        int position = 0;
-        int appIndex = 0;
+    /**
+     * Info about a particular adapter item (can be either section or app)
+     */
+    public static class AdapterItem {
+        /**
+         * Common properties
+         */
+        // The index of this adapter item in the list
+        public int position;
+        // The type of this item
+        public int viewType;
 
-        // Prepare to update the list of sections, filtered apps, etc.
-        mFilteredApps.clear();
-        mFastScrollerSections.clear();
-        mAdapterItems.clear();
+        /**
+         * App-only properties
+         */
+        // The section name of this app.  Note that there can be multiple items with different
+        // sectionNames in the same section
+        public String sectionName = null;
+        // The row that this item shows up on
+        public int rowIndex;
+        // The index of this app in the row
+        public int rowAppIndex;
+        // The associated AppInfo for the app
+        public AppInfo appInfo = null;
+        // The index of this app not including sections
+        public int appIndex = -1;
 
-        // Recreate the filtered and sectioned apps (for convenience for the grid layout) from the
-        // ordered set of sections
-        for (AppInfo info : getFiltersAppInfos()) {
-            String sectionName = info.sectionName;
+        /**
+         * Folder-only properties
+         */
+        // The associated folder for the folder
+        public DrawerFolderItem folderItem = null;
 
-            // Create a new section if the section names do not match
-            if (!sectionName.equals(lastSectionName)) {
-                lastSectionName = sectionName;
-                lastFastScrollerSectionInfo = new FastScrollSectionInfo(sectionName);
-                mFastScrollerSections.add(lastFastScrollerSectionInfo);
-            }
+        /**
+         * Search suggestion-only properties
+         */
+        public String suggestion;
 
-            // Create an app item
-            AdapterItem appItem = AdapterItem.asApp(position++, sectionName, info, appIndex++);
-            if (lastFastScrollerSectionInfo.fastScrollToItem == null) {
-                lastFastScrollerSectionInfo.fastScrollToItem = appItem;
-            }
-            mAdapterItems.add(appItem);
-            mFilteredApps.add(info);
+        public static AdapterItem asApp(int pos, String sectionName, AppInfo appInfo,
+                                        int appIndex) {
+            AdapterItem item = new AdapterItem();
+            item.viewType = AllAppsGridAdapter.VIEW_TYPE_ICON;
+            item.position = pos;
+            item.sectionName = sectionName;
+            item.appInfo = appInfo;
+            item.appIndex = appIndex;
+            return item;
         }
 
-        if (hasFilter()) {
-            // Append the search market item
-            if (hasNoFilteredResults()) {
-                mAdapterItems.add(AdapterItem.asEmptySearch(position++));
-            } else {
-                mAdapterItems.add(AdapterItem.asAllAppsDivider(position++));
-            }
-            mAdapterItems.add(AdapterItem.asMarketSearch(position++));
+        public static AdapterItem asEmptySearch(int pos) {
+            AdapterItem item = new AdapterItem();
+            item.viewType = AllAppsGridAdapter.VIEW_TYPE_EMPTY_SEARCH;
+            item.position = pos;
+            return item;
         }
 
-        if (mNumAppsPerRow != 0) {
-            // Update the number of rows in the adapter after we do all the merging (otherwise, we
-            // would have to shift the values again)
-            int numAppsInSection = 0;
-            int numAppsInRow = 0;
-            int rowIndex = -1;
-            for (AdapterItem item : mAdapterItems) {
-                item.rowIndex = 0;
-                if (AllAppsGridAdapter.isDividerViewType(item.viewType)) {
-                    numAppsInSection = 0;
-                } else if (AllAppsGridAdapter.isIconViewType(item.viewType)) {
-                    if (numAppsInSection % mNumAppsPerRow == 0) {
-                        numAppsInRow = 0;
-                        rowIndex++;
-                    }
-                    item.rowIndex = rowIndex;
-                    item.rowAppIndex = numAppsInRow;
-                    numAppsInSection++;
-                    numAppsInRow++;
-                }
-            }
-            mNumAppRowsInAdapter = rowIndex + 1;
+        public static AdapterItem asAllAppsDivider(int pos) {
+            AdapterItem item = new AdapterItem();
+            item.viewType = AllAppsGridAdapter.VIEW_TYPE_ALL_APPS_DIVIDER;
+            item.position = pos;
+            return item;
+        }
 
-            // Pre-calculate all the fast scroller fractions
-            switch (mFastScrollDistributionMode) {
-                case FAST_SCROLL_FRACTION_DISTRIBUTE_BY_ROWS_FRACTION:
-                    float rowFraction = 1f / mNumAppRowsInAdapter;
-                    for (FastScrollSectionInfo info : mFastScrollerSections) {
-                        AdapterItem item = info.fastScrollToItem;
-                        if (!AllAppsGridAdapter.isIconViewType(item.viewType)) {
-                            info.touchFraction = 0f;
-                            continue;
-                        }
+        public static AdapterItem asMarketSearch(int pos) {
+            AdapterItem item = new AdapterItem();
+            item.viewType = AllAppsGridAdapter.VIEW_TYPE_SEARCH_MARKET;
+            item.position = pos;
+            return item;
+        }
 
-                        float subRowFraction = item.rowAppIndex * (rowFraction / mNumAppsPerRow);
-                        info.touchFraction = item.rowIndex * rowFraction + subRowFraction;
-                    }
-                    break;
-                case FAST_SCROLL_FRACTION_DISTRIBUTE_BY_NUM_SECTIONS:
-                    float perSectionTouchFraction = 1f / mFastScrollerSections.size();
-                    float cumulativeTouchFraction = 0f;
-                    for (FastScrollSectionInfo info : mFastScrollerSections) {
-                        AdapterItem item = info.fastScrollToItem;
-                        if (!AllAppsGridAdapter.isIconViewType(item.viewType)) {
-                            info.touchFraction = 0f;
-                            continue;
-                        }
-                        info.touchFraction = cumulativeTouchFraction;
-                        cumulativeTouchFraction += perSectionTouchFraction;
-                    }
-                    break;
-            }
+        public static AdapterItem asWorkTabFooter(int pos) {
+            AdapterItem item = new AdapterItem();
+            item.viewType = AllAppsGridAdapter.VIEW_TYPE_WORK_TAB_FOOTER;
+            item.position = pos;
+            return item;
         }
 
-        // Add the work profile footer if required.
-        if (shouldShowWorkFooter()) {
-            mAdapterItems.add(AdapterItem.asWorkTabFooter(position++));
+        public static AdapterItem asFolder(int pos, String sectionName,
+                                           DrawerFolderInfo folderInfo, int folderIndex) {
+            AdapterItem item = new AdapterItem();
+            item.viewType = AllAppsGridAdapter.VIEW_TYPE_FOLDER;
+            item.position = pos;
+            item.sectionName = sectionName;
+            item.folderItem = new DrawerFolderItem(folderInfo, folderIndex);
+            return item;
+        }
+
+        public static AdapterItem asSearchSuggestion(int pos, String suggestion) {
+            AdapterItem item = new AdapterItem();
+            item.viewType = AllAppsGridAdapter.VIEW_TYPE_SEARCH_SUGGESTION;
+            item.position = pos;
+            item.suggestion = suggestion;
+            return item;
         }
     }
 
@@ -460,15 +596,53 @@ private boolean shouldShowWorkFooter() {
                         == PackageManager.PERMISSION_GRANTED);
     }
 
+    /**
+     * Info about a fast scroller section, depending if sections are merged, the fast scroller
+     * sections will not be the same set as the section headers.
+     */
+    public static class FastScrollSectionInfo {
+        // The section name
+        public String sectionName;
+        // The AdapterItem to scroll to for this section
+        public AdapterItem fastScrollToItem;
+        // The touch fraction that should map to this fast scroll section info
+        public float touchFraction;
+        // The color of this fast scroll section
+        public int color;
+
+        public FastScrollSectionInfo(String sectionName, int color) {
+            this.sectionName = sectionName;
+            this.color = color;
+        }
+    }
+
+    public void setIsWork(boolean isWork) {
+        mIsWork = isWork;
+    }
+
     private List<AppInfo> getFiltersAppInfos() {
         if (mSearchResults == null) {
             return mApps;
         }
+        LauncherAppsCompat launcherApps = LauncherAppsCompat.getInstance(mLauncher);
+        UserHandle user = Process.myUserHandle();
+        IconCache iconCache = LauncherAppState.getInstance(mLauncher).getIconCache();
+        boolean quietMode = UserManagerCompat.getInstance(mLauncher).isQuietModeEnabled(user);
         ArrayList<AppInfo> result = new ArrayList<>();
         for (ComponentKey key : mSearchResults) {
             AppInfo match = mAllAppsStore.getApp(key);
             if (match != null) {
                 result.add(match);
+            } else {
+                for (LauncherActivityInfo info : launcherApps
+                        .getActivityList(key.componentName.getPackageName(), user)) {
+                    if (info.getComponentName().equals(key.componentName)) {
+                        AppInfo appInfo = new AppInfo(info, user, quietMode);
+                        iconCache.getTitleAndIcon(appInfo, false);
+                        result.add(appInfo);
+                        break;
+                    }
+                }
             }
         }
         return result;
diff --git a/src/com/android/launcher3/allapps/FloatingHeaderView.java b/src/com/android/launcher3/allapps/FloatingHeaderView.java
index 368174312b..5bc0bd0d2a 100644
--- a/src/com/android/launcher3/allapps/FloatingHeaderView.java
+++ b/src/com/android/launcher3/allapps/FloatingHeaderView.java
@@ -79,8 +79,6 @@ public void onScrolled(RecyclerView rv, int dx, int dy) {
     protected final Map<AllAppsRow, PluginHeaderRow> mPluginRows = new ArrayMap<>();
 
     protected ViewGroup mTabLayout;
-    private AllAppsRecyclerView mMainRV;
-    private AllAppsRecyclerView mWorkRV;
     private AllAppsRecyclerView mCurrentRV;
     private ViewGroup mParent;
     private boolean mHeaderCollapsed;
@@ -92,8 +90,9 @@ public void onScrolled(RecyclerView rv, int dx, int dy) {
 
     protected boolean mTabsHidden;
     protected int mMaxTranslation;
-    private boolean mMainRVActive = true;
 
+    private int mActiveRV = 0;
+    private ArrayList<AllAppsRecyclerView> mRVs = new ArrayList<>();
     private boolean mCollapsed = false;
 
     // This is initialized once during inflation and stays constant after that. Fixed views
@@ -117,7 +116,7 @@ public FloatingHeaderView(@NonNull Context context, @Nullable AttributeSet attrs
     @Override
     protected void onFinishInflate() {
         super.onFinishInflate();
-        mTabLayout = findViewById(R.id.tabs);
+        mTabLayout = findViewById(R.id.tabs_scroller);
 
         // Find all floating header rows.
         ArrayList<FloatingHeaderRow> rows = new ArrayList<>();
@@ -207,10 +206,19 @@ public void setup(AllAppsContainerView.AdapterHolder[] mAH, boolean tabsHidden)
 
         mTabsHidden = tabsHidden;
         mTabLayout.setVisibility(tabsHidden ? View.GONE : View.VISIBLE);
-        mMainRV = setupRV(mMainRV, mAH[AllAppsContainerView.AdapterHolder.MAIN].recyclerView);
-        mWorkRV = setupRV(mWorkRV, mAH[AllAppsContainerView.AdapterHolder.WORK].recyclerView);
-        mParent = (ViewGroup) mMainRV.getParent();
-        setMainActive(mMainRVActive || mWorkRV == null);
+        for (AllAppsRecyclerView recyclerView : mRVs) {
+            recyclerView.removeOnScrollListener(mOnScrollListener);
+        }
+        mRVs.clear();
+        //mMainRV = setupRV(mMainRV, mAH[AllAppsContainerView.AdapterHolder.MAIN].recyclerView);
+        //mWorkRV = setupRV(mWorkRV, mAH[AllAppsContainerView.AdapterHolder.WORK].recyclerView);
+        for (AllAppsContainerView.AdapterHolder holder : mAH) {
+            if (holder.recyclerView != null) {
+                mRVs.add(setupRV(null, holder.recyclerView));
+            }
+        }
+        mParent = (ViewGroup) mRVs.get(0).getParent();
+        setCurrentActive(Math.min(mActiveRV, mRVs.size() - 1));
         reset(false);
     }
 
@@ -231,9 +239,14 @@ protected void updateExpectedHeight() {
         }
     }
 
-    public void setMainActive(boolean active) {
+    /*public void setMainActive(boolean active) {
         mCurrentRV = active ? mMainRV : mWorkRV;
         mMainRVActive = active;
+    }*/
+
+    public void setCurrentActive(int active) {
+        mCurrentRV = mRVs.get(active);
+        mActiveRV = active;
     }
 
     public int getMaxTranslation() {
@@ -292,10 +305,12 @@ protected void applyVerticalMove() {
         mTabLayout.setTranslationY(mTranslationY);
         mClip.top = mMaxTranslation + mTranslationY;
         // clipping on a draw might cause additional redraw
+
+        /*
         mMainRV.setClipBounds(mClip);
         if (mWorkRV != null) {
             mWorkRV.setClipBounds(mClip);
-        }
+        }*/
     }
 
     /**
diff --git a/src/com/android/launcher3/allapps/PersonalWorkSlidingTabStrip.java b/src/com/android/launcher3/allapps/PersonalWorkSlidingTabStrip.java
index decdcc0aa0..cf7e7796a3 100644
--- a/src/com/android/launcher3/allapps/PersonalWorkSlidingTabStrip.java
+++ b/src/com/android/launcher3/allapps/PersonalWorkSlidingTabStrip.java
@@ -15,23 +15,30 @@
  */
 package com.android.launcher3.allapps;
 
+import android.animation.ArgbEvaluator;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.graphics.Canvas;
 import android.graphics.Paint;
+import android.graphics.Path;
 import android.util.AttributeSet;
+import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.Button;
+import android.widget.HorizontalScrollView;
 import android.widget.LinearLayout;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import com.android.launcher3.Launcher;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.pageindicators.PageIndicator;
 import com.android.launcher3.util.Themes;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
+import com.saggitt.omega.allapps.AllAppsTabs;
+import com.saggitt.omega.preferences.DrawerTabEditBottomSheet;
+import com.saggitt.omega.views.ColoredButton;
 
 /**
  * Supports two indicator colors, dedicated for personal and work tabs.
@@ -56,6 +63,9 @@ public class PersonalWorkSlidingTabStrip extends LinearLayout implements PageInd
     private int mLastActivePage = 0;
     private boolean mIsRtl;
 
+    private ArgbEvaluator mArgbEvaluator = new ArgbEvaluator();
+    private Path mIndicatorPath = new Path();
+
     public PersonalWorkSlidingTabStrip(@NonNull Context context, @Nullable AttributeSet attrs) {
         super(context, attrs);
         setOrientation(HORIZONTAL);
@@ -98,11 +108,44 @@ protected void onLayout(boolean changed, int l, int t, int r, int b) {
     }
 
     private void updateIndicatorPosition() {
+        float scaled = mScrollOffset * (getChildCount() - 1);
         int left = -1, right = -1;
-        final View leftTab = getLeftTab();
-        if (leftTab != null) {
-            left = (int) (leftTab.getLeft() + leftTab.getWidth() * mScrollOffset);
+        int position = (int) Math.floor(scaled);
+        float leftFraction = scaled - position;
+        float rightFraction = 1 - leftFraction;
+        int leftIndex = mIsRtl ? getChildCount() - position - 1 : position;
+        int rightIndex = mIsRtl ? leftIndex - 1 : leftIndex + 1;
+        ColoredButton leftTab = (ColoredButton) getChildAt(leftIndex);
+        ColoredButton rightTab = (ColoredButton) getChildAt(rightIndex);
+        if (leftTab != null && rightTab != null) {
+            int leftWidth = leftTab.getWidth();
+            int rightWidth = rightTab.getWidth();
+            float width = leftWidth + (rightWidth - leftWidth) * leftFraction;
+            float halfWidth = width / 2;
+
+            float leftCenter = leftTab.getLeft() + leftWidth / 2f;
+            float rightCenter = rightTab.getLeft() + rightWidth / 2f;
+            float dis = rightCenter - leftCenter;
+            float center = leftCenter + (int) (dis * leftFraction);
+            left = (int) (center - halfWidth);
+            right = (int) (center + halfWidth);
+
+            int leftColor = leftTab.getColor();
+            int rightColor = rightTab.getColor();
+            if (leftColor == rightColor) {
+                mSelectedIndicatorPaint.setColor(leftColor);
+            } else {
+                mSelectedIndicatorPaint.setColor(
+                        (Integer) mArgbEvaluator.evaluate(leftFraction, leftColor, rightColor));
+            }
+        } else if (leftTab != null) {
+            left = (int) (leftTab.getLeft() + leftTab.getWidth() * leftFraction);
             right = left + leftTab.getWidth();
+            mSelectedIndicatorPaint.setColor(leftTab.getColor());
+        } else if (rightTab != null) {
+            right = (int) (rightTab.getRight() - (rightTab.getWidth() * rightFraction));
+            left = right - rightTab.getWidth();
+            mSelectedIndicatorPaint.setColor(rightTab.getColor());
         }
         setIndicatorPosition(left, right);
     }
@@ -116,17 +159,41 @@ private void setIndicatorPosition(int left, int right) {
             mIndicatorLeft = left;
             mIndicatorRight = right;
             invalidate();
+            centerInScrollView();
         }
     }
 
+    private void centerInScrollView() {
+        HorizontalScrollView scrollView = (HorizontalScrollView) getParent();
+        int padding = getLeft();
+        int center = (mIndicatorLeft + mIndicatorRight) / 2 + padding;
+        int scroll = center - (scrollView.getWidth() / 2);
+        int maxAmount = getWidth() - scrollView.getWidth() + padding + padding;
+        int boundedScroll = Utilities.boundToRange(scroll, 0, maxAmount);
+        scrollView.scrollTo(boundedScroll, 0);
+    }
+
     @Override
     protected void onDraw(Canvas canvas) {
         super.onDraw(canvas);
 
         float y = getHeight() - mDividerPaint.getStrokeWidth();
         canvas.drawLine(getPaddingLeft(), y, getWidth() - getPaddingRight(), y, mDividerPaint);
-        canvas.drawRect(mIndicatorLeft, getHeight() - mSelectedIndicatorHeight,
-            mIndicatorRight, getHeight(), mSelectedIndicatorPaint);
+        drawIndicator(canvas, mIndicatorLeft, getHeight() - mSelectedIndicatorHeight,
+                mIndicatorRight, getHeight(), mSelectedIndicatorPaint);
+    }
+
+    private void drawIndicator(Canvas canvas, int l, int t, int r, int b, Paint paint) {
+        l = Math.max(l, getPaddingLeft());
+        r = Math.min(r, getWidth() - getPaddingRight());
+        paint.setAntiAlias(true);
+        mIndicatorPath.reset();
+        mIndicatorPath.moveTo(l, b);
+        mIndicatorPath.quadTo(l, t, l + mSelectedIndicatorHeight, t);
+        mIndicatorPath.lineTo(r - mSelectedIndicatorHeight, t);
+        mIndicatorPath.quadTo(r, t, r, b);
+        mIndicatorPath.lineTo(r, b);
+        canvas.drawPath(mIndicatorPath, paint);
     }
 
     public void highlightWorkTabIfNecessary() {
@@ -168,10 +235,36 @@ public void setContainerView(AllAppsContainerView containerView) {
     }
 
     @Override
-    public void setMarkersCount(int numMarkers) { }
+    public void setMarkersCount(int numMarkers) {
+    }
 
     @Override
     public boolean hasOverlappingRendering() {
         return false;
     }
+
+    void inflateButtons(AllAppsTabs tabs) {
+        int childCount = getChildCount();
+        int count = tabs.getCount();
+        LayoutInflater inflater = LayoutInflater.from(getContext());
+        for (int i = childCount; i < count; i++) {
+            inflater.inflate(R.layout.all_apps_tab, this);
+        }
+        while (getChildCount() > count) {
+            removeViewAt(0);
+        }
+        for (int i = 0; i < tabs.getCount(); i++) {
+            AllAppsTabs.Tab tab = tabs.get(i);
+            ColoredButton button = (ColoredButton) getChildAt(i);
+            button.setColor(Utilities.getOmegaPrefs(getContext()).getAccentColor());
+            button.setText(tab.getName());
+            button.setOnLongClickListener(v -> {
+                DrawerTabEditBottomSheet.Companion
+                        .editTab(Launcher.getLauncher(getContext()), tab.getDrawerTab());
+                return true;
+            });
+        }
+        updateIndicatorPosition();
+        invalidate();
+    }
 }
diff --git a/src/com/android/launcher3/allapps/SearchUiManager.java b/src/com/android/launcher3/allapps/SearchUiManager.java
index cf9a0884bd..27b1c804d5 100644
--- a/src/com/android/launcher3/allapps/SearchUiManager.java
+++ b/src/com/android/launcher3/allapps/SearchUiManager.java
@@ -51,5 +51,7 @@ public interface SearchUiManager {
      * Called as part of state transition to update the content UI
      */
     void setContentVisibility(int visibleElements, PropertySetter setter,
-            Interpolator interpolator);
+                              Interpolator interpolator);
+
+    void startSearch();
 }
diff --git a/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java b/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java
index 4515dde25e..a1a511dc85 100644
--- a/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java
+++ b/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java
@@ -33,6 +33,7 @@
 import com.android.launcher3.util.PackageManagerHelper;
 
 import java.util.ArrayList;
+import java.util.List;
 
 /**
  * An interface to a search box that AllApps can command.
@@ -111,6 +112,11 @@ public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
         if (query.isEmpty()) {
             return false;
         }
+
+        if (mCb.onSubmitSearch()) {
+            return true;
+        }
+
         return mLauncher.startActivitySafely(v,
                 PackageManagerHelper.getMarketSearchIntent(mLauncher, query), null,
                 AppLaunchTracker.CONTAINER_SEARCH);
@@ -167,12 +173,14 @@ public interface Callbacks {
          *
          * @param apps sorted list of matching components or null if in case of failure.
          */
-        void onSearchResult(String query, ArrayList<ComponentKey> apps);
+        void onSearchResult(String query, ArrayList<ComponentKey> apps, List<String> suggestions);
 
         /**
          * Called when the search results should be cleared.
          */
         void clearSearchResult();
+
+        boolean onSubmitSearch();
     }
 
 }
\ No newline at end of file
diff --git a/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java b/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java
index 31fcc8c642..66f95aee58 100644
--- a/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java
+++ b/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java
@@ -15,19 +15,10 @@
  */
 package com.android.launcher3.allapps.search;
 
-import static android.view.View.MeasureSpec.EXACTLY;
-import static android.view.View.MeasureSpec.getSize;
-import static android.view.View.MeasureSpec.makeMeasureSpec;
-
-import static com.android.launcher3.LauncherState.ALL_APPS_HEADER;
-import static com.android.launcher3.Utilities.prefixTextWithIcon;
-import static com.android.launcher3.icons.IconNormalizer.ICON_VISIBLE_AREA_FACTOR;
-
 import android.content.Context;
+import android.content.Intent;
 import android.graphics.Rect;
 import android.text.Selection;
-import android.text.Spannable;
-import android.text.SpannableString;
 import android.text.SpannableStringBuilder;
 import android.text.method.TextKeyListener;
 import android.util.AttributeSet;
@@ -41,16 +32,23 @@
 import com.android.launcher3.Insettable;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.R;
-import com.android.launcher3.Utilities;
 import com.android.launcher3.allapps.AllAppsContainerView;
 import com.android.launcher3.allapps.AllAppsStore;
 import com.android.launcher3.allapps.AlphabeticalAppsList;
 import com.android.launcher3.allapps.SearchUiManager;
 import com.android.launcher3.anim.PropertySetter;
-import com.android.launcher3.graphics.TintedDrawableSpan;
 import com.android.launcher3.util.ComponentKey;
+import com.saggitt.omega.allapps.FuzzyAppSearchAlgorithm;
 
 import java.util.ArrayList;
+import java.util.List;
+
+import static android.view.View.MeasureSpec.EXACTLY;
+import static android.view.View.MeasureSpec.getSize;
+import static android.view.View.MeasureSpec.makeMeasureSpec;
+import static com.android.launcher3.LauncherState.ALL_APPS_HEADER;
+import static com.android.launcher3.Utilities.prefixTextWithIcon;
+import static com.android.launcher3.icons.IconNormalizer.ICON_VISIBLE_AREA_FACTOR;
 
 /**
  * Layout to contain the All-apps search UI.
@@ -59,7 +57,6 @@ public class AppsSearchContainerLayout extends ExtendedEditText
         implements SearchUiManager, AllAppsSearchBarController.Callbacks,
         AllAppsStore.OnUpdateListener, Insettable {
 
-
     private final Launcher mLauncher;
     private final AllAppsSearchBarController mSearchBarController;
     private final SpannableStringBuilder mSearchQueryBuilder;
@@ -140,7 +137,7 @@ public void initialize(AllAppsContainerView appsView) {
         mApps = appsView.getApps();
         mAppsView = appsView;
         mSearchBarController.initialize(
-                new DefaultAppSearchAlgorithm(mApps.getApps()), this, mLauncher, this);
+                new FuzzyAppSearchAlgorithm(getContext(), mApps.getApps()), this, mLauncher, this);
     }
 
     @Override
@@ -173,14 +170,29 @@ public void preDispatchKeyEvent(KeyEvent event) {
     }
 
     @Override
-    public void onSearchResult(String query, ArrayList<ComponentKey> apps) {
+    public void onSearchResult(String query, ArrayList<ComponentKey> apps, List<String> suggestions) {
         if (apps != null) {
             mApps.setOrderedFilter(apps);
+        }
+        if (suggestions != null) {
+            mApps.setSearchSuggestions(suggestions);
+        }
+        if (apps != null || suggestions != null) {
             notifyResultChanged();
             mAppsView.setLastSearchQuery(query);
         }
     }
 
+    @Override
+    public boolean onSubmitSearch() {
+        if (mApps.hasNoFilteredResults()) {
+            return false;
+        }
+        Intent i = mApps.getFilteredApps().get(0).getIntent();
+        getContext().startActivity(i);
+        return true;
+    }
+
     @Override
     public void clearSearchResult() {
         if (mApps.setOrderedFilter(null)) {
@@ -212,13 +224,17 @@ public float getScrollRangeDelta(Rect insets) {
         } else {
             int topMargin = Math.round(Math.max(
                     -mFixedTranslationY, insets.top - mMarginTopAdjusting));
-           return insets.bottom + topMargin + mFixedTranslationY;
+            return insets.bottom + topMargin + mFixedTranslationY;
         }
     }
 
     @Override
     public void setContentVisibility(int visibleElements, PropertySetter setter,
-            Interpolator interpolator) {
+                                     Interpolator interpolator) {
         setter.setViewAlpha(this, (visibleElements & ALL_APPS_HEADER) != 0 ? 1 : 0, interpolator);
     }
+
+    @Override
+    public void startSearch() {
+    }
 }
diff --git a/src/com/android/launcher3/allapps/search/DefaultAppSearchAlgorithm.java b/src/com/android/launcher3/allapps/search/DefaultAppSearchAlgorithm.java
index 26f6ec3572..f6cb62eb8b 100644
--- a/src/com/android/launcher3/allapps/search/DefaultAppSearchAlgorithm.java
+++ b/src/com/android/launcher3/allapps/search/DefaultAppSearchAlgorithm.java
@@ -15,26 +15,46 @@
  */
 package com.android.launcher3.allapps.search;
 
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.pm.LauncherActivityInfo;
 import android.os.Handler;
+import android.os.UserHandle;
 
+import com.android.launcher3.AppFilter;
 import com.android.launcher3.AppInfo;
+import com.android.launcher3.LauncherAppState;
+import com.android.launcher3.Utilities;
+import com.android.launcher3.compat.LauncherAppsCompat;
+import com.android.launcher3.compat.UserManagerCompat;
+import com.android.launcher3.icons.IconCache;
 import com.android.launcher3.util.ComponentKey;
+import com.saggitt.omega.allapps.OmegaAppFilter;
+import com.saggitt.omega.search.SearchProvider;
+import com.saggitt.omega.search.SearchProviderController;
+import com.saggitt.omega.search.webproviders.WebSearchProvider;
 
 import java.text.Collator;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 /**
  * The default search implementation.
  */
 public class DefaultAppSearchAlgorithm implements SearchAlgorithm {
-
+    public final static String SEARCH_HIDDEN_APPS = "pref_search_hidden_apps";
     private final List<AppInfo> mApps;
     protected final Handler mResultHandler;
+    private final Context mContext;
+
+    private final AppFilter mBaseFilter;
 
-    public DefaultAppSearchAlgorithm(List<AppInfo> apps) {
+    public DefaultAppSearchAlgorithm(Context context, List<AppInfo> apps) {
+        mContext = context;
         mApps = apps;
         mResultHandler = new Handler();
+        mBaseFilter = new OmegaAppFilter(context);
     }
 
     @Override
@@ -44,17 +64,43 @@ public void cancel(boolean interruptActiveRequests) {
         }
     }
 
+    public static List<AppInfo> getApps(Context context, List<AppInfo> defaultApps, AppFilter filter) {
+        if (!Utilities.getPrefs(context).getBoolean(SEARCH_HIDDEN_APPS, false)) {
+            return defaultApps;
+        }
+        final List<AppInfo> apps = new ArrayList<>();
+        final IconCache iconCache = LauncherAppState.getInstance(context).getIconCache();
+        for (UserHandle user : UserManagerCompat.getInstance(context).getUserProfiles()) {
+            final List<ComponentName> duplicatePreventionCache = new ArrayList<>();
+            for (LauncherActivityInfo info : LauncherAppsCompat.getInstance(context).getActivityList(null, user)) {
+                if (!filter.shouldShowApp(info.getComponentName(), user)) {
+                    continue;
+                }
+                if (!duplicatePreventionCache.contains(info.getComponentName())) {
+                    duplicatePreventionCache.add(info.getComponentName());
+                    final AppInfo appInfo = new AppInfo(context, info, user);
+                    iconCache.getTitleAndIcon(appInfo, false);
+                    apps.add(appInfo);
+                }
+            }
+        }
+        return apps;
+    }
+
     @Override
-    public void doSearch(final String query,
-            final AllAppsSearchBarController.Callbacks callback) {
+    public void doSearch(final String query, final AllAppsSearchBarController.Callbacks callback) {
         final ArrayList<ComponentKey> result = getTitleMatchResult(query);
-        mResultHandler.post(new Runnable() {
+        final List<String> suggestions = getSuggestions(query);
+        mResultHandler.post(() -> callback.onSearchResult(query, result, suggestions));
+    }
 
-            @Override
-            public void run() {
-                callback.onSearchResult(query, result);
-            }
-        });
+    private List<String> getSuggestions(String query) {
+        SearchProvider provider = SearchProviderController.Companion
+                .getInstance(mContext).getSearchProvider();
+        if (provider instanceof WebSearchProvider) {
+            return ((WebSearchProvider) provider).getSuggestions(query);
+        }
+        return Collections.emptyList();
     }
 
     private ArrayList<ComponentKey> getTitleMatchResult(String query) {
@@ -63,7 +109,7 @@ private ArrayList<ComponentKey> getTitleMatchResult(String query) {
         final String queryTextLower = query.toLowerCase();
         final ArrayList<ComponentKey> result = new ArrayList<>();
         StringMatcher matcher = StringMatcher.getInstance();
-        for (AppInfo info : mApps) {
+        for (AppInfo info : getApps(mContext, mApps, mBaseFilter)) {
             if (matches(info, queryTextLower, matcher)) {
                 result.add(info.toComponentKey());
             }
diff --git a/src/com/android/launcher3/anim/AnimatorPlaybackController.java b/src/com/android/launcher3/anim/AnimatorPlaybackController.java
index 4a52795f89..077714b55c 100644
--- a/src/com/android/launcher3/anim/AnimatorPlaybackController.java
+++ b/src/com/android/launcher3/anim/AnimatorPlaybackController.java
@@ -15,9 +15,6 @@
  */
 package com.android.launcher3.anim;
 
-import static com.android.launcher3.anim.Interpolators.LINEAR;
-import static com.android.launcher3.config.FeatureFlags.QUICKSTEP_SPRINGS;
-
 import android.animation.Animator;
 import android.animation.Animator.AnimatorListener;
 import android.animation.AnimatorListenerAdapter;
@@ -35,10 +32,13 @@
 import java.util.List;
 import java.util.Set;
 
+import static com.android.launcher3.anim.Interpolators.LINEAR;
+import static com.android.launcher3.config.FeatureFlags.QUICKSTEP_SPRINGS;
+
 /**
  * Helper class to control the playback of an {@link AnimatorSet}, with custom interpolators
  * and durations.
- *
+ * <p>
  * Note: The implementation does not support start delays on child animations or
  * sequential playbacks.
  */
@@ -294,6 +294,7 @@ public void setOnCancelRunnable(Runnable runnable) {
         mOnCancelRunnable = runnable;
     }
 
+
     public void skipToEnd() {
         mSkipToEnd = true;
         for (SpringAnimation spring : mSprings) {
diff --git a/src/com/android/launcher3/compat/AppWidgetManagerCompat.java b/src/com/android/launcher3/compat/AppWidgetManagerCompat.java
index fc5d11c23d..a2acbc90ce 100644
--- a/src/com/android/launcher3/compat/AppWidgetManagerCompat.java
+++ b/src/com/android/launcher3/compat/AppWidgetManagerCompat.java
@@ -28,14 +28,17 @@
 import com.android.launcher3.LauncherAppWidgetInfo;
 import com.android.launcher3.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.Utilities;
+import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.util.ComponentKey;
 import com.android.launcher3.util.PackageUserKey;
-import com.android.launcher3.widget.custom.CustomWidgetManager;
+import com.android.launcher3.widget.custom.CustomWidgetParser;
 
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 
 public abstract class AppWidgetManagerCompat {
+    private static final List<String> EMUI_BLACKLIST = Arrays.asList("com.android.systemui", "com.android.gallery3d", "com.android.mediacenter", "com.android.settings");
 
     private static final Object sInstanceLock = new Object();
     private static AppWidgetManagerCompat sInstance;
@@ -61,9 +64,15 @@ public static AppWidgetManagerCompat getInstance(Context context) {
         mAppWidgetManager = AppWidgetManager.getInstance(context);
     }
 
+    boolean isBlacklisted(String packageName) {
+        return Utilities.isEmui() && (packageName.toLowerCase().contains("huawei") || EMUI_BLACKLIST.contains(packageName));
+    }
+
     public LauncherAppWidgetProviderInfo getLauncherAppWidgetInfo(int appWidgetId) {
-        if (appWidgetId <= LauncherAppWidgetInfo.CUSTOM_WIDGET_ID) {
-            return CustomWidgetManager.INSTANCE.get(mContext).getWidgetProvider(appWidgetId);
+        if (FeatureFlags.ENABLE_CUSTOM_WIDGETS && appWidgetId <= LauncherAppWidgetInfo.CUSTOM_WIDGET_ID) {
+            //return CustomWidgetManager.INSTANCE.get(mContext).getWidgetProvider(appWidgetId);
+
+            return CustomWidgetParser.getWidgetProvider(mContext, appWidgetId);
         }
         AppWidgetProviderInfo info = mAppWidgetManager.getAppWidgetInfo(appWidgetId);
         return info == null ? null : LauncherAppWidgetProviderInfo.fromProviderInfo(mContext, info);
diff --git a/src/com/android/launcher3/compat/AppWidgetManagerCompatVL.java b/src/com/android/launcher3/compat/AppWidgetManagerCompatVL.java
index c8b1f67c34..76db406bc5 100644
--- a/src/com/android/launcher3/compat/AppWidgetManagerCompatVL.java
+++ b/src/com/android/launcher3/compat/AppWidgetManagerCompatVL.java
@@ -33,6 +33,7 @@
 import com.android.launcher3.util.PackageUserKey;
 import com.android.launcher3.widget.custom.CustomAppWidgetProviderInfo;
 import com.android.launcher3.widget.custom.CustomWidgetManager;
+import com.android.launcher3.widget.custom.CustomWidgetParser;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -59,9 +60,22 @@ public List<AppWidgetProviderInfo> getAllProviders(@Nullable PackageUserKey pack
             for (UserHandle user : mUserManager.getUserProfiles()) {
                 providers.addAll(mAppWidgetManager.getInstalledProvidersForProfile(user));
             }
-            providers.addAll(getCustomWidgets());
+            Iterator<AppWidgetProviderInfo> iterator = providers.iterator();
+            while (iterator.hasNext()) {
+                if (isBlacklisted(iterator.next().provider.getPackageName())) {
+                    iterator.remove();
+                }
+            }
+            if (FeatureFlags.ENABLE_CUSTOM_WIDGETS) {
+                providers.addAll(CustomWidgetParser.getCustomWidgets(mContext));
+            }
             return providers;
         }
+
+        if (isBlacklisted(packageUser.mPackageName)) {
+            return Collections.emptyList();
+        }
+
         // Only get providers for the given package/user.
         List<AppWidgetProviderInfo> providers = new ArrayList<>(mAppWidgetManager
                 .getInstalledProvidersForProfile(packageUser.mUser));
@@ -72,9 +86,9 @@ public List<AppWidgetProviderInfo> getAllProviders(@Nullable PackageUserKey pack
             }
         }
 
-        if (Process.myUserHandle().equals(packageUser.mUser)
+        if (FeatureFlags.ENABLE_CUSTOM_WIDGETS && Process.myUserHandle().equals(packageUser.mUser)
                 && mContext.getPackageName().equals(packageUser.mPackageName)) {
-            providers.addAll(getCustomWidgets());
+            providers.addAll(CustomWidgetParser.getCustomWidgets(mContext));
         }
         return providers;
     }
@@ -85,7 +99,7 @@ public boolean bindAppWidgetIdIfAllowed(int appWidgetId, AppWidgetProviderInfo i
         if (FeatureFlags.GO_DISABLE_WIDGETS) {
             return false;
         }
-        if (appWidgetId <= LauncherAppWidgetInfo.CUSTOM_WIDGET_ID) {
+        if (FeatureFlags.ENABLE_CUSTOM_WIDGETS && appWidgetId <= LauncherAppWidgetInfo.CUSTOM_WIDGET_ID) {
             return true;
         }
         return mAppWidgetManager.bindAppWidgetIdIfAllowed(
@@ -104,7 +118,7 @@ public LauncherAppWidgetProviderInfo findProvider(ComponentName provider, UserHa
             }
         }
 
-        if (Process.myUserHandle().equals(user)) {
+        if (FeatureFlags.ENABLE_CUSTOM_WIDGETS && Process.myUserHandle().equals(user)) {
             for (LauncherAppWidgetProviderInfo info : getCustomWidgets()) {
                 if (info.provider.equals(provider)) {
                     return info;
@@ -123,11 +137,15 @@ public HashMap<ComponentKey, AppWidgetProviderInfo> getAllProvidersMap() {
         for (UserHandle user : mUserManager.getUserProfiles()) {
             for (AppWidgetProviderInfo info :
                     mAppWidgetManager.getInstalledProvidersForProfile(user)) {
-                result.put(new ComponentKey(info.provider, user), info);
+                if (!isBlacklisted(info.provider.getPackageName()))
+                    result.put(new ComponentKey(info.provider, user), info);
             }
         }
-        for (LauncherAppWidgetProviderInfo info : getCustomWidgets()) {
-            result.put(new ComponentKey(info.provider, info.getProfile()), info);
+        if (FeatureFlags.ENABLE_CUSTOM_WIDGETS) {
+            for (LauncherAppWidgetProviderInfo info :
+                    CustomWidgetParser.getCustomWidgets(mContext)) {
+                result.put(new ComponentKey(info.provider, info.getProfile()), info);
+            }
         }
         return result;
     }
diff --git a/src/com/android/launcher3/config/BaseFlags.java b/src/com/android/launcher3/config/BaseFlags.java
index 37ab866536..6750a872a4 100644
--- a/src/com/android/launcher3/config/BaseFlags.java
+++ b/src/com/android/launcher3/config/BaseFlags.java
@@ -58,7 +58,7 @@ public static boolean showFlagTogglerUi(Context context) {
     public static final boolean IS_DOGFOOD_BUILD = false;
 
     // When enabled the promise icon is visible in all apps while installation an app.
-    public static final boolean LAUNCHER3_PROMISE_APPS_IN_ALL_APPS = true;
+    public static final boolean LAUNCHER3_PROMISE_APPS_IN_ALL_APPS = false;
 
     // When enabled a promise icon is added to the home screen when install session is active.
     public static final TogglableFlag PROMISE_APPS_NEW_INSTALLS =
@@ -66,7 +66,7 @@ public static boolean showFlagTogglerUi(Context context) {
                     "Adds a promise icon to the home screen for new install sessions.");
 
     // Enable moving the QSB on the 0th screen of the workspace
-    public static final boolean QSB_ON_FIRST_SCREEN = true;
+    public static final boolean QSB_ON_FIRST_SCREEN = false;
 
     public static final TogglableFlag EXAMPLE_FLAG = new TogglableFlag("EXAMPLE_FLAG", true,
             "An example flag that doesn't do anything. Useful for testing");
@@ -74,6 +74,9 @@ public static boolean showFlagTogglerUi(Context context) {
     //Feature flag to enable pulling down navigation shade from workspace.
     public static final boolean PULL_DOWN_STATUS_BAR = true;
 
+    // When true, custom widgets are loaded using CustomWidgetParser.
+    public static final boolean ENABLE_CUSTOM_WIDGETS = true;
+
     // Features to control Launcher3Go behavior
     public static final boolean GO_DISABLE_WIDGETS = false;
 
@@ -91,14 +94,14 @@ public static boolean showFlagTogglerUi(Context context) {
             "APPLY_CONFIG_AT_RUNTIME", true, "Apply display changes dynamically");
 
     public static final TogglableFlag QUICKSTEP_SPRINGS = new TogglableFlag("QUICKSTEP_SPRINGS",
-            false, "Enable springs for quickstep animations");
+            true, "Enable springs for quickstep animations");
 
     public static final TogglableFlag ADAPTIVE_ICON_WINDOW_ANIM = new TogglableFlag(
             "ADAPTIVE_ICON_WINDOW_ANIM", true,
             "Use adaptive icons for window animations.");
 
     public static final TogglableFlag ENABLE_QUICKSTEP_LIVE_TILE = new TogglableFlag(
-            "ENABLE_QUICKSTEP_LIVE_TILE", false, "Enable live tile in Quickstep overview");
+            "ENABLE_QUICKSTEP_LIVE_TILE", true, "Enable live tile in Quickstep overview");
 
     public static final TogglableFlag ENABLE_HINTS_IN_OVERVIEW = new TogglableFlag(
             "ENABLE_HINTS_IN_OVERVIEW", true,
diff --git a/src/com/android/launcher3/dot/FolderDotInfo.java b/src/com/android/launcher3/dot/FolderDotInfo.java
index 54800a07a8..85194838ea 100644
--- a/src/com/android/launcher3/dot/FolderDotInfo.java
+++ b/src/com/android/launcher3/dot/FolderDotInfo.java
@@ -19,6 +19,7 @@
 import android.view.ViewDebug;
 
 import com.android.launcher3.Utilities;
+import com.saggitt.omega.OmegaLauncher;
 
 /**
  * Subclass of DotInfo that only contains the dot count, which is
@@ -50,7 +51,13 @@ public void subtractDotInfo(DotInfo dotToSubtract) {
 
     @Override
     public int getNotificationCount() {
-        return mNumNotifications;
+        boolean showBadgeCount = OmegaLauncher.showFolderNotificationCount;
+        if (showBadgeCount) {
+            return mNumNotifications;
+        } else {
+            // This forces the folder badge to always show up as a dot.
+            return 0;
+        }
     }
 
     @ViewDebug.ExportedProperty(category = "launcher")
diff --git a/src/com/android/launcher3/folder/Folder.java b/src/com/android/launcher3/folder/Folder.java
index 0bd2c9af7f..f8c701a9ae 100644
--- a/src/com/android/launcher3/folder/Folder.java
+++ b/src/com/android/launcher3/folder/Folder.java
@@ -16,16 +16,13 @@
 
 package com.android.launcher3.folder;
 
-import static com.android.launcher3.LauncherAnimUtils.SPRING_LOADED_EXIT_DELAY;
-import static com.android.launcher3.LauncherState.NORMAL;
-import static com.android.launcher3.compat.AccessibilityManagerCompat.sendCustomAccessibilityEvent;
-
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
 import android.annotation.SuppressLint;
 import android.appwidget.AppWidgetHostView;
 import android.content.Context;
+import android.content.res.Resources;
 import android.graphics.Canvas;
 import android.graphics.Path;
 import android.graphics.Rect;
@@ -82,12 +79,17 @@
 import com.android.launcher3.util.Thunk;
 import com.android.launcher3.views.ClipPathView;
 import com.android.launcher3.widget.PendingAddShortcutInfo;
+import com.saggitt.omega.groups.DrawerFolderInfo;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
+import static com.android.launcher3.LauncherAnimUtils.SPRING_LOADED_EXIT_DELAY;
+import static com.android.launcher3.LauncherState.NORMAL;
+import static com.android.launcher3.compat.AccessibilityManagerCompat.sendCustomAccessibilityEvent;
+
 /**
  * Represents a set of icons chosen by the user or generated by the system.
  */
@@ -181,20 +183,28 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
     // Folder scrolling
     private int mScrollAreaOffset;
 
-    @Thunk int mScrollHintDir = SCROLL_NONE;
-    @Thunk int mCurrentScrollDir = SCROLL_NONE;
+    @Thunk
+    int mScrollHintDir = SCROLL_NONE;
+    @Thunk
+    int mCurrentScrollDir = SCROLL_NONE;
+
+    private static String sDefaultFolderName;
 
     /**
      * Used to inflate the Workspace from XML.
      *
      * @param context The application's context.
-     * @param attrs The attributes set containing the Workspace's customization values.
+     * @param attrs   The attributes set containing the Workspace's customization values.
      */
     public Folder(Context context, AttributeSet attrs) {
         super(context, attrs);
         setAlwaysDrawnWithCacheEnabled(false);
 
         mLauncher = Launcher.getLauncher(context);
+        Resources res = getResources();
+        if (sDefaultFolderName == null) {
+            sDefaultFolderName = res.getString(R.string.default_folder_name);
+        }
         // We need this view to be focusable in touch mode so that when text editing of the folder
         // name is complete, we have something to focus on, thus hiding the cursor and giving
         // reliable behavior when clicking the text field (since it will always gain focus on click).
@@ -268,6 +278,10 @@ public void onDragStart(DropTarget.DragObject dragObject, DragOptions options) {
             return;
         }
 
+        if (isInAppDrawer()) {
+            close(true);
+        }
+
         mContent.removeItem(mCurrentDragView);
         if (dragObject.dragInfo instanceof WorkspaceItemInfo) {
             mItemsInvalidated = true;
@@ -404,10 +418,13 @@ void bind(FolderInfo info) {
             mFolderName.setText("");
             mFolderName.setHint(R.string.folder_hint_text);
         }
+
         // In case any children didn't come across during loading, clean up the folder accordingly
-        mFolderIcon.post(() -> {
-            if (getItemCount() <= 1) {
-                replaceFolderWithFinalItem();
+        mFolderIcon.post(new Runnable() {
+            public void run() {
+                if (getItemCount() <= 1 && !isInAppDrawer()) {
+                    replaceFolderWithFinalItem();
+                }
             }
         });
     }
@@ -694,18 +711,19 @@ private void closeComplete(boolean wasAnimated) {
             mRearrangeOnClose = false;
         }
         if (getItemCount() <= 1) {
-            if (!mDragInProgress && !mSuppressFolderDeletion) {
+            if (!mDragInProgress && !mSuppressFolderDeletion && !isInAppDrawer()) {
                 replaceFolderWithFinalItem();
             } else if (mDragInProgress) {
                 mDeleteFolderOnDropCompleted = true;
             }
-        } else if (!mDragInProgress) {
-            mContent.unbindItems();
         }
         mSuppressFolderDeletion = false;
         clearDragInfo();
         mState = STATE_SMALL;
         mContent.setCurrentPage(0);
+        if (mInfo instanceof DrawerFolderInfo) {
+            ((DrawerFolderInfo) mInfo).onCloseComplete();
+        }
     }
 
     @Override
@@ -810,6 +828,12 @@ public void onAlarm(Alarm alarm) {
     };
 
     public void completeDragExit() {
+        if (isInAppDrawer()) {
+            // This is faster and more straightforward than trying to get the dragged app reliably
+            // back into the folder in any other way
+            mLauncher.getAppsView().getApps().reset();
+            return;
+        }
         if (mIsOpen) {
             close(true);
             mRearrangeOnClose = true;
@@ -1271,6 +1295,9 @@ public void onAdd(WorkspaceItemInfo item, int rank) {
     }
 
     public void onRemove(WorkspaceItemInfo item) {
+        if (isInAppDrawer()) {
+            return;
+        }
         mItemsInvalidated = true;
         View v = getViewForInfo(item);
         mContent.removeItem(v);
@@ -1297,6 +1324,13 @@ public void onItemsChanged(boolean animate) {
         updateTextViewFocus();
     }
 
+    public static String getDefaultFolderName() {
+        return sDefaultFolderName;
+    }
+
+    public void onTitleChanged(CharSequence title) {
+    }
+
     /**
      * Utility methods to iterate over items of the view
      */
@@ -1517,4 +1551,13 @@ public void draw(Canvas canvas) {
             super.draw(canvas);
         }
     }
+
+    @Override
+    public void prepareAutoUpdate() {
+        close(false);
+    }
+
+    public boolean isInAppDrawer() {
+        return mInfo.container == ItemInfo.NO_ID;
+    }
 }
diff --git a/src/com/android/launcher3/folder/FolderAnimationManager.java b/src/com/android/launcher3/folder/FolderAnimationManager.java
index 1310d374ea..1d2bac828c 100644
--- a/src/com/android/launcher3/folder/FolderAnimationManager.java
+++ b/src/com/android/launcher3/folder/FolderAnimationManager.java
@@ -16,12 +16,6 @@
 
 package com.android.launcher3.folder;
 
-import static com.android.launcher3.BubbleTextView.TEXT_ALPHA_PROPERTY;
-import static com.android.launcher3.LauncherAnimUtils.SCALE_PROPERTY;
-import static com.android.launcher3.folder.ClippedFolderIconLayoutRule.MAX_NUM_ITEMS_IN_PREVIEW;
-import static com.android.launcher3.graphics.IconShape.getShape;
-import static com.android.launcher3.icons.GraphicsUtils.setColorAlphaBound;
-
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
@@ -31,6 +25,7 @@
 import android.content.res.Resources;
 import android.graphics.Rect;
 import android.graphics.drawable.GradientDrawable;
+import android.util.Log;
 import android.util.Property;
 import android.view.View;
 import android.view.animation.AnimationUtils;
@@ -50,9 +45,15 @@
 
 import java.util.List;
 
+import static com.android.launcher3.BubbleTextView.TEXT_ALPHA_PROPERTY;
+import static com.android.launcher3.LauncherAnimUtils.SCALE_PROPERTY;
+import static com.android.launcher3.folder.ClippedFolderIconLayoutRule.MAX_NUM_ITEMS_IN_PREVIEW;
+import static com.android.launcher3.graphics.IconShape.getShape;
+import static com.android.launcher3.icons.GraphicsUtils.setColorAlphaBound;
+
 /**
  * Manages the opening and closing animations for a {@link Folder}.
- *
+ * <p>
  * All of the animations are done in the Folder.
  * ie. When the user taps on the FolderIcon, we immediately hide the FolderIcon and show the Folder
  * in its place before starting the animation.
@@ -128,6 +129,7 @@ public AnimatorSet getAnimator() {
         // Match size/scale of icons in the preview
         float previewScale = rule.scaleForItem(itemsInPreview.size());
         float previewSize = rule.getIconSize() * previewScale;
+        Log.d("FolderAnimation", "Items " + itemsInPreview.get(0));
         float initialScale = previewSize / itemsInPreview.get(0).getIconSize()
                 * scaleRelativeToDragLayer;
         final float finalScale = 1f;
diff --git a/src/com/android/launcher3/folder/FolderIcon.java b/src/com/android/launcher3/folder/FolderIcon.java
index fd6d1e38a9..1fe2920ae7 100644
--- a/src/com/android/launcher3/folder/FolderIcon.java
+++ b/src/com/android/launcher3/folder/FolderIcon.java
@@ -16,14 +16,12 @@
 
 package com.android.launcher3.folder;
 
-import static com.android.launcher3.folder.ClippedFolderIconLayoutRule.MAX_NUM_ITEMS_IN_PREVIEW;
-import static com.android.launcher3.folder.PreviewItemManager.INITIAL_ITEM_ANIMATION_DURATION;
-
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.ObjectAnimator;
 import android.content.Context;
 import android.graphics.Canvas;
+import android.graphics.Paint;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
@@ -69,18 +67,24 @@
 import com.android.launcher3.util.Thunk;
 import com.android.launcher3.views.IconLabelDotView;
 import com.android.launcher3.widget.PendingAddShortcutInfo;
+import com.saggitt.omega.groups.DrawerFolderInfo;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Predicate;
 
+import static com.android.launcher3.folder.ClippedFolderIconLayoutRule.MAX_NUM_ITEMS_IN_PREVIEW;
+import static com.android.launcher3.folder.PreviewItemManager.INITIAL_ITEM_ANIMATION_DURATION;
+
 /**
  * An icon that can appear on in the workspace representing an {@link Folder}.
  */
 public class FolderIcon extends FrameLayout implements FolderListener, IconLabelDotView {
 
-    @Thunk Launcher mLauncher;
-    @Thunk Folder mFolder;
+    @Thunk
+    Launcher mLauncher;
+    @Thunk
+    Folder mFolder;
     private FolderInfo mInfo;
 
     private CheckLongPressHelper mLongPressHelper;
@@ -120,6 +124,8 @@ public class FolderIcon extends FrameLayout implements FolderListener, IconLabel
     private float mDotScale;
     private Animator mDotScaleAnim;
 
+    public boolean isCustomIcon = false;
+
     private static final Property<FolderIcon, Float> DOT_SCALE_PROPERTY
             = new Property<FolderIcon, Float>(Float.TYPE, "dotScale") {
         @Override
@@ -172,7 +178,13 @@ public static FolderIcon fromXml(int resId, Launcher launcher, ViewGroup group,
         icon.mFolderName.setText(folderInfo.title);
         icon.mFolderName.setCompoundDrawablePadding(0);
         FrameLayout.LayoutParams lp = (FrameLayout.LayoutParams) icon.mFolderName.getLayoutParams();
-        lp.topMargin = grid.iconSizePx + grid.iconDrawablePaddingPx;
+        if (folderInfo instanceof DrawerFolderInfo) {
+            lp.topMargin = grid.allAppsIconSizePx + grid.allAppsIconDrawablePaddingPx;
+            icon.mBackground = new PreviewBackground(true);
+            ((DrawerFolderInfo) folderInfo).getAppsStore().registerFolderIcon(icon);
+        } else {
+            lp.topMargin = grid.iconSizePx + grid.iconDrawablePaddingPx;
+        }
 
         icon.setTag(folderInfo);
         icon.setOnClickListener(ItemClickHandler.INSTANCE);
@@ -211,6 +223,14 @@ public float getBackgroundStrokeWidth() {
         return mBackground.getStrokeWidth();
     }
 
+    public void unbind() {
+        if (mInfo != null) {
+            mInfo.removeListener(this);
+            mInfo.removeListener(mFolder);
+            mInfo = null;
+        }
+    }
+
     public Folder getFolder() {
         return mFolder;
     }
@@ -306,7 +326,7 @@ private void onDrop(final WorkspaceItemInfo item, DragView animateView, Rect fin
             Rect from = new Rect();
             dragLayer.getViewRectRelativeToSelf(animateView, from);
             Rect to = finalRect;
-            if (to == null) {
+            if (to == null && !isInAppDrawer()) {
                 to = new Rect();
                 Workspace workspace = mLauncher.getWorkspace();
                 // Set cellLayout and this to it's final state to compute final animation locations
@@ -328,7 +348,7 @@ private void onDrop(final WorkspaceItemInfo item, DragView animateView, Rect fin
                 List<WorkspaceItemInfo> oldPreviewItems = new ArrayList<>(mCurrentPreviewItems);
                 mInfo.add(item, index, false);
                 mCurrentPreviewItems.clear();
-                mCurrentPreviewItems.addAll(getPreviewItemsOnPage(0));
+                mCurrentPreviewItems.addAll(getPreviewItems());
 
                 if (!oldPreviewItems.equals(mCurrentPreviewItems)) {
                     int newIndex = mCurrentPreviewItems.indexOf(item);
@@ -350,6 +370,10 @@ private void onDrop(final WorkspaceItemInfo item, DragView animateView, Rect fin
                 mInfo.add(item, index, true);
             }
 
+            if (isInAppDrawer()) {
+                return;
+            }
+
             int[] center = new int[2];
             float scale = getLocalCenterForIndex(index, numItemsInPreview, center);
             center[0] = Math.round(scaleRelativeToDragLayer * center[0]);
@@ -556,15 +580,57 @@ public boolean getTextVisible() {
     /**
      * Returns the list of items which should be visible in the preview
      */
+
     public List<WorkspaceItemInfo> getPreviewItemsOnPage(int page) {
         return mPreviewVerifier.setFolderInfo(mInfo).previewItemsForPage(page, mInfo.contents);
     }
 
+    public List<WorkspaceItemInfo> getPreviewItems() {
+        return getPreviewItemsOnPage(0);
+    }
+
+    public void verifyHighRes() {
+        int processedItemCount = 0;
+        List<BubbleTextView> itemsOnPage = mFolder.getItemsOnPage(0);
+        int numItems = itemsOnPage.size();
+        for (int rank = 0; rank < numItems; ++rank) {
+            if (mPreviewVerifier.isItemInPreview(0, rank)) {
+                BubbleTextView item = itemsOnPage.get(rank);
+                item.verifyHighRes(info -> {
+                    item.reapplyItemInfo(info);
+                    updatePreviewItems(false);
+                    invalidate();
+                });
+                processedItemCount++;
+            }
+
+            if (processedItemCount == MAX_NUM_ITEMS_IN_PREVIEW) {
+                break;
+            }
+        }
+    }
+
     @Override
     protected boolean verifyDrawable(@NonNull Drawable who) {
         return mPreviewItemManager.verifyDrawable(who) || super.verifyDrawable(who);
     }
 
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        if (!mInfo.useIconMode(mLauncher) && isInAppDrawer()) {
+            DeviceProfile grid = mLauncher.getDeviceProfile();
+            int drawablePadding = grid.allAppsIconDrawablePaddingPx;
+
+            Paint.FontMetrics fm = mFolderName.getPaint().getFontMetrics();
+            int cellHeightPx = mFolderName.getIconSize() + drawablePadding +
+                    (int) Math.ceil(fm.bottom - fm.top);
+            int height = MeasureSpec.getSize(heightMeasureSpec);
+            setPadding(getPaddingLeft(), (height - cellHeightPx) / 2, getPaddingRight(),
+                    getPaddingBottom());
+        }
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+    }
+
     @Override
     public void onItemsChanged(boolean animate) {
         updatePreviewItems(animate);
@@ -578,6 +644,10 @@ private void updatePreviewItems(boolean animate) {
         mCurrentPreviewItems.addAll(getPreviewItemsOnPage(0));
     }
 
+    @Override
+    public void prepareAutoUpdate() {
+    }
+
     /**
      * Updates the preview items which match the provided condition
      */
@@ -651,6 +721,9 @@ public void removeListeners() {
     }
 
     public void clearLeaveBehindIfExists() {
+        if (isInAppDrawer()) {
+            return;
+        }
         ((CellLayout.LayoutParams) getLayoutParams()).canReorder = true;
         if (mInfo.container == LauncherSettings.Favorites.CONTAINER_HOTSEAT) {
             CellLayout cl = (CellLayout) getParent().getParent();
@@ -659,6 +732,9 @@ public void clearLeaveBehindIfExists() {
     }
 
     public void drawLeaveBehindIfExists() {
+        if (isInAppDrawer()) {
+            return;
+        }
         CellLayout.LayoutParams lp = (CellLayout.LayoutParams) getLayoutParams();
         // While the folder is open, the position of the icon cannot change.
         lp.canReorder = false;
@@ -671,4 +747,8 @@ public void drawLeaveBehindIfExists() {
     public void onFolderClose(int currentPage) {
         mPreviewItemManager.onFolderClose(currentPage);
     }
+
+    public boolean isInAppDrawer() {
+        return mInfo instanceof DrawerFolderInfo;
+    }
 }
diff --git a/src/com/android/launcher3/folder/FolderPagedView.java b/src/com/android/launcher3/folder/FolderPagedView.java
index 3b5fd5902c..f52f3ce815 100644
--- a/src/com/android/launcher3/folder/FolderPagedView.java
+++ b/src/com/android/launcher3/folder/FolderPagedView.java
@@ -197,8 +197,10 @@ public View createNewView(WorkspaceItemInfo item) {
         if (item == null) {
             return null;
         }
-        final BubbleTextView textView = mViewCache.getView(
-                R.layout.folder_application, getContext(), null);
+        int layout = mFolder.isInAppDrawer() ? R.layout.all_apps_folder_application
+                : R.layout.folder_application;
+
+        final BubbleTextView textView = mViewCache.getView(layout, getContext(), null);
         textView.applyFromWorkspaceItem(item);
         textView.setOnClickListener(ItemClickHandler.INSTANCE);
         textView.setOnLongClickListener(mFolder);
@@ -227,7 +229,13 @@ public CellLayout getCurrentCellLayout() {
     private CellLayout createAndAddNewPage() {
         DeviceProfile grid = Launcher.getLauncher(getContext()).getDeviceProfile();
         CellLayout page = mViewCache.getView(R.layout.folder_page, getContext(), this);
-        page.setCellDimensions(grid.folderCellWidthPx, grid.folderCellHeightPx);
+        if (mFolder.isInAppDrawer()) {
+            page.setCellDimensions(grid.allAppsFolderCellWidthPx, grid.allAppsFolderCellHeightPx);
+        } else {
+            page.setCellDimensions(grid.folderCellWidthPx, grid.folderCellHeightPx);
+        }
+        //page.setCellDimensions(grid.folderCellWidthPx, grid.folderCellHeightPx);
+
         page.getShortcutsAndWidgets().setMotionEventSplittingEnabled(false);
         page.setInvertIfRtl(true);
         page.setGridSize(mGridCountX, mGridCountY);
diff --git a/src/com/android/launcher3/folder/PreviewBackground.java b/src/com/android/launcher3/folder/PreviewBackground.java
index b2c0ca7213..0f07a14f3c 100644
--- a/src/com/android/launcher3/folder/PreviewBackground.java
+++ b/src/com/android/launcher3/folder/PreviewBackground.java
@@ -16,9 +16,6 @@
 
 package com.android.launcher3.folder;
 
-import static com.android.launcher3.graphics.IconShape.getShape;
-import static com.android.launcher3.icons.GraphicsUtils.setColorAlphaBound;
-
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.ObjectAnimator;
@@ -44,6 +41,9 @@
 import com.android.launcher3.R;
 import com.android.launcher3.views.ActivityContext;
 
+import static com.android.launcher3.graphics.IconShape.getShape;
+import static com.android.launcher3.icons.GraphicsUtils.setColorAlphaBound;
+
 /**
  * This object represents a FolderIcon preview background. It stores drawing / measurement
  * information, handles drawing, and animation (accept state <--> rest state).
@@ -96,6 +96,16 @@ public class PreviewBackground {
     private ObjectAnimator mStrokeAlphaAnimator;
     private ObjectAnimator mShadowAnimator;
 
+    private boolean isInDrawer;
+
+    public PreviewBackground() {
+        this(false);
+    }
+
+    public PreviewBackground(boolean inDrawer) {
+        isInDrawer = inDrawer;
+    }
+
     private static final Property<PreviewBackground, Integer> STROKE_ALPHA =
             new Property<PreviewBackground, Integer>(Integer.class, "strokeAlpha") {
                 @Override
@@ -135,10 +145,11 @@ public void setup(Context context, ActivityContext activity, View invalidateDele
         ta.recycle();
 
         DeviceProfile grid = activity.getWallpaperDeviceProfile();
-        previewSize = grid.folderIconSizePx;
+        previewSize = isInDrawer ? grid.allAppsFolderIconSizePx : grid.folderIconSizePx;
 
         basePreviewOffsetX = (availableSpaceX - previewSize) / 2;
-        basePreviewOffsetY = topPadding + grid.folderIconOffsetYPx;
+        basePreviewOffsetY = topPadding +
+                (isInDrawer ? grid.allAppsFolderIconOffsetYPx : grid.folderIconOffsetYPx);
 
         // Stroke width is 1dp
         mStrokeWidth = context.getResources().getDisplayMetrics().density;
@@ -147,8 +158,8 @@ public void setup(Context context, ActivityContext activity, View invalidateDele
         float shadowRadius = radius + mStrokeWidth;
         int shadowColor = Color.argb(SHADOW_OPACITY, 0, 0, 0);
         mShadowShader = new RadialGradient(0, 0, 1,
-                new int[] {shadowColor, Color.TRANSPARENT},
-                new float[] {radius / shadowRadius, 1},
+                new int[]{shadowColor, Color.TRANSPARENT},
+                new float[]{radius / shadowRadius, 1},
                 Shader.TileMode.CLAMP);
 
         invalidate();
@@ -201,6 +212,10 @@ void setInvalidateDelegate(View invalidateDelegate) {
         invalidate();
     }
 
+    public void setStartOpacity(float opacity) {
+        mColorMultiplier = opacity;
+    }
+
     public int getBgColor() {
         int alpha = (int) Math.min(MAX_BG_OPACITY, BG_OPACITY * mColorMultiplier);
         return setColorAlphaBound(mBgColor, alpha);
diff --git a/src/com/android/launcher3/folder/PreviewItemManager.java b/src/com/android/launcher3/folder/PreviewItemManager.java
index 2d817e6d2d..1229daefac 100644
--- a/src/com/android/launcher3/folder/PreviewItemManager.java
+++ b/src/com/android/launcher3/folder/PreviewItemManager.java
@@ -16,11 +16,6 @@
 
 package com.android.launcher3.folder;
 
-import static com.android.launcher3.folder.ClippedFolderIconLayoutRule.ENTER_INDEX;
-import static com.android.launcher3.folder.ClippedFolderIconLayoutRule.EXIT_INDEX;
-import static com.android.launcher3.folder.ClippedFolderIconLayoutRule.MAX_NUM_ITEMS_IN_PREVIEW;
-import static com.android.launcher3.folder.FolderIcon.DROP_IN_ANIMATION_DURATION;
-
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.ObjectAnimator;
@@ -35,6 +30,7 @@
 
 import androidx.annotation.NonNull;
 
+import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.WorkspaceItemInfo;
@@ -45,6 +41,11 @@
 import java.util.List;
 import java.util.function.Predicate;
 
+import static com.android.launcher3.folder.ClippedFolderIconLayoutRule.ENTER_INDEX;
+import static com.android.launcher3.folder.ClippedFolderIconLayoutRule.EXIT_INDEX;
+import static com.android.launcher3.folder.ClippedFolderIconLayoutRule.MAX_NUM_ITEMS_IN_PREVIEW;
+import static com.android.launcher3.folder.FolderIcon.DROP_IN_ANIMATION_DURATION;
+
 /**
  * Manages the drawing and animations of {@link PreviewItemDrawingParams} for a {@link FolderIcon}.
  */
@@ -153,8 +154,8 @@ PreviewItemDrawingParams computePreviewItemDrawingParams(int index, int curNumIt
     }
 
     private PreviewItemDrawingParams getFinalIconParams(PreviewItemDrawingParams params) {
-        float iconSize = mIcon.mLauncher.getDeviceProfile().iconSizePx;
-
+        DeviceProfile dp = mIcon.mLauncher.getDeviceProfile();
+        float iconSize = dp.iconSizePx;
         final float scale = iconSize / mReferenceDrawable.getIntrinsicWidth();
         final float trans = (mIcon.mBackground.previewSize - iconSize) / 2;
 
@@ -334,7 +335,7 @@ float getIntrinsicIconSize() {
      * @param dropped The item that was dropped onto the FolderIcon.
      */
     public void onDrop(List<WorkspaceItemInfo> oldItems, List<WorkspaceItemInfo> newItems,
-            WorkspaceItemInfo dropped) {
+                       WorkspaceItemInfo dropped) {
         int numItems = newItems.size();
         final ArrayList<PreviewItemDrawingParams> params = mFirstPageParams;
         buildParamsForPage(0, params, false);
@@ -382,7 +383,7 @@ public void onDrop(List<WorkspaceItemInfo> oldItems, List<WorkspaceItemInfo> new
     }
 
     private void updateTransitionParam(final PreviewItemDrawingParams p, WorkspaceItemInfo item,
-            int prevIndex, int newIndex, int numItems) {
+                                       int prevIndex, int newIndex, int numItems) {
         setDrawable(p, item);
 
         FolderPreviewItemAnim anim = new FolderPreviewItemAnim(this, p, prevIndex, numItems,
diff --git a/src/com/android/launcher3/graphics/DrawableFactory.java b/src/com/android/launcher3/graphics/DrawableFactory.java
index 837301fb89..98bce220e2 100644
--- a/src/com/android/launcher3/graphics/DrawableFactory.java
+++ b/src/com/android/launcher3/graphics/DrawableFactory.java
@@ -16,9 +16,6 @@
 
 package com.android.launcher3.graphics;
 
-import static com.android.launcher3.graphics.IconShape.getShapePath;
-import static com.android.launcher3.util.MainThreadInitializedObject.forOverride;
-
 import android.content.Context;
 import android.content.pm.ActivityInfo;
 import android.content.res.Resources;
@@ -41,6 +38,9 @@
 import com.android.launcher3.util.MainThreadInitializedObject;
 import com.android.launcher3.util.ResourceBasedOverride;
 
+import static com.android.launcher3.graphics.IconShape.getShapePath;
+import static com.android.launcher3.util.MainThreadInitializedObject.forOverride;
+
 /**
  * Factory for creating new drawables.
  */
@@ -55,6 +55,12 @@ public class DrawableFactory implements ResourceBasedOverride {
     /**
      * Returns a FastBitmapDrawable with the icon.
      */
+    public FastBitmapDrawable newIcon(ItemInfoWithIcon info) {
+        FastBitmapDrawable drawable = new FastBitmapDrawable(info);
+        drawable.setIsDisabled(info.isDisabled());
+        return drawable;
+    }
+
     public FastBitmapDrawable newIcon(Context context, ItemInfoWithIcon info) {
         FastBitmapDrawable drawable = info.usingLowResIcon()
                 ? new PlaceHolderIconDrawable(info, getShapePath(), context)
@@ -69,6 +75,10 @@ public FastBitmapDrawable newIcon(Context context, BitmapInfo info, ActivityInfo
                 : new FastBitmapDrawable(info);
     }
 
+    public FastBitmapDrawable newIcon(BitmapInfo info, ActivityInfo target) {
+        return new FastBitmapDrawable(info);
+    }
+
     /**
      * Returns a FastBitmapDrawable with the icon.
      */
diff --git a/src/com/android/launcher3/graphics/IconShape.java b/src/com/android/launcher3/graphics/IconShape.java
index 4369385ae1..385bcdfbc3 100644
--- a/src/com/android/launcher3/graphics/IconShape.java
+++ b/src/com/android/launcher3/graphics/IconShape.java
@@ -15,8 +15,6 @@
  */
 package com.android.launcher3.graphics;
 
-import static com.android.launcher3.icons.IconNormalizer.ICON_VISIBLE_AREA_FACTOR;
-
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.FloatArrayEvaluator;
@@ -43,6 +41,8 @@
 import android.view.View;
 import android.view.ViewOutlineProvider;
 
+import androidx.annotation.Nullable;
+
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.RoundedRectRevealOutlineProvider;
@@ -51,6 +51,7 @@
 import com.android.launcher3.util.IntArray;
 import com.android.launcher3.util.Themes;
 import com.android.launcher3.views.ClipPathView;
+import com.saggitt.omega.adaptive.IconShapeManager;
 
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
@@ -59,7 +60,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import androidx.annotation.Nullable;
+import static com.android.launcher3.icons.IconNormalizer.ICON_VISIBLE_AREA_FACTOR;
 
 /**
  * Abstract representation of the shape of an icon shape
@@ -89,7 +90,7 @@ public static float getNormalizationScale() {
         return sNormalizationScale;
     }
 
-    private SparseArray<TypedValue> mAttrs;
+    public SparseArray<TypedValue> mAttrs;
 
     public boolean enableShapeDetection(){
         return false;
@@ -182,6 +183,43 @@ public void onAnimationEnd(Animator animation) {
         }
     }
 
+    public static class AdaptiveIconShape extends PathShape {
+
+        private final com.saggitt.omega.adaptive.IconShape mIconShape;
+
+        public AdaptiveIconShape(Context context) {
+            mIconShape = IconShapeManager.Companion.getInstance(context).getIconShape();
+            mAttrs = new SparseArray<>();
+            int qsbEdgeRadius = mIconShape.getQsbEdgeRadius();
+            if (qsbEdgeRadius != 0) {
+                TypedValue value = new TypedValue();
+                context.getResources().getValue(qsbEdgeRadius, value, false);
+                mAttrs.append(R.attr.qsbEdgeRadius, value);
+            }
+        }
+
+        @Override
+        public void addToPath(Path path, float offsetX, float offsetY, float radius) {
+            mIconShape.addShape(path, offsetX, offsetY, radius);
+        }
+
+        @Override
+        public AnimatorUpdateListener newUpdateListener(Rect startRect, Rect endRect,
+                                                        float endRadius, Path outPath) {
+            float startRadius = startRect.width() / 2f;
+            float[] start = new float[]{startRect.left, startRect.top, startRect.right, startRect.bottom};
+            float[] end = new float[]{endRect.left, endRect.top, endRect.right, endRect.bottom};
+            FloatArrayEvaluator evaluator = new FloatArrayEvaluator();
+            return animation -> {
+                float progress = (float) animation.getAnimatedValue();
+                float[] values = evaluator.evaluate(progress, start, end);
+                mIconShape.addToPath(outPath,
+                        values[0], values[1], values[2], values[3],
+                        startRadius, endRadius, progress);
+            };
+        }
+    }
+
     public static final class Circle extends SimpleRectShape {
 
         @Override
diff --git a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
index d7b845b58c..b578cf9ffb 100644
--- a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
+++ b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
@@ -15,10 +15,6 @@
  */
 package com.android.launcher3.graphics;
 
-import static android.view.View.MeasureSpec.EXACTLY;
-import static android.view.View.MeasureSpec.makeMeasureSpec;
-import static android.view.View.VISIBLE;
-
 import android.annotation.TargetApi;
 import android.app.Fragment;
 import android.content.Context;
@@ -50,27 +46,31 @@
 import com.android.launcher3.InvariantDeviceProfile;
 import com.android.launcher3.LauncherSettings.Favorites;
 import com.android.launcher3.R;
-import com.android.launcher3.WorkspaceItemInfo;
 import com.android.launcher3.Utilities;
+import com.android.launcher3.WorkspaceItemInfo;
 import com.android.launcher3.WorkspaceLayoutManager;
 import com.android.launcher3.allapps.SearchUiManager;
-import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.icons.BaseIconFactory;
 import com.android.launcher3.icons.BitmapInfo;
 import com.android.launcher3.icons.BitmapRenderer;
 import com.android.launcher3.views.ActivityContext;
 import com.android.launcher3.views.BaseDragLayer;
+import com.saggitt.omega.preferences.SmartspaceAddToHomePreference;
 
 import java.util.concurrent.Callable;
 import java.util.concurrent.CountDownLatch;
 
+import static android.view.View.MeasureSpec.EXACTLY;
+import static android.view.View.MeasureSpec.makeMeasureSpec;
+import static android.view.View.VISIBLE;
+
 /**
  * Utility class for generating the preview of Launcher for a given InvariantDeviceProfile.
  * Steps:
- *   1) Create a dummy icon info with just white icon
- *   2) Inflate a strip down layout definition for Launcher
- *   3) Place appropriate elements like icons and first-page qsb
- *   4) Measure and draw the view on a canvas
+ * 1) Create a dummy icon info with just white icon
+ * 2) Inflate a strip down layout definition for Launcher
+ * 3) Place appropriate elements like icons and first-page qsb
+ * 4) Measure and draw the view on a canvas
  */
 @TargetApi(Build.VERSION_CODES.O)
 public class LauncherPreviewRenderer implements Callable<Bitmap> {
@@ -260,7 +260,7 @@ private void renderScreenShot(Canvas canvas) {
             }
 
             // Add first page QSB
-            if (FeatureFlags.QSB_ON_FIRST_SCREEN) {
+            if (SmartspaceAddToHomePreference.showSmartspaceInPreview(mContext)) {
                 View qsb = mHomeElementInflater.inflate(
                         R.layout.search_container_workspace, mWorkspace, false);
                 CellLayout.LayoutParams lp =
diff --git a/src/com/android/launcher3/graphics/ShadowDrawable.java b/src/com/android/launcher3/graphics/ShadowDrawable.java
index f10b972590..98eb589d6c 100644
--- a/src/com/android/launcher3/graphics/ShadowDrawable.java
+++ b/src/com/android/launcher3/graphics/ShadowDrawable.java
@@ -17,6 +17,7 @@
 package com.android.launcher3.graphics;
 
 import android.annotation.TargetApi;
+import android.content.Context;
 import android.content.res.Resources;
 import android.content.res.TypedArray;
 import android.graphics.Bitmap;
@@ -31,8 +32,11 @@
 import android.os.Build;
 import android.util.AttributeSet;
 
+import androidx.core.content.ContextCompat;
+
 import com.android.launcher3.R;
 import com.android.launcher3.icons.BitmapRenderer;
+import com.saggitt.omega.util.OmegaUtilsKt;
 
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
@@ -70,6 +74,25 @@ public void draw(Canvas canvas) {
         canvas.drawBitmap(mState.mLastDrawnBitmap, null, bounds, mPaint);
     }
 
+    public static ShadowDrawable wrap(Context context, Drawable d, int shadowColorRes,
+                                      float elevationDps, int darkTintColorRes) {
+        ShadowDrawable sd = new ShadowDrawable();
+        sd.setChild(d);
+        sd.mState.mShadowColor = ContextCompat.getColor(context, shadowColorRes);
+        sd.mState.mShadowSize = (int) OmegaUtilsKt.dpToPx(elevationDps);
+        sd.mState.mDarkTintColor = ContextCompat.getColor(context, darkTintColorRes);
+        sd.mState.mIntrinsicHeight = d.getIntrinsicHeight() + 2 * sd.mState.mShadowSize;
+        sd.mState.mIntrinsicWidth = d.getIntrinsicWidth() + 2 * sd.mState.mShadowSize;
+        sd.mState.mChangingConfigurations = d.getChangingConfigurations();
+
+        sd.mState.mChildState = d.getConstantState();
+        return sd;
+    }
+
+    public Drawable setChild(Drawable newDrawable) {
+        return (new ShadowDrawableState(mState, newDrawable)).newDrawable();
+    }
+
     @Override
     public void setAlpha(int alpha) {
         mPaint.setAlpha(alpha);
@@ -196,6 +219,23 @@ private static class ShadowDrawableState extends ConstantState {
         Bitmap mLastDrawnBitmap;
         ConstantState mChildState;
 
+        private ShadowDrawableState() {
+        }
+
+        private ShadowDrawableState(ShadowDrawableState oldState, Drawable newDrawable) {
+            mChangingConfigurations = newDrawable.getChangingConfigurations();
+            mIntrinsicWidth = newDrawable.getIntrinsicWidth() + 2 * oldState.mShadowSize;
+            mIntrinsicHeight = newDrawable.getIntrinsicHeight() + 2 * oldState.mShadowSize;
+
+            mShadowColor = oldState.mShadowColor;
+            mShadowSize = oldState.mShadowSize;
+            mDarkTintColor = oldState.mDarkTintColor;
+
+            mIsDark = oldState.mIsDark;
+            mLastDrawnBitmap = null;
+            mChildState = newDrawable.getConstantState();
+        }
+
         @Override
         public Drawable newDrawable() {
             return new ShadowDrawable(this);
diff --git a/src/com/android/launcher3/model/AllAppsList.java b/src/com/android/launcher3/model/AllAppsList.java
index c21a79d1ae..617ac73848 100644
--- a/src/com/android/launcher3/model/AllAppsList.java
+++ b/src/com/android/launcher3/model/AllAppsList.java
@@ -16,9 +16,6 @@
 
 package com.android.launcher3.model;
 
-import static com.android.launcher3.AppInfo.COMPONENT_KEY_COMPARATOR;
-import static com.android.launcher3.AppInfo.EMPTY_ARRAY;
-
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
@@ -28,6 +25,9 @@
 import android.os.UserHandle;
 import android.util.Log;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import com.android.launcher3.AppFilter;
 import com.android.launcher3.AppInfo;
 import com.android.launcher3.PromiseAppInfo;
@@ -46,8 +46,8 @@
 import java.util.List;
 import java.util.function.Consumer;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
+import static com.android.launcher3.AppInfo.COMPONENT_KEY_COMPARATOR;
+import static com.android.launcher3.AppInfo.EMPTY_ARRAY;
 
 
 /**
@@ -56,14 +56,22 @@
 public class AllAppsList {
 
     private static final String TAG = "AllAppsList";
-    private static final Consumer<AppInfo> NO_OP_CONSUMER = a -> { };
+    private static final Consumer<AppInfo> NO_OP_CONSUMER = a -> {
+    };
 
 
     public static final int DEFAULT_APPLICATIONS_NUMBER = 42;
 
-    /** The list off all apps. */
+    /**
+     * The list off all apps.
+     */
     public final ArrayList<AppInfo> data = new ArrayList<>(DEFAULT_APPLICATIONS_NUMBER);
 
+    /**
+     * The list of apps that have been removed since the last notify() call.
+     */
+    public ArrayList<AppInfo> removed = new ArrayList<>();
+
     private IconCache mIconCache;
     private AppFilter mAppFilter;
 
@@ -97,7 +105,7 @@ public boolean getAndResetChangeFlag() {
      * If the app is already in the list, doesn't add it.
      */
     public void add(AppInfo info, LauncherActivityInfo activityInfo) {
-        if (!mAppFilter.shouldShowApp(info.componentName)) {
+        if (!mAppFilter.shouldShowApp(info.componentName, info.user)) {
             return;
         }
         if (findAppInfo(info.componentName, info.user) != null) {
@@ -156,6 +164,7 @@ private void removeApp(int index) {
     public void clear() {
         data.clear();
         mDataChanged = false;
+        removed.clear();
         // Reset the index as locales might have changed
         mIndex = new AlphabeticIndexCompat(LocaleList.getDefault());
     }
@@ -271,7 +280,7 @@ public void reloadPackages(Context context, UserHandle user) {
         for (int i = data.size() - 1; i >= 0; i--) {
             final AppInfo applicationInfo = data.get(i);
             if (user.equals(applicationInfo.user) && !mAppFilter.shouldShowApp(applicationInfo.componentName, applicationInfo.user)) {
-                mIconCache.remove(applicationInfo.componentName,applicationInfo.user);
+                removed.add(applicationInfo);
                 data.remove(i);
             }
         }
diff --git a/src/com/android/launcher3/model/GridSizeMigrationTask.java b/src/com/android/launcher3/model/GridSizeMigrationTask.java
index 783e908e30..e08d978c46 100644
--- a/src/com/android/launcher3/model/GridSizeMigrationTask.java
+++ b/src/com/android/launcher3/model/GridSizeMigrationTask.java
@@ -1,9 +1,5 @@
 package com.android.launcher3.model;
 
-import static com.android.launcher3.LauncherSettings.Settings.EXTRA_VALUE;
-import static com.android.launcher3.Utilities.getPointString;
-import static com.android.launcher3.Utilities.parsePoint;
-
 import android.content.ComponentName;
 import android.content.ContentValues;
 import android.content.Context;
@@ -17,6 +13,8 @@
 import android.util.Log;
 import android.util.SparseArray;
 
+import androidx.annotation.VisibleForTesting;
+
 import com.android.launcher3.InvariantDeviceProfile;
 import com.android.launcher3.ItemInfo;
 import com.android.launcher3.LauncherAppState;
@@ -34,14 +32,14 @@
 import com.android.launcher3.util.GridOccupancy;
 import com.android.launcher3.util.IntArray;
 import com.android.launcher3.util.IntSparseArrayMap;
-import com.android.launcher3.util.PackageUserKey;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
-import java.util.function.Consumer;
 
-import androidx.annotation.VisibleForTesting;
+import static com.android.launcher3.LauncherSettings.Settings.EXTRA_VALUE;
+import static com.android.launcher3.Utilities.getPointString;
+import static com.android.launcher3.Utilities.parsePoint;
 
 /**
  * This class takes care of shrinking the workspace (by maximum of one row and one column), as a
@@ -184,7 +182,7 @@ protected boolean migrateHotseat() throws Exception {
     }
 
     @VisibleForTesting
-    static IntArray getWorkspaceScreenIds(SQLiteDatabase db) {
+    public static IntArray getWorkspaceScreenIds(SQLiteDatabase db) {
         return LauncherDbUtils.queryIntArray(db, Favorites.TABLE_NAME, Favorites.SCREEN,
                 Favorites.CONTAINER + " = " + Favorites.CONTAINER_DESKTOP,
                 Favorites.SCREEN, Favorites.SCREEN);
diff --git a/src/com/android/launcher3/model/LoaderCursor.java b/src/com/android/launcher3/model/LoaderCursor.java
index 1c39d1f23c..fcc2194bcd 100644
--- a/src/com/android/launcher3/model/LoaderCursor.java
+++ b/src/com/android/launcher3/model/LoaderCursor.java
@@ -25,6 +25,7 @@
 import android.content.pm.PackageManager;
 import android.database.Cursor;
 import android.database.CursorWrapper;
+import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.os.UserHandle;
 import android.provider.BaseColumns;
@@ -33,17 +34,17 @@
 import android.util.LongSparseArray;
 
 import com.android.launcher3.AppInfo;
-import com.android.launcher3.WorkspaceItemInfo;
-import com.android.launcher3.icons.IconCache;
 import com.android.launcher3.InvariantDeviceProfile;
 import com.android.launcher3.ItemInfo;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.LauncherSettings;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.Workspace;
+import com.android.launcher3.WorkspaceItemInfo;
 import com.android.launcher3.compat.LauncherAppsCompat;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.icons.BitmapInfo;
+import com.android.launcher3.icons.IconCache;
 import com.android.launcher3.icons.LauncherIcons;
 import com.android.launcher3.logging.FileLog;
 import com.android.launcher3.util.ContentWriter;
@@ -76,6 +77,7 @@ public class LoaderCursor extends CursorWrapper {
     private final int iconResourceIndex;
     private final int iconIndex;
     public final int titleIndex;
+    private final int customIconIndex;
 
     private final int idIndex;
     private final int containerIndex;
@@ -104,6 +106,7 @@ public LoaderCursor(Cursor c, LauncherAppState app) {
 
         // Init column indices
         iconIndex = getColumnIndexOrThrow(LauncherSettings.Favorites.ICON);
+        customIconIndex = getColumnIndexOrThrow(LauncherSettings.Favorites.CUSTOM_ICON);
         iconPackageIndex = getColumnIndexOrThrow(LauncherSettings.Favorites.ICON_PACKAGE);
         iconResourceIndex = getColumnIndexOrThrow(LauncherSettings.Favorites.ICON_RESOURCE);
         titleIndex = getColumnIndexOrThrow(LauncherSettings.Favorites.TITLE);
@@ -200,6 +203,21 @@ protected boolean loadIcon(WorkspaceItemInfo info, LauncherIcons li) {
         }
     }
 
+    public Bitmap loadCustomIcon(WorkspaceItemInfo info) {
+        byte[] data = getBlob(customIconIndex);
+        try {
+            if (data != null) {
+                return LauncherIcons.obtain(mContext).createIconBitmap(
+                        BitmapFactory.decodeByteArray(data, 0, data.length)).icon;
+            } else {
+                return null;
+            }
+        } catch (Exception e) {
+            Log.e(TAG, "Failed to load custom iconView for info " + info, e);
+            return null;
+        }
+    }
+
     /**
      * Returns the title or empty string
      */
diff --git a/src/com/android/launcher3/model/LoaderTask.java b/src/com/android/launcher3/model/LoaderTask.java
index 50e1d56ae0..8f1165b32c 100644
--- a/src/com/android/launcher3/model/LoaderTask.java
+++ b/src/com/android/launcher3/model/LoaderTask.java
@@ -16,13 +16,6 @@
 
 package com.android.launcher3.model;
 
-import static com.android.launcher3.ItemInfoWithIcon.FLAG_DISABLED_LOCKED_USER;
-import static com.android.launcher3.ItemInfoWithIcon.FLAG_DISABLED_SAFEMODE;
-import static com.android.launcher3.ItemInfoWithIcon.FLAG_DISABLED_SUSPENDED;
-import static com.android.launcher3.model.LoaderResults.filterCurrentWorkspaceItems;
-import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
-import static com.android.launcher3.util.PackageManagerHelper.isSystemApp;
-
 import android.appwidget.AppWidgetProviderInfo;
 import android.content.ComponentName;
 import android.content.ContentResolver;
@@ -66,7 +59,6 @@
 import com.android.launcher3.icons.cache.IconCacheUpdateHandler;
 import com.android.launcher3.logging.FileLog;
 import com.android.launcher3.provider.ImportDataTask;
-import com.android.launcher3.qsb.QsbContainerView;
 import com.android.launcher3.shortcuts.DeepShortcutManager;
 import com.android.launcher3.shortcuts.ShortcutKey;
 import com.android.launcher3.util.ComponentKey;
@@ -76,6 +68,8 @@
 import com.android.launcher3.util.PackageManagerHelper;
 import com.android.launcher3.util.PackageUserKey;
 import com.android.launcher3.util.TraceHelper;
+import com.saggitt.omega.iconpack.IconPackManager;
+import com.saggitt.omega.model.HomeWidgetMigrationTask;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -86,12 +80,19 @@
 import java.util.concurrent.CancellationException;
 import java.util.function.Supplier;
 
+import static com.android.launcher3.ItemInfoWithIcon.FLAG_DISABLED_LOCKED_USER;
+import static com.android.launcher3.ItemInfoWithIcon.FLAG_DISABLED_SAFEMODE;
+import static com.android.launcher3.ItemInfoWithIcon.FLAG_DISABLED_SUSPENDED;
+import static com.android.launcher3.model.LoaderResults.filterCurrentWorkspaceItems;
+import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
+import static com.android.launcher3.util.PackageManagerHelper.isSystemApp;
+
 /**
  * Runnable for the thread that loads the contents of the launcher:
- *   - workspace icons
- *   - widgets
- *   - all apps icons
- *   - deep shortcuts within apps
+ * - workspace icons
+ * - widgets
+ * - all apps icons
+ * - deep shortcuts within apps
  */
 public class LoaderTask implements Runnable {
     private static final String TAG = "LoaderTask";
@@ -267,6 +268,10 @@ private void loadWorkspace() {
             clearDb = true;
         }
 
+        if (!clearDb) {
+            HomeWidgetMigrationTask.migrateIfNeeded(context);
+        }
+
         if (!clearDb && !GridSizeMigrationTask.migrateGridIfNeeded(context)) {
             // Migration failed. Clear workspace.
             clearDb = true;
@@ -309,6 +314,12 @@ private void loadWorkspace() {
                         LauncherSettings.Favorites.RANK);
                 final int optionsIndex = c.getColumnIndexOrThrow(
                         LauncherSettings.Favorites.OPTIONS);
+                final int titleAliasIndex = c.getColumnIndexOrThrow(
+                        LauncherSettings.Favorites.TITLE_ALIAS);
+                final int customIconEntryIndex = c.getColumnIndexOrThrow(
+                        LauncherSettings.Favorites.CUSTOM_ICON_ENTRY);
+                final int swipeUpActionEntryIndex = c.getColumnIndexOrThrow(
+                        LauncherSettings.Favorites.SWIPE_UP_ACTION);
 
                 final LongSparseArray<UserHandle> allUsers = c.allUsers;
                 final LongSparseArray<Boolean> quietMode = new LongSparseArray<>();
@@ -343,6 +354,9 @@ private void loadWorkspace() {
                 LauncherAppWidgetInfo appWidgetInfo;
                 Intent intent;
                 String targetPkg;
+                String titleAlias;
+                String customIconEntry;
+                String swipeUpAction;
 
                 while (!mStopped && c.moveToNext()) {
                     try {
@@ -367,6 +381,9 @@ private void loadWorkspace() {
                                     WorkspaceItemInfo.FLAG_DISABLED_QUIET_USER : 0;
                             ComponentName cn = intent.getComponent();
                             targetPkg = cn == null ? intent.getPackage() : cn.getPackageName();
+                            titleAlias = c.getString(titleAliasIndex);
+                            customIconEntry = c.getString(customIconEntryIndex);
+                            swipeUpAction = c.getString(swipeUpActionEntryIndex);
 
                             if (allUsers.indexOfValue(c.user) < 0) {
                                 if (c.itemType == LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT) {
@@ -533,7 +550,10 @@ private void loadWorkspace() {
 
                             if (info != null) {
                                 c.applyCommonProperties(info);
-
+                                info.onLoadCustomizations(titleAlias, swipeUpAction,
+                                        IconPackManager.CustomIconEntry.Companion
+                                                .fromNullableString(customIconEntry),
+                                        c.loadCustomIcon(info));
                                 info.intent = intent;
                                 info.rank = c.getInt(rankIndex);
                                 info.spanX = 1;
@@ -581,35 +601,25 @@ private void loadWorkspace() {
                                 continue;
                             }
                             // Follow through
-                        case LauncherSettings.Favorites.ITEM_TYPE_CUSTOM_APPWIDGET:
-                            // Read all Launcher-specific widget details
-                            boolean customWidget = c.itemType ==
-                                LauncherSettings.Favorites.ITEM_TYPE_CUSTOM_APPWIDGET;
-
-                            int appWidgetId = c.getInt(appWidgetIdIndex);
-                            String savedProvider = c.getString(appWidgetProviderIndex);
-                            final ComponentName component;
-
-                            boolean isSearchWidget = (c.getInt(optionsIndex)
-                                    & LauncherAppWidgetInfo.OPTION_SEARCH_WIDGET) != 0;
-                            if (isSearchWidget) {
-                                component  = QsbContainerView.getSearchComponentName(context);
-                                if (component == null) {
-                                    c.markDeleted("Discarding SearchWidget without packagename ");
-                                    continue;
+                            case LauncherSettings.Favorites.ITEM_TYPE_CUSTOM_APPWIDGET:
+                                // Read all Launcher-specific widget details
+                                boolean customWidget = c.itemType ==
+                                        LauncherSettings.Favorites.ITEM_TYPE_CUSTOM_APPWIDGET;
+
+                                int appWidgetId = c.getInt(appWidgetIdIndex);
+                                String savedProvider = c.getString(appWidgetProviderIndex);
+                                final ComponentName component =
+                                        ComponentName.unflattenFromString(savedProvider);
+
+                                final boolean isIdValid = !c.hasRestoreFlag(
+                                        LauncherAppWidgetInfo.FLAG_ID_NOT_VALID);
+                                final boolean wasProviderReady = !c.hasRestoreFlag(
+                                        LauncherAppWidgetInfo.FLAG_PROVIDER_NOT_READY);
+
+                                if (widgetProvidersMap == null) {
+                                    widgetProvidersMap = mAppWidgetManager.getAllProvidersMap();
                                 }
-                            } else {
-                                component = ComponentName.unflattenFromString(savedProvider);
-                            }
-                            final boolean isIdValid = !c.hasRestoreFlag(
-                                    LauncherAppWidgetInfo.FLAG_ID_NOT_VALID);
-                            final boolean wasProviderReady = !c.hasRestoreFlag(
-                                    LauncherAppWidgetInfo.FLAG_PROVIDER_NOT_READY);
-
-                            if (widgetProvidersMap == null) {
-                                widgetProvidersMap = mAppWidgetManager.getAllProvidersMap();
-                            }
-                            final AppWidgetProviderInfo provider = widgetProvidersMap.get(
+                                final AppWidgetProviderInfo provider = widgetProvidersMap.get(
                                     new ComponentKey(component, c.user));
 
                             final boolean isProviderReady = isValidProvider(provider);
diff --git a/src/com/android/launcher3/model/ModelWriter.java b/src/com/android/launcher3/model/ModelWriter.java
index bdf3a6918d..63d4974c23 100644
--- a/src/com/android/launcher3/model/ModelWriter.java
+++ b/src/com/android/launcher3/model/ModelWriter.java
@@ -16,12 +16,11 @@
 
 package com.android.launcher3.model;
 
-import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
-
 import android.content.ContentProviderOperation;
 import android.content.ContentResolver;
 import android.content.ContentValues;
 import android.content.Context;
+import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.Handler;
 import android.os.Looper;
@@ -40,10 +39,12 @@
 import com.android.launcher3.Utilities;
 import com.android.launcher3.WorkspaceItemInfo;
 import com.android.launcher3.config.FeatureFlags;
+import com.android.launcher3.icons.GraphicsUtils;
 import com.android.launcher3.logging.FileLog;
 import com.android.launcher3.model.BgDataModel.Callbacks;
 import com.android.launcher3.util.ContentWriter;
 import com.android.launcher3.util.ItemInfoMatcher;
+import com.saggitt.omega.iconpack.IconPackManager;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -53,6 +54,9 @@
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
+import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
+import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
+
 /**
  * Class for handling model updates.
  */
@@ -207,6 +211,33 @@ public void modifyItemInDatabase(final ItemInfo item,
                         .put(Favorites.SCREEN, item.screenId)));
     }
 
+    private void executeUpdateItem(ItemInfo item, Supplier<ContentWriter> writer) {
+        ((Executor) MODEL_EXECUTOR).execute(new UpdateItemRunnable(item, writer));
+    }
+
+    public static void modifyItemInDatabase(Context context, final ItemInfo item, String alias,
+                                            String swipeUpAction,
+                                            IconPackManager.CustomIconEntry iconEntry, Bitmap icon,
+                                            boolean updateIcon, boolean reload) {
+        LauncherAppState.getInstance(context).getLauncher().getModelWriter().executeUpdateItem(item, () -> {
+            final ContentWriter writer = new ContentWriter(context);
+            writer.put(Favorites.TITLE_ALIAS, alias);
+            writer.put(Favorites.SWIPE_UP_ACTION, swipeUpAction);
+            if (updateIcon) {
+                writer.put(Favorites.CUSTOM_ICON, icon != null ? GraphicsUtils.flattenBitmap(icon) : null);
+                writer.put(Favorites.CUSTOM_ICON_ENTRY, iconEntry != null ? iconEntry.toString() : null);
+            }
+            return writer;
+        });
+        if (reload) {
+            LauncherAppState.getInstance(context).getModel().forceReload();
+        }
+    }
+
+    private void executeUpdateItem(ItemInfo item, ContentWriter writer) {
+        MAIN_EXECUTOR.execute(new UpdateItemRunnable(item, () -> writer));
+    }
+
     /**
      * Update an item to the database in a specified container.
      */
@@ -408,17 +439,17 @@ public void run() {
         }
     }
 
-    private abstract class UpdateItemBaseRunnable implements Runnable {
-        private final StackTraceElement[] mStackTrace;
-        private final ModelVerifier mVerifier = new ModelVerifier();
+        private abstract class UpdateItemBaseRunnable implements Runnable {
+            private final StackTraceElement[] mStackTrace;
+            private final ModelVerifier mVerifier = new ModelVerifier();
 
-        UpdateItemBaseRunnable() {
-            mStackTrace = new Throwable().getStackTrace();
-        }
+            UpdateItemBaseRunnable() {
+                mStackTrace = new Throwable().getStackTrace();
+            }
 
-        protected void updateItemArrays(ItemInfo item, int itemId) {
-            // Lock on mBgLock *after* the db operation
-            synchronized (mBgDataModel) {
+            protected void updateItemArrays(ItemInfo item, int itemId) {
+                // Lock on mBgLock *after* the db operation
+                synchronized (mBgDataModel) {
                 checkItemInfoLocked(itemId, item, mStackTrace);
 
                 if (item.container != Favorites.CONTAINER_DESKTOP &&
diff --git a/src/com/android/launcher3/notification/NotificationListener.java b/src/com/android/launcher3/notification/NotificationListener.java
index 10378ee437..03d64996cf 100644
--- a/src/com/android/launcher3/notification/NotificationListener.java
+++ b/src/com/android/launcher3/notification/NotificationListener.java
@@ -16,9 +16,6 @@
 
 package com.android.launcher3.notification;
 
-import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
-import static com.android.launcher3.util.SecureSettingsObserver.newNotificationSettingsObserver;
-
 import android.annotation.TargetApi;
 import android.app.Notification;
 import android.app.NotificationChannel;
@@ -45,6 +42,9 @@
 import java.util.List;
 import java.util.Map;
 
+import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
+import static com.android.launcher3.util.SecureSettingsObserver.newNotificationSettingsObserver;
+
 /**
  * A {@link NotificationListenerService} that sends updates to its
  * {@link NotificationsChangedListener} when notifications are posted or canceled,
@@ -216,7 +216,8 @@ private void onNotificationFullRefresh() {
     public void onListenerDisconnected() {
         super.onListenerDisconnected();
         sIsConnected = false;
-        mNotificationDotsObserver.unregister();
+        if (mNotificationDotsObserver != null)
+            mNotificationDotsObserver.unregister();
     }
 
     @Override
@@ -395,6 +396,9 @@ void onNotificationRemoved(PackageUserKey removedPackageUserKey,
 
     public interface StatusBarNotificationsChangedListener {
         void onNotificationPosted(StatusBarNotification sbn);
+
         void onNotificationRemoved(StatusBarNotification sbn);
+
+        void onNotificationFullRefresh();
     }
 }
diff --git a/src/com/android/launcher3/pageindicators/WorkspacePageIndicator.java b/src/com/android/launcher3/pageindicators/WorkspacePageIndicator.java
index 654e593354..f59df78c27 100644
--- a/src/com/android/launcher3/pageindicators/WorkspacePageIndicator.java
+++ b/src/com/android/launcher3/pageindicators/WorkspacePageIndicator.java
@@ -5,7 +5,6 @@
 import android.animation.ObjectAnimator;
 import android.animation.ValueAnimator;
 import android.content.Context;
-import android.content.res.Resources;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
@@ -25,6 +24,7 @@
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.uioverrides.WallpaperColorInfo;
+import com.saggitt.omega.OmegaPreferences;
 
 /**
  * A PageIndicator that briefly shows a fraction of a line when moving between pages
@@ -59,7 +59,7 @@ public class WorkspacePageIndicator extends View implements Insettable, PageIndi
     private int mCurrentScroll;
     private int mTotalScroll;
     private Paint mLinePaint;
-    private final int mLineHeight;
+    private int mLineHeight;
 
     private static final Property<WorkspacePageIndicator, Integer> PAINT_ALPHA
             = new Property<WorkspacePageIndicator, Integer>(Integer.class, "paint_alpha") {
@@ -105,6 +105,8 @@ public void set(WorkspacePageIndicator obj, Integer totalScroll) {
 
     private Runnable mHideLineRunnable = () -> animateLineToAlpha(0);
 
+    private boolean mUseBottomLine;
+
     public WorkspacePageIndicator(Context context) {
         this(context, null);
     }
@@ -116,16 +118,24 @@ public WorkspacePageIndicator(Context context, AttributeSet attrs) {
     public WorkspacePageIndicator(Context context, AttributeSet attrs, int defStyle) {
         super(context, attrs, defStyle);
 
-        Resources res = context.getResources();
         mLinePaint = new Paint();
         mLinePaint.setAlpha(0);
 
         mLauncher = Launcher.getLauncher(context);
-        mLineHeight = res.getDimensionPixelSize(R.dimen.dynamic_grid_page_indicator_line_height);
+        updateLineHeight();
 
         boolean darkText = WallpaperColorInfo.getInstance(context).supportsDarkText();
         mActiveAlpha = darkText ? BLACK_ALPHA : WHITE_ALPHA;
         mLinePaint.setColor(darkText ? Color.BLACK : Color.WHITE);
+
+        OmegaPreferences prefs = Utilities.getOmegaPrefs(context);
+        mUseBottomLine = !prefs.getDockGradientStyle() || prefs.getDockShowArrow();
+    }
+
+    public void updateLineHeight() {
+        boolean show = Utilities.getOmegaPrefs(getContext()).getDockShowPageIndicator();
+        mLineHeight = !show ? 0 : getResources()
+                .getDimensionPixelSize(R.dimen.dynamic_grid_page_indicator_line_height);
     }
 
     @Override
@@ -141,6 +151,12 @@ protected void onDraw(Canvas canvas) {
         int lineLeft = (int) (progress * (availableWidth - lineWidth));
         int lineRight = lineLeft + lineWidth;
 
+        if (mUseBottomLine) {
+            canvas.drawRoundRect(lineLeft, getHeight() - mLineHeight / 2, lineRight,
+                    getHeight() + mLineHeight / 2, mLineHeight, mLineHeight, mLinePaint);
+            return;
+        }
+
         canvas.drawRoundRect(lineLeft, getHeight() / 2 - mLineHeight / 2, lineRight,
                 getHeight() / 2 + mLineHeight / 2, mLineHeight, mLineHeight, mLinePaint);
     }
diff --git a/src/com/android/launcher3/popup/PopupContainerWithArrow.java b/src/com/android/launcher3/popup/PopupContainerWithArrow.java
index e8ac1d4c93..32a391faf0 100644
--- a/src/com/android/launcher3/popup/PopupContainerWithArrow.java
+++ b/src/com/android/launcher3/popup/PopupContainerWithArrow.java
@@ -16,16 +16,6 @@
 
 package com.android.launcher3.popup;
 
-import static com.android.launcher3.Utilities.squaredHypot;
-import static com.android.launcher3.Utilities.squaredTouchSlop;
-import static com.android.launcher3.notification.NotificationMainView.NOTIFICATION_ITEM_INFO;
-import static com.android.launcher3.popup.PopupPopulator.MAX_SHORTCUTS;
-import static com.android.launcher3.popup.PopupPopulator.MAX_SHORTCUTS_IF_NOTIFICATIONS;
-import static com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
-import static com.android.launcher3.userevent.nano.LauncherLogProto.ItemType;
-import static com.android.launcher3.userevent.nano.LauncherLogProto.Target;
-import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
-
 import android.animation.AnimatorSet;
 import android.animation.LayoutTransition;
 import android.annotation.TargetApi;
@@ -64,6 +54,7 @@
 import com.android.launcher3.notification.NotificationItemView;
 import com.android.launcher3.notification.NotificationKeyData;
 import com.android.launcher3.popup.PopupDataProvider.PopupDataChangeListener;
+import com.android.launcher3.shortcuts.DeepShortcutManager;
 import com.android.launcher3.shortcuts.DeepShortcutView;
 import com.android.launcher3.shortcuts.ShortcutDragPreviewProvider;
 import com.android.launcher3.testing.TestProtocol;
@@ -78,6 +69,16 @@
 import java.util.Map;
 import java.util.function.Predicate;
 
+import static com.android.launcher3.Utilities.squaredHypot;
+import static com.android.launcher3.Utilities.squaredTouchSlop;
+import static com.android.launcher3.notification.NotificationMainView.NOTIFICATION_ITEM_INFO;
+import static com.android.launcher3.popup.PopupPopulator.MAX_SHORTCUTS;
+import static com.android.launcher3.popup.PopupPopulator.MAX_SHORTCUTS_IF_NOTIFICATIONS;
+import static com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
+import static com.android.launcher3.userevent.nano.LauncherLogProto.ItemType;
+import static com.android.launcher3.userevent.nano.LauncherLogProto.Target;
+import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
+
 /**
  * A container for shortcuts to deep links and notifications associated with an app.
  */
@@ -209,6 +210,9 @@ public static PopupContainerWithArrow showForIcon(BubbleTextView icon) {
         if (!ShortcutUtil.supportsShortcuts(itemInfo)) {
             return null;
         }
+        if (!DeepShortcutManager.supportsEdit(itemInfo)) {
+            return null;
+        }
 
         final PopupContainerWithArrow container =
                 (PopupContainerWithArrow) launcher.getLayoutInflater().inflate(
@@ -247,7 +251,7 @@ protected void populateAndShow(
         populateAndShow(icon,
                 popupDataProvider.getShortcutCountForItem(item),
                 popupDataProvider.getNotificationKeysForItem(item),
-                factory.getEnabledShortcuts(mLauncher, item));
+                popupDataProvider.getEnabledSystemShortcutsForItem(item));
     }
 
     public ViewGroup getSystemShortcutContainerForTesting() {
diff --git a/src/com/android/launcher3/popup/PopupDataProvider.java b/src/com/android/launcher3/popup/PopupDataProvider.java
index 4612b2a474..55ca0b9c00 100644
--- a/src/com/android/launcher3/popup/PopupDataProvider.java
+++ b/src/com/android/launcher3/popup/PopupDataProvider.java
@@ -17,9 +17,14 @@
 package com.android.launcher3.popup;
 
 import android.content.ComponentName;
+import android.content.Context;
+import android.content.pm.LauncherApps;
 import android.service.notification.StatusBarNotification;
 import android.util.Log;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import com.android.launcher3.ItemInfo;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.dot.DotInfo;
@@ -27,10 +32,13 @@
 import com.android.launcher3.notification.NotificationKeyData;
 import com.android.launcher3.notification.NotificationListener;
 import com.android.launcher3.shortcuts.DeepShortcutManager;
+import com.android.launcher3.shortcuts.DeepShortcutManagerBackport;
+import com.android.launcher3.shortcuts.ShortcutInfoCompat;
 import com.android.launcher3.util.ComponentKey;
 import com.android.launcher3.util.PackageUserKey;
 import com.android.launcher3.util.ShortcutUtil;
 import com.android.launcher3.widget.WidgetListRowEntry;
+import com.saggitt.omega.popup.OmegaShortcut;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -39,13 +47,9 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
 /**
  * Provides data for the popup menu that appears after long-clicking on apps.
  */
@@ -160,6 +164,24 @@ public void setDeepShortcutMap(HashMap<ComponentKey, Integer> deepShortcutMapCop
         if (LOGD) Log.d(TAG, "bindDeepShortcutMap: " + mDeepShortcutMap);
     }
 
+    public List<String> getShortcutIdsForItem(ItemInfo info) {
+        if (!DeepShortcutManager.supportsShortcuts(info)) {
+            return Collections.EMPTY_LIST;
+        }
+        ComponentName component = info.getTargetComponent();
+        if (component == null) {
+            return Collections.EMPTY_LIST;
+        }
+        List<String> ids = new ArrayList<>();
+        for (ShortcutInfoCompat compat : DeepShortcutManagerBackport.getForPackage(mLauncher,
+                (LauncherApps) mLauncher.getSystemService(Context.LAUNCHER_APPS_SERVICE),
+                info.getTargetComponent(),
+                info.getTargetComponent().getPackageName())) {
+            ids.add(compat.getId());
+        }
+        return ids;
+    }
+
     public int getShortcutCountForItem(ItemInfo info) {
         if (!ShortcutUtil.supportsDeepShortcuts(info)) {
             return 0;
@@ -195,14 +217,30 @@ public int getShortcutCountForItem(ItemInfo info) {
                 : getNotificationsForItem(info, dotInfo.getNotificationKeys());
     }
 
-    /** This makes a potentially expensive binder call and should be run on a background thread. */
-    public @NonNull List<StatusBarNotification> getStatusBarNotificationsForKeys(
+    /**
+     * This makes a potentially expensive binder call and should be run on a background thread.
+     */
+    public @NonNull
+    List<StatusBarNotification> getStatusBarNotificationsForKeys(
             List<NotificationKeyData> notificationKeys) {
         NotificationListener notificationListener = NotificationListener.getInstanceIfConnected();
         return notificationListener == null ? Collections.EMPTY_LIST
                 : notificationListener.getNotificationsForKeys(notificationKeys);
     }
 
+    public @NonNull
+    List<SystemShortcut> getEnabledSystemShortcutsForItem(ItemInfo info) {
+        List<SystemShortcut> systemShortcuts = new ArrayList<>();
+        for (SystemShortcut systemShortcut :
+                OmegaShortcut.Companion.getInstance(mLauncher).getEnabledShortcuts()) {
+            if (systemShortcut.getOnClickListener(mLauncher, info) != null) {
+                systemShortcuts.add(systemShortcut);
+            }
+        }
+        return systemShortcuts;
+    }
+
+
     public void cancelNotification(String notificationKey) {
         NotificationListener notificationListener = NotificationListener.getInstanceIfConnected();
         if (notificationListener == null) {
diff --git a/src/com/android/launcher3/popup/PopupPopulator.java b/src/com/android/launcher3/popup/PopupPopulator.java
index dbfe9882f7..7132169006 100644
--- a/src/com/android/launcher3/popup/PopupPopulator.java
+++ b/src/com/android/launcher3/popup/PopupPopulator.java
@@ -22,6 +22,9 @@
 import android.os.UserHandle;
 import android.service.notification.StatusBarNotification;
 
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+
 import com.android.launcher3.ItemInfo;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.WorkspaceItemInfo;
@@ -38,9 +41,6 @@
 import java.util.Iterator;
 import java.util.List;
 
-import androidx.annotation.Nullable;
-import androidx.annotation.VisibleForTesting;
-
 /**
  * Contains logic relevant to populating a {@link PopupContainerWithArrow}. In particular,
  * this class determines which items appear in the container, and in what order.
@@ -150,7 +150,7 @@ public static Runnable createUpdateRunnable(final Launcher launcher, final ItemI
                 final WorkspaceItemInfo si = new WorkspaceItemInfo(shortcut, launcher);
                 // Use unbadged icon for the menu.
                 LauncherIcons li = LauncherIcons.obtain(launcher);
-                si.applyFrom(li.createShortcutIcon(shortcut, false /* badged */));
+                si.applyFrom(li.createShortcutIcon(shortcut, false));
                 li.recycle();
                 si.rank = i;
 
diff --git a/src/com/android/launcher3/popup/SystemShortcut.java b/src/com/android/launcher3/popup/SystemShortcut.java
index a87b7b8971..bbb972e08a 100644
--- a/src/com/android/launcher3/popup/SystemShortcut.java
+++ b/src/com/android/launcher3/popup/SystemShortcut.java
@@ -126,6 +126,18 @@ public boolean hasHandlerForAction(int action) {
 
     public abstract View.OnClickListener getOnClickListener(T activity, ItemInfo itemInfo);
 
+    public static class Custom extends SystemShortcut<Launcher> {
+
+        public Custom() {
+            super(R.drawable.ic_edit_no_shadow, R.string.action_preferences);
+        }
+
+        @Override
+        public View.OnClickListener getOnClickListener(Launcher launcher, ItemInfo itemInfo) {
+            return null;
+        }
+    }
+
     public static class Widgets extends SystemShortcut<Launcher> {
 
         public Widgets() {
@@ -134,7 +146,7 @@ public Widgets() {
 
         @Override
         public View.OnClickListener getOnClickListener(final Launcher launcher,
-                final ItemInfo itemInfo) {
+                                                       final ItemInfo itemInfo) {
             if (itemInfo.getTargetComponent() == null) return null;
             final List<WidgetItem> widgets =
                     launcher.getPopupDataProvider().getWidgetsForPackageUser(new PackageUserKey(
diff --git a/src/com/android/launcher3/qsb/QsbContainerView.java b/src/com/android/launcher3/qsb/QsbContainerView.java
index 0eb4285273..4549d2353d 100644
--- a/src/com/android/launcher3/qsb/QsbContainerView.java
+++ b/src/com/android/launcher3/qsb/QsbContainerView.java
@@ -16,10 +16,6 @@
 
 package com.android.launcher3.qsb;
 
-import static android.appwidget.AppWidgetManager.ACTION_APPWIDGET_BIND;
-import static android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_ID;
-import static android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_PROVIDER;
-
 import android.app.Activity;
 import android.app.Fragment;
 import android.app.SearchManager;
@@ -32,100 +28,32 @@
 import android.content.Intent;
 import android.graphics.Rect;
 import android.os.Bundle;
-import android.provider.Settings;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
 import com.android.launcher3.AppWidgetResizeFrame;
 import com.android.launcher3.InvariantDeviceProfile;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.config.FeatureFlags;
-import com.android.launcher3.graphics.FragmentWithPreview;
+
+import static android.appwidget.AppWidgetManager.ACTION_APPWIDGET_BIND;
+import static android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_ID;
+import static android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_PROVIDER;
 
 /**
  * A frame layout which contains a QSB. This internally uses fragment to bind the view, which
  * allows it to contain the logic for {@link Fragment#startActivityForResult(Intent, int)}.
- *
+ * <p>
  * Note: AppWidgetManagerCompat can be disabled using FeatureFlags. In QSB, we should use
  * AppWidgetManager directly, so that it keeps working in that case.
  */
-public class QsbContainerView extends FrameLayout {
-
-    public static final String SEARCH_PROVIDER_SETTINGS_KEY = "SEARCH_PROVIDER_PACKAGE_NAME";
-
-    /**
-     * Returns the package name for user configured search provider or from searchManager
-     * @param context
-     * @return String
-     */
-    @Nullable
-    public static String getSearchWidgetPackageName(@NonNull Context context) {
-        String providerPkg = Settings.Global.getString(context.getContentResolver(),
-                SEARCH_PROVIDER_SETTINGS_KEY);
-        if (providerPkg == null) {
-            SearchManager searchManager = context.getSystemService(SearchManager.class);
-            ComponentName componentName = searchManager.getGlobalSearchActivity();
-            if (componentName != null) {
-                providerPkg = searchManager.getGlobalSearchActivity().getPackageName();
-            }
-        }
-        return providerPkg;
-    }
-
-    /**
-     * returns it's AppWidgetProviderInfo using package name from getSearchWidgetPackageName
-     * @param context
-     * @return AppWidgetProviderInfo
-     */
-    @Nullable
-    public static AppWidgetProviderInfo getSearchWidgetProviderInfo(@NonNull Context context) {
-        String providerPkg = getSearchWidgetPackageName(context);
-        if (providerPkg == null) {
-            return null;
-        }
-
-        AppWidgetProviderInfo defaultWidgetForSearchPackage = null;
-        AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(context);
-        for (AppWidgetProviderInfo info :
-                appWidgetManager.getInstalledProvidersForPackage(providerPkg, null)) {
-            if (info.provider.getPackageName().equals(providerPkg) && info.configure == null) {
-                if ((info.widgetCategory
-                        & AppWidgetProviderInfo.WIDGET_CATEGORY_SEARCHBOX) != 0) {
-                    return info;
-                } else if (defaultWidgetForSearchPackage == null) {
-                    defaultWidgetForSearchPackage = info;
-                }
-            }
-        }
-        return defaultWidgetForSearchPackage;
-    }
 
-    /**
-     * returns componentName for searchWidget if package name is known.
-     */
-    @Nullable
-    public static ComponentName getSearchComponentName(@NonNull  Context context) {
-        AppWidgetProviderInfo providerInfo =
-                QsbContainerView.getSearchWidgetProviderInfo(context);
-        if (providerInfo != null) {
-            return providerInfo.provider;
-        } else {
-            String pkgName = QsbContainerView.getSearchWidgetPackageName(context);
-            if (pkgName != null) {
-                //we don't know the class name yet. we'll put the package name as placeholder
-                return new ComponentName(pkgName, pkgName);
-            }
-            return null;
-        }
-    }
+public class QsbContainerView extends FrameLayout {
 
     public QsbContainerView(Context context) {
         super(context);
@@ -151,7 +79,7 @@ protected void setPaddingUnchecked(int left, int top, int right, int bottom) {
     /**
      * A fragment to display the QSB.
      */
-    public static class QsbFragment extends FragmentWithPreview {
+    public static class QsbFragment extends Fragment {
 
         public static final int QSB_WIDGET_HOST_ID = 1026;
         private static final int REQUEST_BIND_QSB = 1;
@@ -166,14 +94,15 @@ public static class QsbFragment extends FragmentWithPreview {
         private int mOrientation;
 
         @Override
-        public void onInit(Bundle savedInstanceState) {
+        public void onCreate(Bundle savedInstanceState) {
+            super.onCreate(savedInstanceState);
             mQsbWidgetHost = createHost();
             mOrientation = getContext().getResources().getConfiguration().orientation;
         }
 
         protected QsbWidgetHost createHost() {
-            return new QsbWidgetHost(getContext(), QSB_WIDGET_HOST_ID,
-                    (c) -> new QsbWidgetHostView(c), this::rebindFragment);
+            return new QsbWidgetHost(getActivity(), QSB_WIDGET_HOST_ID,
+                    (c) -> new QsbWidgetHostView(c));
         }
 
         private FrameLayout mWrapper;
@@ -182,10 +111,10 @@ protected QsbWidgetHost createHost() {
         public View onCreateView(
                 LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 
-            mWrapper = new FrameLayout(getContext());
+            mWrapper = new FrameLayout(getActivity());
+
             // Only add the view when enabled
             if (isQsbEnabled()) {
-                mQsbWidgetHost.startListening();
                 mWrapper.addView(createQsb(mWrapper));
             }
             return mWrapper;
@@ -198,16 +127,16 @@ private View createQsb(ViewGroup container) {
                 return getDefaultView(container, false /* show setup icon */);
             }
             Bundle opts = createBindOptions();
-            Context context = getContext();
-            AppWidgetManager widgetManager = AppWidgetManager.getInstance(context);
+            Activity activity = getActivity();
+            AppWidgetManager widgetManager = AppWidgetManager.getInstance(activity);
 
-            int widgetId = Utilities.getPrefs(context).getInt(mKeyWidgetId, -1);
+            int widgetId = Utilities.getPrefs(activity).getInt(mKeyWidgetId, -1);
             AppWidgetProviderInfo widgetInfo = widgetManager.getAppWidgetInfo(widgetId);
             boolean isWidgetBound = (widgetInfo != null) &&
                     widgetInfo.provider.equals(mWidgetInfo.provider);
 
             int oldWidgetId = widgetId;
-            if (!isWidgetBound && !isInPreviewMode()) {
+            if (!isWidgetBound) {
                 if (widgetId > -1) {
                     // widgetId is already bound and its not the correct provider. reset host.
                     mQsbWidgetHost.deleteHost();
@@ -227,16 +156,14 @@ private View createQsb(ViewGroup container) {
             }
 
             if (isWidgetBound) {
-                mQsb = (QsbWidgetHostView) mQsbWidgetHost.createView(context, widgetId,
-                        mWidgetInfo);
+                mQsb = (QsbWidgetHostView) mQsbWidgetHost.createView(activity, widgetId, mWidgetInfo);
                 mQsb.setId(R.id.qsb_widget);
 
-                if (!isInPreviewMode()) {
-                    if (!containsAll(AppWidgetManager.getInstance(context)
-                            .getAppWidgetOptions(widgetId), opts)) {
-                        mQsb.updateAppWidgetOptions(opts);
-                    }
+                if (!Utilities.containsAll(AppWidgetManager.getInstance(activity)
+                        .getAppWidgetOptions(widgetId), opts)) {
+                    mQsb.updateAppWidgetOptions(opts);
                 }
+                mQsbWidgetHost.startListening();
                 return mQsb;
             }
 
@@ -245,7 +172,7 @@ private View createQsb(ViewGroup container) {
         }
 
         private void saveWidgetId(int widgetId) {
-            Utilities.getPrefs(getContext()).edit().putInt(mKeyWidgetId, widgetId).apply();
+            Utilities.getPrefs(getActivity()).edit().putInt(mKeyWidgetId, widgetId).apply();
         }
 
         @Override
@@ -280,7 +207,7 @@ private void rebindFragment() {
                 return;
             }
 
-            if (mWrapper != null && getContext() != null) {
+            if (mWrapper != null && getActivity() != null) {
                 mWrapper.removeAllViews();
                 mWrapper.addView(createQsb(mWrapper));
             }
@@ -291,10 +218,10 @@ public boolean isQsbEnabled() {
         }
 
         protected Bundle createBindOptions() {
-            InvariantDeviceProfile idp = LauncherAppState.getIDP(getContext());
+            InvariantDeviceProfile idp = LauncherAppState.getIDP(getActivity());
 
             Bundle opts = new Bundle();
-            Rect size = AppWidgetResizeFrame.getWidgetSizeRanges(getContext(),
+            Rect size = AppWidgetResizeFrame.getWidgetSizeRanges(getActivity(),
                     idp.numColumns, 1, null);
             opts.putInt(AppWidgetManager.OPTION_APPWIDGET_MIN_WIDTH, size.left);
             opts.putInt(AppWidgetManager.OPTION_APPWIDGET_MIN_HEIGHT, size.top);
@@ -318,32 +245,43 @@ protected View getDefaultView(ViewGroup container, boolean showSetupIcon) {
             return v;
         }
 
-
         /**
          * Returns a widget with category {@link AppWidgetProviderInfo#WIDGET_CATEGORY_SEARCHBOX}
-         * provided by the package from getSearchProviderPackageName
+         * provided by the same package which is set to be global search activity.
          * If widgetCategory is not supported, or no such widget is found, returns the first widget
          * provided by the package.
          */
         protected AppWidgetProviderInfo getSearchWidgetProvider() {
-            return getSearchWidgetProviderInfo(getContext());
+            SearchManager searchManager =
+                    (SearchManager) getActivity().getSystemService(Context.SEARCH_SERVICE);
+            ComponentName searchComponent = searchManager.getGlobalSearchActivity();
+            if (searchComponent == null) return null;
+            String providerPkg = searchComponent.getPackageName();
+
+            AppWidgetProviderInfo defaultWidgetForSearchPackage = null;
+
+            AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(getActivity());
+            for (AppWidgetProviderInfo info : appWidgetManager.getInstalledProviders()) {
+                if (info.provider.getPackageName().equals(providerPkg) && info.configure == null) {
+                    if ((info.widgetCategory
+                            & AppWidgetProviderInfo.WIDGET_CATEGORY_SEARCHBOX) != 0) {
+                        return info;
+                    } else if (defaultWidgetForSearchPackage == null) {
+                        defaultWidgetForSearchPackage = info;
+                    }
+                }
+            }
+            return defaultWidgetForSearchPackage;
         }
     }
 
     public static class QsbWidgetHost extends AppWidgetHost {
 
         private final WidgetViewFactory mViewFactory;
-        private final WidgetProvidersUpdateCallback mWidgetsUpdateCallback;
 
-        public QsbWidgetHost(Context context, int hostId, WidgetViewFactory viewFactory,
-                WidgetProvidersUpdateCallback widgetProvidersUpdateCallback) {
+        public QsbWidgetHost(Context context, int hostId, WidgetViewFactory viewFactory) {
             super(context, hostId);
             mViewFactory = viewFactory;
-            mWidgetsUpdateCallback = widgetProvidersUpdateCallback;
-        }
-
-        public QsbWidgetHost(Context context, int hostId, WidgetViewFactory viewFactory) {
-            this(context, hostId, viewFactory, null);
         }
 
         @Override
@@ -351,50 +289,10 @@ protected AppWidgetHostView onCreateView(
                 Context context, int appWidgetId, AppWidgetProviderInfo appWidget) {
             return mViewFactory.newView(context);
         }
-
-        @Override
-        protected void onProvidersChanged() {
-            super.onProvidersChanged();
-            if (mWidgetsUpdateCallback != null) {
-                mWidgetsUpdateCallback.onProvidersUpdated();
-            }
-        }
     }
 
     public interface WidgetViewFactory {
 
         QsbWidgetHostView newView(Context context);
     }
-
-    /**
-     * Callback interface for packages list update.
-     */
-    @FunctionalInterface
-    public interface WidgetProvidersUpdateCallback {
-        /**
-         * Gets called when widget providers list changes
-         */
-        void onProvidersUpdated();
-    }
-
-    /**
-     * Returns true if {@param original} contains all entries defined in {@param updates} and
-     * have the same value.
-     * The comparison uses {@link Object#equals(Object)} to compare the values.
-     */
-    private static boolean containsAll(Bundle original, Bundle updates) {
-        for (String key : updates.keySet()) {
-            Object value1 = updates.get(key);
-            Object value2 = original.get(key);
-            if (value1 == null) {
-                if (value2 != null) {
-                    return false;
-                }
-            } else if (!value1.equals(value2)) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-}
+}
\ No newline at end of file
diff --git a/src/com/android/launcher3/qsb/QsbWidgetHostView.java b/src/com/android/launcher3/qsb/QsbWidgetHostView.java
index f5ecda3e30..b0d89b3793 100644
--- a/src/com/android/launcher3/qsb/QsbWidgetHostView.java
+++ b/src/com/android/launcher3/qsb/QsbWidgetHostView.java
@@ -16,6 +16,7 @@
 
 package com.android.launcher3.qsb;
 
+import android.appwidget.AppWidgetHostView;
 import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -25,20 +26,19 @@
 
 import com.android.launcher3.Launcher;
 import com.android.launcher3.R;
-import com.android.launcher3.widget.NavigableAppWidgetHostView;
 
 /**
  * Appwidget host view with QSB specific logic.
  */
-public class QsbWidgetHostView extends NavigableAppWidgetHostView {
+public class QsbWidgetHostView extends AppWidgetHostView {
 
     @ViewDebug.ExportedProperty(category = "launcher")
     private int mPreviousOrientation;
 
     public QsbWidgetHostView(Context context) {
         super(context);
-        setFocusable(true);
-        setBackgroundResource(R.drawable.qsb_host_view_focus_bg);
+        //setFocusable(true);
+        //setBackgroundResource(R.drawable.qsb_host_view_focus_bg);
     }
 
     @Override
@@ -92,8 +92,8 @@ public static View getDefaultView(ViewGroup parent) {
         return v;
     }
 
-    @Override
+    /*@Override
     protected boolean shouldAllowDirectClick() {
         return true;
-    }
+    }*/
 }
diff --git a/src/com/android/launcher3/settings/NotificationDotsPreference.java b/src/com/android/launcher3/settings/NotificationDotsPreference.java
index 9bd0f13ce7..d87857bdc7 100644
--- a/src/com/android/launcher3/settings/NotificationDotsPreference.java
+++ b/src/com/android/launcher3/settings/NotificationDotsPreference.java
@@ -17,7 +17,6 @@
 
 import android.app.AlertDialog;
 import android.app.Dialog;
-import android.app.DialogFragment;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -27,6 +26,7 @@
 import android.util.AttributeSet;
 import android.view.View;
 
+import androidx.fragment.app.DialogFragment;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceViewHolder;
 
@@ -34,8 +34,8 @@
 import com.android.launcher3.notification.NotificationListener;
 import com.android.launcher3.util.SecureSettingsObserver;
 
-import static com.android.launcher3.settings.SettingsActivity.EXTRA_FRAGMENT_ARG_KEY;
-import static com.android.launcher3.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGS;
+import static com.saggitt.omega.settings.SettingsActivity.EXTRA_FRAGMENT_ARG_KEY;
+import static com.saggitt.omega.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGS;
 
 /**
  * A {@link Preference} for indicating notification dots status.
diff --git a/src/com/android/launcher3/states/SpringLoadedState.java b/src/com/android/launcher3/states/SpringLoadedState.java
index be3e6c9cbc..ec8e208b28 100644
--- a/src/com/android/launcher3/states/SpringLoadedState.java
+++ b/src/com/android/launcher3/states/SpringLoadedState.java
@@ -15,22 +15,22 @@
  */
 package com.android.launcher3.states;
 
-import static com.android.launcher3.LauncherAnimUtils.SPRING_LOADED_TRANSITION_MS;
-import static com.android.launcher3.states.RotationHelper.REQUEST_LOCK;
-
 import android.graphics.Rect;
 
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.InstallShortcutReceiver;
 import com.android.launcher3.Launcher;
-import com.android.launcher3.LauncherState;
 import com.android.launcher3.Workspace;
 import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
+import com.saggitt.omega.states.HomeState;
+
+import static com.android.launcher3.LauncherAnimUtils.SPRING_LOADED_TRANSITION_MS;
+import static com.android.launcher3.states.RotationHelper.REQUEST_LOCK;
 
 /**
  * Definition for spring loaded state used during drag and drop.
  */
-public class SpringLoadedState extends LauncherState {
+public class SpringLoadedState extends HomeState {
 
     private static final int STATE_FLAGS = FLAG_MULTI_PAGE |
             FLAG_DISABLE_ACCESSIBILITY | FLAG_DISABLE_RESTORE | FLAG_WORKSPACE_ICONS_CAN_BE_DRAGGED |
diff --git a/src/com/android/launcher3/testing/TestProtocol.java b/src/com/android/launcher3/testing/TestProtocol.java
index 07ddbdc4e1..e25c2af51b 100644
--- a/src/com/android/launcher3/testing/TestProtocol.java
+++ b/src/com/android/launcher3/testing/TestProtocol.java
@@ -35,6 +35,8 @@ public final class TestProtocol {
     public static final int ALL_APPS_STATE_ORDINAL = 5;
     public static final int BACKGROUND_APP_STATE_ORDINAL = 6;
 
+    public static final int OPTIONS_STATE_ORDINAL = 8;
+
     public static String stateOrdinalToString(int ordinal) {
         switch (ordinal) {
             case NORMAL_STATE_ORDINAL:
diff --git a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
index f40f9762d0..8c0a685e84 100644
--- a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
+++ b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
@@ -15,17 +15,6 @@
  */
 package com.android.launcher3.touch;
 
-import static com.android.launcher3.LauncherAnimUtils.MIN_PROGRESS_TO_ALL_APPS;
-import static com.android.launcher3.LauncherState.ALL_APPS;
-import static com.android.launcher3.LauncherState.NORMAL;
-import static com.android.launcher3.LauncherState.OVERVIEW;
-import static com.android.launcher3.LauncherStateManager.ANIM_ALL;
-import static com.android.launcher3.LauncherStateManager.ATOMIC_OVERVIEW_SCALE_COMPONENT;
-import static com.android.launcher3.LauncherStateManager.NON_ATOMIC_COMPONENT;
-import static com.android.launcher3.anim.Interpolators.scrollInterpolatorForVelocity;
-import static com.android.launcher3.config.FeatureFlags.QUICKSTEP_SPRINGS;
-import static com.android.launcher3.util.DefaultDisplay.getSingleFrameMs;
-
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
@@ -49,6 +38,17 @@
 import com.android.launcher3.util.PendingAnimation;
 import com.android.launcher3.util.TouchController;
 
+import static com.android.launcher3.LauncherAnimUtils.MIN_PROGRESS_TO_ALL_APPS;
+import static com.android.launcher3.LauncherState.ALL_APPS;
+import static com.android.launcher3.LauncherState.NORMAL;
+import static com.android.launcher3.LauncherState.OVERVIEW;
+import static com.android.launcher3.LauncherStateManager.ANIM_ALL;
+import static com.android.launcher3.LauncherStateManager.ATOMIC_OVERVIEW_SCALE_COMPONENT;
+import static com.android.launcher3.LauncherStateManager.NON_ATOMIC_COMPONENT;
+import static com.android.launcher3.anim.Interpolators.scrollInterpolatorForVelocity;
+import static com.android.launcher3.config.FeatureFlags.QUICKSTEP_SPRINGS;
+import static com.android.launcher3.util.DefaultDisplay.getSingleFrameMs;
+
 /**
  * TouchController for handling state changes
  */
@@ -80,7 +80,7 @@ public abstract class AbstractStateChangeTouchController
 
     private float mStartProgress;
     // Ratio of transition process [0, 1] to drag displacement (px)
-    private float mProgressMultiplier;
+    protected float mProgressMultiplier;
     private float mDisplacementShift;
     private boolean mCanBlockFling;
     private FlingBlockCheck mFlingBlockCheck = new FlingBlockCheck();
@@ -296,7 +296,9 @@ public boolean onDrag(float displacement, MotionEvent ev) {
     }
 
     protected void updateProgress(float fraction) {
-        mCurrentAnimation.setPlayFraction(fraction);
+        if (mCurrentAnimation != null) {
+            mCurrentAnimation.setPlayFraction(fraction);
+        }
         if (mAtomicComponentsController != null) {
             // Make sure we don't divide by 0, and have at least a small runway.
             float start = Math.min(mAtomicComponentsStartProgress, 0.9f);
diff --git a/src/com/android/launcher3/touch/BaseSwipeDetector.java b/src/com/android/launcher3/touch/BaseSwipeDetector.java
index 12ca5ee7b1..300d21f7e2 100644
--- a/src/com/android/launcher3/touch/BaseSwipeDetector.java
+++ b/src/com/android/launcher3/touch/BaseSwipeDetector.java
@@ -15,8 +15,6 @@
  */
 package com.android.launcher3.touch;
 
-import static android.view.MotionEvent.INVALID_POINTER_ID;
-
 import android.graphics.PointF;
 import android.util.Log;
 import android.view.MotionEvent;
@@ -25,6 +23,8 @@
 
 import androidx.annotation.NonNull;
 
+import static android.view.MotionEvent.INVALID_POINTER_ID;
+
 /**
  * Scroll/drag/swipe gesture detector.
  *
@@ -40,15 +40,17 @@ public abstract class BaseSwipeDetector {
     private static final boolean DBG = false;
     private static final String TAG = "BaseSwipeDetector";
     private static final float ANIMATION_DURATION = 1200;
-    /** The minimum release velocity in pixels per millisecond that triggers fling.*/
+    /**
+     * The minimum release velocity in pixels per millisecond that triggers fling.
+     */
     private static final float RELEASE_VELOCITY_PX_MS = 1.0f;
     private static final PointF sTempPoint = new PointF();
 
     private final PointF mDownPos = new PointF();
     private final PointF mLastPos = new PointF();
-    protected final boolean mIsRtl;
-    protected final float mTouchSlop;
-    protected final float mMaxVelocity;
+    public boolean mIsRtl;
+    protected float mTouchSlop;
+    public float mMaxVelocity;
 
     private int mActivePointerId = INVALID_POINTER_ID;
     private VelocityTracker mVelocityTracker;
diff --git a/src/com/android/launcher3/touch/ItemClickHandler.java b/src/com/android/launcher3/touch/ItemClickHandler.java
index 5d6ce5f595..28c17caebf 100644
--- a/src/com/android/launcher3/touch/ItemClickHandler.java
+++ b/src/com/android/launcher3/touch/ItemClickHandler.java
@@ -94,8 +94,8 @@ private static void onClick(View v, String sourceContainer) {
         } else if (tag instanceof AppInfo) {
             startAppShortcutOrInfoActivity(v, (AppInfo) tag, launcher,
                     sourceContainer == null ? CONTAINER_ALL_APPS : sourceContainer);
-            if (Utilities.getOmegaPrefs(Launcher.mContext).getSortMode() == Config.SORT_MOST_USED) {
-                Utilities.getOmegaPrefs(Launcher.mContext).updateSortApps();
+            if (Utilities.getOmegaPrefs(launcher).getSortMode() == Config.SORT_MOST_USED) {
+                Utilities.getOmegaPrefs(launcher).updateSortApps();
                 Log.d(TAG, "Sort Mode Most Used");
             }
         } else if (tag instanceof LauncherAppWidgetInfo) {
diff --git a/src/com/android/launcher3/touch/WorkspaceTouchListener.java b/src/com/android/launcher3/touch/WorkspaceTouchListener.java
index 310d598b25..3bae837e3f 100644
--- a/src/com/android/launcher3/touch/WorkspaceTouchListener.java
+++ b/src/com/android/launcher3/touch/WorkspaceTouchListener.java
@@ -15,14 +15,6 @@
  */
 package com.android.launcher3.touch;
 
-import static android.view.MotionEvent.ACTION_CANCEL;
-import static android.view.MotionEvent.ACTION_DOWN;
-import static android.view.MotionEvent.ACTION_MOVE;
-import static android.view.MotionEvent.ACTION_POINTER_UP;
-import static android.view.MotionEvent.ACTION_UP;
-
-import static com.android.launcher3.LauncherState.NORMAL;
-
 import android.graphics.PointF;
 import android.graphics.Rect;
 import android.view.GestureDetector;
@@ -36,17 +28,30 @@
 import com.android.launcher3.CellLayout;
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.Launcher;
+import com.android.launcher3.R;
 import com.android.launcher3.Workspace;
 import com.android.launcher3.dragndrop.DragLayer;
-import com.android.launcher3.views.OptionsPopupView;
 import com.android.launcher3.userevent.nano.LauncherLogProto.Action;
 import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
+import com.android.launcher3.views.OptionsPopupView;
+import com.saggitt.omega.OmegaLauncher;
+import com.saggitt.omega.blur.BlurWallpaperProvider;
+import com.saggitt.omega.gestures.GestureController;
+
+import java.util.ArrayList;
+
+import static android.view.MotionEvent.ACTION_CANCEL;
+import static android.view.MotionEvent.ACTION_DOWN;
+import static android.view.MotionEvent.ACTION_MOVE;
+import static android.view.MotionEvent.ACTION_POINTER_UP;
+import static android.view.MotionEvent.ACTION_UP;
+import static com.android.launcher3.LauncherState.NORMAL;
+import static com.android.launcher3.LauncherState.OPTIONS;
 
 /**
  * Helper class to handle touch on empty space in workspace and show options popup on long press
  */
-public class WorkspaceTouchListener extends GestureDetector.SimpleOnGestureListener
-        implements OnTouchListener {
+public class WorkspaceTouchListener extends GestureDetector.SimpleOnGestureListener implements OnTouchListener {
 
     /**
      * STATE_PENDING_PARENT_INFORM is the state between longPress performed & the next motionEvent.
@@ -68,14 +73,16 @@ public class WorkspaceTouchListener extends GestureDetector.SimpleOnGestureListe
     private int mLongPressState = STATE_CANCELLED;
 
     private final GestureDetector mGestureDetector;
+    private final GestureController mGestureController;
 
     public WorkspaceTouchListener(Launcher launcher, Workspace workspace) {
         mLauncher = launcher;
         mWorkspace = workspace;
-        // Use twice the touch slop as we are looking for long press which is more
-        // likely to cause movement.
+
         mTouchSlop = 2 * ViewConfiguration.get(launcher).getScaledTouchSlop();
         mGestureDetector = new GestureDetector(workspace.getContext(), this);
+        mGestureController = ((OmegaLauncher) launcher).getGestureController();
+        mGestureController.attachDoubleTapListener(mGestureDetector);
     }
 
     @Override
@@ -102,6 +109,7 @@ public boolean onTouch(View view, MotionEvent ev) {
             if (handleLongPress) {
                 mLongPressState = STATE_REQUESTED;
                 mTouchDownPoint.set(ev.getX(), ev.getY());
+                mGestureController.setTouchDownPoint(mTouchDownPoint);
             }
 
             mWorkspace.onTouchEvent(ev);
@@ -131,6 +139,7 @@ public boolean onTouch(View view, MotionEvent ev) {
                 cancelLongPress();
             }
 
+
             result = true;
         } else {
             // We don't want to handle touch, let workspace handle it as usual.
@@ -138,7 +147,7 @@ public boolean onTouch(View view, MotionEvent ev) {
         }
 
         if (action == ACTION_UP || action == ACTION_POINTER_UP) {
-            if (!mWorkspace.isHandlingTouch()) {
+            if (!mWorkspace.isTouchActive()) {
                 final CellLayout currentPage =
                         (CellLayout) mWorkspace.getChildAt(mWorkspace.getCurrentPage());
                 if (currentPage != null) {
@@ -150,13 +159,12 @@ public boolean onTouch(View view, MotionEvent ev) {
         if (action == ACTION_UP || action == ACTION_CANCEL) {
             cancelLongPress();
         }
-
         return result;
     }
 
     private boolean canHandleLongPress() {
         return AbstractFloatingView.getTopOpenView(mLauncher) == null
-                && mLauncher.isInState(NORMAL);
+                && mLauncher.isInState(NORMAL) || mLauncher.isInState(OPTIONS);
     }
 
     private void cancelLongPress() {
@@ -175,10 +183,30 @@ public void onLongPress(MotionEvent event) {
                 mLauncher.getUserEventDispatcher().logActionOnContainer(Action.Touch.LONGPRESS,
                         Action.Direction.NONE, ContainerType.WORKSPACE,
                         mWorkspace.getCurrentPage());
-                OptionsPopupView.showDefaultOptions(mLauncher, mTouchDownPoint.x, mTouchDownPoint.y);
+                doLongPressAction();
             } else {
                 cancelLongPress();
             }
         }
     }
+
+    private void doLongPressAction() {
+        if (mLauncher.isInState(NORMAL)) {
+            mGestureController.onLongPress();
+        } else if (mLauncher.isInState(OPTIONS)) {
+            final int currentScreen = mLauncher.getCurrentWorkspaceScreen();
+            ArrayList<OptionsPopupView.OptionItem> options = new ArrayList<>();
+            options.add(new OptionsPopupView.OptionItem(
+                    R.string.remove_drop_target_label,
+                    R.drawable.ic_remove_no_shadow,
+                    -1, v -> {
+                mLauncher.getWorkspace().removeScreen(currentScreen, true);
+                return true;
+            }));
+            if (BlurWallpaperProvider.Companion.isEnabled()) {
+                //options.add(mWorkspace.getWorkspaceBlur().getOptionItem(currentScreen));
+            }
+            OptionsPopupView.show(mLauncher, mTouchDownPoint.x, mTouchDownPoint.y, options);
+        }
+    }
 }
diff --git a/src/com/android/launcher3/util/ContentWriter.java b/src/com/android/launcher3/util/ContentWriter.java
index 00adf1069a..7257744e2b 100644
--- a/src/com/android/launcher3/util/ContentWriter.java
+++ b/src/com/android/launcher3/util/ContentWriter.java
@@ -79,6 +79,11 @@ public ContentWriter put(String key, Intent value) {
         return this;
     }
 
+    public ContentWriter put(String key, byte[] value) {
+        mValues.put(key, value);
+        return this;
+    }
+
     public ContentWriter putIcon(Bitmap value, UserHandle user) {
         mIcon = value;
         mUser = user;
diff --git a/src/com/android/launcher3/util/Executors.java b/src/com/android/launcher3/util/Executors.java
index 4d5ee49e83..2bc089655c 100644
--- a/src/com/android/launcher3/util/Executors.java
+++ b/src/com/android/launcher3/util/Executors.java
@@ -84,4 +84,10 @@ public static Looper createAndStartNewForegroundLooper(String name) {
      */
     public static final LooperExecutor MODEL_EXECUTOR =
             new LooperExecutor(createAndStartNewLooper("launcher-loader"));
+
+    public static final LooperExecutor ICON_PACK_EXECUTOR =
+            new LooperExecutor(createAndStartNewLooper("launcher-icon-pack"));
+
+    public static final LooperExecutor ICON_PACK_UI_EXECUTOR =
+            new LooperExecutor(createAndStartNewLooper("launcher-icon-pack-ui"));
 }
diff --git a/src/com/android/launcher3/util/MainThreadInitializedObject.java b/src/com/android/launcher3/util/MainThreadInitializedObject.java
index fe9c2c468b..a59f5d9203 100644
--- a/src/com/android/launcher3/util/MainThreadInitializedObject.java
+++ b/src/com/android/launcher3/util/MainThreadInitializedObject.java
@@ -15,8 +15,6 @@
  */
 package com.android.launcher3.util;
 
-import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
-
 import android.content.Context;
 import android.os.Looper;
 
@@ -26,6 +24,8 @@
 
 import java.util.concurrent.ExecutionException;
 
+import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
+
 /**
  * Utility class for defining singletons which are initiated on main thread.
  */
@@ -42,10 +42,11 @@ public T get(Context context) {
         if (mValue == null) {
             if (Looper.myLooper() == Looper.getMainLooper()) {
                 mValue = mProvider.get(context.getApplicationContext());
+                onPostInit(context);
             } else {
                 try {
                     return MAIN_EXECUTOR.submit(() -> get(context)).get();
-                } catch (InterruptedException|ExecutionException e) {
+                } catch (InterruptedException | ExecutionException e) {
                     throw new RuntimeException(e);
                 }
             }
@@ -53,6 +54,9 @@ public T get(Context context) {
         return mValue;
     }
 
+    protected void onPostInit(Context context) {
+    }
+
     public T getNoCreate() {
         return mValue;
     }
diff --git a/src/com/android/launcher3/util/PackageManagerHelper.java b/src/com/android/launcher3/util/PackageManagerHelper.java
index e97adb5771..ad35da6b3c 100644
--- a/src/com/android/launcher3/util/PackageManagerHelper.java
+++ b/src/com/android/launcher3/util/PackageManagerHelper.java
@@ -79,6 +79,33 @@ public boolean isAppOnSdcard(String packageName, UserHandle user) {
         return info != null && (info.flags & ApplicationInfo.FLAG_EXTERNAL_STORAGE) != 0;
     }
 
+    public static boolean isAppEnabled(PackageManager pm, String packageName, int flags) {
+        try {
+            ApplicationInfo info = pm.getApplicationInfo(packageName, flags);
+            return info != null && info.enabled;
+        } catch (PackageManager.NameNotFoundException e) {
+            return false;
+        }
+    }
+
+    public static boolean isAppInstalled(PackageManager pm, String packageName, int flags) {
+        try {
+            ApplicationInfo info = pm.getApplicationInfo(packageName, flags);
+            return info != null;
+        } catch (PackageManager.NameNotFoundException e) {
+            return false;
+        }
+    }
+
+    public String getPackageVersion(final String packageName) {
+        try {
+            PackageInfo info = mPm.getPackageInfo(packageName, 0);
+            return info.versionName;
+        } catch (PackageManager.NameNotFoundException ignored) {
+        }
+        return "";
+    }
+
     /**
      * Returns whether the target app is suspended for a given user as per
      * {@link android.app.admin.DevicePolicyManager#isPackageSuspended}.
diff --git a/src/com/android/launcher3/util/PackageUserKey.java b/src/com/android/launcher3/util/PackageUserKey.java
index f243ca6283..47556842f0 100644
--- a/src/com/android/launcher3/util/PackageUserKey.java
+++ b/src/com/android/launcher3/util/PackageUserKey.java
@@ -49,6 +49,12 @@ public boolean updateFromItemInfo(ItemInfo info) {
         return false;
     }
 
+    public boolean updateFromNotification(StatusBarNotification sbn) {
+        update(sbn.getPackageName(), sbn.getUser());
+        return true;
+    }
+
+
     @Override
     public int hashCode() {
         return mHashCode;
diff --git a/src/com/android/launcher3/util/UiThreadHelper.java b/src/com/android/launcher3/util/UiThreadHelper.java
index f8d163230d..c8dc0bb46b 100644
--- a/src/com/android/launcher3/util/UiThreadHelper.java
+++ b/src/com/android/launcher3/util/UiThreadHelper.java
@@ -15,26 +15,39 @@
  */
 package com.android.launcher3.util;
 
-import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
-
 import android.app.Activity;
 import android.content.Context;
 import android.os.Handler;
+import android.os.HandlerThread;
 import android.os.IBinder;
+import android.os.Looper;
 import android.os.Message;
+import android.os.Process;
 import android.view.inputmethod.InputMethodManager;
 
+import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
+
 /**
  * Utility class for offloading some class from UI thread
  */
 public class UiThreadHelper {
 
+    private static HandlerThread sHandlerThread;
     private static Handler sHandler;
 
     private static final int MSG_HIDE_KEYBOARD = 1;
     private static final int MSG_SET_ORIENTATION = 2;
     private static final int MSG_RUN_COMMAND = 3;
 
+    public static Looper getBackgroundLooper() {
+        if (sHandlerThread == null) {
+            sHandlerThread =
+                    new HandlerThread("UiThreadHelper", Process.THREAD_PRIORITY_FOREGROUND);
+            sHandlerThread.start();
+        }
+        return sHandlerThread.getLooper();
+    }
+
     private static Handler getHandler(Context context) {
         if (sHandler == null) {
             sHandler = new Handler(UI_HELPER_EXECUTOR.getLooper(),
diff --git a/src/com/android/launcher3/views/OptionsPopupView.java b/src/com/android/launcher3/views/OptionsPopupView.java
index 465df448e3..e3419a46df 100644
--- a/src/com/android/launcher3/views/OptionsPopupView.java
+++ b/src/com/android/launcher3/views/OptionsPopupView.java
@@ -15,9 +15,6 @@
  */
 package com.android.launcher3.views;
 
-import static com.android.launcher3.Utilities.EXTRA_WALLPAPER_FLAVOR;
-import static com.android.launcher3.Utilities.EXTRA_WALLPAPER_OFFSET;
-
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Rect;
@@ -47,6 +44,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import static com.android.launcher3.Utilities.EXTRA_WALLPAPER_FLAVOR;
+import static com.android.launcher3.Utilities.EXTRA_WALLPAPER_OFFSET;
+
 
 /**
  * Popup shown on long pressing an empty space in launcher
@@ -143,6 +143,16 @@ public static ArrowPopup getOptionsPopup(Launcher launcher) {
         return launcher.findViewById(R.id.deep_shortcuts_container);
     }
 
+    public static void show(Launcher launcher, float x, float y, List<OptionItem> items) {
+        float halfSize = launcher.getResources().getDimension(R.dimen.options_menu_thumb_size) / 2;
+        if (x < 0 || y < 0) {
+            x = launcher.getDragLayer().getWidth() / 2;
+            y = launcher.getDragLayer().getHeight() / 2;
+        }
+        RectF target = new RectF(x - halfSize, y - halfSize, x + halfSize, y + halfSize);
+        show(launcher, target, items);
+    }
+
     public static void showDefaultOptions(Launcher launcher, float x, float y) {
         float halfSize = launcher.getResources().getDimension(R.dimen.options_menu_thumb_size) / 2;
         if (x < 0 || y < 0) {
diff --git a/src/com/android/launcher3/views/RecyclerViewFastScroller.java b/src/com/android/launcher3/views/RecyclerViewFastScroller.java
index 56538016df..d47dac3993 100644
--- a/src/com/android/launcher3/views/RecyclerViewFastScroller.java
+++ b/src/com/android/launcher3/views/RecyclerViewFastScroller.java
@@ -402,4 +402,9 @@ public boolean hasOverlappingRendering() {
         // alpha is so low, it does not matter.
         return false;
     }
+
+    public void setColor(int color, int foregroundColor) {
+        mThumbPaint.setColor(color);
+        mPopupView.setTextColor(foregroundColor);
+    }
 }
diff --git a/src/com/android/launcher3/views/ScrimView.java b/src/com/android/launcher3/views/ScrimView.java
index 9f59d78217..cc2a27a02d 100644
--- a/src/com/android/launcher3/views/ScrimView.java
+++ b/src/com/android/launcher3/views/ScrimView.java
@@ -15,17 +15,6 @@
  */
 package com.android.launcher3.views;
 
-import static android.content.Context.ACCESSIBILITY_SERVICE;
-import static android.view.MotionEvent.ACTION_DOWN;
-
-import static androidx.core.graphics.ColorUtils.compositeColors;
-
-import static com.android.launcher3.LauncherState.ALL_APPS;
-import static com.android.launcher3.LauncherState.NORMAL;
-import static com.android.launcher3.anim.Interpolators.ACCEL;
-import static com.android.launcher3.anim.Interpolators.DEACCEL;
-import static com.android.launcher3.icons.GraphicsUtils.setColorAlphaBound;
-
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.Keyframe;
@@ -35,6 +24,7 @@
 import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Color;
+import android.graphics.Paint;
 import android.graphics.Rect;
 import android.graphics.RectF;
 import android.graphics.drawable.Drawable;
@@ -73,6 +63,15 @@
 
 import java.util.List;
 
+import static android.content.Context.ACCESSIBILITY_SERVICE;
+import static android.view.MotionEvent.ACTION_DOWN;
+import static androidx.core.graphics.ColorUtils.compositeColors;
+import static com.android.launcher3.LauncherState.ALL_APPS;
+import static com.android.launcher3.LauncherState.NORMAL;
+import static com.android.launcher3.anim.Interpolators.ACCEL;
+import static com.android.launcher3.anim.Interpolators.DEACCEL;
+import static com.android.launcher3.icons.GraphicsUtils.setColorAlphaBound;
+
 
 /**
  * Simple scrim which draws a flat color
@@ -104,7 +103,7 @@ public void set(ScrimView scrimView, Integer value) {
     protected final Launcher mLauncher;
     private final WallpaperColorInfo mWallpaperColorInfo;
     private final AccessibilityManager mAM;
-    protected final int mEndScrim;
+    protected int mEndScrim;
 
     protected float mMaxScrimAlpha;
 
@@ -117,7 +116,7 @@ public void set(ScrimView scrimView, Integer value) {
 
     protected final int mDragHandleSize;
     protected float mDragHandleOffset;
-    private final Rect mDragHandleBounds;
+    protected final Rect mDragHandleBounds;
     private final RectF mHitRect = new RectF();
 
     private final MultiValueAlpha mMultiValueAlpha;
@@ -335,8 +334,14 @@ public void onAccessibilityStateChanged(boolean enabled) {
         updateDragHandleVisibility(null);
     }
 
+    protected void updateDragHandleVisibility() {
+        updateDragHandleVisibility(null);
+    }
+
     private void updateDragHandleVisibility(Drawable recycle) {
-        boolean visible = mLauncher.getDeviceProfile().isVerticalBarLayout() || mAM.isEnabled();
+        boolean visible = mLauncher.getDeviceProfile().isVerticalBarLayout() ||
+                mAM.isEnabled() || Utilities.getOmegaPrefs(mLauncher).getDockShowArrow();
+        ;
         boolean wasVisible = mDragHandle != null;
         if (visible != wasVisible) {
             if (visible) {
@@ -364,7 +369,7 @@ public boolean dispatchKeyEvent(KeyEvent event) {
 
     @Override
     public void onFocusChanged(boolean gainFocus, int direction,
-            Rect previouslyFocusedRect) {
+                               Rect previouslyFocusedRect) {
         super.onFocusChanged(gainFocus, direction, previouslyFocusedRect);
         mAccessibilityHelper.onFocusChanged(gainFocus, direction, previouslyFocusedRect);
     }
@@ -404,7 +409,7 @@ protected void getVisibleVirtualViews(List<Integer> virtualViewIds) {
 
         @Override
         protected void onPopulateNodeForVirtualView(int virtualViewId,
-                AccessibilityNodeInfoCompat node) {
+                                                    AccessibilityNodeInfoCompat node) {
             node.setContentDescription(getContext().getString(R.string.all_apps_button_label));
             node.setBoundsInParent(mDragHandleBounds);
 
@@ -469,4 +474,14 @@ public void onViewDetachedFromWindow(View view) {
     public int getDragHandleSize() {
         return mDragHandleSize;
     }
+
+    protected void onDrawFlatColor(Canvas canvas) {
+
+    }
+
+    protected void onDrawRoundRect(Canvas canvas, float left, float top, float right, float bottom,
+                                   float rx, float ry, Paint paint) {
+
+    }
 }
+
diff --git a/src/com/android/launcher3/widget/WidgetAddFlowHandler.java b/src/com/android/launcher3/widget/WidgetAddFlowHandler.java
index 5387be8392..ef0f4846e2 100644
--- a/src/com/android/launcher3/widget/WidgetAddFlowHandler.java
+++ b/src/com/android/launcher3/widget/WidgetAddFlowHandler.java
@@ -25,6 +25,7 @@
 import com.android.launcher3.LauncherAppWidgetInfo;
 import com.android.launcher3.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.util.PendingRequestArgs;
+import com.android.launcher3.widget.custom.CustomAppWidgetProviderInfo;
 
 /**
  * Utility class to handle app widget add flow.
@@ -80,6 +81,9 @@ public boolean startConfigActivity(Launcher launcher, int appWidgetId, ItemInfo
     }
 
     public boolean needsConfigure() {
+        if (mProviderInfo instanceof CustomAppWidgetProviderInfo) {
+            return false;
+        }
         return mProviderInfo.configure != null;
     }
 
diff --git a/src/com/android/launcher3/widget/custom/CustomAppWidgetProviderInfo.java b/src/com/android/launcher3/widget/custom/CustomAppWidgetProviderInfo.java
index d7bff8c06f..fbf37d094e 100644
--- a/src/com/android/launcher3/widget/custom/CustomAppWidgetProviderInfo.java
+++ b/src/com/android/launcher3/widget/custom/CustomAppWidgetProviderInfo.java
@@ -73,8 +73,8 @@ public String toString() {
         return "WidgetProviderInfo(" + provider + ")";
     }
 
-    protected CustomAppWidgetProviderInfo(Parcel parcel, boolean readSelf,
-                                          int providerId, boolean noPadding) {
+    public CustomAppWidgetProviderInfo(Parcel parcel, boolean readSelf,
+                                       int providerId, boolean noPadding) {
         super(parcel);
         if (readSelf) {
             this.providerId = parcel.readInt();
diff --git a/src/com/android/launcher3/widget/custom/CustomWidgetParser.java b/src/com/android/launcher3/widget/custom/CustomWidgetParser.java
new file mode 100644
index 0000000000..2994b6ba6e
--- /dev/null
+++ b/src/com/android/launcher3/widget/custom/CustomWidgetParser.java
@@ -0,0 +1,146 @@
+/*
+ * 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.
+ */
+package com.android.launcher3.widget.custom;
+
+import android.appwidget.AppWidgetManager;
+import android.appwidget.AppWidgetProviderInfo;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.content.res.XmlResourceParser;
+import android.os.Parcel;
+import android.os.Process;
+import android.util.SparseArray;
+import android.util.Xml;
+
+import com.android.launcher3.LauncherAppWidgetInfo;
+import com.android.launcher3.LauncherAppWidgetProviderInfo;
+import com.android.launcher3.R;
+
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import static com.android.launcher3.LauncherAppWidgetProviderInfo.CLS_CUSTOM_WIDGET_PREFIX;
+
+/**
+ * Utility class to parse {@ink CustomAppWidgetProviderInfo} definitions from xml
+ */
+public class CustomWidgetParser {
+
+    private static List<LauncherAppWidgetProviderInfo> sCustomWidgets;
+    private static SparseArray<ComponentName> sWidgetsIdMap;
+
+    public static List<LauncherAppWidgetProviderInfo> getCustomWidgets(Context context) {
+        if (sCustomWidgets == null) {
+            // Synchronization not needed as it it safe to load multiple times
+            parseCustomWidgets(context);
+        }
+
+        return sCustomWidgets;
+    }
+
+    public static int getWidgetIdForCustomProvider(Context context, ComponentName provider) {
+        if (sWidgetsIdMap == null) {
+            parseCustomWidgets(context);
+        }
+        int index = sWidgetsIdMap.indexOfValue(provider);
+        if (index >= 0) {
+            return LauncherAppWidgetInfo.CUSTOM_WIDGET_ID - sWidgetsIdMap.keyAt(index);
+        } else {
+            return AppWidgetManager.INVALID_APPWIDGET_ID;
+        }
+    }
+
+    public static LauncherAppWidgetProviderInfo getWidgetProvider(Context context, int widgetId) {
+        if (sWidgetsIdMap == null || sCustomWidgets == null) {
+            parseCustomWidgets(context);
+        }
+        ComponentName cn = sWidgetsIdMap.get(LauncherAppWidgetInfo.CUSTOM_WIDGET_ID - widgetId);
+        for (LauncherAppWidgetProviderInfo info : sCustomWidgets) {
+            if (info.provider.equals(cn)) {
+                return info;
+            }
+        }
+        return null;
+    }
+
+    private static void parseCustomWidgets(Context context) {
+        ArrayList<LauncherAppWidgetProviderInfo> widgets = new ArrayList<>();
+        SparseArray<ComponentName> idMap = new SparseArray<>();
+
+        List<AppWidgetProviderInfo> providers = AppWidgetManager.getInstance(context)
+                .getInstalledProvidersForProfile(Process.myUserHandle());
+        if (providers.isEmpty()) {
+            sCustomWidgets = widgets;
+            sWidgetsIdMap = idMap;
+            return;
+        }
+
+        Parcel parcel = Parcel.obtain();
+        providers.get(0).writeToParcel(parcel, 0);
+
+        try (XmlResourceParser parser = context.getResources().getXml(R.xml.custom_widgets)) {
+            final int depth = parser.getDepth();
+            int type;
+
+            while (((type = parser.next()) != XmlPullParser.END_TAG ||
+                    parser.getDepth() > depth) && type != XmlPullParser.END_DOCUMENT) {
+                if ((type == XmlPullParser.START_TAG) && "widget".equals(parser.getName())) {
+                    TypedArray a = context.obtainStyledAttributes(
+                            Xml.asAttributeSet(parser), R.styleable.CustomAppWidgetProviderInfo);
+
+                    parcel.setDataPosition(0);
+                    CustomAppWidgetProviderInfo info = newInfo(a, parcel, context);
+                    widgets.add(info);
+                    a.recycle();
+
+                    idMap.put(info.providerId, info.provider);
+                }
+            }
+        } catch (IOException | XmlPullParserException e) {
+            throw new RuntimeException(e);
+        }
+        parcel.recycle();
+        sCustomWidgets = widgets;
+        sWidgetsIdMap = idMap;
+    }
+
+    private static CustomAppWidgetProviderInfo newInfo(TypedArray a, Parcel parcel, Context context) {
+        int providerId = a.getInt(R.styleable.CustomAppWidgetProviderInfo_providerId, 0);
+        boolean noPadding = a.getBoolean(R.styleable.CustomAppWidgetProviderInfo_noPadding, false);
+        CustomAppWidgetProviderInfo info = new CustomAppWidgetProviderInfo(parcel, false, providerId, noPadding);
+        info.provider = new ComponentName(context.getPackageName(), CLS_CUSTOM_WIDGET_PREFIX + providerId);
+        info.customizeTitle = a.getResourceId(R.styleable.CustomAppWidgetProviderInfo_customizeTitle, 0);
+        info.customizeScreen = a.getResourceId(R.styleable.CustomAppWidgetProviderInfo_customizeScreen, 0);
+        info.customizeHasPreview = a.getBoolean(R.styleable.CustomAppWidgetProviderInfo_customizeHasPreview, false);
+
+        info.label = a.getString(R.styleable.CustomAppWidgetProviderInfo_android_label);
+        info.initialLayout = a.getResourceId(R.styleable.CustomAppWidgetProviderInfo_android_initialLayout, 0);
+        info.icon = a.getResourceId(R.styleable.CustomAppWidgetProviderInfo_android_icon, 0);
+        info.previewImage = a.getResourceId(R.styleable.CustomAppWidgetProviderInfo_android_previewImage, 0);
+        info.resizeMode = a.getInt(R.styleable.CustomAppWidgetProviderInfo_android_resizeMode, 0);
+
+        info.spanX = a.getInt(R.styleable.CustomAppWidgetProviderInfo_numColumns, 1);
+        info.spanY = a.getInt(R.styleable.CustomAppWidgetProviderInfo_numRows, 1);
+        info.minSpanX = a.getInt(R.styleable.CustomAppWidgetProviderInfo_numMinColumns, 1);
+        info.minSpanY = a.getInt(R.styleable.CustomAppWidgetProviderInfo_numMinRows, 1);
+        return info;
+    }
+}
diff --git a/src_flags/com/android/launcher3/config/FeatureFlags.java b/src_flags/com/android/launcher3/config/FeatureFlags.java
index 9a6bd702cf..992474b04b 100644
--- a/src_flags/com/android/launcher3/config/FeatureFlags.java
+++ b/src_flags/com/android/launcher3/config/FeatureFlags.java
@@ -23,6 +23,7 @@ public final class FeatureFlags extends BaseFlags {
 
     public static boolean REFLECTION_FORCE_OVERVIEW_MODE = true;
 
+    public static boolean FORCE_FEED_BRIDGE = false;
     private FeatureFlags() {
         // Prevent instantiation
     }
diff --git a/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java b/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java
index 7a7f828396..58755456e6 100644
--- a/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java
+++ b/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java
@@ -1,8 +1,6 @@
 
 package com.android.launcher3.model;
 
-import static android.appwidget.AppWidgetProviderInfo.WIDGET_FEATURE_HIDE_FROM_PICKER;
-
 import android.appwidget.AppWidgetProviderInfo;
 import android.content.Context;
 import android.content.pm.PackageManager;
@@ -10,9 +8,9 @@
 import android.os.UserHandle;
 import android.util.Log;
 
+import androidx.annotation.Nullable;
+
 import com.android.launcher3.AppFilter;
-import com.android.launcher3.icons.ComponentWithLabel;
-import com.android.launcher3.icons.IconCache;
 import com.android.launcher3.InvariantDeviceProfile;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.LauncherAppWidgetProviderInfo;
@@ -22,6 +20,8 @@
 import com.android.launcher3.compat.LauncherAppsCompat;
 import com.android.launcher3.compat.ShortcutConfigActivityInfo;
 import com.android.launcher3.config.FeatureFlags;
+import com.android.launcher3.icons.ComponentWithLabel;
+import com.android.launcher3.icons.IconCache;
 import com.android.launcher3.util.MultiHashMap;
 import com.android.launcher3.util.PackageUserKey;
 import com.android.launcher3.util.Preconditions;
@@ -37,7 +37,7 @@
 import java.util.Map.Entry;
 import java.util.Set;
 
-import androidx.annotation.Nullable;
+import static android.appwidget.AppWidgetProviderInfo.WIDGET_FEATURE_HIDE_FROM_PICKER;
 
 /**
  * Widgets data model that is used by the adapters of the widget views and controllers.
@@ -189,7 +189,7 @@ private synchronized void setWidgetsAndShortcuts(ArrayList<WidgetItem> rawWidget
             if (mAppFilter == null) {
                 mAppFilter = AppFilter.newInstance(app.getContext());
             }
-            if (!mAppFilter.shouldShowApp(item.componentName)) {
+            if (!mAppFilter.shouldShowApp(item.componentName, item.user)) {
                 if (DEBUG) {
                     Log.d(TAG, String.format("%s is filtered and not added to the widget tray.",
                             item.componentName));
diff --git a/src_shortcuts_overrides/com/android/launcher3/shortcuts/DeepShortcutManager.java b/src_shortcuts_overrides/com/android/launcher3/shortcuts/DeepShortcutManager.java
index 57f416495f..89010dd91f 100644
--- a/src_shortcuts_overrides/com/android/launcher3/shortcuts/DeepShortcutManager.java
+++ b/src_shortcuts_overrides/com/android/launcher3/shortcuts/DeepShortcutManager.java
@@ -16,6 +16,7 @@
 
 package com.android.launcher3.shortcuts;
 
+import android.annotation.TargetApi;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.pm.LauncherApps;
@@ -29,6 +30,12 @@
 
 import androidx.annotation.Nullable;
 
+import com.android.launcher3.ItemInfo;
+import com.android.launcher3.LauncherSettings;
+import com.android.launcher3.Utilities;
+import com.android.launcher3.WorkspaceItemInfo;
+import com.saggitt.omega.override.CustomInfoProvider;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -57,14 +64,21 @@ private DeepShortcutManager(Context context) {
         mLauncherApps = (LauncherApps) context.getSystemService(Context.LAUNCHER_APPS_SERVICE);
     }
 
+    public static boolean supportsShortcuts(ItemInfo info) {
+        boolean isItemPromise = info instanceof WorkspaceItemInfo
+                && ((WorkspaceItemInfo) info).hasPromiseIconUi();
+        return info.itemType == LauncherSettings.Favorites.ITEM_TYPE_APPLICATION
+                && !info.isDisabled() && !isItemPromise;
+    }
+
     /**
      * Queries for the shortcuts with the package name and provided ids.
-     *
+     * <p>
      * This method is intended to get the full details for shortcuts when they are added or updated,
      * because we only get "key" fields in onShortcutsChanged().
      */
     public QueryResult queryForFullDetails(String packageName,
-            List<String> shortcutIds, UserHandle user) {
+                                           List<String> shortcutIds, UserHandle user) {
         return query(FLAG_GET_ALL, packageName, null, shortcutIds, user);
     }
 
@@ -126,15 +140,43 @@ public void startShortcut(String packageName, String id, Rect sourceBounds,
     public Drawable getShortcutIconDrawable(ShortcutInfo shortcutInfo, int density) {
         try {
             return mLauncherApps.getShortcutIconDrawable(shortcutInfo, density);
-        } catch (SecurityException|IllegalStateException e) {
+        } catch (SecurityException | IllegalStateException e) {
             Log.e(TAG, "Failed to get shortcut icon", e);
             return null;
         }
     }
 
+    private boolean mWasLastCallSuccess;
+
+    @TargetApi(25)
+    public Drawable getShortcutIconDrawable(ShortcutInfoCompat shortcutInfo, int density) {
+        if (Utilities.ATLEAST_NOUGAT) {
+            try {
+                Drawable icon = mLauncherApps.getShortcutIconDrawable(
+                        shortcutInfo.getShortcutInfo(), density);
+                mWasLastCallSuccess = true;
+                return icon;
+            } catch (SecurityException | IllegalStateException e) {
+                Log.e(TAG, "Failed to get shortcut icon", e);
+                mWasLastCallSuccess = false;
+            }
+        } else {
+            return DeepShortcutManagerBackport.getShortcutIconDrawable(shortcutInfo, density);
+        }
+        return null;
+    }
+
+    public static boolean supportsEdit(ItemInfo info) {
+        return CustomInfoProvider.Companion.isEditable(info) || supportsShortcuts(info);
+    }
+
+    public boolean wasLastCallSuccess() {
+        return mWasLastCallSuccess;
+    }
+
     /**
      * Returns the id's of pinned shortcuts associated with the given package and user.
-     *
+     * <p>
      * If packageName is null, returns all pinned shortcuts regardless of package.
      */
     public QueryResult queryForPinnedShortcuts(String packageName, UserHandle user) {