diff --git a/Android.mk b/Android.mk
index 4e5b954..ba39dfa 100644
--- a/Android.mk
+++ b/Android.mk
@@ -106,7 +106,7 @@ LOCAL_REQUIRED_MODULES := privapp_whitelist_com.android.launcher3
 
 LOCAL_FULL_LIBS_MANIFEST_FILES := $(LOCAL_PATH)/AndroidManifest-common.xml
 
-LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.android.colorfulos.*
+LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.aoleyun.os.*
 
 include $(BUILD_PACKAGE)
 
@@ -140,7 +140,7 @@ LOCAL_FULL_LIBS_MANIFEST_FILES := \
     $(LOCAL_PATH)/AndroidManifest-common.xml
 
 LOCAL_MANIFEST_FILE := go/AndroidManifest.xml
-LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.android.colorfulos.*
+LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.aoleyun.os.*
 include $(BUILD_PACKAGE)
 
 #
@@ -212,7 +212,7 @@ LOCAL_FULL_LIBS_MANIFEST_FILES := \
     $(LOCAL_PATH)/AndroidManifest-common.xml
 
 LOCAL_MANIFEST_FILE := quickstep/AndroidManifest.xml
-LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.android.colorfulos.*
+LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.aoleyun.os.*
 
 include $(BUILD_PACKAGE)
 
@@ -260,7 +260,7 @@ LOCAL_FULL_LIBS_MANIFEST_FILES := \
     $(LOCAL_PATH)/AndroidManifest-common.xml
 
 LOCAL_MANIFEST_FILE := quickstep/AndroidManifest.xml
-LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.android.colorfulos.*
+LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.aoleyun.os.*
 include $(BUILD_PACKAGE)
 
 #
@@ -307,7 +307,7 @@ LOCAL_FULL_LIBS_MANIFEST_FILES := \
     $(LOCAL_PATH)/AndroidManifest-common.xml
 
 LOCAL_MANIFEST_FILE := quickstep/AndroidManifest.xml
-LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.android.colorfulos.*
+LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.aoleyun.os.*
 include $(BUILD_PACKAGE)
 
 
diff --git a/AndroidManifest-common.xml b/AndroidManifest-common.xml
index ea7a010..85cc94b 100644
--- a/AndroidManifest-common.xml
+++ b/AndroidManifest-common.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
 /*
 **
 ** Copyright 2016, The Android Open Source Project
@@ -17,11 +16,10 @@
 ** limitations under the License.
 */
 -->
-<manifest
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:sharedUserId="android.uid.system"
-    package="com.android.colorfulos">
+    package="com.aoleyun.os"
+    android:sharedUserId="android.uid.system">
 
     <!--
     The manifest defines the common entries that should be present in any derivative of Launcher3.
@@ -33,10 +31,10 @@
     -->
     <permission
         android:name="com.android.launcher.permission.INSTALL_SHORTCUT"
-        android:permissionGroup="android.permission-group.SYSTEM_TOOLS"
-        android:protectionLevel="dangerous"
+        android:description="@string/permdesc_install_shortcut"
         android:label="@string/permlab_install_shortcut"
-        android:description="@string/permdesc_install_shortcut" />
+        android:permissionGroup="android.permission-group.SYSTEM_TOOLS"
+        android:protectionLevel="dangerous" />
 
     <uses-permission android:name="android.permission.CALL_PHONE" />
     <uses-permission android:name="android.permission.SET_WALLPAPER" />
@@ -56,82 +54,83 @@
     -->
     <permission
         android:name="${packageName}.permission.READ_SETTINGS"
-        android:permissionGroup="android.permission-group.SYSTEM_TOOLS"
-        android:protectionLevel="signatureOrSystem"
+        android:description="@string/permdesc_read_settings"
         android:label="@string/permlab_read_settings"
-        android:description="@string/permdesc_read_settings"/>
+        android:permissionGroup="android.permission-group.SYSTEM_TOOLS"
+        android:protectionLevel="signatureOrSystem" />
     <permission
         android:name="${packageName}.permission.WRITE_SETTINGS"
-        android:permissionGroup="android.permission-group.SYSTEM_TOOLS"
-        android:protectionLevel="signatureOrSystem"
+        android:description="@string/permdesc_write_settings"
         android:label="@string/permlab_write_settings"
-        android:description="@string/permdesc_write_settings"/>
+        android:permissionGroup="android.permission-group.SYSTEM_TOOLS"
+        android:protectionLevel="signatureOrSystem" />
 
     <uses-permission android:name="${packageName}.permission.READ_SETTINGS" />
     <uses-permission android:name="${packageName}.permission.WRITE_SETTINGS" />
 
     <application
-        android:name="com.android.colorfulos.base.MyApplication"
-        android:backupAgent="com.android.colorfulos.LauncherBackupAgent"
-        android:fullBackupOnly="true"
+        android:name="com.aoleyun.os.base.MyApplication"
+        android:backupAgent="com.aoleyun.os.LauncherBackupAgent"
         android:fullBackupContent="@xml/backupscheme"
+        android:fullBackupOnly="true"
         android:hardwareAccelerated="true"
         android:icon="@drawable/ic_launcher_home"
         android:label="@string/derived_app_name"
         android:largeHeap="@bool/config_largeHeap"
-        android:restoreAnyVersion="true"
         android:networkSecurityConfig="@xml/network"
-        android:supportsRtl="true" >
+        android:restoreAnyVersion="true"
+        android:supportsRtl="true">
 
         <!-- Intent received used to install shortcuts from other applications -->
         <receiver
-            android:name="com.android.colorfulos.InstallShortcutReceiver"
-            android:permission="com.android.launcher.permission.INSTALL_SHORTCUT"
-            android:enabled="@bool/enable_install_shortcut_api" >
+            android:name="com.aoleyun.os.InstallShortcutReceiver"
+            android:enabled="@bool/enable_install_shortcut_api"
+            android:permission="com.android.launcher.permission.INSTALL_SHORTCUT">
             <intent-filter>
                 <action android:name="com.android.launcher.action.INSTALL_SHORTCUT" />
             </intent-filter>
         </receiver>
 
         <!-- Intent received when a session is committed -->
-        <receiver
-            android:name="com.android.colorfulos.SessionCommitReceiver" >
+        <receiver android:name="com.aoleyun.os.SessionCommitReceiver">
             <intent-filter>
                 <action android:name="android.content.pm.action.SESSION_COMMITTED" />
             </intent-filter>
         </receiver>
 
         <!-- Intent received used to initialize a restored widget -->
-        <receiver android:name="com.android.colorfulos.AppWidgetsRestoredReceiver" >
+        <receiver android:name="com.aoleyun.os.AppWidgetsRestoredReceiver">
             <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_HOST_RESTORED"/>
+                <action android:name="android.appwidget.action.APPWIDGET_HOST_RESTORED" />
             </intent-filter>
         </receiver>
 
         <service
-            android:name="com.android.colorfulos.uioverrides.dynamicui.WallpaperManagerCompatVL$ColorExtractionService"
+            android:name="com.aoleyun.os.uioverrides.dynamicui.WallpaperManagerCompatVL$ColorExtractionService"
             android:exported="false"
-            android:process=":wallpaper_chooser"
-            android:permission="android.permission.BIND_JOB_SERVICE" />
+            android:permission="android.permission.BIND_JOB_SERVICE"
+            android:process=":wallpaper_chooser" />
 
         <service
-            android:name="com.android.colorfulos.notification.NotificationListener"
-            android:label="@string/notification_dots_service_title"
+            android:name="com.aoleyun.os.notification.NotificationListener"
             android:enabled="@bool/notification_dots_enabled"
+            android:label="@string/notification_dots_service_title"
             android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE">
             <intent-filter>
                 <action android:name="android.service.notification.NotificationListenerService" />
             </intent-filter>
         </service>
 
-        <meta-data android:name="android.nfc.disable_beam_default"
-                       android:value="true" />
+        <meta-data
+            android:name="android.nfc.disable_beam_default"
+            android:value="true" />
 
-        <activity android:name="com.android.colorfulos.dragndrop.AddItemActivity"
-            android:theme="@style/AppItemActivityTheme"
-            android:excludeFromRecents="true"
+        <activity
+            android:name="com.aoleyun.os.dragndrop.AddItemActivity"
             android:autoRemoveFromRecents="true"
-            android:label="@string/action_add_to_workspace" >
+            android:excludeFromRecents="true"
+            android:label="@string/action_add_to_workspace"
+            android:theme="@style/AppItemActivityTheme">
             <intent-filter>
                 <action android:name="android.content.pm.action.CONFIRM_PIN_SHORTCUT" />
                 <action android:name="android.content.pm.action.CONFIRM_PIN_APPWIDGET" />
@@ -143,8 +142,8 @@
         worspace configuration to the dump's file descriptor by using launcher_dump.proto
         -->
         <meta-data
-            android:name="com.android.colorfulos.launcher_dump_provider"
-            android:value="com.android.colorfulos.LauncherProvider" />
+            android:name="com.aoleyun.os.launcher_dump_provider"
+            android:value="com.aoleyun.os.LauncherProvider" />
 
         <!--
         The settings provider contains Home's data, like the workspace favorites. The permissions
@@ -152,18 +151,18 @@
         represent the package name.
         -->
         <provider
-            android:name="com.android.colorfulos.LauncherProvider"
+            android:name="com.aoleyun.os.LauncherProvider"
             android:authorities="${packageName}.settings"
             android:exported="true"
-            android:writePermission="${packageName}.permission.WRITE_SETTINGS"
-            android:readPermission="${packageName}.permission.READ_SETTINGS" />
+            android:readPermission="${packageName}.permission.READ_SETTINGS"
+            android:writePermission="${packageName}.permission.WRITE_SETTINGS" />
 
         <!--
         The content provider for exposing various launcher grid options.
         TODO: Add proper permissions
         -->
         <provider
-            android:name="com.android.colorfulos.graphics.GridOptionsProvider"
+            android:name="com.aoleyun.os.graphics.GridOptionsProvider"
             android:authorities="${packageName}.grid_control"
             android:enabled="false"
             android:exported="true" />
@@ -172,64 +171,65 @@
         The settings activity. To extend point settings_fragment_name to appropriate fragment class
         -->
         <activity
-            android:name="com.android.colorfulos.settings.SettingsActivity"
+            android:name="com.aoleyun.os.settings.SettingsActivity"
+            android:autoRemoveFromRecents="true"
             android:label="@string/settings_button_text"
-            android:theme="@android:style/Theme.DeviceDefault.Settings"
-            android:autoRemoveFromRecents="true">
+            android:theme="@android:style/Theme.DeviceDefault.Settings">
             <intent-filter>
                 <action android:name="android.intent.action.APPLICATION_PREFERENCES" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
 
-        <activity android:name="com.android.colorfulos.Launcher"
-            android:launchMode="singleTask"
+        <activity
+            android:name="com.aoleyun.os.Launcher"
             android:clearTaskOnLaunch="true"
-            android:stateNotNeeded="true"
-            android:windowSoftInputMode="adjustPan"
-            android:screenOrientation="unspecified"
             android:configChanges="keyboard|keyboardHidden|mcc|mnc|navigation|orientation|screenSize|screenLayout|smallestScreenSize"
+            android:enabled="true"
+            android:launchMode="singleTask"
             android:resizeableActivity="true"
             android:resumeWhilePausing="true"
+            android:screenOrientation="unspecified"
+            android:stateNotNeeded="true"
             android:taskAffinity=""
-            android:enabled="true">
+            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"/>
+                <category android:name="android.intent.category.MONKEY" />
                 <category android:name="android.intent.category.LAUNCHER_APP" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
 
         <provider
-            android:name="com.android.colorfulos.testing.TestInformationProvider"
+            android:name="com.aoleyun.os.testing.TestInformationProvider"
             android:authorities="${packageName}.TestInfo"
-            android:readPermission="android.permission.WRITE_SECURE_SETTINGS"
-            android:writePermission="android.permission.WRITE_SECURE_SETTINGS"
+            android:enabled="false"
             android:exported="true"
-            android:enabled="false" />
-
+            android:readPermission="android.permission.WRITE_SECURE_SETTINGS"
+            android:writePermission="android.permission.WRITE_SECURE_SETTINGS" />
 
 
         <!-- Rich push 核心功能 since 2.0.6-->
         <activity
             android:name="cn.jpush.android.ui.PopWinActivity"
-            android:theme="@style/MyDialogStyle"
             android:exported="false"
-            tools:replace="android:exported">
-        </activity>
+            android:theme="@style/MyDialogStyle"
+            tools:replace="android:exported"></activity>
 
         <!-- Required SDK核心功能-->
         <activity
             android:name="cn.jpush.android.ui.PushActivity"
             android:configChanges="orientation|keyboardHidden"
-            android:theme="@android:style/Theme.NoTitleBar"
             android:exported="false"
+            android:theme="@android:style/Theme.NoTitleBar"
             tools:replace="android:exported">
             <intent-filter>
                 <action android:name="cn.jpush.android.ui.PushActivity" />
+
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="${applicationId}" />
             </intent-filter>
@@ -239,8 +239,8 @@
         <!-- 可配置android:process参数将PushService放在其他进程中 -->
         <service
             android:name="cn.jpush.android.service.PushService"
-            android:process=":pushcore"
-            android:exported="false">
+            android:exported="false"
+            android:process=":pushcore">
             <intent-filter>
                 <action android:name="cn.jpush.android.intent.REGISTER" />
                 <action android:name="cn.jpush.android.intent.REPORT" />
@@ -251,10 +251,10 @@
 
         <!-- since 3.0.9 Required SDK 核心功能-->
         <provider
-            android:authorities="${applicationId}.DataProvider"
             android:name="cn.jpush.android.service.DataProvider"
-            android:process=":pushcore"
+            android:authorities="${applicationId}.DataProvider"
             android:exported="false"
+            android:process=":pushcore"
             tools:replace="android:authorities" />
 
         <!-- since 1.8.0 option 可选项。用于同一设备中不同应用的JPush服务相互拉起的功能。 -->
@@ -272,8 +272,8 @@
 
         <!-- since 3.1.0 Required SDK 核心功能-->
         <provider
-            android:authorities="${applicationId}.DownloadProvider"
             android:name="cn.jpush.android.service.DownloadProvider"
+            android:authorities="${applicationId}.DownloadProvider"
             android:exported="true"
             tools:replace="android:authorities" />
 
@@ -281,7 +281,8 @@
         <receiver
             android:name="cn.jpush.android.service.PushReceiver"
             android:enabled="true"
-            android:exported="false">
+            android:exported="false"
+            tools:replace="android:exported">
             <intent-filter android:priority="1000">
                 <action android:name="cn.jpush.android.intent.NOTIFICATION_RECEIVED_PROXY" />   <!--Required  显示通知栏 -->
                 <category android:name="${applicationId}" />
@@ -300,14 +301,16 @@
         </receiver>
 
         <!-- Required SDK核心功能-->
-        <receiver android:name="cn.jpush.android.service.AlarmReceiver" android:exported="false"/>
+        <receiver
+            android:name="cn.jpush.android.service.AlarmReceiver"
+            android:exported="false" />
 
 
         <!-- User defined.  For test only  用户自定义的广播接收器-->
         <receiver
-            android:name="com.android.colorfulos.jpush.MyReceiver"
-            android:exported="false"
-            android:enabled="true">
+            android:name="com.aoleyun.os.jpush.MyReceiver"
+            android:enabled="true"
+            android:exported="false">
             <intent-filter>
                 <action android:name="cn.jpush.android.intent.REGISTRATION" /> <!--Required  用户注册SDK的intent-->
                 <action android:name="cn.jpush.android.intent.MESSAGE_RECEIVED" /> <!--Required  用户接收SDK消息的intent-->
@@ -319,17 +322,16 @@
         </receiver>
 
 
-
         <!-- User defined.  For test only  用户自定义接收消息器,3.0.7开始支持,目前新tag/alias接口设置结果会在该广播接收器对应的方法中回调-->
         <!--since 3.3.0 接收JPush相关事件-->
-        <receiver android:name="com.android.colorfulos.jpush.PushMessageReceiver">
+        <receiver android:name="com.aoleyun.os.jpush.MyJPushMessageReceiver">
             <intent-filter>
                 <action android:name="cn.jpush.android.intent.RECEIVE_MESSAGE" />
-                <category android:name="${applicationId}"></category>
+                <category android:name="${applicationId}" />
             </intent-filter>
         </receiver>
         <receiver
-            android:name="com.android.colorfulos.receiver.InstallResultReceiver"
+            android:name="com.aoleyun.os.receiver.InstallResultReceiver"
             android:enabled="true"
             android:exported="true" />
 
@@ -348,7 +350,8 @@
         <!-- since 3.3.0 Required SDK 核心功能-->
         <!-- 可配置android:process参数将PushService放在其他进程中 -->
         <!--User defined.  For test only 继承自cn.jpush.android.service.JCommonService-->
-        <service android:name="com.android.colorfulos.jpush.PushService"
+        <service
+            android:name="com.aoleyun.os.jpush.PushService"
             android:process=":pushcore">
             <intent-filter>
                 <action android:name="cn.jiguang.user.service.action" />
@@ -356,7 +359,11 @@
         </service>
 
         <!-- Required  . Enable it you can get statistics data with channel -->
-        <meta-data android:name="JPUSH_CHANNEL" android:value="${JPUSH_CHANNEL}"/>
-        <meta-data android:name="JPUSH_APPKEY" android:value="${JPUSH_APPKEY}" /> <!--  </>值来自开发者平台取得的AppKey-->
+        <meta-data
+            android:name="JPUSH_CHANNEL"
+            android:value="${JPUSH_CHANNEL}" />
+        <meta-data
+            android:name="JPUSH_APPKEY"
+            android:value="${JPUSH_APPKEY}" /> <!--  </>值来自开发者平台取得的AppKey-->
     </application>
 </manifest>
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 2549d6c..5050def 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.colorfulos">
+    package="com.aoleyun.os">
 
     <uses-sdk
         android:minSdkVersion="25"
         android:targetSdkVersion="29" />
 
     <application
-        android:name=".base.MyApplication"
-        android:backupAgent=".LauncherBackupAgent"
+        android:name="com.aoleyun.os.base.MyApplication"
+        android:backupAgent="com.aoleyun.os.LauncherBackupAgent"
         android:extractNativeLibs="false"
         android:fullBackupContent="@xml/backupscheme"
         android:fullBackupOnly="true"
@@ -20,7 +20,7 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <service
-            android:name=".service.MainService"
+            android:name="com.aoleyun.os.service.MainService"
             android:enabled="true"
             android:exported="true" />
         <!--
@@ -28,10 +28,11 @@
         attributes and intent filters the same
         -->
         <activity
-            android:name=".Launcher"
+            android:name="com.aoleyun.os.Launcher"
             android:clearTaskOnLaunch="true"
             android:configChanges="keyboard|keyboardHidden|mcc|mnc|navigation|orientation|screenSize|screenLayout|smallestScreenSize"
             android:enabled="true"
+            android:excludeFromRecents="true"
             android:launchMode="singleTask"
             android:resizeableActivity="true"
             android:resumeWhilePausing="true"
@@ -49,7 +50,7 @@
             </intent-filter>
 
             <meta-data
-                android:name="com.android.colorfulos.grid.control"
+                android:name="com.aoleyun.os.grid.control"
                 android:value="${packageName}.grid_control" />
         </activity>
     </application>
diff --git a/SecondaryDisplayLauncher/AndroidManifest.xml b/SecondaryDisplayLauncher/AndroidManifest.xml
index ebf55a5..06a2171 100644
--- a/SecondaryDisplayLauncher/AndroidManifest.xml
+++ b/SecondaryDisplayLauncher/AndroidManifest.xml
@@ -19,12 +19,12 @@
 -->
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.colorfulos">
+    package="com.aoleyun.os">
 
     <application>
 
         <activity
-            android:name="com.android.colorfulos.SecondaryDisplayLauncher"
+            android:name="com.aoleyun.os.SecondaryDisplayLauncher"
             android:theme="@style/SecondaryLauncherTheme"
             android:launchMode="singleTop"
             android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|colorMode|density"
diff --git a/SecondaryDisplayLauncher/src/com/android/launcher3/AppEntry.java b/SecondaryDisplayLauncher/src/com/android/launcher3/AppEntry.java
index e52833f..264a7f2 100644
--- a/SecondaryDisplayLauncher/src/com/android/launcher3/AppEntry.java
+++ b/SecondaryDisplayLauncher/src/com/android/launcher3/AppEntry.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos;
+package com.aoleyun.os;
 
 import android.content.ComponentName;
 import android.content.Intent;
diff --git a/SecondaryDisplayLauncher/src/com/android/launcher3/AppListAdapter.java b/SecondaryDisplayLauncher/src/com/android/launcher3/AppListAdapter.java
index 971e5c0..d8db498 100644
--- a/SecondaryDisplayLauncher/src/com/android/launcher3/AppListAdapter.java
+++ b/SecondaryDisplayLauncher/src/com/android/launcher3/AppListAdapter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos;
+package com.aoleyun.os;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -24,7 +24,7 @@ import android.widget.ArrayAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.android.colorfulos.R;
+import com.aoleyun.os.R;
 
 import java.util.List;
 
diff --git a/SecondaryDisplayLauncher/src/com/android/launcher3/AppListViewModel.java b/SecondaryDisplayLauncher/src/com/android/launcher3/AppListViewModel.java
index d81a84c..c516ae2 100644
--- a/SecondaryDisplayLauncher/src/com/android/launcher3/AppListViewModel.java
+++ b/SecondaryDisplayLauncher/src/com/android/launcher3/AppListViewModel.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos;
+package com.aoleyun.os;
 
 import android.app.Application;
 import android.content.BroadcastReceiver;
diff --git a/SecondaryDisplayLauncher/src/com/android/launcher3/PinnedAppListViewModel.java b/SecondaryDisplayLauncher/src/com/android/launcher3/PinnedAppListViewModel.java
index 63ce0a3..ba98947 100644
--- a/SecondaryDisplayLauncher/src/com/android/launcher3/PinnedAppListViewModel.java
+++ b/SecondaryDisplayLauncher/src/com/android/launcher3/PinnedAppListViewModel.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos;
+package com.aoleyun.os;
 
-import static com.android.colorfulos.PinnedAppListViewModel.PINNED_APPS_KEY;
+import static com.aoleyun.os.PinnedAppListViewModel.PINNED_APPS_KEY;
 
 import android.app.Application;
 import android.content.ComponentName;
diff --git a/SecondaryDisplayLauncher/src/com/android/launcher3/PinnedAppPickerDialog.java b/SecondaryDisplayLauncher/src/com/android/launcher3/PinnedAppPickerDialog.java
index 821c622..91326d6 100644
--- a/SecondaryDisplayLauncher/src/com/android/launcher3/PinnedAppPickerDialog.java
+++ b/SecondaryDisplayLauncher/src/com/android/launcher3/PinnedAppPickerDialog.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos;
+package com.aoleyun.os;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -24,7 +24,7 @@ import android.widget.GridView;
 
 import androidx.fragment.app.DialogFragment;
 
-import com.android.colorfulos.R;
+import com.aoleyun.os.R;
 
 /**
  * Callback to be invoked when an app was picked.
diff --git a/SecondaryDisplayLauncher/src/com/android/launcher3/SecondaryDisplayLauncher.java b/SecondaryDisplayLauncher/src/com/android/launcher3/SecondaryDisplayLauncher.java
index 3666460..ea0205f 100644
--- a/SecondaryDisplayLauncher/src/com/android/launcher3/SecondaryDisplayLauncher.java
+++ b/SecondaryDisplayLauncher/src/com/android/launcher3/SecondaryDisplayLauncher.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos;
+package com.aoleyun.os;
 
-import static com.android.colorfulos.PinnedAppListViewModel.PINNED_APPS_KEY;
+import static com.aoleyun.os.PinnedAppListViewModel.PINNED_APPS_KEY;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
diff --git a/build.gradle b/build.gradle
index b040b09..356a26d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,8 +9,16 @@ buildscript {
     }
 }
 
+allprojects {
+    gradle.projectsEvaluated {
+        tasks.withType(JavaCompile) {
+            options.compilerArgs.add('-Xbootclasspath/p:libs/framework.jar')
+        }
+    }
+}
+
 def appName() {
-    return "colorfulos"
+    return "奥乐云桌面"
 }
 
 def releaseTime() {
@@ -24,26 +32,41 @@ apply plugin: 'com.android.application'
 apply plugin: 'com.google.protobuf'
 
 android {
+    gradle.projectsEvaluated {
+        tasks.withType(JavaCompile) {
+            Set<File> fileSet = options.bootstrapClasspath.getFiles()
+            List<File> newFileList =  new ArrayList<>();
+            //JAVA语法，可连续调用，输入参数建议为相对路径
+            newFileList.add(new File("libs/framework.jar"))
+            //最后将原始参数添加
+            newFileList.addAll(fileSet)
+            options.bootstrapClasspath = files(
+                    newFileList.toArray()
+            )
+        }
+    }
+
     lintOptions {
         checkReleaseBuilds false
         abortOnError false
     }
+
     compileSdkVersion COMPILE_SDK
     buildToolsVersion BUILD_TOOLS_VERSION
 
     defaultConfig {
         minSdkVersion 26
         targetSdkVersion 28
-        versionCode 2
-        versionName "1.1"
+        versionCode 6
+        versionName "1.5"
         ndk {
             //选择要添加的对应 cpu 类型的 .so 库。
             abiFilters 'armeabi', 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
             // 还可以添加 'x86', 'x86_64', 'mips', 'mips64'
         }
         manifestPlaceholders = [
-                JPUSH_PKGNAME: "com.android.colorfulos",
-                JPUSH_APPKEY : "12db92240df0226d5e2f3b61", //JPush 上注册的包名对应的 Appkey.
+                JPUSH_PKGNAME: "com.aoleyun.os",
+                JPUSH_APPKEY : "0c7ba5a1622dba78d5bd00cc", //JPush 上注册的包名对应的 Appkey.
                 JPUSH_CHANNEL: "developer-default", //暂时填写默认值即可.
         ]
 
@@ -148,14 +171,14 @@ android {
     productFlavors {
         aosp {
             dimension "app"
-            applicationId 'com.android.colorfulos'
-            testApplicationId 'com.android.colorfulos.tests'
+            applicationId 'com.aoleyun.os'
+            testApplicationId 'com.aoleyun.os.tests'
         }
 
         l3go {
             dimension "app"
-            applicationId 'com.android.colorfulos'
-            testApplicationId 'com.android.colorfulos.tests'
+            applicationId 'com.aoleyun.os'
+            testApplicationId 'com.aoleyun.os.tests'
         }
 
         /*withQuickstep {
@@ -250,6 +273,8 @@ repositories {
 }
 
 dependencies {
+    compileOnly files('libs/framework.jar')
+
     implementation "androidx.dynamicanimation:dynamicanimation:${ANDROID_X_VERSION}"
     implementation "androidx.recyclerview:recyclerview:${ANDROID_X_VERSION}"
     implementation "androidx.preference:preference:${ANDROID_X_VERSION}"
@@ -277,20 +302,45 @@ dependencies {
     androidTestImplementation "androidx.annotation:annotation:${ANDROID_X_VERSION}"
 
     //RxJava和Retrofit
-    implementation 'io.reactivex.rxjava2:rxjava:2.2.8'
+    implementation 'io.reactivex.rxjava2:rxjava:2.2.12'
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
-    implementation 'com.squareup.retrofit2:adapter-rxjava2:2.4.0'
-
+    implementation 'com.squareup.retrofit2:adapter-rxjava2:2.5.0'
+    //gson
     implementation 'com.google.code.gson:gson:2.8.7'
-
+    //mmkv
+    implementation 'com.tencent:mmkv-static:1.2.10'
     //极光推送
     implementation 'cn.jiguang.sdk:jpush:3.8.6'  // 此处以JPush 3.8.6 版本为例。
     implementation 'cn.jiguang.sdk:jcore:2.6.0'  // 此处以JCore 2.6.0 版本为例。
     //下载
     implementation 'me.laoyuyu.aria:core:3.8.16'
     annotationProcessor 'me.laoyuyu.aria:compiler:3.8.16'
+    //工具类
+    implementation 'com.blankj:utilcodex:1.30.6'
+}
+
+preBuild {
+    doLast {
+        def imlFile = file(project.name + ".iml")
+        println 'Change ' + project.name + '.iml order'
+        try {
+            def parsedXml = (new XmlParser()).parse(imlFile)
+            def jdkNode = parsedXml.component[1].orderEntry.find { it.'@type' == 'jdk' }
+            parsedXml.component[1].remove(jdkNode)
+            def sdkString = "Android API " + android.compileSdkVersion.substring("android-".length()) + " Platform"
+            println 'what' + sdkString
+            new Node(parsedXml.component[1], 'orderEntry', ['type': 'jdk', 'jdkName': sdkString, 'jdkType': 'Android SDK'])
+            groovy.xml.XmlUtil.serialize(parsedXml, new FileOutputStream(imlFile))
+        } catch (FileNotFoundException e) {
+            // nop, iml not found
+            println "no iml found"
+        }
+    }
+    //https://www.pianshen.com/article/93481144911/
+    //https://blog.csdn.net/dhl_1986/article/details/102856026
+    //使用系统编译后的framework.jar
 }
 
 protobuf {
@@ -303,9 +353,9 @@ protobuf {
                 task.builtins {
                     remove java
                     javanano {
-                        option "java_package=launcher_log_extension.proto|com.android.colorfulos.userevent.nano"
-                        option "java_package=launcher_log.proto|com.android.colorfulos.userevent.nano"
-                        option "java_package=launcher_dump.proto|com.android.colorfulos.model.nano"
+                        option "java_package=launcher_log_extension.proto|com.aoleyun.os.userevent.nano"
+                        option "java_package=launcher_log.proto|com.aoleyun.os.userevent.nano"
+                        option "java_package=launcher_dump.proto|com.aoleyun.os.model.nano"
                         option "enum_style=java"
                     }
                 }
diff --git a/go/AndroidManifest.xml b/go/AndroidManifest.xml
index e38c336..e8dc2dc 100644
--- a/go/AndroidManifest.xml
+++ b/go/AndroidManifest.xml
@@ -20,12 +20,12 @@
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.android.colorfulos" >
+    package="com.aoleyun.os" >
 
     <uses-sdk android:targetSdkVersion="28" android:minSdkVersion="25"/>
 
     <application
-        android:backupAgent="com.android.colorfulos.LauncherBackupAgent"
+        android:backupAgent="com.aoleyun.os.LauncherBackupAgent"
         android:fullBackupOnly="true"
         android:fullBackupContent="@xml/backupscheme"
         android:hardwareAccelerated="true"
@@ -37,7 +37,7 @@
         android:supportsRtl="true" >
 
         <!-- Activity for handling PinItemRequest is disabled on Android Go. -->
-        <activity android:name="com.android.colorfulos.dragndrop.AddItemActivity"
+        <activity android:name="com.aoleyun.os.dragndrop.AddItemActivity"
             android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.Alert"
             android:excludeFromRecents="true"
             android:autoRemoveFromRecents="true"
diff --git a/go/quickstep/res/values/override.xml b/go/quickstep/res/values/override.xml
index 88496a9..9441c2c 100644
--- a/go/quickstep/res/values/override.xml
+++ b/go/quickstep/res/values/override.xml
@@ -17,7 +17,7 @@
 <!-- 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.colorfulos.GoLauncherAppTransitionManagerImpl</string>
+  <string name="app_transition_manager_class" translatable="false">com.aoleyun.os.GoLauncherAppTransitionManagerImpl</string>
 
   <string name="instant_app_resolver_class" translatable="false">com.android.quickstep.InstantAppResolverImpl</string>
 
diff --git a/go/quickstep/src/com/android/launcher3/GoLauncherAppTransitionManagerImpl.java b/go/quickstep/src/com/android/launcher3/GoLauncherAppTransitionManagerImpl.java
index b328d90..319a8dd 100644
--- a/go/quickstep/src/com/android/launcher3/GoLauncherAppTransitionManagerImpl.java
+++ b/go/quickstep/src/com/android/launcher3/GoLauncherAppTransitionManagerImpl.java
@@ -1,8 +1,8 @@
-package com.android.colorfulos;
+package com.aoleyun.os;
 
-import static com.android.colorfulos.Utilities.postAsyncCallback;
-import static com.android.colorfulos.anim.Interpolators.AGGRESSIVE_EASE;
-import static com.android.colorfulos.anim.Interpolators.LINEAR;
+import static com.aoleyun.os.Utilities.postAsyncCallback;
+import static com.aoleyun.os.anim.Interpolators.AGGRESSIVE_EASE;
+import static com.aoleyun.os.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;
diff --git a/go/quickstep/src/com/android/launcher3/LauncherRecentsToActivityHelper.java b/go/quickstep/src/com/android/launcher3/LauncherRecentsToActivityHelper.java
index ae0e3d5..749fe8f 100644
--- a/go/quickstep/src/com/android/launcher3/LauncherRecentsToActivityHelper.java
+++ b/go/quickstep/src/com/android/launcher3/LauncherRecentsToActivityHelper.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos;
+package com.aoleyun.os;
 
-import static com.android.colorfulos.LauncherState.NORMAL;
+import static com.aoleyun.os.LauncherState.NORMAL;
 
 import com.android.quickstep.RecentsToActivityHelper;
 
diff --git a/go/quickstep/src/com/android/launcher3/uioverrides/RecentsUiFactory.java b/go/quickstep/src/com/android/launcher3/uioverrides/RecentsUiFactory.java
index f14b75e..caf14bf 100644
--- a/go/quickstep/src/com/android/launcher3/uioverrides/RecentsUiFactory.java
+++ b/go/quickstep/src/com/android/launcher3/uioverrides/RecentsUiFactory.java
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.uioverrides;
+package com.aoleyun.os.uioverrides;
 
-import com.android.colorfulos.DeviceProfile;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.LauncherStateManager.StateHandler;
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.config.FeatureFlags;
-import com.android.colorfulos.graphics.RotationMode;
-import com.android.colorfulos.uioverrides.touchcontrollers.LandscapeEdgeSwipeController;
-import com.android.colorfulos.uioverrides.touchcontrollers.LandscapeStatesTouchController;
-import com.android.colorfulos.uioverrides.touchcontrollers.PortraitStatesTouchController;
-import com.android.colorfulos.uioverrides.touchcontrollers.StatusBarTouchController;
-import com.android.colorfulos.util.TouchController;
+import com.aoleyun.os.DeviceProfile;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.LauncherStateManager.StateHandler;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.config.FeatureFlags;
+import com.aoleyun.os.graphics.RotationMode;
+import com.aoleyun.os.uioverrides.touchcontrollers.LandscapeEdgeSwipeController;
+import com.aoleyun.os.uioverrides.touchcontrollers.LandscapeStatesTouchController;
+import com.aoleyun.os.uioverrides.touchcontrollers.PortraitStatesTouchController;
+import com.aoleyun.os.uioverrides.touchcontrollers.StatusBarTouchController;
+import com.aoleyun.os.util.TouchController;
 import com.android.quickstep.SysUINavigationMode;
 import com.android.quickstep.views.IconRecentsView;
 
diff --git a/go/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java b/go/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java
index fc96060..ae65591 100644
--- a/go/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java
+++ b/go/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.uioverrides;
+package com.aoleyun.os.uioverrides;
 
 import static com.android.quickstep.views.IconRecentsView.CONTENT_ALPHA;
 
 import android.util.FloatProperty;
 
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.LauncherRecentsToActivityHelper;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.LauncherRecentsToActivityHelper;
 import com.android.quickstep.views.IconRecentsView;
 
 import androidx.annotation.NonNull;
diff --git a/go/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java b/go/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
index 21942c9..42856ff 100644
--- a/go/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
+++ b/go/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
@@ -14,32 +14,32 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.uioverrides.states;
+package com.aoleyun.os.uioverrides.states;
 
 import static android.view.View.VISIBLE;
 
-import static com.android.colorfulos.LauncherAnimUtils.OVERVIEW_TRANSITION_MS;
-import static com.android.colorfulos.LauncherAnimUtils.SCALE_PROPERTY;
-import static com.android.colorfulos.anim.AnimatorSetBuilder.ANIM_OVERVIEW_FADE;
-import static com.android.colorfulos.anim.AnimatorSetBuilder.ANIM_OVERVIEW_SCALE;
-import static com.android.colorfulos.anim.AnimatorSetBuilder.ANIM_OVERVIEW_TRANSLATE_X;
-import static com.android.colorfulos.anim.AnimatorSetBuilder.ANIM_WORKSPACE_FADE;
-import static com.android.colorfulos.anim.AnimatorSetBuilder.ANIM_WORKSPACE_SCALE;
-import static com.android.colorfulos.anim.AnimatorSetBuilder.ANIM_WORKSPACE_TRANSLATE;
-import static com.android.colorfulos.anim.Interpolators.ACCEL;
-import static com.android.colorfulos.anim.Interpolators.DEACCEL_2;
-import static com.android.colorfulos.anim.Interpolators.OVERSHOOT_1_2;
-import static com.android.colorfulos.anim.Interpolators.OVERSHOOT_1_7;
-import static com.android.colorfulos.states.RotationHelper.REQUEST_ROTATE;
+import static com.aoleyun.os.LauncherAnimUtils.OVERVIEW_TRANSITION_MS;
+import static com.aoleyun.os.LauncherAnimUtils.SCALE_PROPERTY;
+import static com.aoleyun.os.anim.AnimatorSetBuilder.ANIM_OVERVIEW_FADE;
+import static com.aoleyun.os.anim.AnimatorSetBuilder.ANIM_OVERVIEW_SCALE;
+import static com.aoleyun.os.anim.AnimatorSetBuilder.ANIM_OVERVIEW_TRANSLATE_X;
+import static com.aoleyun.os.anim.AnimatorSetBuilder.ANIM_WORKSPACE_FADE;
+import static com.aoleyun.os.anim.AnimatorSetBuilder.ANIM_WORKSPACE_SCALE;
+import static com.aoleyun.os.anim.AnimatorSetBuilder.ANIM_WORKSPACE_TRANSLATE;
+import static com.aoleyun.os.anim.Interpolators.ACCEL;
+import static com.aoleyun.os.anim.Interpolators.DEACCEL_2;
+import static com.aoleyun.os.anim.Interpolators.OVERSHOOT_1_2;
+import static com.aoleyun.os.anim.Interpolators.OVERSHOOT_1_7;
+import static com.aoleyun.os.states.RotationHelper.REQUEST_ROTATE;
 
 import android.view.View;
 
-import com.android.colorfulos.DeviceProfile;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.LauncherState;
-import com.android.colorfulos.R;
-import com.android.colorfulos.anim.AnimatorSetBuilder;
-import com.android.colorfulos.userevent.nano.LauncherLogProto;
+import com.aoleyun.os.DeviceProfile;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.LauncherState;
+import com.aoleyun.os.R;
+import com.aoleyun.os.anim.AnimatorSetBuilder;
+import com.aoleyun.os.userevent.nano.LauncherLogProto;
 import com.android.quickstep.SysUINavigationMode;
 import com.android.quickstep.views.IconRecentsView;
 
diff --git a/go/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/LandscapeStatesTouchController.java b/go/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/LandscapeStatesTouchController.java
index 4984c69..92b0727 100644
--- a/go/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/LandscapeStatesTouchController.java
+++ b/go/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/LandscapeStatesTouchController.java
@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.uioverrides.touchcontrollers;
+package com.aoleyun.os.uioverrides.touchcontrollers;
 
-import static com.android.colorfulos.LauncherState.ALL_APPS;
-import static com.android.colorfulos.LauncherState.NORMAL;
+import static com.aoleyun.os.LauncherState.ALL_APPS;
+import static com.aoleyun.os.LauncherState.NORMAL;
 
 import android.view.MotionEvent;
 
-import com.android.colorfulos.AbstractFloatingView;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.LauncherState;
-import com.android.colorfulos.userevent.nano.LauncherLogProto;
+import com.aoleyun.os.AbstractFloatingView;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.LauncherState;
+import com.aoleyun.os.userevent.nano.LauncherLogProto;
 
 /**
  * Touch controller for landscape mode.
diff --git a/go/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitOverviewStateTouchHelper.java b/go/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitOverviewStateTouchHelper.java
index 5b1740c..f7c1005 100644
--- a/go/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitOverviewStateTouchHelper.java
+++ b/go/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitOverviewStateTouchHelper.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.uioverrides.touchcontrollers;
+package com.aoleyun.os.uioverrides.touchcontrollers;
 
 import android.view.MotionEvent;
 
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.util.PendingAnimation;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.util.PendingAnimation;
 
 /**
  * Helper class for {@link PortraitStatesTouchController} that determines swipeable regions and
diff --git a/go/quickstep/src/com/android/quickstep/AppToOverviewAnimationProvider.java b/go/quickstep/src/com/android/quickstep/AppToOverviewAnimationProvider.java
index 8fdec0a..43eff31 100644
--- a/go/quickstep/src/com/android/quickstep/AppToOverviewAnimationProvider.java
+++ b/go/quickstep/src/com/android/quickstep/AppToOverviewAnimationProvider.java
@@ -15,8 +15,8 @@
  */
 package com.android.quickstep;
 
-import static com.android.colorfulos.Utilities.postAsyncCallback;
-import static com.android.colorfulos.anim.Interpolators.FAST_OUT_SLOW_IN;
+import static com.aoleyun.os.Utilities.postAsyncCallback;
+import static com.aoleyun.os.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;
@@ -28,8 +28,8 @@ import android.app.ActivityOptions;
 import android.os.Handler;
 import android.util.Log;
 
-import com.android.colorfulos.BaseDraggingActivity;
-import com.android.colorfulos.LauncherAnimationRunner;
+import com.aoleyun.os.BaseDraggingActivity;
+import com.aoleyun.os.LauncherAnimationRunner;
 import com.android.quickstep.util.RemoteAnimationProvider;
 import com.android.quickstep.util.RemoteAnimationTargetSet;
 import com.android.quickstep.views.IconRecentsView;
diff --git a/go/quickstep/src/com/android/quickstep/FallbackActivityControllerHelper.java b/go/quickstep/src/com/android/quickstep/FallbackActivityControllerHelper.java
index 7e9e95a..7387da6 100644
--- a/go/quickstep/src/com/android/quickstep/FallbackActivityControllerHelper.java
+++ b/go/quickstep/src/com/android/quickstep/FallbackActivityControllerHelper.java
@@ -15,7 +15,7 @@
  */
 package com.android.quickstep;
 
-import static com.android.colorfulos.anim.Interpolators.LINEAR;
+import static com.aoleyun.os.anim.Interpolators.LINEAR;
 import static com.android.quickstep.views.IconRecentsView.CONTENT_ALPHA;
 
 import android.animation.AnimatorSet;
@@ -24,8 +24,8 @@ import android.graphics.Rect;
 
 import androidx.annotation.Nullable;
 
-import com.android.colorfulos.anim.AnimatorPlaybackController;
-import com.android.colorfulos.userevent.nano.LauncherLogProto;
+import com.aoleyun.os.anim.AnimatorPlaybackController;
+import com.aoleyun.os.userevent.nano.LauncherLogProto;
 import com.android.quickstep.util.RemoteAnimationTargetSet;
 import com.android.quickstep.views.IconRecentsView;
 
diff --git a/go/quickstep/src/com/android/quickstep/GoActivityControlHelper.java b/go/quickstep/src/com/android/quickstep/GoActivityControlHelper.java
index 7bb5ea4..3ce24d7 100644
--- a/go/quickstep/src/com/android/quickstep/GoActivityControlHelper.java
+++ b/go/quickstep/src/com/android/quickstep/GoActivityControlHelper.java
@@ -3,8 +3,8 @@ package com.android.quickstep;
 import android.content.Context;
 import android.graphics.Rect;
 
-import com.android.colorfulos.BaseDraggingActivity;
-import com.android.colorfulos.DeviceProfile;
+import com.aoleyun.os.BaseDraggingActivity;
+import com.aoleyun.os.DeviceProfile;
 import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
 
 /**
diff --git a/go/quickstep/src/com/android/quickstep/IconRecentsFragment.java b/go/quickstep/src/com/android/quickstep/IconRecentsFragment.java
index 1d6a6c0..849b4bb 100644
--- a/go/quickstep/src/com/android/quickstep/IconRecentsFragment.java
+++ b/go/quickstep/src/com/android/quickstep/IconRecentsFragment.java
@@ -25,7 +25,7 @@ import android.view.ViewGroup;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import com.android.colorfulos.R;
+import com.aoleyun.os.R;
 
 public class IconRecentsFragment extends Fragment {
     @Nullable
diff --git a/go/quickstep/src/com/android/quickstep/LauncherActivityControllerHelper.java b/go/quickstep/src/com/android/quickstep/LauncherActivityControllerHelper.java
index fd8ff1b..6ecab99 100644
--- a/go/quickstep/src/com/android/quickstep/LauncherActivityControllerHelper.java
+++ b/go/quickstep/src/com/android/quickstep/LauncherActivityControllerHelper.java
@@ -16,14 +16,14 @@
 
 package com.android.quickstep;
 
-import static com.android.colorfulos.LauncherState.OVERVIEW;
+import static com.aoleyun.os.LauncherState.OVERVIEW;
 
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.LauncherAppState;
-import com.android.colorfulos.LauncherInitListener;
-import com.android.colorfulos.LauncherState;
-import com.android.colorfulos.anim.AnimatorPlaybackController;
-import com.android.colorfulos.userevent.nano.LauncherLogProto;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.LauncherAppState;
+import com.aoleyun.os.LauncherInitListener;
+import com.aoleyun.os.LauncherState;
+import com.aoleyun.os.anim.AnimatorPlaybackController;
+import com.aoleyun.os.userevent.nano.LauncherLogProto;
 import com.android.quickstep.views.IconRecentsView;
 
 import java.util.function.BiPredicate;
diff --git a/go/quickstep/src/com/android/quickstep/OverviewCommandHelper.java b/go/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
index 3b5c99f..7133941 100644
--- a/go/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
+++ b/go/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
@@ -24,10 +24,10 @@ import android.os.Build;
 import android.os.SystemClock;
 import android.view.ViewConfiguration;
 
-import com.android.colorfulos.BaseDraggingActivity;
-import com.android.colorfulos.MainThreadExecutor;
-import com.android.colorfulos.logging.UserEventDispatcher;
-import com.android.colorfulos.userevent.nano.LauncherLogProto;
+import com.aoleyun.os.BaseDraggingActivity;
+import com.aoleyun.os.MainThreadExecutor;
+import com.aoleyun.os.logging.UserEventDispatcher;
+import com.aoleyun.os.userevent.nano.LauncherLogProto;
 import com.android.quickstep.ActivityControlHelper.ActivityInitListener;
 import com.android.quickstep.AppToOverviewAnimationProvider.AppToOverviewAnimationListener;
 import com.android.quickstep.views.IconRecentsView;
diff --git a/go/quickstep/src/com/android/quickstep/RecentsActivity.java b/go/quickstep/src/com/android/quickstep/RecentsActivity.java
index 82dba72..26a7d3b 100644
--- a/go/quickstep/src/com/android/quickstep/RecentsActivity.java
+++ b/go/quickstep/src/com/android/quickstep/RecentsActivity.java
@@ -18,8 +18,8 @@ package com.android.quickstep;
 import android.app.ActivityOptions;
 import android.view.View;
 
-import com.android.colorfulos.R;
-import com.android.colorfulos.views.BaseDragLayer;
+import com.aoleyun.os.R;
+import com.aoleyun.os.views.BaseDragLayer;
 import com.android.quickstep.fallback.GoRecentsActivityRootView;
 import com.android.quickstep.views.IconRecentsView;
 
diff --git a/go/quickstep/src/com/android/quickstep/TaskActionController.java b/go/quickstep/src/com/android/quickstep/TaskActionController.java
index d925b78..4bca74d 100644
--- a/go/quickstep/src/com/android/quickstep/TaskActionController.java
+++ b/go/quickstep/src/com/android/quickstep/TaskActionController.java
@@ -23,7 +23,7 @@ import android.view.View;
 
 import androidx.annotation.NonNull;
 
-import com.android.colorfulos.logging.StatsLogManager;
+import com.aoleyun.os.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;
diff --git a/go/quickstep/src/com/android/quickstep/TaskAdapter.java b/go/quickstep/src/com/android/quickstep/TaskAdapter.java
index 72a14d5..4836818 100644
--- a/go/quickstep/src/com/android/quickstep/TaskAdapter.java
+++ b/go/quickstep/src/com/android/quickstep/TaskAdapter.java
@@ -25,7 +25,7 @@ import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView.Adapter;
 import androidx.recyclerview.widget.RecyclerView.ViewHolder;
 
-import com.android.colorfulos.R;
+import com.aoleyun.os.R;
 import com.android.quickstep.views.TaskItemView;
 import com.android.systemui.shared.recents.model.Task;
 
diff --git a/go/quickstep/src/com/android/quickstep/ThumbnailDrawable.java b/go/quickstep/src/com/android/quickstep/ThumbnailDrawable.java
index 3dbd0e2..5450289 100644
--- a/go/quickstep/src/com/android/quickstep/ThumbnailDrawable.java
+++ b/go/quickstep/src/com/android/quickstep/ThumbnailDrawable.java
@@ -32,7 +32,7 @@ import android.graphics.drawable.Drawable;
 
 import androidx.annotation.NonNull;
 
-import com.android.colorfulos.R;
+import com.aoleyun.os.R;
 import com.android.systemui.shared.recents.model.ThumbnailData;
 
 /**
diff --git a/go/quickstep/src/com/android/quickstep/TouchInteractionService.java b/go/quickstep/src/com/android/quickstep/TouchInteractionService.java
index 736dad5..cdea2b3 100644
--- a/go/quickstep/src/com/android/quickstep/TouchInteractionService.java
+++ b/go/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -32,8 +32,8 @@ import android.os.RemoteException;
 import android.util.Log;
 import android.view.MotionEvent;
 
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.compat.UserManagerCompat;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.compat.UserManagerCompat;
 import com.android.systemui.shared.recents.IOverviewProxy;
 import com.android.systemui.shared.recents.ISystemUiProxy;
 
diff --git a/go/quickstep/src/com/android/quickstep/fallback/GoRecentsActivityRootView.java b/go/quickstep/src/com/android/quickstep/fallback/GoRecentsActivityRootView.java
index 37a89b7..492321f 100644
--- a/go/quickstep/src/com/android/quickstep/fallback/GoRecentsActivityRootView.java
+++ b/go/quickstep/src/com/android/quickstep/fallback/GoRecentsActivityRootView.java
@@ -21,8 +21,8 @@ import android.graphics.Rect;
 import android.util.AttributeSet;
 import android.view.WindowInsets;
 
-import com.android.colorfulos.util.TouchController;
-import com.android.colorfulos.views.BaseDragLayer;
+import com.aoleyun.os.util.TouchController;
+import com.aoleyun.os.views.BaseDragLayer;
 import com.android.quickstep.RecentsActivity;
 
 /**
diff --git a/go/quickstep/src/com/android/quickstep/views/IconRecentsView.java b/go/quickstep/src/com/android/quickstep/views/IconRecentsView.java
index e4252cf..cc0f5a7 100644
--- a/go/quickstep/src/com/android/quickstep/views/IconRecentsView.java
+++ b/go/quickstep/src/com/android/quickstep/views/IconRecentsView.java
@@ -19,7 +19,7 @@ import static android.content.res.Configuration.ORIENTATION_LANDSCAPE;
 
 import static androidx.recyclerview.widget.LinearLayoutManager.VERTICAL;
 
-import static com.android.colorfulos.anim.Interpolators.ACCEL_2;
+import static com.aoleyun.os.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;
@@ -60,10 +60,10 @@ import androidx.recyclerview.widget.RecyclerView.AdapterDataObserver;
 import androidx.recyclerview.widget.RecyclerView.ItemDecoration;
 import androidx.recyclerview.widget.RecyclerView.OnChildAttachStateChangeListener;
 
-import com.android.colorfulos.BaseActivity;
-import com.android.colorfulos.Insettable;
-import com.android.colorfulos.R;
-import com.android.colorfulos.util.Themes;
+import com.aoleyun.os.BaseActivity;
+import com.aoleyun.os.Insettable;
+import com.aoleyun.os.R;
+import com.aoleyun.os.util.Themes;
 import com.android.quickstep.ContentFillItemAnimator;
 import com.android.quickstep.RecentsModel;
 import com.android.quickstep.RecentsToActivityHelper;
diff --git a/go/quickstep/src/com/android/quickstep/views/TaskItemView.java b/go/quickstep/src/com/android/quickstep/views/TaskItemView.java
index a139747..e8bb06d 100644
--- a/go/quickstep/src/com/android/quickstep/views/TaskItemView.java
+++ b/go/quickstep/src/com/android/quickstep/views/TaskItemView.java
@@ -29,7 +29,7 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import com.android.colorfulos.R;
+import com.aoleyun.os.R;
 import com.android.quickstep.ThumbnailDrawable;
 import com.android.systemui.shared.recents.model.ThumbnailData;
 
diff --git a/go/quickstep/src/com/android/quickstep/views/TaskLayerDrawable.java b/go/quickstep/src/com/android/quickstep/views/TaskLayerDrawable.java
index 328a4ba..a86e778 100644
--- a/go/quickstep/src/com/android/quickstep/views/TaskLayerDrawable.java
+++ b/go/quickstep/src/com/android/quickstep/views/TaskLayerDrawable.java
@@ -22,7 +22,7 @@ import android.graphics.drawable.LayerDrawable;
 
 import androidx.annotation.NonNull;
 
-import com.android.colorfulos.R;
+import com.aoleyun.os.R;
 
 /**
  * A layer drawable for task content that transitions between two drawables by crossfading. Similar
diff --git a/go/quickstep/src/com/android/quickstep/views/TaskThumbnailIconView.java b/go/quickstep/src/com/android/quickstep/views/TaskThumbnailIconView.java
index d4c205b..72d36f8 100644
--- a/go/quickstep/src/com/android/quickstep/views/TaskThumbnailIconView.java
+++ b/go/quickstep/src/com/android/quickstep/views/TaskThumbnailIconView.java
@@ -26,7 +26,7 @@ import android.view.Gravity;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.android.colorfulos.R;
+import com.aoleyun.os.R;
 
 /**
  * Square view that holds thumbnail and icon and shrinks them appropriately so that both fit nicely
diff --git a/go/src/com/android/uiuios/config/FeatureFlags.java b/go/src/com/android/uiuios/config/FeatureFlags.java
index 9c9218b..b13d6fe 100644
--- a/go/src/com/android/uiuios/config/FeatureFlags.java
+++ b/go/src/com/android/uiuios/config/FeatureFlags.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.config;
+package com.aoleyun.os.config;
 
 import android.content.Context;
 
diff --git a/go/src/com/android/uiuios/model/LoaderResults.java b/go/src/com/android/uiuios/model/LoaderResults.java
index 21a8697..62aef6b 100644
--- a/go/src/com/android/uiuios/model/LoaderResults.java
+++ b/go/src/com/android/uiuios/model/LoaderResults.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.model;
+package com.aoleyun.os.model;
 
-import com.android.colorfulos.AllAppsList;
-import com.android.colorfulos.LauncherAppState;
-import com.android.colorfulos.LauncherModel.Callbacks;
+import com.aoleyun.os.AllAppsList;
+import com.aoleyun.os.LauncherAppState;
+import com.aoleyun.os.LauncherModel.Callbacks;
 
 import java.lang.ref.WeakReference;
 
 /**
- * Helper class to handle results of {@link com.android.colorfulos.model.LoaderTask}.
+ * Helper class to handle results of {@link com.aoleyun.os.model.LoaderTask}.
  */
 public class LoaderResults extends BaseLoaderResults {
 
diff --git a/go/src/com/android/uiuios/model/WidgetsModel.java b/go/src/com/android/uiuios/model/WidgetsModel.java
index 74990b9..b82383b 100644
--- a/go/src/com/android/uiuios/model/WidgetsModel.java
+++ b/go/src/com/android/uiuios/model/WidgetsModel.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.model;
+package com.aoleyun.os.model;
 
 import android.content.Context;
 import android.os.UserHandle;
 
-import com.android.colorfulos.icons.ComponentWithLabel;
-import com.android.colorfulos.LauncherAppState;
-import com.android.colorfulos.util.PackageUserKey;
-import com.android.colorfulos.widget.WidgetListRowEntry;
+import com.aoleyun.os.icons.ComponentWithLabel;
+import com.aoleyun.os.LauncherAppState;
+import com.aoleyun.os.util.PackageUserKey;
+import com.aoleyun.os.widget.WidgetListRowEntry;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -43,9 +43,9 @@ public class WidgetsModel {
      * 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.colorfulos.widget.WidgetsDiffReporter}
+     * {@link com.aoleyun.os.widget.WidgetsDiffReporter}
      *
-     * @see com.android.colorfulos.widget.WidgetsListAdapter#setWidgets(ArrayList)
+     * @see com.aoleyun.os.widget.WidgetsListAdapter#setWidgets(ArrayList)
      */
     public synchronized ArrayList<WidgetListRowEntry> getWidgetsList(Context context) {
         return EMPTY_WIDGET_LIST;
diff --git a/go/src/com/android/uiuios/shortcuts/DeepShortcutManager.java b/go/src/com/android/uiuios/shortcuts/DeepShortcutManager.java
index 72f4845..a643ed5 100644
--- a/go/src/com/android/uiuios/shortcuts/DeepShortcutManager.java
+++ b/go/src/com/android/uiuios/shortcuts/DeepShortcutManager.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.shortcuts;
+package com.aoleyun.os.shortcuts;
 
 import android.content.ComponentName;
 import android.content.Context;
@@ -24,7 +24,7 @@ import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.os.UserHandle;
 
-import com.android.colorfulos.ItemInfo;
+import com.aoleyun.os.ItemInfo;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/iconloaderlib/AndroidManifest.xml b/iconloaderlib/AndroidManifest.xml
index e654818..eac579b 100644
--- a/iconloaderlib/AndroidManifest.xml
+++ b/iconloaderlib/AndroidManifest.xml
@@ -16,5 +16,5 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.colorfulos.icons">
+    package="com.aoleyun.os.icons">
 </manifest>
diff --git a/iconloaderlib/res/drawable-v26/adaptive_icon_drawable_wrapper.xml b/iconloaderlib/res/drawable-v26/adaptive_icon_drawable_wrapper.xml
index f2a5941..6374371 100644
--- a/iconloaderlib/res/drawable-v26/adaptive_icon_drawable_wrapper.xml
+++ b/iconloaderlib/res/drawable-v26/adaptive_icon_drawable_wrapper.xml
@@ -17,6 +17,6 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/legacy_icon_background"/>
     <foreground>
-        <com.android.colorfulos.icons.FixedScaleDrawable />
+        <com.aoleyun.os.icons.FixedScaleDrawable />
     </foreground>
 </adaptive-icon>
diff --git a/iconloaderlib/src/com/android/colorfulos/icons/BaseIconFactory.java b/iconloaderlib/src/com/aoleyun/os/icons/BaseIconFactory.java
similarity index 98%
rename from iconloaderlib/src/com/android/colorfulos/icons/BaseIconFactory.java
rename to iconloaderlib/src/com/aoleyun/os/icons/BaseIconFactory.java
index fb99bd8..71ed39c 100644
--- a/iconloaderlib/src/com/android/colorfulos/icons/BaseIconFactory.java
+++ b/iconloaderlib/src/com/aoleyun/os/icons/BaseIconFactory.java
@@ -1,10 +1,8 @@
-package com.android.colorfulos.icons;
+package com.aoleyun.os.icons;
 
 import static android.graphics.Paint.DITHER_FLAG;
 import static android.graphics.Paint.FILTER_BITMAP_FLAG;
 
-import static com.android.colorfulos.icons.ShadowGenerator.BLUR_FACTOR;
-
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
@@ -22,6 +20,8 @@ import android.os.Build;
 import android.os.Process;
 import android.os.UserHandle;
 
+import com.aoleyun.os.icons.R;
+
 /**
  * This class will be moved to androidx library. There shouldn't be any dependency outside
  * this package.
@@ -269,7 +269,7 @@ public class BaseIconFactory implements AutoCloseable {
         mOldBounds.set(icon.getBounds());
 
         if (ATLEAST_OREO && icon instanceof AdaptiveIconDrawable) {
-            int offset = Math.max((int) Math.ceil(BLUR_FACTOR * size),
+            int offset = Math.max((int) Math.ceil(ShadowGenerator.BLUR_FACTOR * size),
                     Math.round(size * (1 - scale) / 2 ));
             icon.setBounds(offset, offset, size - offset, size - offset);
             icon.draw(mCanvas);
diff --git a/iconloaderlib/src/com/android/colorfulos/icons/BitmapInfo.java b/iconloaderlib/src/com/aoleyun/os/icons/BitmapInfo.java
similarity index 97%
rename from iconloaderlib/src/com/android/colorfulos/icons/BitmapInfo.java
rename to iconloaderlib/src/com/aoleyun/os/icons/BitmapInfo.java
index 7df26f0..ca1d56c 100644
--- a/iconloaderlib/src/com/android/colorfulos/icons/BitmapInfo.java
+++ b/iconloaderlib/src/com/aoleyun/os/icons/BitmapInfo.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.icons;
+package com.aoleyun.os.icons;
 
 import android.graphics.Bitmap;
 import android.graphics.Bitmap.Config;
diff --git a/iconloaderlib/src/com/android/colorfulos/icons/BitmapRenderer.java b/iconloaderlib/src/com/aoleyun/os/icons/BitmapRenderer.java
similarity index 97%
rename from iconloaderlib/src/com/android/colorfulos/icons/BitmapRenderer.java
rename to iconloaderlib/src/com/aoleyun/os/icons/BitmapRenderer.java
index 3feeb27..b7af574 100644
--- a/iconloaderlib/src/com/android/colorfulos/icons/BitmapRenderer.java
+++ b/iconloaderlib/src/com/aoleyun/os/icons/BitmapRenderer.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.icons;
+package com.aoleyun.os.icons;
 
 import android.annotation.TargetApi;
 import android.graphics.Bitmap;
diff --git a/iconloaderlib/src/com/android/colorfulos/icons/ColorExtractor.java b/iconloaderlib/src/com/aoleyun/os/icons/ColorExtractor.java
similarity index 99%
rename from iconloaderlib/src/com/android/colorfulos/icons/ColorExtractor.java
rename to iconloaderlib/src/com/aoleyun/os/icons/ColorExtractor.java
index 03dd992..7f30639 100644
--- a/iconloaderlib/src/com/android/colorfulos/icons/ColorExtractor.java
+++ b/iconloaderlib/src/com/aoleyun/os/icons/ColorExtractor.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.icons;
+package com.aoleyun.os.icons;
 
 import android.graphics.Bitmap;
 import android.graphics.Color;
diff --git a/iconloaderlib/src/com/android/colorfulos/icons/DotRenderer.java b/iconloaderlib/src/com/aoleyun/os/icons/DotRenderer.java
similarity index 99%
rename from iconloaderlib/src/com/android/colorfulos/icons/DotRenderer.java
rename to iconloaderlib/src/com/aoleyun/os/icons/DotRenderer.java
index 20c09cc..d4d0fd6 100644
--- a/iconloaderlib/src/com/android/colorfulos/icons/DotRenderer.java
+++ b/iconloaderlib/src/com/aoleyun/os/icons/DotRenderer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.icons;
+package com.aoleyun.os.icons;
 
 import static android.graphics.Paint.ANTI_ALIAS_FLAG;
 import static android.graphics.Paint.FILTER_BITMAP_FLAG;
diff --git a/iconloaderlib/src/com/android/colorfulos/icons/FixedScaleDrawable.java b/iconloaderlib/src/com/aoleyun/os/icons/FixedScaleDrawable.java
similarity index 97%
rename from iconloaderlib/src/com/android/colorfulos/icons/FixedScaleDrawable.java
rename to iconloaderlib/src/com/aoleyun/os/icons/FixedScaleDrawable.java
index 5342e1a..67831a0 100644
--- a/iconloaderlib/src/com/android/colorfulos/icons/FixedScaleDrawable.java
+++ b/iconloaderlib/src/com/aoleyun/os/icons/FixedScaleDrawable.java
@@ -1,4 +1,4 @@
-package com.android.colorfulos.icons;
+package com.aoleyun.os.icons;
 
 import android.content.res.Resources;
 import android.content.res.Resources.Theme;
diff --git a/iconloaderlib/src/com/android/colorfulos/icons/GraphicsUtils.java b/iconloaderlib/src/com/aoleyun/os/icons/GraphicsUtils.java
similarity index 98%
rename from iconloaderlib/src/com/android/colorfulos/icons/GraphicsUtils.java
rename to iconloaderlib/src/com/aoleyun/os/icons/GraphicsUtils.java
index ee7ec8d..313d881 100644
--- a/iconloaderlib/src/com/android/colorfulos/icons/GraphicsUtils.java
+++ b/iconloaderlib/src/com/aoleyun/os/icons/GraphicsUtils.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.icons;
+package com.aoleyun.os.icons;
 
 import android.graphics.Bitmap;
 import android.graphics.Rect;
diff --git a/iconloaderlib/src/com/android/colorfulos/icons/IconNormalizer.java b/iconloaderlib/src/com/aoleyun/os/icons/IconNormalizer.java
similarity index 99%
rename from iconloaderlib/src/com/android/colorfulos/icons/IconNormalizer.java
rename to iconloaderlib/src/com/aoleyun/os/icons/IconNormalizer.java
index 228210b..aca3456 100644
--- a/iconloaderlib/src/com/android/colorfulos/icons/IconNormalizer.java
+++ b/iconloaderlib/src/com/aoleyun/os/icons/IconNormalizer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.icons;
+package com.aoleyun.os.icons;
 
 import android.annotation.TargetApi;
 import android.content.Context;
diff --git a/iconloaderlib/src/com/android/colorfulos/icons/ShadowGenerator.java b/iconloaderlib/src/com/aoleyun/os/icons/ShadowGenerator.java
similarity index 95%
rename from iconloaderlib/src/com/android/colorfulos/icons/ShadowGenerator.java
rename to iconloaderlib/src/com/aoleyun/os/icons/ShadowGenerator.java
index c59d645..7e8e598 100644
--- a/iconloaderlib/src/com/android/colorfulos/icons/ShadowGenerator.java
+++ b/iconloaderlib/src/com/aoleyun/os/icons/ShadowGenerator.java
@@ -14,9 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.icons;
-
-import static com.android.colorfulos.icons.GraphicsUtils.setColorAlphaBound;
+package com.aoleyun.os.icons;
 
 import android.graphics.Bitmap;
 import android.graphics.Bitmap.Config;
@@ -146,12 +144,12 @@ public class ShadowGenerator {
 
             // Key shadow
             p.setShadowLayer(shadowBlur, 0, keyShadowDistance,
-                    setColorAlphaBound(Color.BLACK, keyShadowAlpha));
+                    GraphicsUtils.setColorAlphaBound(Color.BLACK, keyShadowAlpha));
             c.drawRoundRect(bounds, radius, radius, p);
 
             // Ambient shadow
             p.setShadowLayer(shadowBlur, 0, 0,
-                    setColorAlphaBound(Color.BLACK, ambientShadowAlpha));
+                    GraphicsUtils.setColorAlphaBound(Color.BLACK, ambientShadowAlpha));
             c.drawRoundRect(bounds, radius, radius, p);
 
             if (Color.alpha(color) < 255) {
diff --git a/iconloaderlib/src/com/android/colorfulos/icons/cache/BaseIconCache.java b/iconloaderlib/src/com/aoleyun/os/icons/cache/BaseIconCache.java
similarity index 95%
rename from iconloaderlib/src/com/android/colorfulos/icons/cache/BaseIconCache.java
rename to iconloaderlib/src/com/aoleyun/os/icons/cache/BaseIconCache.java
index 2ccf0bb..c4fd52f 100644
--- a/iconloaderlib/src/com/android/colorfulos/icons/cache/BaseIconCache.java
+++ b/iconloaderlib/src/com/aoleyun/os/icons/cache/BaseIconCache.java
@@ -13,11 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.icons.cache;
-
-import static com.android.colorfulos.icons.BaseIconFactory.getFullResDefaultActivityIcon;
-import static com.android.colorfulos.icons.BitmapInfo.LOW_RES_ICON;
-import static com.android.colorfulos.icons.GraphicsUtils.setColorAlphaBound;
+package com.aoleyun.os.icons.cache;
 
 import android.content.ComponentName;
 import android.content.ContentValues;
@@ -42,12 +38,12 @@ import android.os.UserHandle;
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.android.colorfulos.icons.BaseIconFactory;
-import com.android.colorfulos.icons.BitmapInfo;
-import com.android.colorfulos.icons.BitmapRenderer;
-import com.android.colorfulos.icons.GraphicsUtils;
-import com.android.colorfulos.util.ComponentKey;
-import com.android.colorfulos.util.SQLiteCacheHelper;
+import com.aoleyun.os.icons.BaseIconFactory;
+import com.aoleyun.os.icons.BitmapInfo;
+import com.aoleyun.os.icons.BitmapRenderer;
+import com.aoleyun.os.icons.GraphicsUtils;
+import com.aoleyun.os.util.ComponentKey;
+import com.aoleyun.os.util.SQLiteCacheHelper;
 
 import java.util.AbstractMap;
 import java.util.Collections;
@@ -162,14 +158,14 @@ public abstract class BaseIconCache {
                 return resources.getDrawableForDensity(iconId, mIconDpi);
             } catch (Resources.NotFoundException e) { }
         }
-        return getFullResDefaultActivityIcon(mIconDpi);
+        return BaseIconFactory.getFullResDefaultActivityIcon(mIconDpi);
     }
 
     public Drawable getFullResIcon(String packageName, int iconId) {
         try {
             return getFullResIcon(mPackageManager.getResourcesForApplication(packageName), iconId);
         } catch (PackageManager.NameNotFoundException e) { }
-        return getFullResDefaultActivityIcon(mIconDpi);
+        return BaseIconFactory.getFullResDefaultActivityIcon(mIconDpi);
     }
 
     public Drawable getFullResIcon(ActivityInfo info) {
@@ -177,7 +173,7 @@ public abstract class BaseIconCache {
             return getFullResIcon(mPackageManager.getResourcesForApplication(info.applicationInfo),
                     info.getIconResource());
         } catch (PackageManager.NameNotFoundException e) { }
-        return getFullResDefaultActivityIcon(mIconDpi);
+        return BaseIconFactory.getFullResDefaultActivityIcon(mIconDpi);
     }
 
     private BitmapInfo makeDefaultIcon(UserHandle user) {
@@ -439,7 +435,7 @@ public abstract class BaseIconCache {
 
                     entry.title = appInfo.loadLabel(mPackageManager);
                     entry.contentDescription = mPackageManager.getUserBadgedLabel(entry.title, user);
-                    entry.icon = useLowResIcon ? LOW_RES_ICON : iconInfo.icon;
+                    entry.icon = useLowResIcon ? BitmapInfo.LOW_RES_ICON : iconInfo.icon;
                     entry.color = iconInfo.color;
 
                     // Add the icon in the DB here, since these do not get written during
@@ -473,7 +469,7 @@ public abstract class BaseIconCache {
                             Long.toString(getSerialNumberForUser(cacheKey.user))});
             if (c.moveToNext()) {
                 // Set the alpha to be 255, so that we never have a wrong color
-                entry.color = setColorAlphaBound(c.getInt(0), 255);
+                entry.color = GraphicsUtils.setColorAlphaBound(c.getInt(0), 255);
                 entry.title = c.getString(1);
                 if (entry.title == null) {
                     entry.title = "";
@@ -484,7 +480,7 @@ public abstract class BaseIconCache {
                 }
 
                 if (lowRes) {
-                    entry.icon = LOW_RES_ICON;
+                    entry.icon = BitmapInfo.LOW_RES_ICON;
                 } else {
                     byte[] data = c.getBlob(2);
                     try {
diff --git a/iconloaderlib/src/com/android/colorfulos/icons/cache/CachingLogic.java b/iconloaderlib/src/com/aoleyun/os/icons/cache/CachingLogic.java
similarity index 91%
rename from iconloaderlib/src/com/android/colorfulos/icons/cache/CachingLogic.java
rename to iconloaderlib/src/com/aoleyun/os/icons/cache/CachingLogic.java
index da7b9d2..8ea78ee 100644
--- a/iconloaderlib/src/com/android/colorfulos/icons/cache/CachingLogic.java
+++ b/iconloaderlib/src/com/aoleyun/os/icons/cache/CachingLogic.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.icons.cache;
+package com.aoleyun.os.icons.cache;
 
 import android.content.ComponentName;
 import android.content.Context;
 import android.os.UserHandle;
 
-import com.android.colorfulos.icons.BitmapInfo;
+import com.aoleyun.os.icons.BitmapInfo;
 
 public interface CachingLogic<T> {
 
diff --git a/iconloaderlib/src/com/android/colorfulos/icons/cache/HandlerRunnable.java b/iconloaderlib/src/com/aoleyun/os/icons/cache/HandlerRunnable.java
similarity index 97%
rename from iconloaderlib/src/com/android/colorfulos/icons/cache/HandlerRunnable.java
rename to iconloaderlib/src/com/aoleyun/os/icons/cache/HandlerRunnable.java
index def39d3..732b2d4 100644
--- a/iconloaderlib/src/com/android/colorfulos/icons/cache/HandlerRunnable.java
+++ b/iconloaderlib/src/com/aoleyun/os/icons/cache/HandlerRunnable.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.icons.cache;
+package com.aoleyun.os.icons.cache;
 
 import android.os.Handler;
 
diff --git a/iconloaderlib/src/com/android/colorfulos/icons/cache/IconCacheUpdateHandler.java b/iconloaderlib/src/com/aoleyun/os/icons/cache/IconCacheUpdateHandler.java
similarity index 99%
rename from iconloaderlib/src/com/android/colorfulos/icons/cache/IconCacheUpdateHandler.java
rename to iconloaderlib/src/com/aoleyun/os/icons/cache/IconCacheUpdateHandler.java
index 19ed9ff..535b35d 100644
--- a/iconloaderlib/src/com/android/colorfulos/icons/cache/IconCacheUpdateHandler.java
+++ b/iconloaderlib/src/com/aoleyun/os/icons/cache/IconCacheUpdateHandler.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.icons.cache;
+package com.aoleyun.os.icons.cache;
 
 import android.content.ComponentName;
 import android.content.pm.ApplicationInfo;
@@ -27,7 +27,7 @@ import android.text.TextUtils;
 import android.util.Log;
 import android.util.SparseBooleanArray;
 
-import com.android.colorfulos.icons.cache.BaseIconCache.IconDB;
+import com.aoleyun.os.icons.cache.BaseIconCache.IconDB;
 
 import java.util.Collections;
 import java.util.HashMap;
diff --git a/iconloaderlib/src/com/android/colorfulos/util/ComponentKey.java b/iconloaderlib/src/com/aoleyun/os/util/ComponentKey.java
similarity index 97%
rename from iconloaderlib/src/com/android/colorfulos/util/ComponentKey.java
rename to iconloaderlib/src/com/aoleyun/os/util/ComponentKey.java
index 3f1b1a1..8752cd8 100644
--- a/iconloaderlib/src/com/android/colorfulos/util/ComponentKey.java
+++ b/iconloaderlib/src/com/aoleyun/os/util/ComponentKey.java
@@ -1,4 +1,4 @@
-package com.android.colorfulos.util;
+package com.aoleyun.os.util;
 
 /**
  * Copyright (C) 2015 The Android Open Source Project
diff --git a/iconloaderlib/src/com/android/colorfulos/util/NoLocaleSQLiteHelper.java b/iconloaderlib/src/com/aoleyun/os/util/NoLocaleSQLiteHelper.java
similarity index 98%
rename from iconloaderlib/src/com/android/colorfulos/util/NoLocaleSQLiteHelper.java
rename to iconloaderlib/src/com/aoleyun/os/util/NoLocaleSQLiteHelper.java
index 471f386..47b9ce0 100644
--- a/iconloaderlib/src/com/android/colorfulos/util/NoLocaleSQLiteHelper.java
+++ b/iconloaderlib/src/com/aoleyun/os/util/NoLocaleSQLiteHelper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.util;
+package com.aoleyun.os.util;
 
 import static android.database.sqlite.SQLiteDatabase.NO_LOCALIZED_COLLATORS;
 
diff --git a/iconloaderlib/src/com/android/colorfulos/util/SQLiteCacheHelper.java b/iconloaderlib/src/com/aoleyun/os/util/SQLiteCacheHelper.java
similarity index 99%
rename from iconloaderlib/src/com/android/colorfulos/util/SQLiteCacheHelper.java
rename to iconloaderlib/src/com/aoleyun/os/util/SQLiteCacheHelper.java
index 4851f1d..4e34c21 100644
--- a/iconloaderlib/src/com/android/colorfulos/util/SQLiteCacheHelper.java
+++ b/iconloaderlib/src/com/aoleyun/os/util/SQLiteCacheHelper.java
@@ -1,4 +1,4 @@
-package com.android.colorfulos.util;
+package com.aoleyun.os.util;
 
 import android.content.ContentValues;
 import android.content.Context;
diff --git a/iconloaderlib/src_full_lib/com/android/colorfulos/icons/IconFactory.java b/iconloaderlib/src_full_lib/com/aoleyun/os/icons/IconFactory.java
similarity index 97%
rename from iconloaderlib/src_full_lib/com/android/colorfulos/icons/IconFactory.java
rename to iconloaderlib/src_full_lib/com/aoleyun/os/icons/IconFactory.java
index fd6bd1d..d3440c6 100644
--- a/iconloaderlib/src_full_lib/com/android/colorfulos/icons/IconFactory.java
+++ b/iconloaderlib/src_full_lib/com/aoleyun/os/icons/IconFactory.java
@@ -14,10 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.icons;
+package com.aoleyun.os.icons;
 
 import android.content.Context;
 
+import com.aoleyun.os.icons.R;
+
 /**
  * Wrapper class to provide access to {@link BaseIconFactory} and also to provide pool of this class
  * that are threadsafe.
diff --git a/iconloaderlib/src_full_lib/com/android/colorfulos/icons/SimpleIconCache.java b/iconloaderlib/src_full_lib/com/aoleyun/os/icons/SimpleIconCache.java
similarity index 97%
rename from iconloaderlib/src_full_lib/com/android/colorfulos/icons/SimpleIconCache.java
rename to iconloaderlib/src_full_lib/com/aoleyun/os/icons/SimpleIconCache.java
index 62d1dfd..19ec327 100644
--- a/iconloaderlib/src_full_lib/com/android/colorfulos/icons/SimpleIconCache.java
+++ b/iconloaderlib/src_full_lib/com/aoleyun/os/icons/SimpleIconCache.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.icons;
+package com.aoleyun.os.icons;
 
 import static android.content.Intent.ACTION_MANAGED_PROFILE_ADDED;
 import static android.content.Intent.ACTION_MANAGED_PROFILE_REMOVED;
@@ -32,7 +32,8 @@ import android.os.UserHandle;
 import android.os.UserManager;
 import android.util.SparseLongArray;
 
-import com.android.colorfulos.icons.cache.BaseIconCache;
+import com.aoleyun.os.icons.R;
+import com.aoleyun.os.icons.cache.BaseIconCache;
 
 /**
  * Wrapper class to provide access to {@link BaseIconFactory} and also to provide pool of this class
diff --git a/libs/framework.jar b/libs/framework.jar
new file mode 100644
index 0000000..fefe7ec
Binary files /dev/null and b/libs/framework.jar differ
diff --git a/print_db.py b/print_db.py
index a1a4bc7..8ac6db0 100644
--- a/print_db.py
+++ b/print_db.py
@@ -43,7 +43,7 @@ def adb_root_remount():
 def pull_file(fn):
   print "pull_file: " + fn
   rv = os.system("adb pull"
-    + " /data/data/com.android.colorfulos/databases/launcher.db"
+    + " /data/data/com.aoleyun.os/databases/launcher.db"
     + " " + fn);
   if rv != 0:
     print "adb pull failed"
diff --git a/proguard.flags b/proguard.flags
index 5439265..861bd11 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -1,14 +1,14 @@
--keep,allowshrinking,allowoptimization class com.android.colorfulos.** {
+-keep,allowshrinking,allowoptimization class com.aoleyun.os.** {
   *;
 }
 
 # Proguard will strip new callbacks in LauncherApps.Callback from
 # WrappedCallback if compiled against an older SDK. Don't let this happen.
--keep class com.android.colorfulos.compat.** {
+-keep class com.aoleyun.os.compat.** {
   *;
 }
 
--keep class com.android.colorfulos.graphics.ShadowDrawable {
+-keep class com.aoleyun.os.graphics.ShadowDrawable {
   public <init>(...);
 }
 
@@ -29,19 +29,19 @@
 }
 
 ## Prevent obfuscating various overridable objects
--keep class ** implements com.android.colorfulos.util.ResourceBasedOverride {
+-keep class ** implements com.aoleyun.os.util.ResourceBasedOverride {
     public <init>(...);
 }
 
--keep interface com.android.colorfulos.userevent.nano.LauncherLogProto.** {
+-keep interface com.aoleyun.os.userevent.nano.LauncherLogProto.** {
   *;
 }
--keep interface com.android.colorfulos.model.nano.LauncherDumpProto.** {
+-keep interface com.aoleyun.os.model.nano.LauncherDumpProto.** {
   *;
 }
 
 # Discovery bounce animation
--keep class com.android.colorfulos.allapps.DiscoveryBounce$VerticalProgressWrapper {
+-keep class com.aoleyun.os.allapps.DiscoveryBounce$VerticalProgressWrapper {
   public void setProgress(float);
   public float getProgress();
 }
diff --git a/proto_overrides/launcher_log_extension.proto b/proto_overrides/launcher_log_extension.proto
index 979132d..2d2b231 100644
--- a/proto_overrides/launcher_log_extension.proto
+++ b/proto_overrides/launcher_log_extension.proto
@@ -15,7 +15,7 @@
  */
 syntax = "proto2";
 
-option java_package = "com.android.colorfulos.userevent";
+option java_package = "com.aoleyun.os.userevent";
 option java_outer_classname = "LauncherLogExtensions";
 
 package userevent;
diff --git a/protos/launcher_dump.proto b/protos/launcher_dump.proto
index d5592ef..1a55cbc 100644
--- a/protos/launcher_dump.proto
+++ b/protos/launcher_dump.proto
@@ -15,7 +15,7 @@
  */
 syntax = "proto2";
 
-option java_package = "com.android.colorfulos.model";
+option java_package = "com.aoleyun.os.model";
 option java_outer_classname = "LauncherDumpProto";
 
 package model;
diff --git a/protos/launcher_log.proto b/protos/launcher_log.proto
index e02bc75..9fc287b 100644
--- a/protos/launcher_log.proto
+++ b/protos/launcher_log.proto
@@ -17,7 +17,7 @@ syntax = "proto2";
 
 import "launcher_log_extension.proto";
 
-option java_package = "com.android.colorfulos.userevent";
+option java_package = "com.aoleyun.os.userevent";
 option java_outer_classname = "LauncherLogProto";
 
 package userevent;
diff --git a/quickstep/AndroidManifest.xml b/quickstep/AndroidManifest.xml
index 74457b0..f5ebbf7 100644
--- a/quickstep/AndroidManifest.xml
+++ b/quickstep/AndroidManifest.xml
@@ -20,12 +20,12 @@
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.android.colorfulos" >
+    package="com.aoleyun.os" >
 
     <uses-permission android:name="android.permission.CONTROL_REMOTE_APP_TRANSITION_ANIMATIONS" />
 
     <application
-        android:backupAgent="com.android.colorfulos.LauncherBackupAgent"
+        android:backupAgent="com.aoleyun.os.LauncherBackupAgent"
         android:fullBackupOnly="true"
         android:fullBackupContent="@xml/backupscheme"
         android:hardwareAccelerated="true"
@@ -74,11 +74,11 @@
         </provider>
 
         <service
-            android:name="com.android.colorfulos.uioverrides.dynamicui.WallpaperManagerCompatVL$ColorExtractionService"
+            android:name="com.aoleyun.os.uioverrides.dynamicui.WallpaperManagerCompatVL$ColorExtractionService"
             tools:node="remove" />
 
         <activity
-            android:name="com.android.colorfulos.proxy.ProxyActivityStarter"
+            android:name="com.aoleyun.os.proxy.ProxyActivityStarter"
             android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen"
             android:launchMode="singleTask"
             android:clearTaskOnLaunch="true"
diff --git a/quickstep/recents_ui_overrides/res/layout/floating_header_content.xml b/quickstep/recents_ui_overrides/res/layout/floating_header_content.xml
index 9433135..0684fad 100644
--- a/quickstep/recents_ui_overrides/res/layout/floating_header_content.xml
+++ b/quickstep/recents_ui_overrides/res/layout/floating_header_content.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android" >
 
-    <com.android.colorfulos.appprediction.PredictionRowView
+    <com.aoleyun.os.appprediction.PredictionRowView
         android:id="@+id/prediction_row"
         android:accessibilityPaneTitle="@string/title_app_suggestions"
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
 
-    <com.android.colorfulos.appprediction.AppsDividerView
+    <com.aoleyun.os.appprediction.AppsDividerView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:id="@+id/apps_divider_view" />
diff --git a/quickstep/recents_ui_overrides/res/values/override.xml b/quickstep/recents_ui_overrides/res/values/override.xml
index 0dc358f..60280ca 100644
--- a/quickstep/recents_ui_overrides/res/values/override.xml
+++ b/quickstep/recents_ui_overrides/res/values/override.xml
@@ -17,11 +17,11 @@
 <!-- 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.colorfulos.LauncherAppTransitionManagerImpl</string>
+  <string name="app_transition_manager_class" translatable="false">com.aoleyun.os.LauncherAppTransitionManagerImpl</string>
 
   <string name="instant_app_resolver_class" translatable="false">com.android.quickstep.InstantAppResolverImpl</string>
 
-  <string name="app_launch_tracker_class" translatable="false">com.android.colorfulos.appprediction.PredictionAppTracker</string>
+  <string name="app_launch_tracker_class" translatable="false">com.aoleyun.os.appprediction.PredictionAppTracker</string>
 
   <string name="main_process_initializer_class" translatable="false">com.android.quickstep.QuickstepProcessInitializer</string>
 </resources>
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 dc60538..2fdeb47 100644
--- a/quickstep/recents_ui_overrides/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java
+++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos;
+package com.aoleyun.os;
 
-import static com.android.colorfulos.LauncherAnimUtils.VIEW_TRANSLATE_X;
-import static com.android.colorfulos.LauncherState.NORMAL;
-import static com.android.colorfulos.allapps.AllAppsTransitionController.ALL_APPS_PROGRESS;
-import static com.android.colorfulos.anim.Interpolators.AGGRESSIVE_EASE;
-import static com.android.colorfulos.anim.Interpolators.LINEAR;
+import static com.aoleyun.os.LauncherAnimUtils.VIEW_TRANSLATE_X;
+import static com.aoleyun.os.LauncherState.NORMAL;
+import static com.aoleyun.os.allapps.AllAppsTransitionController.ALL_APPS_PROGRESS;
+import static com.aoleyun.os.anim.Interpolators.AGGRESSIVE_EASE;
+import static com.aoleyun.os.anim.Interpolators.LINEAR;
 import static com.android.quickstep.TaskViewUtils.findTaskViewToLaunch;
 import static com.android.quickstep.TaskViewUtils.getRecentsWindowAnimator;
 
@@ -38,10 +38,10 @@ import android.view.View;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import com.android.colorfulos.allapps.AllAppsTransitionController;
-import com.android.colorfulos.anim.AnimatorPlaybackController;
-import com.android.colorfulos.anim.Interpolators;
-import com.android.colorfulos.anim.SpringObjectAnimator;
+import com.aoleyun.os.allapps.AllAppsTransitionController;
+import com.aoleyun.os.anim.AnimatorPlaybackController;
+import com.aoleyun.os.anim.Interpolators;
+import com.aoleyun.os.anim.SpringObjectAnimator;
 import com.android.quickstep.util.ClipAnimationHelper;
 import com.android.quickstep.views.RecentsView;
 import com.android.quickstep.views.TaskView;
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/LauncherInitListenerEx.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/LauncherInitListenerEx.java
index 7e9533d..296f7ec 100644
--- a/quickstep/recents_ui_overrides/src/com/android/launcher3/LauncherInitListenerEx.java
+++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/LauncherInitListenerEx.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos;
+package com.aoleyun.os;
 
-import com.android.colorfulos.appprediction.PredictionUiStateManager;
-import com.android.colorfulos.appprediction.PredictionUiStateManager.Client;
+import com.aoleyun.os.appprediction.PredictionUiStateManager;
+import com.aoleyun.os.appprediction.PredictionUiStateManager.Client;
 
 import java.util.function.BiPredicate;
 
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/AllAppsTipView.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/AllAppsTipView.java
index 31837f9..86447f1 100644
--- a/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/AllAppsTipView.java
+++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/AllAppsTipView.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.appprediction;
+package com.aoleyun.os.appprediction;
 
-import static com.android.colorfulos.LauncherState.ALL_APPS;
+import static com.aoleyun.os.LauncherState.ALL_APPS;
 import static com.android.quickstep.logging.UserEventDispatcherExtension.ALL_APPS_PREDICTION_TIPS;
 
 import android.content.Context;
@@ -33,17 +33,17 @@ import android.view.ViewGroup;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.android.colorfulos.AbstractFloatingView;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.LauncherState;
-import com.android.colorfulos.LauncherStateManager;
-import com.android.colorfulos.R;
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.allapps.FloatingHeaderView;
-import com.android.colorfulos.anim.Interpolators;
-import com.android.colorfulos.compat.UserManagerCompat;
-import com.android.colorfulos.dragndrop.DragLayer;
-import com.android.colorfulos.graphics.TriangleShape;
+import com.aoleyun.os.AbstractFloatingView;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.LauncherState;
+import com.aoleyun.os.LauncherStateManager;
+import com.aoleyun.os.R;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.allapps.FloatingHeaderView;
+import com.aoleyun.os.anim.Interpolators;
+import com.aoleyun.os.compat.UserManagerCompat;
+import com.aoleyun.os.dragndrop.DragLayer;
+import com.aoleyun.os.graphics.TriangleShape;
 import com.android.systemui.shared.system.LauncherEventUtil;
 
 import androidx.core.content.ContextCompat;
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 f211c5b..74c75d5 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
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.appprediction;
+package com.aoleyun.os.appprediction;
 
-import static com.android.colorfulos.LauncherState.ALL_APPS;
+import static com.aoleyun.os.LauncherState.ALL_APPS;
 
 import android.annotation.TargetApi;
 import android.content.Context;
@@ -31,15 +31,15 @@ import android.util.AttributeSet;
 import android.view.View;
 import android.view.animation.Interpolator;
 
-import com.android.colorfulos.DeviceProfile;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.LauncherState;
-import com.android.colorfulos.LauncherStateManager;
-import com.android.colorfulos.R;
-import com.android.colorfulos.allapps.FloatingHeaderRow;
-import com.android.colorfulos.allapps.FloatingHeaderView;
-import com.android.colorfulos.anim.PropertySetter;
-import com.android.colorfulos.util.Themes;
+import com.aoleyun.os.DeviceProfile;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.LauncherState;
+import com.aoleyun.os.LauncherStateManager;
+import com.aoleyun.os.R;
+import com.aoleyun.os.allapps.FloatingHeaderRow;
+import com.aoleyun.os.allapps.FloatingHeaderView;
+import com.aoleyun.os.anim.PropertySetter;
+import com.aoleyun.os.util.Themes;
 
 import androidx.annotation.ColorInt;
 import androidx.core.content.ContextCompat;
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/ComponentKeyMapper.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/ComponentKeyMapper.java
index a8eacd3..1c3e304 100644
--- a/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/ComponentKeyMapper.java
+++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/ComponentKeyMapper.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.appprediction;
+package com.aoleyun.os.appprediction;
 
 import static com.android.quickstep.InstantAppResolverImpl.COMPONENT_CLASS_MARKER;
 
 import android.content.Context;
 
-import com.android.colorfulos.AppInfo;
-import com.android.colorfulos.ItemInfoWithIcon;
-import com.android.colorfulos.allapps.AllAppsStore;
-import com.android.colorfulos.shortcuts.ShortcutKey;
-import com.android.colorfulos.util.ComponentKey;
+import com.aoleyun.os.AppInfo;
+import com.aoleyun.os.ItemInfoWithIcon;
+import com.aoleyun.os.allapps.AllAppsStore;
+import com.aoleyun.os.shortcuts.ShortcutKey;
+import com.aoleyun.os.util.ComponentKey;
 
 public class ComponentKeyMapper {
 
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/DynamicItemCache.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/DynamicItemCache.java
index e8082b7..d53a6fd 100644
--- a/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/DynamicItemCache.java
+++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/DynamicItemCache.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.appprediction;
+package com.aoleyun.os.appprediction;
 
 import static android.content.pm.PackageManager.MATCH_INSTANT;
 
@@ -30,14 +30,14 @@ import android.os.Message;
 import android.util.ArrayMap;
 import android.util.Log;
 
-import com.android.colorfulos.LauncherAppState;
-import com.android.colorfulos.LauncherModel;
-import com.android.colorfulos.WorkspaceItemInfo;
-import com.android.colorfulos.icons.IconCache;
-import com.android.colorfulos.icons.LauncherIcons;
-import com.android.colorfulos.shortcuts.DeepShortcutManager;
-import com.android.colorfulos.shortcuts.ShortcutKey;
-import com.android.colorfulos.util.InstantAppResolver;
+import com.aoleyun.os.LauncherAppState;
+import com.aoleyun.os.LauncherModel;
+import com.aoleyun.os.WorkspaceItemInfo;
+import com.aoleyun.os.icons.IconCache;
+import com.aoleyun.os.icons.LauncherIcons;
+import com.aoleyun.os.shortcuts.DeepShortcutManager;
+import com.aoleyun.os.shortcuts.ShortcutKey;
+import com.aoleyun.os.util.InstantAppResolver;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/InstantAppItemInfo.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/InstantAppItemInfo.java
index 60e322d..126dbe5 100644
--- a/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/InstantAppItemInfo.java
+++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/InstantAppItemInfo.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.appprediction;
+package com.aoleyun.os.appprediction;
 
 import static com.android.quickstep.InstantAppResolverImpl.COMPONENT_CLASS_MARKER;
 
 import android.content.ComponentName;
 import android.content.Intent;
 
-import com.android.colorfulos.AppInfo;
-import com.android.colorfulos.LauncherSettings;
-import com.android.colorfulos.WorkspaceItemInfo;
+import com.aoleyun.os.AppInfo;
+import com.aoleyun.os.LauncherSettings;
+import com.aoleyun.os.WorkspaceItemInfo;
 
 public class InstantAppItemInfo extends AppInfo {
 
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 14d5699..263a9ee 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
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.appprediction;
+package com.aoleyun.os.appprediction;
 
-import static com.android.colorfulos.InvariantDeviceProfile.CHANGE_FLAG_GRID;
+import static com.aoleyun.os.InvariantDeviceProfile.CHANGE_FLAG_GRID;
 
 import android.annotation.TargetApi;
 import android.app.prediction.AppPredictionContext;
@@ -34,10 +34,10 @@ import android.os.UserHandle;
 import android.util.Log;
 
 import androidx.annotation.Nullable;
-import com.android.colorfulos.InvariantDeviceProfile;
-import com.android.colorfulos.appprediction.PredictionUiStateManager.Client;
-import com.android.colorfulos.model.AppLaunchTracker;
-import com.android.colorfulos.util.UiThreadHelper;
+import com.aoleyun.os.InvariantDeviceProfile;
+import com.aoleyun.os.appprediction.PredictionUiStateManager.Client;
+import com.aoleyun.os.model.AppLaunchTracker;
+import com.aoleyun.os.util.UiThreadHelper;
 
 import androidx.annotation.UiThread;
 import androidx.annotation.WorkerThread;
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 9964469..4afd55b 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
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.appprediction;
+package com.aoleyun.os.appprediction;
 
-import static com.android.colorfulos.anim.Interpolators.LINEAR;
-import static com.android.colorfulos.icons.GraphicsUtils.setColorAlphaBound;
+import static com.aoleyun.os.anim.Interpolators.LINEAR;
+import static com.aoleyun.os.icons.GraphicsUtils.setColorAlphaBound;
 
 import android.annotation.TargetApi;
 import android.content.Context;
@@ -32,30 +32,30 @@ import android.view.View;
 import android.view.animation.Interpolator;
 import android.widget.LinearLayout;
 
-import com.android.colorfulos.AppInfo;
-import com.android.colorfulos.BubbleTextView;
-import com.android.colorfulos.DeviceProfile;
-import com.android.colorfulos.DeviceProfile.OnDeviceProfileChangeListener;
-import com.android.colorfulos.ItemInfo;
-import com.android.colorfulos.ItemInfoWithIcon;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.LauncherAppState;
-import com.android.colorfulos.R;
-import com.android.colorfulos.WorkspaceItemInfo;
-import com.android.colorfulos.allapps.AllAppsStore;
-import com.android.colorfulos.allapps.FloatingHeaderRow;
-import com.android.colorfulos.allapps.FloatingHeaderView;
-import com.android.colorfulos.anim.AlphaUpdateListener;
-import com.android.colorfulos.anim.PropertySetter;
-import com.android.colorfulos.config.FeatureFlags;
-import com.android.colorfulos.keyboard.FocusIndicatorHelper;
-import com.android.colorfulos.keyboard.FocusIndicatorHelper.SimpleFocusIndicatorHelper;
-import com.android.colorfulos.logging.StatsLogUtils.LogContainerProvider;
-import com.android.colorfulos.model.AppLaunchTracker;
-import com.android.colorfulos.touch.ItemClickHandler;
-import com.android.colorfulos.touch.ItemLongClickListener;
-import com.android.colorfulos.userevent.nano.LauncherLogProto;
-import com.android.colorfulos.util.Themes;
+import com.aoleyun.os.AppInfo;
+import com.aoleyun.os.BubbleTextView;
+import com.aoleyun.os.DeviceProfile;
+import com.aoleyun.os.DeviceProfile.OnDeviceProfileChangeListener;
+import com.aoleyun.os.ItemInfo;
+import com.aoleyun.os.ItemInfoWithIcon;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.LauncherAppState;
+import com.aoleyun.os.R;
+import com.aoleyun.os.WorkspaceItemInfo;
+import com.aoleyun.os.allapps.AllAppsStore;
+import com.aoleyun.os.allapps.FloatingHeaderRow;
+import com.aoleyun.os.allapps.FloatingHeaderView;
+import com.aoleyun.os.anim.AlphaUpdateListener;
+import com.aoleyun.os.anim.PropertySetter;
+import com.aoleyun.os.config.FeatureFlags;
+import com.aoleyun.os.keyboard.FocusIndicatorHelper;
+import com.aoleyun.os.keyboard.FocusIndicatorHelper.SimpleFocusIndicatorHelper;
+import com.aoleyun.os.logging.StatsLogUtils.LogContainerProvider;
+import com.aoleyun.os.model.AppLaunchTracker;
+import com.aoleyun.os.touch.ItemClickHandler;
+import com.aoleyun.os.touch.ItemLongClickListener;
+import com.aoleyun.os.userevent.nano.LauncherLogProto;
+import com.aoleyun.os.util.Themes;
 import com.android.quickstep.AnimatedFloat;
 
 import java.util.ArrayList;
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 a680871..64e905a 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
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.appprediction;
+package com.aoleyun.os.appprediction;
 
-import static com.android.colorfulos.LauncherState.BACKGROUND_APP;
-import static com.android.colorfulos.LauncherState.OVERVIEW;
+import static com.aoleyun.os.LauncherState.BACKGROUND_APP;
+import static com.aoleyun.os.LauncherState.OVERVIEW;
 import static com.android.quickstep.InstantAppResolverImpl.COMPONENT_CLASS_MARKER;
 
 import android.app.prediction.AppPredictor;
@@ -26,20 +26,20 @@ import android.content.ComponentName;
 import android.content.Context;
 import android.view.ViewTreeObserver.OnGlobalLayoutListener;
 
-import com.android.colorfulos.AppInfo;
-import com.android.colorfulos.InvariantDeviceProfile;
-import com.android.colorfulos.InvariantDeviceProfile.OnIDPChangeListener;
-import com.android.colorfulos.ItemInfoWithIcon;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.LauncherAppState;
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.allapps.AllAppsContainerView;
-import com.android.colorfulos.allapps.AllAppsStore.OnUpdateListener;
-import com.android.colorfulos.icons.IconCache;
-import com.android.colorfulos.icons.IconCache.ItemInfoUpdateReceiver;
-import com.android.colorfulos.shortcuts.ShortcutKey;
-import com.android.colorfulos.util.ComponentKey;
-import com.android.colorfulos.util.MainThreadInitializedObject;
+import com.aoleyun.os.AppInfo;
+import com.aoleyun.os.InvariantDeviceProfile;
+import com.aoleyun.os.InvariantDeviceProfile.OnIDPChangeListener;
+import com.aoleyun.os.ItemInfoWithIcon;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.LauncherAppState;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.allapps.AllAppsContainerView;
+import com.aoleyun.os.allapps.AllAppsStore.OnUpdateListener;
+import com.aoleyun.os.icons.IconCache;
+import com.aoleyun.os.icons.IconCache.ItemInfoUpdateReceiver;
+import com.aoleyun.os.shortcuts.ShortcutKey;
+import com.aoleyun.os.util.ComponentKey;
+import com.aoleyun.os.util.MainThreadInitializedObject;
 
 import java.util.ArrayList;
 import java.util.Collections;
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 3c56758..bf69041 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
@@ -14,36 +14,36 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.uioverrides;
+package com.aoleyun.os.uioverrides;
 
-import static com.android.colorfulos.LauncherState.NORMAL;
-import static com.android.colorfulos.LauncherState.OVERVIEW;
+import static com.aoleyun.os.LauncherState.NORMAL;
+import static com.aoleyun.os.LauncherState.OVERVIEW;
 import static com.android.quickstep.SysUINavigationMode.Mode.NO_BUTTON;
 
 import android.content.Context;
 import android.graphics.Rect;
 import android.view.Gravity;
 
-import com.android.colorfulos.DeviceProfile;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.LauncherState;
-import com.android.colorfulos.LauncherStateManager.StateHandler;
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.anim.AnimatorPlaybackController;
-import com.android.colorfulos.config.FeatureFlags;
-import com.android.colorfulos.graphics.RotationMode;
-import com.android.colorfulos.uioverrides.touchcontrollers.FlingAndHoldTouchController;
-import com.android.colorfulos.uioverrides.touchcontrollers.LandscapeEdgeSwipeController;
-import com.android.colorfulos.uioverrides.touchcontrollers.NavBarToHomeTouchController;
-import com.android.colorfulos.uioverrides.touchcontrollers.OverviewToAllAppsTouchController;
-import com.android.colorfulos.uioverrides.touchcontrollers.PortraitStatesTouchController;
-import com.android.colorfulos.uioverrides.touchcontrollers.StatusBarTouchController;
-import com.android.colorfulos.uioverrides.touchcontrollers.QuickSwitchTouchController;
-import com.android.colorfulos.uioverrides.touchcontrollers.TaskViewTouchController;
-import com.android.colorfulos.uioverrides.touchcontrollers.TransposedQuickSwitchTouchController;
-import com.android.colorfulos.util.TouchController;
-import com.android.colorfulos.util.UiThreadHelper;
-import com.android.colorfulos.util.UiThreadHelper.AsyncCommand;
+import com.aoleyun.os.DeviceProfile;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.LauncherState;
+import com.aoleyun.os.LauncherStateManager.StateHandler;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.anim.AnimatorPlaybackController;
+import com.aoleyun.os.config.FeatureFlags;
+import com.aoleyun.os.graphics.RotationMode;
+import com.aoleyun.os.uioverrides.touchcontrollers.FlingAndHoldTouchController;
+import com.aoleyun.os.uioverrides.touchcontrollers.LandscapeEdgeSwipeController;
+import com.aoleyun.os.uioverrides.touchcontrollers.NavBarToHomeTouchController;
+import com.aoleyun.os.uioverrides.touchcontrollers.OverviewToAllAppsTouchController;
+import com.aoleyun.os.uioverrides.touchcontrollers.PortraitStatesTouchController;
+import com.aoleyun.os.uioverrides.touchcontrollers.StatusBarTouchController;
+import com.aoleyun.os.uioverrides.touchcontrollers.QuickSwitchTouchController;
+import com.aoleyun.os.uioverrides.touchcontrollers.TaskViewTouchController;
+import com.aoleyun.os.uioverrides.touchcontrollers.TransposedQuickSwitchTouchController;
+import com.aoleyun.os.util.TouchController;
+import com.aoleyun.os.util.UiThreadHelper;
+import com.aoleyun.os.util.UiThreadHelper.AsyncCommand;
 import com.android.quickstep.SysUINavigationMode;
 import com.android.quickstep.SysUINavigationMode.Mode;
 import com.android.quickstep.TouchInteractionService;
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/RecentsViewStateController.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/RecentsViewStateController.java
index 37fe2fb..4604c37 100644
--- a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/RecentsViewStateController.java
+++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/RecentsViewStateController.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.uioverrides;
+package com.aoleyun.os.uioverrides;
 
-import static com.android.colorfulos.LauncherState.RECENTS_CLEAR_ALL_BUTTON;
-import static com.android.colorfulos.anim.Interpolators.LINEAR;
+import static com.aoleyun.os.LauncherState.RECENTS_CLEAR_ALL_BUTTON;
+import static com.aoleyun.os.anim.Interpolators.LINEAR;
 import static com.android.quickstep.views.RecentsView.CONTENT_ALPHA;
 import static com.android.quickstep.views.RecentsView.FULLSCREEN_PROGRESS;
 
@@ -27,11 +27,11 @@ import android.util.FloatProperty;
 
 import androidx.annotation.NonNull;
 
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.LauncherState;
-import com.android.colorfulos.LauncherStateManager.AnimationConfig;
-import com.android.colorfulos.anim.AnimatorSetBuilder;
-import com.android.colorfulos.anim.PropertySetter;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.LauncherState;
+import com.aoleyun.os.LauncherStateManager.AnimationConfig;
+import com.aoleyun.os.anim.AnimatorSetBuilder;
+import com.aoleyun.os.anim.PropertySetter;
 import com.android.quickstep.views.ClearAllButton;
 import com.android.quickstep.views.LauncherRecentsView;
 import com.android.quickstep.views.RecentsView;
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java
index 7ef7921..6468cba 100644
--- a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java
+++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.uioverrides.states;
+package com.aoleyun.os.uioverrides.states;
 
-import static com.android.colorfulos.LauncherAnimUtils.OVERVIEW_TRANSITION_MS;
+import static com.aoleyun.os.LauncherAnimUtils.OVERVIEW_TRANSITION_MS;
 
-import com.android.colorfulos.AbstractFloatingView;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.allapps.AllAppsTransitionController;
-import com.android.colorfulos.userevent.nano.LauncherLogProto;
+import com.aoleyun.os.AbstractFloatingView;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.allapps.AllAppsTransitionController;
+import com.aoleyun.os.userevent.nano.LauncherLogProto;
 import com.android.quickstep.util.LayoutUtils;
 import com.android.quickstep.views.RecentsView;
 import com.android.quickstep.views.TaskView;
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/OverviewPeekState.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/OverviewPeekState.java
index 9825f36..bcb86b9 100644
--- a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/OverviewPeekState.java
+++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/OverviewPeekState.java
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.uioverrides.states;
-import static com.android.colorfulos.anim.AnimatorSetBuilder.ANIM_OVERVIEW_FADE;
-import static com.android.colorfulos.anim.AnimatorSetBuilder.ANIM_OVERVIEW_TRANSLATE_X;
-import static com.android.colorfulos.anim.Interpolators.INSTANT;
-import static com.android.colorfulos.anim.Interpolators.OVERSHOOT_1_7;
+package com.aoleyun.os.uioverrides.states;
+import static com.aoleyun.os.anim.AnimatorSetBuilder.ANIM_OVERVIEW_FADE;
+import static com.aoleyun.os.anim.AnimatorSetBuilder.ANIM_OVERVIEW_TRANSLATE_X;
+import static com.aoleyun.os.anim.Interpolators.INSTANT;
+import static com.aoleyun.os.anim.Interpolators.OVERSHOOT_1_7;
 
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.LauncherState;
-import com.android.colorfulos.R;
-import com.android.colorfulos.anim.AnimatorSetBuilder;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.LauncherState;
+import com.aoleyun.os.R;
+import com.aoleyun.os.anim.AnimatorSetBuilder;
 
 public class OverviewPeekState extends OverviewState {
     public OverviewPeekState(int id) {
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/OverviewState.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/OverviewState.java
index 239af62..4ce1502 100644
--- a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/OverviewState.java
+++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/OverviewState.java
@@ -13,39 +13,39 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.uioverrides.states;
+package com.aoleyun.os.uioverrides.states;
 
 import static android.view.View.VISIBLE;
 
-import static com.android.colorfulos.LauncherAnimUtils.OVERVIEW_TRANSITION_MS;
-import static com.android.colorfulos.LauncherAnimUtils.SCALE_PROPERTY;
-import static com.android.colorfulos.anim.AnimatorSetBuilder.ANIM_OVERVIEW_FADE;
-import static com.android.colorfulos.anim.AnimatorSetBuilder.ANIM_OVERVIEW_SCALE;
-import static com.android.colorfulos.anim.AnimatorSetBuilder.ANIM_OVERVIEW_TRANSLATE_X;
-import static com.android.colorfulos.anim.AnimatorSetBuilder.ANIM_WORKSPACE_FADE;
-import static com.android.colorfulos.anim.AnimatorSetBuilder.ANIM_WORKSPACE_SCALE;
-import static com.android.colorfulos.anim.AnimatorSetBuilder.ANIM_WORKSPACE_TRANSLATE;
-import static com.android.colorfulos.anim.Interpolators.ACCEL;
-import static com.android.colorfulos.anim.Interpolators.DEACCEL_2;
-import static com.android.colorfulos.anim.Interpolators.OVERSHOOT_1_2;
-import static com.android.colorfulos.anim.Interpolators.OVERSHOOT_1_7;
-import static com.android.colorfulos.logging.LoggerUtils.newContainerTarget;
-import static com.android.colorfulos.states.RotationHelper.REQUEST_ROTATE;
+import static com.aoleyun.os.LauncherAnimUtils.OVERVIEW_TRANSITION_MS;
+import static com.aoleyun.os.LauncherAnimUtils.SCALE_PROPERTY;
+import static com.aoleyun.os.anim.AnimatorSetBuilder.ANIM_OVERVIEW_FADE;
+import static com.aoleyun.os.anim.AnimatorSetBuilder.ANIM_OVERVIEW_SCALE;
+import static com.aoleyun.os.anim.AnimatorSetBuilder.ANIM_OVERVIEW_TRANSLATE_X;
+import static com.aoleyun.os.anim.AnimatorSetBuilder.ANIM_WORKSPACE_FADE;
+import static com.aoleyun.os.anim.AnimatorSetBuilder.ANIM_WORKSPACE_SCALE;
+import static com.aoleyun.os.anim.AnimatorSetBuilder.ANIM_WORKSPACE_TRANSLATE;
+import static com.aoleyun.os.anim.Interpolators.ACCEL;
+import static com.aoleyun.os.anim.Interpolators.DEACCEL_2;
+import static com.aoleyun.os.anim.Interpolators.OVERSHOOT_1_2;
+import static com.aoleyun.os.anim.Interpolators.OVERSHOOT_1_7;
+import static com.aoleyun.os.logging.LoggerUtils.newContainerTarget;
+import static com.aoleyun.os.states.RotationHelper.REQUEST_ROTATE;
 
 import android.graphics.Rect;
 import android.view.View;
 
-import com.android.colorfulos.AbstractFloatingView;
-import com.android.colorfulos.DeviceProfile;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.LauncherState;
-import com.android.colorfulos.R;
-import com.android.colorfulos.Workspace;
-import com.android.colorfulos.allapps.DiscoveryBounce;
-import com.android.colorfulos.anim.AnimatorSetBuilder;
-import com.android.colorfulos.uioverrides.UiFactory;
-import com.android.colorfulos.userevent.nano.LauncherLogProto.Action;
-import com.android.colorfulos.userevent.nano.LauncherLogProto.ContainerType;
+import com.aoleyun.os.AbstractFloatingView;
+import com.aoleyun.os.DeviceProfile;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.LauncherState;
+import com.aoleyun.os.R;
+import com.aoleyun.os.Workspace;
+import com.aoleyun.os.allapps.DiscoveryBounce;
+import com.aoleyun.os.anim.AnimatorSetBuilder;
+import com.aoleyun.os.uioverrides.UiFactory;
+import com.aoleyun.os.userevent.nano.LauncherLogProto.Action;
+import com.aoleyun.os.userevent.nano.LauncherLogProto.ContainerType;
 import com.android.quickstep.SysUINavigationMode;
 import com.android.quickstep.views.RecentsView;
 import com.android.quickstep.views.TaskView;
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/QuickSwitchState.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/QuickSwitchState.java
index 24ce64b..183ce31 100644
--- a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/QuickSwitchState.java
+++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/QuickSwitchState.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.uioverrides.states;
+package com.aoleyun.os.uioverrides.states;
 
 import android.os.Handler;
 import android.os.Looper;
 
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.userevent.nano.LauncherLogProto;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.userevent.nano.LauncherLogProto;
 import com.android.quickstep.views.RecentsView;
 import com.android.quickstep.views.TaskView;
 
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 15c4ec5..f2a8c4c 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
@@ -14,23 +14,23 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.uioverrides.touchcontrollers;
+package com.aoleyun.os.uioverrides.touchcontrollers;
 
-import static com.android.colorfulos.LauncherState.ALL_APPS;
-import static com.android.colorfulos.LauncherState.HOTSEAT_ICONS;
-import static com.android.colorfulos.LauncherState.NORMAL;
-import static com.android.colorfulos.LauncherState.OVERVIEW;
-import static com.android.colorfulos.LauncherState.OVERVIEW_PEEK;
-import static com.android.colorfulos.LauncherStateManager.ANIM_ALL;
-import static com.android.colorfulos.LauncherStateManager.ATOMIC_OVERVIEW_PEEK_COMPONENT;
-import static com.android.colorfulos.anim.AnimatorSetBuilder.ANIM_HOTSEAT_SCALE;
-import static com.android.colorfulos.anim.AnimatorSetBuilder.ANIM_HOTSEAT_TRANSLATE;
-import static com.android.colorfulos.anim.AnimatorSetBuilder.ANIM_VERTICAL_PROGRESS;
-import static com.android.colorfulos.anim.AnimatorSetBuilder.ANIM_WORKSPACE_FADE;
-import static com.android.colorfulos.anim.AnimatorSetBuilder.ANIM_WORKSPACE_SCALE;
-import static com.android.colorfulos.anim.AnimatorSetBuilder.ANIM_WORKSPACE_TRANSLATE;
-import static com.android.colorfulos.anim.Interpolators.DEACCEL_3;
-import static com.android.colorfulos.anim.Interpolators.OVERSHOOT_1_2;
+import static com.aoleyun.os.LauncherState.ALL_APPS;
+import static com.aoleyun.os.LauncherState.HOTSEAT_ICONS;
+import static com.aoleyun.os.LauncherState.NORMAL;
+import static com.aoleyun.os.LauncherState.OVERVIEW;
+import static com.aoleyun.os.LauncherState.OVERVIEW_PEEK;
+import static com.aoleyun.os.LauncherStateManager.ANIM_ALL;
+import static com.aoleyun.os.LauncherStateManager.ATOMIC_OVERVIEW_PEEK_COMPONENT;
+import static com.aoleyun.os.anim.AnimatorSetBuilder.ANIM_HOTSEAT_SCALE;
+import static com.aoleyun.os.anim.AnimatorSetBuilder.ANIM_HOTSEAT_TRANSLATE;
+import static com.aoleyun.os.anim.AnimatorSetBuilder.ANIM_VERTICAL_PROGRESS;
+import static com.aoleyun.os.anim.AnimatorSetBuilder.ANIM_WORKSPACE_FADE;
+import static com.aoleyun.os.anim.AnimatorSetBuilder.ANIM_WORKSPACE_SCALE;
+import static com.aoleyun.os.anim.AnimatorSetBuilder.ANIM_WORKSPACE_TRANSLATE;
+import static com.aoleyun.os.anim.Interpolators.DEACCEL_3;
+import static com.aoleyun.os.anim.Interpolators.OVERSHOOT_1_2;
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_OVERVIEW_DISABLED;
 
 import android.animation.Animator;
@@ -40,10 +40,10 @@ import android.view.HapticFeedbackConstants;
 import android.view.MotionEvent;
 import android.view.ViewConfiguration;
 
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.LauncherState;
-import com.android.colorfulos.anim.AnimatorSetBuilder;
-import com.android.colorfulos.userevent.nano.LauncherLogProto.Action.Touch;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.LauncherState;
+import com.aoleyun.os.anim.AnimatorSetBuilder;
+import com.aoleyun.os.userevent.nano.LauncherLogProto.Action.Touch;
 import com.android.quickstep.OverviewInteractionState;
 import com.android.quickstep.util.MotionPauseDetector;
 import com.android.quickstep.views.RecentsView;
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java
index 52025b7..e1c852f 100644
--- a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java
+++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.uioverrides.touchcontrollers;
+package com.aoleyun.os.uioverrides.touchcontrollers;
 
 import static android.view.View.TRANSLATION_X;
 
-import static com.android.colorfulos.LauncherState.ALL_APPS;
-import static com.android.colorfulos.LauncherState.NORMAL;
-import static com.android.colorfulos.LauncherState.OVERVIEW;
-import static com.android.colorfulos.allapps.AllAppsTransitionController.ALL_APPS_PROGRESS;
-import static com.android.colorfulos.anim.Interpolators.DEACCEL_3;
-import static com.android.colorfulos.touch.AbstractStateChangeTouchController.SUCCESS_TRANSITION_PROGRESS;
+import static com.aoleyun.os.LauncherState.ALL_APPS;
+import static com.aoleyun.os.LauncherState.NORMAL;
+import static com.aoleyun.os.LauncherState.OVERVIEW;
+import static com.aoleyun.os.allapps.AllAppsTransitionController.ALL_APPS_PROGRESS;
+import static com.aoleyun.os.anim.Interpolators.DEACCEL_3;
+import static com.aoleyun.os.touch.AbstractStateChangeTouchController.SUCCESS_TRANSITION_PROGRESS;
 
 import android.animation.Animator;
 import android.animation.AnimatorSet;
@@ -31,22 +31,22 @@ import android.animation.ValueAnimator;
 import android.view.MotionEvent;
 import android.view.animation.Interpolator;
 
-import com.android.colorfulos.AbstractFloatingView;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.LauncherState;
-import com.android.colorfulos.LauncherStateManager.AnimationConfig;
-import com.android.colorfulos.R;
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.allapps.AllAppsTransitionController;
-import com.android.colorfulos.anim.AnimationSuccessListener;
-import com.android.colorfulos.anim.AnimatorPlaybackController;
-import com.android.colorfulos.anim.AnimatorSetBuilder;
-import com.android.colorfulos.anim.Interpolators;
-import com.android.colorfulos.compat.AccessibilityManagerCompat;
-import com.android.colorfulos.touch.SwipeDetector;
-import com.android.colorfulos.userevent.nano.LauncherLogProto;
-import com.android.colorfulos.userevent.nano.LauncherLogProto.Action.Touch;
-import com.android.colorfulos.util.TouchController;
+import com.aoleyun.os.AbstractFloatingView;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.LauncherState;
+import com.aoleyun.os.LauncherStateManager.AnimationConfig;
+import com.aoleyun.os.R;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.allapps.AllAppsTransitionController;
+import com.aoleyun.os.anim.AnimationSuccessListener;
+import com.aoleyun.os.anim.AnimatorPlaybackController;
+import com.aoleyun.os.anim.AnimatorSetBuilder;
+import com.aoleyun.os.anim.Interpolators;
+import com.aoleyun.os.compat.AccessibilityManagerCompat;
+import com.aoleyun.os.touch.SwipeDetector;
+import com.aoleyun.os.userevent.nano.LauncherLogProto;
+import com.aoleyun.os.userevent.nano.LauncherLogProto.Action.Touch;
+import com.aoleyun.os.util.TouchController;
 import com.android.quickstep.views.RecentsView;
 
 /**
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/OverviewToAllAppsTouchController.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/OverviewToAllAppsTouchController.java
index 310b1bc..639558a 100644
--- a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/OverviewToAllAppsTouchController.java
+++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/OverviewToAllAppsTouchController.java
@@ -13,19 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.uioverrides.touchcontrollers;
+package com.aoleyun.os.uioverrides.touchcontrollers;
 
-import static com.android.colorfulos.LauncherState.ALL_APPS;
-import static com.android.colorfulos.LauncherState.NORMAL;
-import static com.android.colorfulos.LauncherState.OVERVIEW;
+import static com.aoleyun.os.LauncherState.ALL_APPS;
+import static com.aoleyun.os.LauncherState.NORMAL;
+import static com.aoleyun.os.LauncherState.OVERVIEW;
 
 import android.view.MotionEvent;
 
-import com.android.colorfulos.AbstractFloatingView;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.LauncherState;
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.userevent.nano.LauncherLogProto;
+import com.aoleyun.os.AbstractFloatingView;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.LauncherState;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.userevent.nano.LauncherLogProto;
 import com.android.quickstep.TouchInteractionService;
 import com.android.quickstep.views.RecentsView;
 
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitOverviewStateTouchHelper.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitOverviewStateTouchHelper.java
index dde7806..115ac3d 100644
--- a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitOverviewStateTouchHelper.java
+++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitOverviewStateTouchHelper.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.uioverrides.touchcontrollers;
+package com.aoleyun.os.uioverrides.touchcontrollers;
 
-import static com.android.colorfulos.uioverrides.touchcontrollers.PortraitStatesTouchController.isTouchOverHotseat;
+import static com.aoleyun.os.uioverrides.touchcontrollers.PortraitStatesTouchController.isTouchOverHotseat;
 
 import android.view.MotionEvent;
 
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.util.PendingAnimation;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.util.PendingAnimation;
 import com.android.quickstep.views.RecentsView;
 import com.android.quickstep.views.TaskView;
 
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java
index b7e0055..304314b 100644
--- a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java
+++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java
@@ -13,22 +13,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.uioverrides.touchcontrollers;
+package com.aoleyun.os.uioverrides.touchcontrollers;
 
-import static com.android.colorfulos.LauncherState.NORMAL;
-import static com.android.colorfulos.LauncherState.QUICK_SWITCH;
-import static com.android.colorfulos.anim.AnimatorSetBuilder.ANIM_ALL_APPS_FADE;
-import static com.android.colorfulos.anim.AnimatorSetBuilder.ANIM_OVERVIEW_FADE;
-import static com.android.colorfulos.anim.AnimatorSetBuilder.ANIM_OVERVIEW_SCALE;
-import static com.android.colorfulos.anim.AnimatorSetBuilder.ANIM_OVERVIEW_TRANSLATE_Y;
-import static com.android.colorfulos.anim.AnimatorSetBuilder.ANIM_VERTICAL_PROGRESS;
-import static com.android.colorfulos.anim.AnimatorSetBuilder.ANIM_WORKSPACE_FADE;
-import static com.android.colorfulos.anim.AnimatorSetBuilder.ANIM_WORKSPACE_TRANSLATE;
-import static com.android.colorfulos.anim.Interpolators.ACCEL_2;
-import static com.android.colorfulos.anim.Interpolators.DEACCEL_2;
-import static com.android.colorfulos.anim.Interpolators.INSTANT;
-import static com.android.colorfulos.anim.Interpolators.LINEAR;
-import static com.android.colorfulos.util.SystemUiController.UI_STATE_OVERVIEW;
+import static com.aoleyun.os.LauncherState.NORMAL;
+import static com.aoleyun.os.LauncherState.QUICK_SWITCH;
+import static com.aoleyun.os.anim.AnimatorSetBuilder.ANIM_ALL_APPS_FADE;
+import static com.aoleyun.os.anim.AnimatorSetBuilder.ANIM_OVERVIEW_FADE;
+import static com.aoleyun.os.anim.AnimatorSetBuilder.ANIM_OVERVIEW_SCALE;
+import static com.aoleyun.os.anim.AnimatorSetBuilder.ANIM_OVERVIEW_TRANSLATE_Y;
+import static com.aoleyun.os.anim.AnimatorSetBuilder.ANIM_VERTICAL_PROGRESS;
+import static com.aoleyun.os.anim.AnimatorSetBuilder.ANIM_WORKSPACE_FADE;
+import static com.aoleyun.os.anim.AnimatorSetBuilder.ANIM_WORKSPACE_TRANSLATE;
+import static com.aoleyun.os.anim.Interpolators.ACCEL_2;
+import static com.aoleyun.os.anim.Interpolators.DEACCEL_2;
+import static com.aoleyun.os.anim.Interpolators.INSTANT;
+import static com.aoleyun.os.anim.Interpolators.LINEAR;
+import static com.aoleyun.os.util.SystemUiController.UI_STATE_OVERVIEW;
 import static com.android.quickstep.views.RecentsView.UPDATE_SYSUI_FLAGS_THRESHOLD;
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_OVERVIEW_DISABLED;
 
@@ -36,15 +36,15 @@ import android.view.MotionEvent;
 
 import androidx.annotation.Nullable;
 
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.LauncherState;
-import com.android.colorfulos.LauncherStateManager;
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.anim.AnimatorSetBuilder;
-import com.android.colorfulos.touch.AbstractStateChangeTouchController;
-import com.android.colorfulos.touch.SwipeDetector;
-import com.android.colorfulos.userevent.nano.LauncherLogProto;
-import com.android.colorfulos.userevent.nano.LauncherLogProto.Action.Direction;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.LauncherState;
+import com.aoleyun.os.LauncherStateManager;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.anim.AnimatorSetBuilder;
+import com.aoleyun.os.touch.AbstractStateChangeTouchController;
+import com.aoleyun.os.touch.SwipeDetector;
+import com.aoleyun.os.userevent.nano.LauncherLogProto;
+import com.aoleyun.os.userevent.nano.LauncherLogProto.Action.Direction;
 import com.android.quickstep.OverviewInteractionState;
 import com.android.quickstep.SysUINavigationMode;
 import com.android.quickstep.SysUINavigationMode.Mode;
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java
index 06b5111..fd0241f 100644
--- a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java
+++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java
@@ -13,31 +13,31 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.uioverrides.touchcontrollers;
+package com.aoleyun.os.uioverrides.touchcontrollers;
 
-import static com.android.colorfulos.AbstractFloatingView.TYPE_ACCESSIBLE;
-import static com.android.colorfulos.Utilities.SINGLE_FRAME_MS;
-import static com.android.colorfulos.anim.Interpolators.scrollInterpolatorForVelocity;
-import static com.android.colorfulos.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
-import static com.android.colorfulos.config.FeatureFlags.QUICKSTEP_SPRINGS;
+import static com.aoleyun.os.AbstractFloatingView.TYPE_ACCESSIBLE;
+import static com.aoleyun.os.Utilities.SINGLE_FRAME_MS;
+import static com.aoleyun.os.anim.Interpolators.scrollInterpolatorForVelocity;
+import static com.aoleyun.os.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
+import static com.aoleyun.os.config.FeatureFlags.QUICKSTEP_SPRINGS;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.ValueAnimator;
 import android.view.MotionEvent;
 
-import com.android.colorfulos.AbstractFloatingView;
-import com.android.colorfulos.BaseDraggingActivity;
-import com.android.colorfulos.LauncherAnimUtils;
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.anim.AnimatorPlaybackController;
-import com.android.colorfulos.anim.Interpolators;
-import com.android.colorfulos.touch.SwipeDetector;
-import com.android.colorfulos.userevent.nano.LauncherLogProto.Action.Touch;
-import com.android.colorfulos.util.FlingBlockCheck;
-import com.android.colorfulos.util.PendingAnimation;
-import com.android.colorfulos.util.TouchController;
-import com.android.colorfulos.views.BaseDragLayer;
+import com.aoleyun.os.AbstractFloatingView;
+import com.aoleyun.os.BaseDraggingActivity;
+import com.aoleyun.os.LauncherAnimUtils;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.anim.AnimatorPlaybackController;
+import com.aoleyun.os.anim.Interpolators;
+import com.aoleyun.os.touch.SwipeDetector;
+import com.aoleyun.os.userevent.nano.LauncherLogProto.Action.Touch;
+import com.aoleyun.os.util.FlingBlockCheck;
+import com.aoleyun.os.util.PendingAnimation;
+import com.aoleyun.os.util.TouchController;
+import com.aoleyun.os.views.BaseDragLayer;
 import com.android.quickstep.SysUINavigationMode;
 import com.android.quickstep.views.RecentsView;
 import com.android.quickstep.views.TaskView;
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/TransposedQuickSwitchTouchController.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/TransposedQuickSwitchTouchController.java
index 7cabb83..d1e5fa3 100644
--- a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/TransposedQuickSwitchTouchController.java
+++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/TransposedQuickSwitchTouchController.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.uioverrides.touchcontrollers;
+package com.aoleyun.os.uioverrides.touchcontrollers;
 
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.LauncherState;
-import com.android.colorfulos.touch.SwipeDetector;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.LauncherState;
+import com.aoleyun.os.touch.SwipeDetector;
 
 public class TransposedQuickSwitchTouchController extends QuickSwitchTouchController {
 
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/AppToOverviewAnimationProvider.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/AppToOverviewAnimationProvider.java
index e9e2efa..51ff086 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/AppToOverviewAnimationProvider.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/AppToOverviewAnimationProvider.java
@@ -15,8 +15,8 @@
  */
 package com.android.quickstep;
 
-import static com.android.colorfulos.anim.Interpolators.FAST_OUT_SLOW_IN;
-import static com.android.colorfulos.anim.Interpolators.TOUCH_RESPONSE_INTERPOLATOR;
+import static com.aoleyun.os.anim.Interpolators.FAST_OUT_SLOW_IN;
+import static com.aoleyun.os.anim.Interpolators.TOUCH_RESPONSE_INTERPOLATOR;
 import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.MODE_CLOSING;
 import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.MODE_OPENING;
 
@@ -27,9 +27,9 @@ import android.graphics.Rect;
 import android.util.Log;
 import android.view.View;
 
-import com.android.colorfulos.AbstractFloatingView;
-import com.android.colorfulos.BaseDraggingActivity;
-import com.android.colorfulos.anim.AnimationSuccessListener;
+import com.aoleyun.os.AbstractFloatingView;
+import com.aoleyun.os.BaseDraggingActivity;
+import com.aoleyun.os.anim.AnimationSuccessListener;
 import com.android.quickstep.util.ClipAnimationHelper;
 import com.android.quickstep.util.RemoteAnimationProvider;
 import com.android.quickstep.util.RemoteAnimationTargetSet;
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/FallbackActivityControllerHelper.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/FallbackActivityControllerHelper.java
index e81f773..006f537 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/FallbackActivityControllerHelper.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/FallbackActivityControllerHelper.java
@@ -15,7 +15,7 @@
  */
 package com.android.quickstep;
 
-import static com.android.colorfulos.anim.Interpolators.LINEAR;
+import static com.aoleyun.os.anim.Interpolators.LINEAR;
 import static com.android.quickstep.SysUINavigationMode.Mode.NO_BUTTON;
 import static com.android.quickstep.fallback.FallbackRecentsView.ZOOM_PROGRESS;
 import static com.android.quickstep.views.RecentsView.CONTENT_ALPHA;
@@ -30,10 +30,10 @@ import android.graphics.RectF;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import com.android.colorfulos.DeviceProfile;
-import com.android.colorfulos.anim.AnimationSuccessListener;
-import com.android.colorfulos.anim.AnimatorPlaybackController;
-import com.android.colorfulos.userevent.nano.LauncherLogProto;
+import com.aoleyun.os.DeviceProfile;
+import com.aoleyun.os.anim.AnimationSuccessListener;
+import com.aoleyun.os.anim.AnimatorPlaybackController;
+import com.aoleyun.os.userevent.nano.LauncherLogProto;
 import com.android.quickstep.fallback.FallbackRecentsView;
 import com.android.quickstep.util.LayoutUtils;
 import com.android.quickstep.util.RemoteAnimationTargetSet;
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityControllerHelper.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityControllerHelper.java
index e56b913..b38aa69 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityControllerHelper.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityControllerHelper.java
@@ -17,18 +17,18 @@ package com.android.quickstep;
 
 import static android.view.View.TRANSLATION_Y;
 
-import static com.android.colorfulos.LauncherAnimUtils.SCALE_PROPERTY;
-import static com.android.colorfulos.LauncherAppTransitionManagerImpl.INDEX_RECENTS_FADE_ANIM;
-import static com.android.colorfulos.LauncherAppTransitionManagerImpl.INDEX_RECENTS_TRANSLATE_X_ANIM;
-import static com.android.colorfulos.LauncherAppTransitionManagerImpl.INDEX_SHELF_ANIM;
-import static com.android.colorfulos.LauncherState.BACKGROUND_APP;
-import static com.android.colorfulos.LauncherState.NORMAL;
-import static com.android.colorfulos.LauncherState.OVERVIEW;
-import static com.android.colorfulos.LauncherStateManager.ANIM_ALL;
-import static com.android.colorfulos.anim.Interpolators.ACCEL_2;
-import static com.android.colorfulos.anim.Interpolators.ACCEL_DEACCEL;
-import static com.android.colorfulos.anim.Interpolators.INSTANT;
-import static com.android.colorfulos.anim.Interpolators.LINEAR;
+import static com.aoleyun.os.LauncherAnimUtils.SCALE_PROPERTY;
+import static com.aoleyun.os.LauncherAppTransitionManagerImpl.INDEX_RECENTS_FADE_ANIM;
+import static com.aoleyun.os.LauncherAppTransitionManagerImpl.INDEX_RECENTS_TRANSLATE_X_ANIM;
+import static com.aoleyun.os.LauncherAppTransitionManagerImpl.INDEX_SHELF_ANIM;
+import static com.aoleyun.os.LauncherState.BACKGROUND_APP;
+import static com.aoleyun.os.LauncherState.NORMAL;
+import static com.aoleyun.os.LauncherState.OVERVIEW;
+import static com.aoleyun.os.LauncherStateManager.ANIM_ALL;
+import static com.aoleyun.os.anim.Interpolators.ACCEL_2;
+import static com.aoleyun.os.anim.Interpolators.ACCEL_DEACCEL;
+import static com.aoleyun.os.anim.Interpolators.INSTANT;
+import static com.aoleyun.os.anim.Interpolators.LINEAR;
 import static com.android.quickstep.WindowTransformSwipeHandler.RECENTS_ATTACH_DURATION;
 
 import android.animation.Animator;
@@ -49,19 +49,19 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.UiThread;
 
-import com.android.colorfulos.DeviceProfile;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.LauncherAppState;
-import com.android.colorfulos.LauncherInitListenerEx;
-import com.android.colorfulos.LauncherState;
-import com.android.colorfulos.LauncherStateManager;
-import com.android.colorfulos.allapps.DiscoveryBounce;
-import com.android.colorfulos.anim.AnimatorPlaybackController;
-import com.android.colorfulos.anim.AnimatorSetBuilder;
-import com.android.colorfulos.testing.TestProtocol;
-import com.android.colorfulos.uioverrides.states.OverviewState;
-import com.android.colorfulos.userevent.nano.LauncherLogProto;
-import com.android.colorfulos.views.FloatingIconView;
+import com.aoleyun.os.DeviceProfile;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.LauncherAppState;
+import com.aoleyun.os.LauncherInitListenerEx;
+import com.aoleyun.os.LauncherState;
+import com.aoleyun.os.LauncherStateManager;
+import com.aoleyun.os.allapps.DiscoveryBounce;
+import com.aoleyun.os.anim.AnimatorPlaybackController;
+import com.aoleyun.os.anim.AnimatorSetBuilder;
+import com.aoleyun.os.testing.TestProtocol;
+import com.aoleyun.os.uioverrides.states.OverviewState;
+import com.aoleyun.os.userevent.nano.LauncherLogProto;
+import com.aoleyun.os.views.FloatingIconView;
 import com.android.quickstep.SysUINavigationMode.Mode;
 import com.android.quickstep.util.LayoutUtils;
 import com.android.quickstep.util.StaggeredWorkspaceAnim;
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/MultiStateCallback.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/MultiStateCallback.java
index 5afc012..9fcf500 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/MultiStateCallback.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/MultiStateCallback.java
@@ -18,7 +18,7 @@ package com.android.quickstep;
 import android.util.Log;
 import android.util.SparseArray;
 
-import com.android.colorfulos.config.FeatureFlags;
+import com.aoleyun.os.config.FeatureFlags;
 
 import java.util.StringJoiner;
 import java.util.function.Consumer;
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/OverviewCommandHelper.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/OverviewCommandHelper.java
index df451bb..738bac0 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/OverviewCommandHelper.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/OverviewCommandHelper.java
@@ -27,10 +27,10 @@ import android.os.Build;
 import android.os.SystemClock;
 import android.view.ViewConfiguration;
 
-import com.android.colorfulos.BaseDraggingActivity;
-import com.android.colorfulos.MainThreadExecutor;
-import com.android.colorfulos.logging.UserEventDispatcher;
-import com.android.colorfulos.userevent.nano.LauncherLogProto;
+import com.aoleyun.os.BaseDraggingActivity;
+import com.aoleyun.os.MainThreadExecutor;
+import com.aoleyun.os.logging.UserEventDispatcher;
+import com.aoleyun.os.userevent.nano.LauncherLogProto;
 import com.android.quickstep.ActivityControlHelper.ActivityInitListener;
 import com.android.quickstep.views.RecentsView;
 import com.android.quickstep.views.TaskView;
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/RecentsActivity.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/RecentsActivity.java
index 7e773df..eae2648 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/RecentsActivity.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/RecentsActivity.java
@@ -15,10 +15,10 @@
  */
 package com.android.quickstep;
 
-import static com.android.colorfulos.QuickstepAppTransitionManagerImpl.RECENTS_LAUNCH_DURATION;
-import static com.android.colorfulos.QuickstepAppTransitionManagerImpl
+import static com.aoleyun.os.QuickstepAppTransitionManagerImpl.RECENTS_LAUNCH_DURATION;
+import static com.aoleyun.os.QuickstepAppTransitionManagerImpl
         .STATUS_BAR_TRANSITION_DURATION;
-import static com.android.colorfulos.QuickstepAppTransitionManagerImpl
+import static com.aoleyun.os.QuickstepAppTransitionManagerImpl
         .STATUS_BAR_TRANSITION_PRE_DELAY;
 import static com.android.quickstep.TaskViewUtils.getRecentsWindowAnimator;
 import static com.android.quickstep.TaskUtils.taskIsATargetWithMode;
@@ -33,12 +33,12 @@ import android.os.Handler;
 import android.os.Looper;
 import android.view.View;
 
-import com.android.colorfulos.DeviceProfile;
-import com.android.colorfulos.InvariantDeviceProfile;
-import com.android.colorfulos.LauncherAnimationRunner;
-import com.android.colorfulos.R;
-import com.android.colorfulos.anim.Interpolators;
-import com.android.colorfulos.views.BaseDragLayer;
+import com.aoleyun.os.DeviceProfile;
+import com.aoleyun.os.InvariantDeviceProfile;
+import com.aoleyun.os.LauncherAnimationRunner;
+import com.aoleyun.os.R;
+import com.aoleyun.os.anim.Interpolators;
+import com.aoleyun.os.views.BaseDragLayer;
 import com.android.quickstep.fallback.FallbackRecentsView;
 import com.android.quickstep.fallback.RecentsRootView;
 import com.android.quickstep.util.ClipAnimationHelper;
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/RecentsAnimationWrapper.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/RecentsAnimationWrapper.java
index cf2ee7c..5a81e9d 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/RecentsAnimationWrapper.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/RecentsAnimationWrapper.java
@@ -19,13 +19,13 @@ import static android.view.MotionEvent.ACTION_CANCEL;
 import static android.view.MotionEvent.ACTION_DOWN;
 import static android.view.MotionEvent.ACTION_UP;
 
-import static com.android.colorfulos.Utilities.FLAG_NO_GESTURES;
+import static com.aoleyun.os.Utilities.FLAG_NO_GESTURES;
 
 import android.view.InputEvent;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 
-import com.android.colorfulos.util.Preconditions;
+import com.aoleyun.os.util.Preconditions;
 import com.android.quickstep.inputconsumers.InputConsumer;
 import com.android.quickstep.util.SwipeAnimationTargetSet;
 import com.android.systemui.shared.system.InputConsumerController;
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/SwipeSharedState.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/SwipeSharedState.java
index 2b9fa88..08cb9e8 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/SwipeSharedState.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/SwipeSharedState.java
@@ -19,9 +19,9 @@ import static com.android.quickstep.TouchInteractionService.MAIN_THREAD_EXECUTOR
 
 import android.util.Log;
 
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.config.FeatureFlags;
-import com.android.colorfulos.util.Preconditions;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.config.FeatureFlags;
+import com.aoleyun.os.util.Preconditions;
 import com.android.quickstep.util.RecentsAnimationListenerSet;
 import com.android.quickstep.util.SwipeAnimationTargetSet;
 import com.android.quickstep.util.SwipeAnimationTargetSet.SwipeAnimationListener;
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskOverlayFactory.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskOverlayFactory.java
index 1f5a95b..ad5f9d8 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskOverlayFactory.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskOverlayFactory.java
@@ -19,11 +19,11 @@ package com.android.quickstep;
 import android.graphics.Matrix;
 import android.view.View;
 
-import com.android.colorfulos.BaseActivity;
-import com.android.colorfulos.BaseDraggingActivity;
-import com.android.colorfulos.R;
-import com.android.colorfulos.util.MainThreadInitializedObject;
-import com.android.colorfulos.util.ResourceBasedOverride;
+import com.aoleyun.os.BaseActivity;
+import com.aoleyun.os.BaseDraggingActivity;
+import com.aoleyun.os.R;
+import com.aoleyun.os.util.MainThreadInitializedObject;
+import com.aoleyun.os.util.ResourceBasedOverride;
 import com.android.quickstep.views.TaskThumbnailView;
 import com.android.quickstep.views.TaskView;
 import com.android.systemui.shared.recents.model.Task;
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskSystemShortcut.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskSystemShortcut.java
index c353dd6..68f3ead 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskSystemShortcut.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskSystemShortcut.java
@@ -17,7 +17,7 @@
 package com.android.quickstep;
 
 import static android.view.Display.DEFAULT_DISPLAY;
-import static com.android.colorfulos.userevent.nano.LauncherLogProto.Action.Touch.TAP;
+import static com.aoleyun.os.userevent.nano.LauncherLogProto.Action.Touch.TAP;
 
 import android.app.Activity;
 import android.app.ActivityOptions;
@@ -33,16 +33,16 @@ import android.os.UserHandle;
 import android.util.Log;
 import android.view.View;
 
-import com.android.colorfulos.BaseDraggingActivity;
-import com.android.colorfulos.DeviceProfile;
-import com.android.colorfulos.ItemInfo;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.LauncherState;
-import com.android.colorfulos.R;
-import com.android.colorfulos.WorkspaceItemInfo;
-import com.android.colorfulos.popup.SystemShortcut;
-import com.android.colorfulos.userevent.nano.LauncherLogProto;
-import com.android.colorfulos.util.InstantAppResolver;
+import com.aoleyun.os.BaseDraggingActivity;
+import com.aoleyun.os.DeviceProfile;
+import com.aoleyun.os.ItemInfo;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.LauncherState;
+import com.aoleyun.os.R;
+import com.aoleyun.os.WorkspaceItemInfo;
+import com.aoleyun.os.popup.SystemShortcut;
+import com.aoleyun.os.userevent.nano.LauncherLogProto;
+import com.aoleyun.os.util.InstantAppResolver;
 import com.android.quickstep.views.RecentsView;
 import com.android.quickstep.views.TaskThumbnailView;
 import com.android.quickstep.views.TaskView;
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskViewUtils.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskViewUtils.java
index 52fb72c..00afaab 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskViewUtils.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskViewUtils.java
@@ -15,8 +15,8 @@
  */
 package com.android.quickstep;
 
-import static com.android.colorfulos.anim.Interpolators.LINEAR;
-import static com.android.colorfulos.anim.Interpolators.TOUCH_RESPONSE_INTERPOLATOR;
+import static com.aoleyun.os.anim.Interpolators.LINEAR;
+import static com.aoleyun.os.anim.Interpolators.TOUCH_RESPONSE_INTERPOLATOR;
 import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.MODE_OPENING;
 
 import android.animation.Animator;
@@ -26,10 +26,10 @@ import android.content.ComponentName;
 import android.graphics.RectF;
 import android.view.View;
 
-import com.android.colorfulos.BaseActivity;
-import com.android.colorfulos.BaseDraggingActivity;
-import com.android.colorfulos.ItemInfo;
-import com.android.colorfulos.Utilities;
+import com.aoleyun.os.BaseActivity;
+import com.aoleyun.os.BaseDraggingActivity;
+import com.aoleyun.os.ItemInfo;
+import com.aoleyun.os.Utilities;
 import com.android.quickstep.util.ClipAnimationHelper;
 import com.android.quickstep.util.MultiValueUpdateListener;
 import com.android.quickstep.util.RemoteAnimationTargetSet;
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 0a28487..06bc262 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
@@ -17,12 +17,12 @@ package com.android.quickstep;
 
 import static android.view.MotionEvent.ACTION_DOWN;
 
-import static com.android.colorfulos.config.FeatureFlags.ADAPTIVE_ICON_WINDOW_ANIM;
-import static com.android.colorfulos.config.FeatureFlags.APPLY_CONFIG_AT_RUNTIME;
-import static com.android.colorfulos.config.FeatureFlags.ENABLE_HINTS_IN_OVERVIEW;
-import static com.android.colorfulos.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
-import static com.android.colorfulos.config.FeatureFlags.FAKE_LANDSCAPE_UI;
-import static com.android.colorfulos.config.FeatureFlags.QUICKSTEP_SPRINGS;
+import static com.aoleyun.os.config.FeatureFlags.ADAPTIVE_ICON_WINDOW_ANIM;
+import static com.aoleyun.os.config.FeatureFlags.APPLY_CONFIG_AT_RUNTIME;
+import static com.aoleyun.os.config.FeatureFlags.ENABLE_HINTS_IN_OVERVIEW;
+import static com.aoleyun.os.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
+import static com.aoleyun.os.config.FeatureFlags.FAKE_LANDSCAPE_UI;
+import static com.aoleyun.os.config.FeatureFlags.QUICKSTEP_SPRINGS;
 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;
@@ -66,16 +66,16 @@ import android.view.WindowManager;
 import androidx.annotation.BinderThread;
 import androidx.annotation.UiThread;
 
-import com.android.colorfulos.BaseDraggingActivity;
-import com.android.colorfulos.MainThreadExecutor;
-import com.android.colorfulos.R;
-import com.android.colorfulos.ResourceUtils;
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.compat.UserManagerCompat;
-import com.android.colorfulos.logging.EventLogArray;
-import com.android.colorfulos.logging.UserEventDispatcher;
-import com.android.colorfulos.util.LooperExecutor;
-import com.android.colorfulos.util.UiThreadHelper;
+import com.aoleyun.os.BaseDraggingActivity;
+import com.aoleyun.os.MainThreadExecutor;
+import com.aoleyun.os.R;
+import com.aoleyun.os.ResourceUtils;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.compat.UserManagerCompat;
+import com.aoleyun.os.logging.EventLogArray;
+import com.aoleyun.os.logging.UserEventDispatcher;
+import com.aoleyun.os.util.LooperExecutor;
+import com.aoleyun.os.util.UiThreadHelper;
 import com.android.quickstep.SysUINavigationMode.Mode;
 import com.android.quickstep.SysUINavigationMode.NavigationModeChangeListener;
 import com.android.quickstep.inputconsumers.AccessibilityInputConsumer;
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 4678ebc..d793b5e 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java
@@ -15,20 +15,20 @@
  */
 package com.android.quickstep;
 
-import static com.android.colorfulos.BaseActivity.INVISIBLE_BY_STATE_HANDLER;
-import static com.android.colorfulos.BaseActivity.STATE_HANDLER_INVISIBILITY_FLAGS;
-import static com.android.colorfulos.Utilities.SINGLE_FRAME_MS;
-import static com.android.colorfulos.Utilities.postAsyncCallback;
-import static com.android.colorfulos.anim.Interpolators.ACCEL_1_5;
-import static com.android.colorfulos.anim.Interpolators.DEACCEL;
-import static com.android.colorfulos.anim.Interpolators.LINEAR;
-import static com.android.colorfulos.anim.Interpolators.OVERSHOOT_1_2;
-import static com.android.colorfulos.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
-import static com.android.colorfulos.config.FeatureFlags.QUICKSTEP_SPRINGS;
-import static com.android.colorfulos.util.RaceConditionTracker.ENTER;
-import static com.android.colorfulos.util.RaceConditionTracker.EXIT;
-import static com.android.colorfulos.util.SystemUiController.UI_STATE_OVERVIEW;
-import static com.android.colorfulos.views.FloatingIconView.SHAPE_PROGRESS_DURATION;
+import static com.aoleyun.os.BaseActivity.INVISIBLE_BY_STATE_HANDLER;
+import static com.aoleyun.os.BaseActivity.STATE_HANDLER_INVISIBILITY_FLAGS;
+import static com.aoleyun.os.Utilities.SINGLE_FRAME_MS;
+import static com.aoleyun.os.Utilities.postAsyncCallback;
+import static com.aoleyun.os.anim.Interpolators.ACCEL_1_5;
+import static com.aoleyun.os.anim.Interpolators.DEACCEL;
+import static com.aoleyun.os.anim.Interpolators.LINEAR;
+import static com.aoleyun.os.anim.Interpolators.OVERSHOOT_1_2;
+import static com.aoleyun.os.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
+import static com.aoleyun.os.config.FeatureFlags.QUICKSTEP_SPRINGS;
+import static com.aoleyun.os.util.RaceConditionTracker.ENTER;
+import static com.aoleyun.os.util.RaceConditionTracker.EXIT;
+import static com.aoleyun.os.util.SystemUiController.UI_STATE_OVERVIEW;
+import static com.aoleyun.os.views.FloatingIconView.SHAPE_PROGRESS_DURATION;
 import static com.android.quickstep.ActivityControlHelper.AnimationFactory.ShelfAnimState.HIDE;
 import static com.android.quickstep.ActivityControlHelper.AnimationFactory.ShelfAnimState.PEEK;
 import static com.android.quickstep.MultiStateCallback.DEBUG_STATES;
@@ -72,24 +72,24 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.UiThread;
 
-import com.android.colorfulos.AbstractFloatingView;
-import com.android.colorfulos.BaseDraggingActivity;
-import com.android.colorfulos.DeviceProfile;
-import com.android.colorfulos.InvariantDeviceProfile;
-import com.android.colorfulos.R;
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.anim.AnimationSuccessListener;
-import com.android.colorfulos.anim.AnimatorPlaybackController;
-import com.android.colorfulos.anim.Interpolators;
-import com.android.colorfulos.graphics.RotationMode;
-import com.android.colorfulos.logging.UserEventDispatcher;
-import com.android.colorfulos.testing.TestProtocol;
-import com.android.colorfulos.userevent.nano.LauncherLogProto.Action.Direction;
-import com.android.colorfulos.userevent.nano.LauncherLogProto.Action.Touch;
-import com.android.colorfulos.userevent.nano.LauncherLogProto.ContainerType;
-import com.android.colorfulos.util.RaceConditionTracker;
-import com.android.colorfulos.util.TraceHelper;
-import com.android.colorfulos.views.FloatingIconView;
+import com.aoleyun.os.AbstractFloatingView;
+import com.aoleyun.os.BaseDraggingActivity;
+import com.aoleyun.os.DeviceProfile;
+import com.aoleyun.os.InvariantDeviceProfile;
+import com.aoleyun.os.R;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.anim.AnimationSuccessListener;
+import com.aoleyun.os.anim.AnimatorPlaybackController;
+import com.aoleyun.os.anim.Interpolators;
+import com.aoleyun.os.graphics.RotationMode;
+import com.aoleyun.os.logging.UserEventDispatcher;
+import com.aoleyun.os.testing.TestProtocol;
+import com.aoleyun.os.userevent.nano.LauncherLogProto.Action.Direction;
+import com.aoleyun.os.userevent.nano.LauncherLogProto.Action.Touch;
+import com.aoleyun.os.userevent.nano.LauncherLogProto.ContainerType;
+import com.aoleyun.os.util.RaceConditionTracker;
+import com.aoleyun.os.util.TraceHelper;
+import com.aoleyun.os.views.FloatingIconView;
 import com.android.quickstep.ActivityControlHelper.ActivityInitListener;
 import com.android.quickstep.ActivityControlHelper.AnimationFactory;
 import com.android.quickstep.ActivityControlHelper.AnimationFactory.ShelfAnimState;
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/fallback/FallbackRecentsView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/fallback/FallbackRecentsView.java
index bc9263b..1f4d330 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/fallback/FallbackRecentsView.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/fallback/FallbackRecentsView.java
@@ -15,7 +15,7 @@
  */
 package com.android.quickstep.fallback;
 
-import static com.android.colorfulos.LauncherAnimUtils.SCALE_PROPERTY;
+import static com.aoleyun.os.LauncherAnimUtils.SCALE_PROPERTY;
 
 import android.content.Context;
 import android.graphics.Canvas;
@@ -24,9 +24,9 @@ import android.util.AttributeSet;
 import android.util.FloatProperty;
 import android.view.View;
 
-import com.android.colorfulos.DeviceProfile;
-import com.android.colorfulos.LauncherState.ScaleAndTranslation;
-import com.android.colorfulos.Utilities;
+import com.aoleyun.os.DeviceProfile;
+import com.aoleyun.os.LauncherState.ScaleAndTranslation;
+import com.aoleyun.os.Utilities;
 import com.android.quickstep.RecentsActivity;
 import com.android.quickstep.util.LayoutUtils;
 import com.android.quickstep.views.RecentsView;
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/fallback/RecentsRootView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/fallback/RecentsRootView.java
index 394629f..86de043 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/fallback/RecentsRootView.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/fallback/RecentsRootView.java
@@ -21,11 +21,11 @@ import android.graphics.Point;
 import android.graphics.Rect;
 import android.util.AttributeSet;
 
-import com.android.colorfulos.BaseActivity;
-import com.android.colorfulos.R;
-import com.android.colorfulos.util.Themes;
-import com.android.colorfulos.util.TouchController;
-import com.android.colorfulos.views.BaseDragLayer;
+import com.aoleyun.os.BaseActivity;
+import com.aoleyun.os.R;
+import com.aoleyun.os.util.Themes;
+import com.aoleyun.os.util.TouchController;
+import com.aoleyun.os.views.BaseDragLayer;
 import com.android.quickstep.RecentsActivity;
 
 public class RecentsRootView extends BaseDragLayer<RecentsActivity> {
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/fallback/RecentsTaskController.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/fallback/RecentsTaskController.java
index 1474f46..b07d0cb 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/fallback/RecentsTaskController.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/fallback/RecentsTaskController.java
@@ -15,7 +15,7 @@
  */
 package com.android.quickstep.fallback;
 
-import com.android.colorfulos.uioverrides.touchcontrollers.TaskViewTouchController;
+import com.aoleyun.os.uioverrides.touchcontrollers.TaskViewTouchController;
 import com.android.quickstep.RecentsActivity;
 
 public class RecentsTaskController extends TaskViewTouchController<RecentsActivity> {
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/AccessibilityInputConsumer.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/AccessibilityInputConsumer.java
index a8cd4f1..21711ea 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/AccessibilityInputConsumer.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/AccessibilityInputConsumer.java
@@ -31,7 +31,7 @@ import android.view.MotionEvent;
 import android.view.VelocityTracker;
 import android.view.ViewConfiguration;
 
-import com.android.colorfulos.R;
+import com.aoleyun.os.R;
 import com.android.quickstep.util.MotionPauseDetector;
 import com.android.systemui.shared.recents.ISystemUiProxy;
 import com.android.systemui.shared.system.InputMonitorCompat;
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 7fdf493..b20abb0 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
@@ -23,13 +23,13 @@ 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.colorfulos.Utilities.squaredHypot;
-import static com.android.colorfulos.userevent.nano.LauncherLogProto.Action.Direction.UPLEFT;
-import static com.android.colorfulos.userevent.nano.LauncherLogProto.Action.Direction.UPRIGHT;
-import static com.android.colorfulos.userevent.nano.LauncherLogProto.Action.Touch.FLING;
-import static com.android.colorfulos.userevent.nano.LauncherLogProto.Action.Touch.SWIPE;
-import static com.android.colorfulos.userevent.nano.LauncherLogProto.Action.Touch.SWIPE_NOOP;
-import static com.android.colorfulos.userevent.nano.LauncherLogProto.ContainerType.NAVBAR;
+import static com.aoleyun.os.Utilities.squaredHypot;
+import static com.aoleyun.os.userevent.nano.LauncherLogProto.Action.Direction.UPLEFT;
+import static com.aoleyun.os.userevent.nano.LauncherLogProto.Action.Direction.UPRIGHT;
+import static com.aoleyun.os.userevent.nano.LauncherLogProto.Action.Touch.FLING;
+import static com.aoleyun.os.userevent.nano.LauncherLogProto.Action.Touch.SWIPE;
+import static com.aoleyun.os.userevent.nano.LauncherLogProto.Action.Touch.SWIPE_NOOP;
+import static com.aoleyun.os.userevent.nano.LauncherLogProto.ContainerType.NAVBAR;
 
 import android.animation.ValueAnimator;
 import android.content.Context;
@@ -45,10 +45,10 @@ import android.view.HapticFeedbackConstants;
 import android.view.MotionEvent;
 import android.view.ViewConfiguration;
 
-import com.android.colorfulos.BaseDraggingActivity;
-import com.android.colorfulos.R;
-import com.android.colorfulos.anim.Interpolators;
-import com.android.colorfulos.logging.UserEventDispatcher;
+import com.aoleyun.os.BaseDraggingActivity;
+import com.aoleyun.os.R;
+import com.aoleyun.os.anim.Interpolators;
+import com.aoleyun.os.logging.UserEventDispatcher;
 import com.android.quickstep.ActivityControlHelper;
 import com.android.systemui.shared.recents.ISystemUiProxy;
 import com.android.systemui.shared.system.InputMonitorCompat;
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/DeviceLockedInputConsumer.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/DeviceLockedInputConsumer.java
index df572ac..d7f7b94 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/DeviceLockedInputConsumer.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/DeviceLockedInputConsumer.java
@@ -19,8 +19,8 @@ import static android.view.MotionEvent.ACTION_CANCEL;
 import static android.view.MotionEvent.ACTION_POINTER_DOWN;
 import static android.view.MotionEvent.ACTION_UP;
 
-import static com.android.colorfulos.Utilities.squaredHypot;
-import static com.android.colorfulos.Utilities.squaredTouchSlop;
+import static com.aoleyun.os.Utilities.squaredHypot;
+import static com.aoleyun.os.Utilities.squaredTouchSlop;
 import static com.android.quickstep.MultiStateCallback.DEBUG_STATES;
 import static com.android.quickstep.WindowTransformSwipeHandler.MIN_PROGRESS_FOR_OVERVIEW;
 
@@ -36,8 +36,8 @@ import android.view.VelocityTracker;
 import android.view.ViewConfiguration;
 import android.view.WindowManager;
 
-import com.android.colorfulos.R;
-import com.android.colorfulos.Utilities;
+import com.aoleyun.os.R;
+import com.aoleyun.os.Utilities;
 import com.android.quickstep.LockScreenRecentsActivity;
 import com.android.quickstep.MultiStateCallback;
 import com.android.quickstep.SwipeSharedState;
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/FallbackNoButtonInputConsumer.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/FallbackNoButtonInputConsumer.java
index 093dcf2..5ef44a4 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/FallbackNoButtonInputConsumer.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/FallbackNoButtonInputConsumer.java
@@ -43,9 +43,9 @@ import android.view.VelocityTracker;
 import android.view.ViewConfiguration;
 import android.view.WindowManager;
 
-import com.android.colorfulos.DeviceProfile;
-import com.android.colorfulos.InvariantDeviceProfile;
-import com.android.colorfulos.R;
+import com.aoleyun.os.DeviceProfile;
+import com.aoleyun.os.InvariantDeviceProfile;
+import com.aoleyun.os.R;
 import com.android.quickstep.ActivityControlHelper;
 import com.android.quickstep.OverviewComponentObserver;
 import com.android.quickstep.SwipeSharedState;
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java
index a508462..7679549 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java
@@ -23,10 +23,10 @@ import static android.view.MotionEvent.ACTION_POINTER_UP;
 import static android.view.MotionEvent.ACTION_UP;
 import static android.view.MotionEvent.INVALID_POINTER_ID;
 
-import static com.android.colorfulos.Utilities.EDGE_NAV_BAR;
-import static com.android.colorfulos.Utilities.squaredHypot;
-import static com.android.colorfulos.util.RaceConditionTracker.ENTER;
-import static com.android.colorfulos.util.RaceConditionTracker.EXIT;
+import static com.aoleyun.os.Utilities.EDGE_NAV_BAR;
+import static com.aoleyun.os.Utilities.squaredHypot;
+import static com.aoleyun.os.util.RaceConditionTracker.ENTER;
+import static com.aoleyun.os.util.RaceConditionTracker.EXIT;
 import static com.android.quickstep.TouchInteractionService.TOUCH_INTERACTION_LOG;
 import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_RECENTS;
 
@@ -44,10 +44,10 @@ import android.view.MotionEvent;
 import android.view.VelocityTracker;
 import android.view.ViewConfiguration;
 
-import com.android.colorfulos.R;
-import com.android.colorfulos.util.Preconditions;
-import com.android.colorfulos.util.RaceConditionTracker;
-import com.android.colorfulos.util.TraceHelper;
+import com.aoleyun.os.R;
+import com.aoleyun.os.util.Preconditions;
+import com.aoleyun.os.util.RaceConditionTracker;
+import com.aoleyun.os.util.TraceHelper;
 import com.android.quickstep.ActivityControlHelper;
 import com.android.quickstep.OverviewCallbacks;
 import com.android.quickstep.RecentsModel;
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OverviewInputConsumer.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OverviewInputConsumer.java
index c653ea1..8dc7a08 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OverviewInputConsumer.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OverviewInputConsumer.java
@@ -15,7 +15,7 @@
  */
 package com.android.quickstep.inputconsumers;
 
-import static com.android.colorfulos.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
+import static com.aoleyun.os.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
 import static com.android.quickstep.TouchInteractionService.TOUCH_INTERACTION_LOG;
 import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_RECENTS;
 
@@ -24,9 +24,9 @@ import android.view.MotionEvent;
 
 import androidx.annotation.Nullable;
 
-import com.android.colorfulos.BaseDraggingActivity;
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.views.BaseDragLayer;
+import com.aoleyun.os.BaseDraggingActivity;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.views.BaseDragLayer;
 import com.android.quickstep.OverviewCallbacks;
 import com.android.systemui.shared.system.ActivityManagerWrapper;
 import com.android.systemui.shared.system.InputMonitorCompat;
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OverviewWithoutFocusInputConsumer.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OverviewWithoutFocusInputConsumer.java
index 095e3ba..8ebe44c 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OverviewWithoutFocusInputConsumer.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OverviewWithoutFocusInputConsumer.java
@@ -20,7 +20,7 @@ import static android.view.MotionEvent.ACTION_DOWN;
 import static android.view.MotionEvent.ACTION_MOVE;
 import static android.view.MotionEvent.ACTION_UP;
 
-import static com.android.colorfulos.Utilities.squaredHypot;
+import static com.aoleyun.os.Utilities.squaredHypot;
 import static com.android.quickstep.TouchInteractionService.TOUCH_INTERACTION_LOG;
 import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_RECENTS;
 
@@ -30,7 +30,7 @@ import android.view.MotionEvent;
 import android.view.VelocityTracker;
 import android.view.ViewConfiguration;
 
-import com.android.colorfulos.Utilities;
+import com.aoleyun.os.Utilities;
 import com.android.quickstep.OverviewCallbacks;
 import com.android.quickstep.util.NavBarPosition;
 import com.android.systemui.shared.system.ActivityManagerWrapper;
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/ScreenPinnedInputConsumer.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/ScreenPinnedInputConsumer.java
index ad32029..87430bf 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/ScreenPinnedInputConsumer.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/ScreenPinnedInputConsumer.java
@@ -21,8 +21,8 @@ import android.util.Log;
 import android.view.HapticFeedbackConstants;
 import android.view.MotionEvent;
 
-import com.android.colorfulos.BaseDraggingActivity;
-import com.android.colorfulos.R;
+import com.aoleyun.os.BaseDraggingActivity;
+import com.aoleyun.os.R;
 import com.android.quickstep.ActivityControlHelper;
 import com.android.quickstep.util.MotionPauseDetector;
 import com.android.systemui.shared.recents.ISystemUiProxy;
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/ClipAnimationHelper.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/util/ClipAnimationHelper.java
index 4665f66..dd84187 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/ClipAnimationHelper.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/util/ClipAnimationHelper.java
@@ -15,7 +15,7 @@
  */
 package com.android.quickstep.util;
 
-import static com.android.colorfulos.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
+import static com.aoleyun.os.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
 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;
@@ -32,12 +32,12 @@ import android.os.RemoteException;
 
 import androidx.annotation.Nullable;
 
-import com.android.colorfulos.BaseDraggingActivity;
-import com.android.colorfulos.DeviceProfile;
-import com.android.colorfulos.LauncherState;
-import com.android.colorfulos.R;
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.views.BaseDragLayer;
+import com.aoleyun.os.BaseDraggingActivity;
+import com.aoleyun.os.DeviceProfile;
+import com.aoleyun.os.LauncherState;
+import com.aoleyun.os.R;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.views.BaseDragLayer;
 import com.android.quickstep.RecentsModel;
 import com.android.quickstep.views.RecentsView;
 import com.android.quickstep.views.TaskThumbnailView;
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/NavBarPosition.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/util/NavBarPosition.java
index f2f5a1f..49babf8 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/NavBarPosition.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/util/NavBarPosition.java
@@ -15,15 +15,15 @@
  */
 package com.android.quickstep.util;
 
-import static com.android.colorfulos.uioverrides.RecentsUiFactory.ROTATION_LANDSCAPE;
-import static com.android.colorfulos.uioverrides.RecentsUiFactory.ROTATION_SEASCAPE;
+import static com.aoleyun.os.uioverrides.RecentsUiFactory.ROTATION_LANDSCAPE;
+import static com.aoleyun.os.uioverrides.RecentsUiFactory.ROTATION_SEASCAPE;
 import static com.android.quickstep.SysUINavigationMode.Mode.NO_BUTTON;
 
 import android.content.Context;
 import android.view.Surface;
 import android.view.WindowManager;
 
-import com.android.colorfulos.graphics.RotationMode;
+import com.aoleyun.os.graphics.RotationMode;
 import com.android.quickstep.SysUINavigationMode;
 
 /**
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/RecentsAnimationListenerSet.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/util/RecentsAnimationListenerSet.java
index d1bb6d3..698c3c8 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/RecentsAnimationListenerSet.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/util/RecentsAnimationListenerSet.java
@@ -20,8 +20,8 @@ import static com.android.quickstep.TouchInteractionService.MAIN_THREAD_EXECUTOR
 import android.graphics.Rect;
 import android.util.ArraySet;
 
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.util.Preconditions;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.util.Preconditions;
 import com.android.quickstep.util.SwipeAnimationTargetSet.SwipeAnimationListener;
 import com.android.systemui.shared.system.RecentsAnimationControllerCompat;
 import com.android.systemui.shared.system.RecentsAnimationListener;
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/RectFSpringAnim.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/util/RectFSpringAnim.java
index 1b29452..04bd71b 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/RectFSpringAnim.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/util/RectFSpringAnim.java
@@ -25,9 +25,9 @@ import androidx.dynamicanimation.animation.FloatPropertyCompat;
 import androidx.dynamicanimation.animation.SpringAnimation;
 import androidx.dynamicanimation.animation.SpringForce;
 
-import com.android.colorfulos.R;
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.anim.FlingSpringAnim;
+import com.aoleyun.os.R;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.anim.FlingSpringAnim;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java
index b196126..11b65a1 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java
@@ -22,24 +22,24 @@ import android.view.ViewGroup;
 
 import androidx.annotation.Nullable;
 
-import com.android.colorfulos.CellLayout;
-import com.android.colorfulos.DeviceProfile;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.LauncherState;
-import com.android.colorfulos.LauncherStateManager.AnimationConfig;
-import com.android.colorfulos.R;
-import com.android.colorfulos.ShortcutAndWidgetContainer;
-import com.android.colorfulos.anim.AnimatorSetBuilder;
-import com.android.colorfulos.anim.PropertySetter;
-import com.android.colorfulos.anim.SpringObjectAnimator;
+import com.aoleyun.os.CellLayout;
+import com.aoleyun.os.DeviceProfile;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.LauncherState;
+import com.aoleyun.os.LauncherStateManager.AnimationConfig;
+import com.aoleyun.os.R;
+import com.aoleyun.os.ShortcutAndWidgetContainer;
+import com.aoleyun.os.anim.AnimatorSetBuilder;
+import com.aoleyun.os.anim.PropertySetter;
+import com.aoleyun.os.anim.SpringObjectAnimator;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.android.colorfulos.LauncherAnimUtils.VIEW_TRANSLATE_Y;
-import static com.android.colorfulos.LauncherState.BACKGROUND_APP;
-import static com.android.colorfulos.LauncherState.NORMAL;
-import static com.android.colorfulos.anim.Interpolators.LINEAR;
+import static com.aoleyun.os.LauncherAnimUtils.VIEW_TRANSLATE_Y;
+import static com.aoleyun.os.LauncherState.BACKGROUND_APP;
+import static com.aoleyun.os.LauncherState.NORMAL;
+import static com.aoleyun.os.anim.Interpolators.LINEAR;
 
 /**
  * Creates an animation where all the workspace items are moved into their final location,
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/TaskCornerRadius.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/util/TaskCornerRadius.java
index a10fbb7..78e7c2c 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/TaskCornerRadius.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/util/TaskCornerRadius.java
@@ -19,8 +19,8 @@ import static com.android.systemui.shared.system.QuickStepContract.supportsRound
 
 import android.content.Context;
 
-import com.android.colorfulos.R;
-import com.android.colorfulos.util.Themes;
+import com.aoleyun.os.R;
+import com.aoleyun.os.util.Themes;
 
 public class TaskCornerRadius {
 
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/ClearAllButton.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/ClearAllButton.java
index 1bcd9b9..ace9915 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/ClearAllButton.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/ClearAllButton.java
@@ -21,7 +21,7 @@ import android.util.AttributeSet;
 import android.util.Property;
 import android.widget.Button;
 
-import com.android.colorfulos.Utilities;
+import com.aoleyun.os.Utilities;
 import com.android.quickstep.views.RecentsView.PageCallbacks;
 import com.android.quickstep.views.RecentsView.ScrollState;
 
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/DigitalWellBeingToast.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/DigitalWellBeingToast.java
index ddb856b..6ebd49e 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/DigitalWellBeingToast.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/DigitalWellBeingToast.java
@@ -18,7 +18,7 @@ package com.android.quickstep.views;
 
 import static android.provider.Settings.ACTION_APP_USAGE_SETTINGS;
 
-import static com.android.colorfulos.Utilities.prefixTextWithIcon;
+import static com.aoleyun.os.Utilities.prefixTextWithIcon;
 
 import android.annotation.TargetApi;
 import android.app.ActivityOptions;
@@ -38,11 +38,11 @@ import android.widget.TextView;
 
 import androidx.annotation.StringRes;
 
-import com.android.colorfulos.BaseActivity;
-import com.android.colorfulos.BaseDraggingActivity;
-import com.android.colorfulos.R;
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.userevent.nano.LauncherLogProto;
+import com.aoleyun.os.BaseActivity;
+import com.aoleyun.os.BaseDraggingActivity;
+import com.aoleyun.os.R;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.userevent.nano.LauncherLogProto;
 import com.android.systemui.shared.recents.model.Task;
 
 import java.time.Duration;
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/IconView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/IconView.java
index 9a8f044..49a1813 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/IconView.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/IconView.java
@@ -21,7 +21,7 @@ import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
 import android.view.View;
 
-import com.android.colorfulos.FastBitmapDrawable;
+import com.aoleyun.os.FastBitmapDrawable;
 
 import java.util.ArrayList;
 
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/LauncherRecentsView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/LauncherRecentsView.java
index 77bf301..438a15d 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/LauncherRecentsView.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/LauncherRecentsView.java
@@ -15,15 +15,15 @@
  */
 package com.android.quickstep.views;
 
-import static com.android.colorfulos.LauncherState.ALL_APPS;
-import static com.android.colorfulos.LauncherState.ALL_APPS_HEADER_EXTRA;
-import static com.android.colorfulos.LauncherState.NORMAL;
-import static com.android.colorfulos.LauncherState.OVERVIEW;
-import static com.android.colorfulos.LauncherState.RECENTS_CLEAR_ALL_BUTTON;
-import static com.android.colorfulos.LauncherState.SPRING_LOADED;
-import static com.android.colorfulos.QuickstepAppTransitionManagerImpl.ALL_APPS_PROGRESS_OFF_SCREEN;
-import static com.android.colorfulos.allapps.AllAppsTransitionController.ALL_APPS_PROGRESS;
-import static com.android.colorfulos.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
+import static com.aoleyun.os.LauncherState.ALL_APPS;
+import static com.aoleyun.os.LauncherState.ALL_APPS_HEADER_EXTRA;
+import static com.aoleyun.os.LauncherState.NORMAL;
+import static com.aoleyun.os.LauncherState.OVERVIEW;
+import static com.aoleyun.os.LauncherState.RECENTS_CLEAR_ALL_BUTTON;
+import static com.aoleyun.os.LauncherState.SPRING_LOADED;
+import static com.aoleyun.os.QuickstepAppTransitionManagerImpl.ALL_APPS_PROGRESS_OFF_SCREEN;
+import static com.aoleyun.os.allapps.AllAppsTransitionController.ALL_APPS_PROGRESS;
+import static com.aoleyun.os.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
 
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
@@ -36,16 +36,16 @@ import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;
 
-import com.android.colorfulos.DeviceProfile;
-import com.android.colorfulos.Hotseat;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.LauncherState;
-import com.android.colorfulos.LauncherStateManager.StateListener;
-import com.android.colorfulos.R;
-import com.android.colorfulos.anim.Interpolators;
-import com.android.colorfulos.appprediction.PredictionUiStateManager;
-import com.android.colorfulos.appprediction.PredictionUiStateManager.Client;
-import com.android.colorfulos.views.ScrimView;
+import com.aoleyun.os.DeviceProfile;
+import com.aoleyun.os.Hotseat;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.LauncherState;
+import com.aoleyun.os.LauncherStateManager.StateListener;
+import com.aoleyun.os.R;
+import com.aoleyun.os.anim.Interpolators;
+import com.aoleyun.os.appprediction.PredictionUiStateManager;
+import com.aoleyun.os.appprediction.PredictionUiStateManager.Client;
+import com.aoleyun.os.views.ScrimView;
 import com.android.quickstep.SysUINavigationMode;
 import com.android.quickstep.util.ClipAnimationHelper;
 import com.android.quickstep.util.ClipAnimationHelper.TransformParams;
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/LiveTileOverlay.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/LiveTileOverlay.java
index 0cbd7d7..f5337ab 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/LiveTileOverlay.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/LiveTileOverlay.java
@@ -1,7 +1,7 @@
 package com.android.quickstep.views;
 
-import static com.android.colorfulos.anim.Interpolators.FAST_OUT_SLOW_IN;
-import static com.android.colorfulos.anim.Interpolators.LINEAR;
+import static com.aoleyun.os.anim.Interpolators.FAST_OUT_SLOW_IN;
+import static com.aoleyun.os.anim.Interpolators.LINEAR;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -17,7 +17,7 @@ import android.graphics.RectF;
 import android.graphics.drawable.Drawable;
 import android.util.FloatProperty;
 
-import com.android.colorfulos.anim.Interpolators;
+import com.aoleyun.os.anim.Interpolators;
 
 public class LiveTileOverlay extends Drawable {
 
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 5db3d0f..b34d207 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
@@ -18,24 +18,24 @@ package com.android.quickstep.views;
 
 import static androidx.dynamicanimation.animation.DynamicAnimation.MIN_VISIBLE_CHANGE_PIXELS;
 
-import static com.android.colorfulos.BaseActivity.STATE_HANDLER_INVISIBILITY_FLAGS;
-import static com.android.colorfulos.InvariantDeviceProfile.CHANGE_FLAG_ICON_PARAMS;
-import static com.android.colorfulos.LauncherAnimUtils.SCALE_PROPERTY;
-import static com.android.colorfulos.LauncherAnimUtils.VIEW_TRANSLATE_X;
-import static com.android.colorfulos.LauncherAnimUtils.VIEW_TRANSLATE_Y;
-import static com.android.colorfulos.Utilities.EDGE_NAV_BAR;
-import static com.android.colorfulos.Utilities.squaredHypot;
-import static com.android.colorfulos.Utilities.squaredTouchSlop;
-import static com.android.colorfulos.anim.Interpolators.ACCEL;
-import static com.android.colorfulos.anim.Interpolators.ACCEL_2;
-import static com.android.colorfulos.anim.Interpolators.FAST_OUT_SLOW_IN;
-import static com.android.colorfulos.anim.Interpolators.LINEAR;
-import static com.android.colorfulos.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
-import static com.android.colorfulos.config.FeatureFlags.QUICKSTEP_SPRINGS;
-import static com.android.colorfulos.uioverrides.touchcontrollers.TaskViewTouchController.SUCCESS_TRANSITION_PROGRESS;
-import static com.android.colorfulos.userevent.nano.LauncherLogProto.Action.Touch.TAP;
-import static com.android.colorfulos.userevent.nano.LauncherLogProto.ControlType.CLEAR_ALL_BUTTON;
-import static com.android.colorfulos.util.SystemUiController.UI_STATE_OVERVIEW;
+import static com.aoleyun.os.BaseActivity.STATE_HANDLER_INVISIBILITY_FLAGS;
+import static com.aoleyun.os.InvariantDeviceProfile.CHANGE_FLAG_ICON_PARAMS;
+import static com.aoleyun.os.LauncherAnimUtils.SCALE_PROPERTY;
+import static com.aoleyun.os.LauncherAnimUtils.VIEW_TRANSLATE_X;
+import static com.aoleyun.os.LauncherAnimUtils.VIEW_TRANSLATE_Y;
+import static com.aoleyun.os.Utilities.EDGE_NAV_BAR;
+import static com.aoleyun.os.Utilities.squaredHypot;
+import static com.aoleyun.os.Utilities.squaredTouchSlop;
+import static com.aoleyun.os.anim.Interpolators.ACCEL;
+import static com.aoleyun.os.anim.Interpolators.ACCEL_2;
+import static com.aoleyun.os.anim.Interpolators.FAST_OUT_SLOW_IN;
+import static com.aoleyun.os.anim.Interpolators.LINEAR;
+import static com.aoleyun.os.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
+import static com.aoleyun.os.config.FeatureFlags.QUICKSTEP_SPRINGS;
+import static com.aoleyun.os.uioverrides.touchcontrollers.TaskViewTouchController.SUCCESS_TRANSITION_PROGRESS;
+import static com.aoleyun.os.userevent.nano.LauncherLogProto.Action.Touch.TAP;
+import static com.aoleyun.os.userevent.nano.LauncherLogProto.ControlType.CLEAR_ALL_BUTTON;
+import static com.aoleyun.os.util.SystemUiController.UI_STATE_OVERVIEW;
 import static com.android.quickstep.TaskUtils.checkCurrentOrManagedUserId;
 
 import android.animation.Animator;
@@ -79,26 +79,26 @@ import android.widget.ListView;
 import androidx.annotation.Nullable;
 import androidx.dynamicanimation.animation.SpringForce;
 
-import com.android.colorfulos.BaseActivity;
-import com.android.colorfulos.DeviceProfile;
-import com.android.colorfulos.Insettable;
-import com.android.colorfulos.InvariantDeviceProfile;
-import com.android.colorfulos.LauncherState;
-import com.android.colorfulos.PagedView;
-import com.android.colorfulos.R;
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.anim.AnimatorPlaybackController;
-import com.android.colorfulos.anim.PropertyListBuilder;
-import com.android.colorfulos.anim.SpringObjectAnimator;
-import com.android.colorfulos.config.FeatureFlags;
-import com.android.colorfulos.graphics.RotationMode;
-import com.android.colorfulos.userevent.nano.LauncherLogProto;
-import com.android.colorfulos.userevent.nano.LauncherLogProto.Action.Direction;
-import com.android.colorfulos.userevent.nano.LauncherLogProto.Action.Touch;
-import com.android.colorfulos.util.OverScroller;
-import com.android.colorfulos.util.PendingAnimation;
-import com.android.colorfulos.util.Themes;
-import com.android.colorfulos.util.ViewPool;
+import com.aoleyun.os.BaseActivity;
+import com.aoleyun.os.DeviceProfile;
+import com.aoleyun.os.Insettable;
+import com.aoleyun.os.InvariantDeviceProfile;
+import com.aoleyun.os.LauncherState;
+import com.aoleyun.os.PagedView;
+import com.aoleyun.os.R;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.anim.AnimatorPlaybackController;
+import com.aoleyun.os.anim.PropertyListBuilder;
+import com.aoleyun.os.anim.SpringObjectAnimator;
+import com.aoleyun.os.config.FeatureFlags;
+import com.aoleyun.os.graphics.RotationMode;
+import com.aoleyun.os.userevent.nano.LauncherLogProto;
+import com.aoleyun.os.userevent.nano.LauncherLogProto.Action.Direction;
+import com.aoleyun.os.userevent.nano.LauncherLogProto.Action.Touch;
+import com.aoleyun.os.util.OverScroller;
+import com.aoleyun.os.util.PendingAnimation;
+import com.aoleyun.os.util.Themes;
+import com.aoleyun.os.util.ViewPool;
 import com.android.quickstep.RecentsAnimationWrapper;
 import com.android.quickstep.RecentsModel;
 import com.android.quickstep.RecentsModel.TaskThumbnailChangeListener;
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskMenuView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskMenuView.java
index e6e2d71..8a2ac1d 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskMenuView.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskMenuView.java
@@ -16,7 +16,7 @@
 
 package com.android.quickstep.views;
 
-import static com.android.colorfulos.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
+import static com.aoleyun.os.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
 import static com.android.quickstep.views.TaskThumbnailView.DIM_ALPHA;
 
 import android.animation.Animator;
@@ -33,15 +33,15 @@ import android.view.ViewGroup;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.android.colorfulos.AbstractFloatingView;
-import com.android.colorfulos.BaseDraggingActivity;
-import com.android.colorfulos.FastBitmapDrawable;
-import com.android.colorfulos.R;
-import com.android.colorfulos.anim.AnimationSuccessListener;
-import com.android.colorfulos.anim.Interpolators;
-import com.android.colorfulos.anim.RoundedRectRevealOutlineProvider;
-import com.android.colorfulos.util.Themes;
-import com.android.colorfulos.views.BaseDragLayer;
+import com.aoleyun.os.AbstractFloatingView;
+import com.aoleyun.os.BaseDraggingActivity;
+import com.aoleyun.os.FastBitmapDrawable;
+import com.aoleyun.os.R;
+import com.aoleyun.os.anim.AnimationSuccessListener;
+import com.aoleyun.os.anim.Interpolators;
+import com.aoleyun.os.anim.RoundedRectRevealOutlineProvider;
+import com.aoleyun.os.util.Themes;
+import com.aoleyun.os.views.BaseDragLayer;
 import com.android.quickstep.TaskOverlayFactory;
 import com.android.quickstep.TaskSystemShortcut;
 import com.android.quickstep.TaskUtils;
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskThumbnailView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskThumbnailView.java
index d4d0d25..93f1de5 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskThumbnailView.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskThumbnailView.java
@@ -16,7 +16,7 @@
 
 package com.android.quickstep.views;
 
-import static com.android.colorfulos.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
+import static com.aoleyun.os.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
 import static com.android.systemui.shared.system.WindowManagerWrapper.WINDOWING_MODE_FULLSCREEN;
 
 import android.content.Context;
@@ -40,13 +40,13 @@ import android.util.FloatProperty;
 import android.util.Property;
 import android.view.View;
 
-import com.android.colorfulos.BaseActivity;
-import com.android.colorfulos.DeviceProfile;
-import com.android.colorfulos.R;
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.config.FeatureFlags;
-import com.android.colorfulos.util.SystemUiController;
-import com.android.colorfulos.util.Themes;
+import com.aoleyun.os.BaseActivity;
+import com.aoleyun.os.DeviceProfile;
+import com.aoleyun.os.R;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.config.FeatureFlags;
+import com.aoleyun.os.util.SystemUiController;
+import com.aoleyun.os.util.Themes;
 import com.android.quickstep.TaskOverlayFactory;
 import com.android.quickstep.TaskOverlayFactory.TaskOverlay;
 import com.android.quickstep.util.TaskCornerRadius;
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskView.java
index b527e69..2d0e6c9 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskView.java
@@ -18,10 +18,10 @@ package com.android.quickstep.views;
 
 import static android.widget.Toast.LENGTH_SHORT;
 
-import static com.android.colorfulos.QuickstepAppTransitionManagerImpl.RECENTS_LAUNCH_DURATION;
-import static com.android.colorfulos.anim.Interpolators.FAST_OUT_SLOW_IN;
-import static com.android.colorfulos.anim.Interpolators.LINEAR;
-import static com.android.colorfulos.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
+import static com.aoleyun.os.QuickstepAppTransitionManagerImpl.RECENTS_LAUNCH_DURATION;
+import static com.aoleyun.os.anim.Interpolators.FAST_OUT_SLOW_IN;
+import static com.aoleyun.os.anim.Interpolators.LINEAR;
+import static com.aoleyun.os.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -48,18 +48,18 @@ import android.view.accessibility.AccessibilityNodeInfo;
 import android.widget.FrameLayout;
 import android.widget.Toast;
 
-import com.android.colorfulos.BaseDraggingActivity;
-import com.android.colorfulos.R;
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.anim.AnimatorPlaybackController;
-import com.android.colorfulos.anim.Interpolators;
-import com.android.colorfulos.logging.UserEventDispatcher;
-import com.android.colorfulos.testing.TestProtocol;
-import com.android.colorfulos.userevent.nano.LauncherLogProto;
-import com.android.colorfulos.userevent.nano.LauncherLogProto.Action.Direction;
-import com.android.colorfulos.userevent.nano.LauncherLogProto.Action.Touch;
-import com.android.colorfulos.util.PendingAnimation;
-import com.android.colorfulos.util.ViewPool.Reusable;
+import com.aoleyun.os.BaseDraggingActivity;
+import com.aoleyun.os.R;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.anim.AnimatorPlaybackController;
+import com.aoleyun.os.anim.Interpolators;
+import com.aoleyun.os.logging.UserEventDispatcher;
+import com.aoleyun.os.testing.TestProtocol;
+import com.aoleyun.os.userevent.nano.LauncherLogProto;
+import com.aoleyun.os.userevent.nano.LauncherLogProto.Action.Direction;
+import com.aoleyun.os.userevent.nano.LauncherLogProto.Action.Touch;
+import com.aoleyun.os.util.PendingAnimation;
+import com.aoleyun.os.util.ViewPool.Reusable;
 import com.android.quickstep.RecentsModel;
 import com.android.quickstep.TaskIconCache;
 import com.android.quickstep.TaskOverlayFactory;
@@ -192,7 +192,7 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
         super(context, attrs, defStyleAttr);
         mActivity = BaseDraggingActivity.fromContext(context);
         setOnClickListener((view) -> {
-            if (com.android.colorfulos.testing.TestProtocol.sDebugTracing) {
+            if (com.aoleyun.os.testing.TestProtocol.sDebugTracing) {
                 android.util.Log.d(TestProtocol.NO_START_TASK_TAG, "TaskView onClick");
             }
             if (getTask() == null) {
@@ -291,7 +291,7 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
 
     public void launchTask(boolean animate, boolean freezeTaskList, Consumer<Boolean> resultCallback,
             Handler resultCallbackHandler) {
-        if (com.android.colorfulos.testing.TestProtocol.sDebugTracing) {
+        if (com.aoleyun.os.testing.TestProtocol.sDebugTracing) {
             android.util.Log.d(TestProtocol.NO_START_TASK_TAG, "launchTask");
         }
         if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
@@ -308,7 +308,7 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
 
     private void launchTaskInternal(boolean animate, boolean freezeTaskList,
             Consumer<Boolean> resultCallback, Handler resultCallbackHandler) {
-        if (com.android.colorfulos.testing.TestProtocol.sDebugTracing) {
+        if (com.aoleyun.os.testing.TestProtocol.sDebugTracing) {
             android.util.Log.d(TestProtocol.NO_START_TASK_TAG, "launchTaskInternal");
         }
         if (mTask != null) {
diff --git a/quickstep/src/com/android/launcher3/LauncherAnimationRunner.java b/quickstep/src/com/android/launcher3/LauncherAnimationRunner.java
index 455d4ad..aabf7e3 100644
--- a/quickstep/src/com/android/launcher3/LauncherAnimationRunner.java
+++ b/quickstep/src/com/android/launcher3/LauncherAnimationRunner.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos;
+package com.aoleyun.os;
 
-import static com.android.colorfulos.Utilities.SINGLE_FRAME_MS;
-import static com.android.colorfulos.Utilities.postAsyncCallback;
+import static com.aoleyun.os.Utilities.SINGLE_FRAME_MS;
+import static com.aoleyun.os.Utilities.postAsyncCallback;
 import static com.android.systemui.shared.recents.utilities.Utilities
         .postAtFrontOfQueueAsynchronously;
 
diff --git a/quickstep/src/com/android/launcher3/LauncherInitListener.java b/quickstep/src/com/android/launcher3/LauncherInitListener.java
index 560d1ea..07dca05 100644
--- a/quickstep/src/com/android/launcher3/LauncherInitListener.java
+++ b/quickstep/src/com/android/launcher3/LauncherInitListener.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos;
+package com.aoleyun.os;
 
 import android.annotation.TargetApi;
 import android.content.Context;
@@ -23,7 +23,7 @@ import android.os.Bundle;
 import android.os.CancellationSignal;
 import android.os.Handler;
 
-import com.android.colorfulos.states.InternalStateHandler;
+import com.aoleyun.os.states.InternalStateHandler;
 import com.android.quickstep.ActivityControlHelper.ActivityInitListener;
 import com.android.quickstep.OverviewCallbacks;
 import com.android.quickstep.util.RemoteAnimationProvider;
diff --git a/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java b/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
index 3b5b4de..0ec0478 100644
--- a/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
+++ b/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
@@ -14,22 +14,22 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos;
+package com.aoleyun.os;
 
-import static com.android.colorfulos.BaseActivity.INVISIBLE_ALL;
-import static com.android.colorfulos.BaseActivity.INVISIBLE_BY_APP_TRANSITIONS;
-import static com.android.colorfulos.BaseActivity.INVISIBLE_BY_PENDING_FLAGS;
-import static com.android.colorfulos.BaseActivity.PENDING_INVISIBLE_BY_WALLPAPER_ANIMATION;
-import static com.android.colorfulos.LauncherState.ALL_APPS;
-import static com.android.colorfulos.LauncherState.OVERVIEW;
-import static com.android.colorfulos.Utilities.postAsyncCallback;
-import static com.android.colorfulos.allapps.AllAppsTransitionController.ALL_APPS_PROGRESS;
-import static com.android.colorfulos.anim.Interpolators.AGGRESSIVE_EASE;
-import static com.android.colorfulos.anim.Interpolators.DEACCEL_1_7;
-import static com.android.colorfulos.anim.Interpolators.EXAGGERATED_EASE;
-import static com.android.colorfulos.anim.Interpolators.LINEAR;
-import static com.android.colorfulos.dragndrop.DragLayer.ALPHA_INDEX_TRANSITIONS;
-import static com.android.colorfulos.views.FloatingIconView.SHAPE_PROGRESS_DURATION;
+import static com.aoleyun.os.BaseActivity.INVISIBLE_ALL;
+import static com.aoleyun.os.BaseActivity.INVISIBLE_BY_APP_TRANSITIONS;
+import static com.aoleyun.os.BaseActivity.INVISIBLE_BY_PENDING_FLAGS;
+import static com.aoleyun.os.BaseActivity.PENDING_INVISIBLE_BY_WALLPAPER_ANIMATION;
+import static com.aoleyun.os.LauncherState.ALL_APPS;
+import static com.aoleyun.os.LauncherState.OVERVIEW;
+import static com.aoleyun.os.Utilities.postAsyncCallback;
+import static com.aoleyun.os.allapps.AllAppsTransitionController.ALL_APPS_PROGRESS;
+import static com.aoleyun.os.anim.Interpolators.AGGRESSIVE_EASE;
+import static com.aoleyun.os.anim.Interpolators.DEACCEL_1_7;
+import static com.aoleyun.os.anim.Interpolators.EXAGGERATED_EASE;
+import static com.aoleyun.os.anim.Interpolators.LINEAR;
+import static com.aoleyun.os.dragndrop.DragLayer.ALPHA_INDEX_TRANSITIONS;
+import static com.aoleyun.os.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;
@@ -57,15 +57,15 @@ import android.os.Looper;
 import android.util.Pair;
 import android.view.View;
 
-import com.android.colorfulos.DeviceProfile.OnDeviceProfileChangeListener;
-import com.android.colorfulos.allapps.AllAppsTransitionController;
-import com.android.colorfulos.anim.Interpolators;
-import com.android.colorfulos.config.FeatureFlags;
-import com.android.colorfulos.dragndrop.DragLayer;
-import com.android.colorfulos.shortcuts.DeepShortcutView;
-import com.android.colorfulos.util.MultiValueAlpha;
-import com.android.colorfulos.util.MultiValueAlpha.AlphaProperty;
-import com.android.colorfulos.views.FloatingIconView;
+import com.aoleyun.os.DeviceProfile.OnDeviceProfileChangeListener;
+import com.aoleyun.os.allapps.AllAppsTransitionController;
+import com.aoleyun.os.anim.Interpolators;
+import com.aoleyun.os.config.FeatureFlags;
+import com.aoleyun.os.dragndrop.DragLayer;
+import com.aoleyun.os.shortcuts.DeepShortcutView;
+import com.aoleyun.os.util.MultiValueAlpha;
+import com.aoleyun.os.util.MultiValueAlpha.AlphaProperty;
+import com.aoleyun.os.views.FloatingIconView;
 import com.android.quickstep.util.MultiValueUpdateListener;
 import com.android.quickstep.util.RemoteAnimationProvider;
 import com.android.quickstep.util.RemoteAnimationTargetSet;
diff --git a/quickstep/src/com/android/launcher3/proxy/ProxyActivityStarter.java b/quickstep/src/com/android/launcher3/proxy/ProxyActivityStarter.java
index 825b1e5..7f2003c 100644
--- a/quickstep/src/com/android/launcher3/proxy/ProxyActivityStarter.java
+++ b/quickstep/src/com/android/launcher3/proxy/ProxyActivityStarter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.proxy;
+package com.aoleyun.os.proxy;
 
 import android.app.Activity;
 import android.content.Context;
diff --git a/quickstep/src/com/android/launcher3/proxy/StartActivityParams.java b/quickstep/src/com/android/launcher3/proxy/StartActivityParams.java
index 31102e2..c8727d9 100644
--- a/quickstep/src/com/android/launcher3/proxy/StartActivityParams.java
+++ b/quickstep/src/com/android/launcher3/proxy/StartActivityParams.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.proxy;
+package com.aoleyun.os.proxy;
 
 import android.app.Activity;
 import android.app.PendingIntent;
diff --git a/quickstep/src/com/android/launcher3/uioverrides/BackButtonAlphaHandler.java b/quickstep/src/com/android/launcher3/uioverrides/BackButtonAlphaHandler.java
index 60e3d80..caeaa0d 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/BackButtonAlphaHandler.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/BackButtonAlphaHandler.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.uioverrides;
+package com.aoleyun.os.uioverrides;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.ValueAnimator;
 
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.LauncherState;
-import com.android.colorfulos.LauncherStateManager;
-import com.android.colorfulos.anim.AnimatorSetBuilder;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.LauncherState;
+import com.aoleyun.os.LauncherStateManager;
+import com.aoleyun.os.anim.AnimatorSetBuilder;
 import com.android.quickstep.OverviewInteractionState;
 
 public class BackButtonAlphaHandler implements LauncherStateManager.StateHandler {
diff --git a/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java b/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java
index 1f80a4a..7194b61 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java
@@ -14,28 +14,28 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.uioverrides;
+package com.aoleyun.os.uioverrides;
 
-import static com.android.colorfulos.LauncherAnimUtils.SCALE_PROPERTY;
-import static com.android.colorfulos.anim.AnimatorSetBuilder.ANIM_OVERVIEW_FADE;
-import static com.android.colorfulos.anim.AnimatorSetBuilder.ANIM_OVERVIEW_SCALE;
-import static com.android.colorfulos.anim.AnimatorSetBuilder.ANIM_OVERVIEW_TRANSLATE_X;
-import static com.android.colorfulos.anim.AnimatorSetBuilder.ANIM_OVERVIEW_TRANSLATE_Y;
-import static com.android.colorfulos.anim.AnimatorSetBuilder.FLAG_DONT_ANIMATE_OVERVIEW;
-import static com.android.colorfulos.anim.Interpolators.AGGRESSIVE_EASE_IN_OUT;
-import static com.android.colorfulos.anim.Interpolators.LINEAR;
+import static com.aoleyun.os.LauncherAnimUtils.SCALE_PROPERTY;
+import static com.aoleyun.os.anim.AnimatorSetBuilder.ANIM_OVERVIEW_FADE;
+import static com.aoleyun.os.anim.AnimatorSetBuilder.ANIM_OVERVIEW_SCALE;
+import static com.aoleyun.os.anim.AnimatorSetBuilder.ANIM_OVERVIEW_TRANSLATE_X;
+import static com.aoleyun.os.anim.AnimatorSetBuilder.ANIM_OVERVIEW_TRANSLATE_Y;
+import static com.aoleyun.os.anim.AnimatorSetBuilder.FLAG_DONT_ANIMATE_OVERVIEW;
+import static com.aoleyun.os.anim.Interpolators.AGGRESSIVE_EASE_IN_OUT;
+import static com.aoleyun.os.anim.Interpolators.LINEAR;
 
 import android.util.FloatProperty;
 import android.view.View;
 import android.view.animation.Interpolator;
 
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.LauncherState;
-import com.android.colorfulos.LauncherState.ScaleAndTranslation;
-import com.android.colorfulos.LauncherStateManager.AnimationConfig;
-import com.android.colorfulos.LauncherStateManager.StateHandler;
-import com.android.colorfulos.anim.AnimatorSetBuilder;
-import com.android.colorfulos.anim.PropertySetter;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.LauncherState;
+import com.aoleyun.os.LauncherState.ScaleAndTranslation;
+import com.aoleyun.os.LauncherStateManager.AnimationConfig;
+import com.aoleyun.os.LauncherStateManager.StateHandler;
+import com.aoleyun.os.anim.AnimatorSetBuilder;
+import com.aoleyun.os.anim.PropertySetter;
 
 import androidx.annotation.NonNull;
 
diff --git a/quickstep/src/com/android/launcher3/uioverrides/DisplayRotationListener.java b/quickstep/src/com/android/launcher3/uioverrides/DisplayRotationListener.java
index 18e97c3..30cd3ea 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/DisplayRotationListener.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/DisplayRotationListener.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.uioverrides;
+package com.aoleyun.os.uioverrides;
 
 import android.content.Context;
 import android.os.Handler;
diff --git a/quickstep/src/com/android/launcher3/uioverrides/UiFactory.java b/quickstep/src/com/android/launcher3/uioverrides/UiFactory.java
index a2009b6..d77e5e6 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/UiFactory.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/UiFactory.java
@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.uioverrides;
+package com.aoleyun.os.uioverrides;
 
 import static android.app.Activity.RESULT_CANCELED;
 
-import static com.android.colorfulos.AbstractFloatingView.TYPE_ALL;
-import static com.android.colorfulos.AbstractFloatingView.TYPE_HIDE_BACK_BUTTON;
-import static com.android.colorfulos.LauncherState.ALL_APPS;
-import static com.android.colorfulos.LauncherState.NORMAL;
-import static com.android.colorfulos.LauncherState.OVERVIEW;
-import static com.android.colorfulos.allapps.DiscoveryBounce.BOUNCE_MAX_COUNT;
-import static com.android.colorfulos.allapps.DiscoveryBounce.HOME_BOUNCE_COUNT;
-import static com.android.colorfulos.allapps.DiscoveryBounce.HOME_BOUNCE_SEEN;
-import static com.android.colorfulos.allapps.DiscoveryBounce.SHELF_BOUNCE_COUNT;
-import static com.android.colorfulos.allapps.DiscoveryBounce.SHELF_BOUNCE_SEEN;
+import static com.aoleyun.os.AbstractFloatingView.TYPE_ALL;
+import static com.aoleyun.os.AbstractFloatingView.TYPE_HIDE_BACK_BUTTON;
+import static com.aoleyun.os.LauncherState.ALL_APPS;
+import static com.aoleyun.os.LauncherState.NORMAL;
+import static com.aoleyun.os.LauncherState.OVERVIEW;
+import static com.aoleyun.os.allapps.DiscoveryBounce.BOUNCE_MAX_COUNT;
+import static com.aoleyun.os.allapps.DiscoveryBounce.HOME_BOUNCE_COUNT;
+import static com.aoleyun.os.allapps.DiscoveryBounce.HOME_BOUNCE_SEEN;
+import static com.aoleyun.os.allapps.DiscoveryBounce.SHELF_BOUNCE_COUNT;
+import static com.aoleyun.os.allapps.DiscoveryBounce.SHELF_BOUNCE_SEEN;
 
 import android.animation.AnimatorSet;
 import android.animation.ValueAnimator;
@@ -39,16 +39,16 @@ import android.os.Bundle;
 import android.os.CancellationSignal;
 import android.util.Base64;
 
-import com.android.colorfulos.AbstractFloatingView;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.LauncherState;
-import com.android.colorfulos.LauncherState.ScaleAndTranslation;
-import com.android.colorfulos.LauncherStateManager;
-import com.android.colorfulos.LauncherStateManager.StateHandler;
-import com.android.colorfulos.QuickstepAppTransitionManagerImpl;
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.proxy.ProxyActivityStarter;
-import com.android.colorfulos.proxy.StartActivityParams;
+import com.aoleyun.os.AbstractFloatingView;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.LauncherState;
+import com.aoleyun.os.LauncherState.ScaleAndTranslation;
+import com.aoleyun.os.LauncherStateManager;
+import com.aoleyun.os.LauncherStateManager.StateHandler;
+import com.aoleyun.os.QuickstepAppTransitionManagerImpl;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.proxy.ProxyActivityStarter;
+import com.aoleyun.os.proxy.StartActivityParams;
 import com.android.quickstep.OverviewInteractionState;
 import com.android.quickstep.RecentsModel;
 import com.android.quickstep.SysUINavigationMode;
diff --git a/quickstep/src/com/android/launcher3/uioverrides/WallpaperColorInfo.java b/quickstep/src/com/android/launcher3/uioverrides/WallpaperColorInfo.java
index c1b535c..301947f 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/WallpaperColorInfo.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/WallpaperColorInfo.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.uioverrides;
+package com.aoleyun.os.uioverrides;
 
 import static android.app.WallpaperManager.FLAG_SYSTEM;
 
diff --git a/quickstep/src/com/android/launcher3/uioverrides/plugins/PluginEnablerImpl.java b/quickstep/src/com/android/launcher3/uioverrides/plugins/PluginEnablerImpl.java
index 6541c84..2c25e7d 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/plugins/PluginEnablerImpl.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/plugins/PluginEnablerImpl.java
@@ -12,13 +12,13 @@
  * permissions and limitations under the License.
  */
 
-package com.android.colorfulos.uioverrides.plugins;
+package com.aoleyun.os.uioverrides.plugins;
 
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.SharedPreferences;
 
-import com.android.colorfulos.Utilities;
+import com.aoleyun.os.Utilities;
 import com.android.systemui.shared.plugins.PluginEnabler;
 
 import androidx.preference.PreferenceDataStore;
diff --git a/quickstep/src/com/android/launcher3/uioverrides/plugins/PluginInitializerImpl.java b/quickstep/src/com/android/launcher3/uioverrides/plugins/PluginInitializerImpl.java
index b8d2026..70a7aa7 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/plugins/PluginInitializerImpl.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/plugins/PluginInitializerImpl.java
@@ -12,12 +12,12 @@
  * permissions and limitations under the License.
  */
 
-package com.android.colorfulos.uioverrides.plugins;
+package com.aoleyun.os.uioverrides.plugins;
 
 import android.content.Context;
 import android.os.Looper;
 
-import com.android.colorfulos.LauncherModel;
+import com.aoleyun.os.LauncherModel;
 import com.android.systemui.shared.plugins.PluginInitializer;
 
 public class PluginInitializerImpl implements PluginInitializer {
diff --git a/quickstep/src/com/android/launcher3/uioverrides/plugins/PluginManagerWrapper.java b/quickstep/src/com/android/launcher3/uioverrides/plugins/PluginManagerWrapper.java
index 61f5f41..4179fe0 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/plugins/PluginManagerWrapper.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/plugins/PluginManagerWrapper.java
@@ -12,12 +12,12 @@
  * permissions and limitations under the License.
  */
 
-package com.android.colorfulos.uioverrides.plugins;
+package com.aoleyun.os.uioverrides.plugins;
 
 import android.content.ComponentName;
 import android.content.Context;
 
-import com.android.colorfulos.util.MainThreadInitializedObject;
+import com.aoleyun.os.util.MainThreadInitializedObject;
 import com.android.systemui.plugins.Plugin;
 import com.android.systemui.plugins.PluginListener;
 import com.android.systemui.shared.plugins.PluginManager;
diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java b/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java
index f433275..891ad5b 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.uioverrides.states;
+package com.aoleyun.os.uioverrides.states;
 
-import static com.android.colorfulos.LauncherAnimUtils.ALL_APPS_TRANSITION_MS;
-import static com.android.colorfulos.anim.Interpolators.DEACCEL_2;
+import static com.aoleyun.os.LauncherAnimUtils.ALL_APPS_TRANSITION_MS;
+import static com.aoleyun.os.anim.Interpolators.DEACCEL_2;
 
-import com.android.colorfulos.AbstractFloatingView;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.LauncherState;
-import com.android.colorfulos.allapps.AllAppsContainerView;
-import com.android.colorfulos.userevent.nano.LauncherLogProto.ContainerType;
+import com.aoleyun.os.AbstractFloatingView;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.LauncherState;
+import com.aoleyun.os.allapps.AllAppsContainerView;
+import com.aoleyun.os.userevent.nano.LauncherLogProto.ContainerType;
 import com.android.quickstep.SysUINavigationMode;
 
 /**
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/LandscapeEdgeSwipeController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/LandscapeEdgeSwipeController.java
index bfd692a..a5b05ed 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/LandscapeEdgeSwipeController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/LandscapeEdgeSwipeController.java
@@ -1,19 +1,19 @@
-package com.android.colorfulos.uioverrides.touchcontrollers;
+package com.aoleyun.os.uioverrides.touchcontrollers;
 
-import static com.android.colorfulos.LauncherState.NORMAL;
-import static com.android.colorfulos.LauncherState.OVERVIEW;
-import static com.android.colorfulos.Utilities.EDGE_NAV_BAR;
+import static com.aoleyun.os.LauncherState.NORMAL;
+import static com.aoleyun.os.LauncherState.OVERVIEW;
+import static com.aoleyun.os.Utilities.EDGE_NAV_BAR;
 
 import android.view.MotionEvent;
 
-import com.android.colorfulos.AbstractFloatingView;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.LauncherState;
-import com.android.colorfulos.LauncherStateManager.AnimationComponents;
-import com.android.colorfulos.touch.AbstractStateChangeTouchController;
-import com.android.colorfulos.touch.SwipeDetector;
-import com.android.colorfulos.userevent.nano.LauncherLogProto;
-import com.android.colorfulos.userevent.nano.LauncherLogProto.Action.Direction;
+import com.aoleyun.os.AbstractFloatingView;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.LauncherState;
+import com.aoleyun.os.LauncherStateManager.AnimationComponents;
+import com.aoleyun.os.touch.AbstractStateChangeTouchController;
+import com.aoleyun.os.touch.SwipeDetector;
+import com.aoleyun.os.userevent.nano.LauncherLogProto;
+import com.aoleyun.os.userevent.nano.LauncherLogProto.Action.Direction;
 import com.android.quickstep.RecentsModel;
 
 /**
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java
index fb8cce3..faf71b5 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java
@@ -13,19 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.uioverrides.touchcontrollers;
+package com.aoleyun.os.uioverrides.touchcontrollers;
 
-import static com.android.colorfulos.AbstractFloatingView.TYPE_ACCESSIBLE;
-import static com.android.colorfulos.LauncherState.ALL_APPS;
-import static com.android.colorfulos.LauncherState.NORMAL;
-import static com.android.colorfulos.LauncherState.OVERVIEW;
-import static com.android.colorfulos.anim.AnimatorSetBuilder.ANIM_ALL_APPS_FADE;
-import static com.android.colorfulos.anim.AnimatorSetBuilder.ANIM_OVERVIEW_FADE;
-import static com.android.colorfulos.anim.AnimatorSetBuilder.ANIM_VERTICAL_PROGRESS;
-import static com.android.colorfulos.anim.Interpolators.ACCEL;
-import static com.android.colorfulos.anim.Interpolators.DEACCEL;
-import static com.android.colorfulos.anim.Interpolators.LINEAR;
-import static com.android.colorfulos.config.FeatureFlags.QUICKSTEP_SPRINGS;
+import static com.aoleyun.os.AbstractFloatingView.TYPE_ACCESSIBLE;
+import static com.aoleyun.os.LauncherState.ALL_APPS;
+import static com.aoleyun.os.LauncherState.NORMAL;
+import static com.aoleyun.os.LauncherState.OVERVIEW;
+import static com.aoleyun.os.anim.AnimatorSetBuilder.ANIM_ALL_APPS_FADE;
+import static com.aoleyun.os.anim.AnimatorSetBuilder.ANIM_OVERVIEW_FADE;
+import static com.aoleyun.os.anim.AnimatorSetBuilder.ANIM_VERTICAL_PROGRESS;
+import static com.aoleyun.os.anim.Interpolators.ACCEL;
+import static com.aoleyun.os.anim.Interpolators.DEACCEL;
+import static com.aoleyun.os.anim.Interpolators.LINEAR;
+import static com.aoleyun.os.config.FeatureFlags.QUICKSTEP_SPRINGS;
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_OVERVIEW_DISABLED;
 
 import android.animation.TimeInterpolator;
@@ -33,20 +33,20 @@ import android.animation.ValueAnimator;
 import android.view.MotionEvent;
 import android.view.animation.Interpolator;
 
-import com.android.colorfulos.AbstractFloatingView;
-import com.android.colorfulos.DeviceProfile;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.LauncherState;
-import com.android.colorfulos.LauncherStateManager.AnimationComponents;
-import com.android.colorfulos.allapps.AllAppsTransitionController;
-import com.android.colorfulos.anim.AnimatorPlaybackController;
-import com.android.colorfulos.anim.AnimatorSetBuilder;
-import com.android.colorfulos.anim.Interpolators;
-import com.android.colorfulos.touch.AbstractStateChangeTouchController;
-import com.android.colorfulos.touch.SwipeDetector;
-import com.android.colorfulos.uioverrides.states.OverviewState;
-import com.android.colorfulos.userevent.nano.LauncherLogProto.Action.Touch;
-import com.android.colorfulos.userevent.nano.LauncherLogProto.ContainerType;
+import com.aoleyun.os.AbstractFloatingView;
+import com.aoleyun.os.DeviceProfile;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.LauncherState;
+import com.aoleyun.os.LauncherStateManager.AnimationComponents;
+import com.aoleyun.os.allapps.AllAppsTransitionController;
+import com.aoleyun.os.anim.AnimatorPlaybackController;
+import com.aoleyun.os.anim.AnimatorSetBuilder;
+import com.aoleyun.os.anim.Interpolators;
+import com.aoleyun.os.touch.AbstractStateChangeTouchController;
+import com.aoleyun.os.touch.SwipeDetector;
+import com.aoleyun.os.uioverrides.states.OverviewState;
+import com.aoleyun.os.userevent.nano.LauncherLogProto.Action.Touch;
+import com.aoleyun.os.userevent.nano.LauncherLogProto.ContainerType;
 import com.android.quickstep.OverviewInteractionState;
 import com.android.quickstep.RecentsModel;
 import com.android.quickstep.TouchInteractionService;
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/StatusBarTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/StatusBarTouchController.java
index 192dd08..a5bb812 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/StatusBarTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/StatusBarTouchController.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.uioverrides.touchcontrollers;
+package com.aoleyun.os.uioverrides.touchcontrollers;
 
 import static android.view.MotionEvent.ACTION_DOWN;
 import static android.view.MotionEvent.ACTION_MOVE;
@@ -23,12 +23,12 @@ import android.util.Log;
 import android.view.MotionEvent;
 import android.view.ViewConfiguration;
 
-import com.android.colorfulos.AbstractFloatingView;
-import com.android.colorfulos.DeviceProfile;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.LauncherState;
-import com.android.colorfulos.touch.TouchEventTranslator;
-import com.android.colorfulos.util.TouchController;
+import com.aoleyun.os.AbstractFloatingView;
+import com.aoleyun.os.DeviceProfile;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.LauncherState;
+import com.aoleyun.os.touch.TouchEventTranslator;
+import com.aoleyun.os.util.TouchController;
 import com.android.quickstep.RecentsModel;
 import com.android.systemui.shared.recents.ISystemUiProxy;
 
diff --git a/quickstep/src/com/android/quickstep/ActivityControlHelper.java b/quickstep/src/com/android/quickstep/ActivityControlHelper.java
index 0d5828c..bc867f0 100644
--- a/quickstep/src/com/android/quickstep/ActivityControlHelper.java
+++ b/quickstep/src/com/android/quickstep/ActivityControlHelper.java
@@ -31,9 +31,9 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.UiThread;
 
-import com.android.colorfulos.BaseDraggingActivity;
-import com.android.colorfulos.DeviceProfile;
-import com.android.colorfulos.anim.AnimatorPlaybackController;
+import com.aoleyun.os.BaseDraggingActivity;
+import com.aoleyun.os.DeviceProfile;
+import com.aoleyun.os.anim.AnimatorPlaybackController;
 import com.android.quickstep.util.RemoteAnimationProvider;
 import com.android.quickstep.util.RemoteAnimationTargetSet;
 import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
@@ -87,7 +87,7 @@ public interface ActivityControlHelper<T extends BaseDraggingActivity> {
     }
 
     /**
-     * Used for containerType in {@link com.android.colorfulos.logging.UserEventDispatcher}
+     * Used for containerType in {@link com.aoleyun.os.logging.UserEventDispatcher}
      */
     int getContainerType();
 
diff --git a/quickstep/src/com/android/quickstep/BaseRecentsActivity.java b/quickstep/src/com/android/quickstep/BaseRecentsActivity.java
index fdc54d8..9a187bc 100644
--- a/quickstep/src/com/android/quickstep/BaseRecentsActivity.java
+++ b/quickstep/src/com/android/quickstep/BaseRecentsActivity.java
@@ -22,14 +22,14 @@ import android.content.Intent;
 import android.content.res.Configuration;
 import android.os.Bundle;
 
-import com.android.colorfulos.AbstractFloatingView;
-import com.android.colorfulos.BaseDraggingActivity;
-import com.android.colorfulos.DeviceProfile;
-import com.android.colorfulos.InvariantDeviceProfile;
-import com.android.colorfulos.R;
-import com.android.colorfulos.uioverrides.UiFactory;
-import com.android.colorfulos.util.SystemUiController;
-import com.android.colorfulos.util.Themes;
+import com.aoleyun.os.AbstractFloatingView;
+import com.aoleyun.os.BaseDraggingActivity;
+import com.aoleyun.os.DeviceProfile;
+import com.aoleyun.os.InvariantDeviceProfile;
+import com.aoleyun.os.R;
+import com.aoleyun.os.uioverrides.UiFactory;
+import com.aoleyun.os.util.SystemUiController;
+import com.aoleyun.os.util.Themes;
 
 import java.io.FileDescriptor;
 import java.io.PrintWriter;
diff --git a/quickstep/src/com/android/quickstep/InstantAppResolverImpl.java b/quickstep/src/com/android/quickstep/InstantAppResolverImpl.java
index 5e0a590..85b70c8 100644
--- a/quickstep/src/com/android/quickstep/InstantAppResolverImpl.java
+++ b/quickstep/src/com/android/quickstep/InstantAppResolverImpl.java
@@ -21,8 +21,8 @@ import android.content.Context;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 
-import com.android.colorfulos.AppInfo;
-import com.android.colorfulos.util.InstantAppResolver;
+import com.aoleyun.os.AppInfo;
+import com.aoleyun.os.util.InstantAppResolver;
 
 /**
  * Implementation of InstantAppResolver using platform APIs
diff --git a/quickstep/src/com/android/quickstep/LauncherSearchIndexablesProvider.java b/quickstep/src/com/android/quickstep/LauncherSearchIndexablesProvider.java
index 761568b..b036290 100644
--- a/quickstep/src/com/android/quickstep/LauncherSearchIndexablesProvider.java
+++ b/quickstep/src/com/android/quickstep/LauncherSearchIndexablesProvider.java
@@ -28,7 +28,7 @@ import android.provider.SearchIndexablesContract.XmlResource;
 import android.provider.SearchIndexablesProvider;
 import android.util.Xml;
 
-import com.android.colorfulos.R;
+import com.aoleyun.os.R;
 
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
diff --git a/quickstep/src/com/android/quickstep/NormalizedIconLoader.java b/quickstep/src/com/android/quickstep/NormalizedIconLoader.java
index 45cf61c..d61dbc4 100644
--- a/quickstep/src/com/android/quickstep/NormalizedIconLoader.java
+++ b/quickstep/src/com/android/quickstep/NormalizedIconLoader.java
@@ -27,10 +27,10 @@ import android.os.UserHandle;
 import android.util.LruCache;
 import android.util.SparseArray;
 
-import com.android.colorfulos.FastBitmapDrawable;
-import com.android.colorfulos.icons.BitmapInfo;
-import com.android.colorfulos.graphics.DrawableFactory;
-import com.android.colorfulos.icons.LauncherIcons;
+import com.aoleyun.os.FastBitmapDrawable;
+import com.aoleyun.os.icons.BitmapInfo;
+import com.aoleyun.os.graphics.DrawableFactory;
+import com.aoleyun.os.icons.LauncherIcons;
 import com.android.systemui.shared.recents.model.IconLoader;
 import com.android.systemui.shared.recents.model.TaskKeyLruCache;
 
diff --git a/quickstep/src/com/android/quickstep/OverviewCallbacks.java b/quickstep/src/com/android/quickstep/OverviewCallbacks.java
index 98c975d..ce26648 100644
--- a/quickstep/src/com/android/quickstep/OverviewCallbacks.java
+++ b/quickstep/src/com/android/quickstep/OverviewCallbacks.java
@@ -17,9 +17,9 @@ package com.android.quickstep;
 
 import android.content.Context;
 
-import com.android.colorfulos.R;
-import com.android.colorfulos.util.Preconditions;
-import com.android.colorfulos.util.ResourceBasedOverride;
+import com.aoleyun.os.R;
+import com.aoleyun.os.util.Preconditions;
+import com.aoleyun.os.util.ResourceBasedOverride;
 
 /**
  * Callbacks related to overview/quicksteps.
diff --git a/quickstep/src/com/android/quickstep/OverviewComponentObserver.java b/quickstep/src/com/android/quickstep/OverviewComponentObserver.java
index 140dfef..3ca2e8f 100644
--- a/quickstep/src/com/android/quickstep/OverviewComponentObserver.java
+++ b/quickstep/src/com/android/quickstep/OverviewComponentObserver.java
@@ -20,7 +20,7 @@ import static android.content.Intent.ACTION_PACKAGE_ADDED;
 import static android.content.Intent.ACTION_PACKAGE_CHANGED;
 import static android.content.Intent.ACTION_PACKAGE_REMOVED;
 
-import static com.android.colorfulos.util.PackageManagerHelper.getPackageFilter;
+import static com.aoleyun.os.util.PackageManagerHelper.getPackageFilter;
 import static com.android.systemui.shared.system.PackageManagerWrapper.ACTION_PREFERRED_ACTIVITY_CHANGED;
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_HOME_DISABLED;
 
diff --git a/quickstep/src/com/android/quickstep/OverviewInteractionState.java b/quickstep/src/com/android/quickstep/OverviewInteractionState.java
index bc41f05..d755d40 100644
--- a/quickstep/src/com/android/quickstep/OverviewInteractionState.java
+++ b/quickstep/src/com/android/quickstep/OverviewInteractionState.java
@@ -21,10 +21,10 @@ import android.os.Message;
 import android.os.RemoteException;
 import android.util.Log;
 
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.allapps.DiscoveryBounce;
-import com.android.colorfulos.util.MainThreadInitializedObject;
-import com.android.colorfulos.util.UiThreadHelper;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.allapps.DiscoveryBounce;
+import com.aoleyun.os.util.MainThreadInitializedObject;
+import com.aoleyun.os.util.UiThreadHelper;
 import com.android.systemui.shared.recents.ISystemUiProxy;
 
 import androidx.annotation.WorkerThread;
diff --git a/quickstep/src/com/android/quickstep/QuickstepProcessInitializer.java b/quickstep/src/com/android/quickstep/QuickstepProcessInitializer.java
index 674f059..f7718b8 100644
--- a/quickstep/src/com/android/quickstep/QuickstepProcessInitializer.java
+++ b/quickstep/src/com/android/quickstep/QuickstepProcessInitializer.java
@@ -21,9 +21,9 @@ import android.content.pm.PackageManager;
 import android.os.UserManager;
 import android.util.Log;
 
-import com.android.colorfulos.BuildConfig;
-import com.android.colorfulos.MainProcessInitializer;
-import com.android.colorfulos.Utilities;
+import com.aoleyun.os.BuildConfig;
+import com.aoleyun.os.MainProcessInitializer;
+import com.aoleyun.os.Utilities;
 import com.android.systemui.shared.system.ThreadedRendererCompat;
 
 @SuppressWarnings("unused")
diff --git a/quickstep/src/com/android/quickstep/QuickstepTestInformationHandler.java b/quickstep/src/com/android/quickstep/QuickstepTestInformationHandler.java
index c3b0565..d326e4b 100644
--- a/quickstep/src/com/android/quickstep/QuickstepTestInformationHandler.java
+++ b/quickstep/src/com/android/quickstep/QuickstepTestInformationHandler.java
@@ -3,9 +3,9 @@ package com.android.quickstep;
 import android.content.Context;
 import android.os.Bundle;
 
-import com.android.colorfulos.testing.TestInformationHandler;
-import com.android.colorfulos.testing.TestProtocol;
-import com.android.colorfulos.uioverrides.states.OverviewState;
+import com.aoleyun.os.testing.TestInformationHandler;
+import com.aoleyun.os.testing.TestProtocol;
+import com.aoleyun.os.uioverrides.states.OverviewState;
 import com.android.quickstep.util.LayoutUtils;
 
 public class QuickstepTestInformationHandler extends TestInformationHandler {
diff --git a/quickstep/src/com/android/quickstep/RecentTasksList.java b/quickstep/src/com/android/quickstep/RecentTasksList.java
index a74ca57..7fabef8 100644
--- a/quickstep/src/com/android/quickstep/RecentTasksList.java
+++ b/quickstep/src/com/android/quickstep/RecentTasksList.java
@@ -22,7 +22,7 @@ import android.content.Context;
 import android.os.Build;
 import android.os.Process;
 import android.util.SparseBooleanArray;
-import com.android.colorfulos.MainThreadExecutor;
+import com.aoleyun.os.MainThreadExecutor;
 import com.android.systemui.shared.recents.model.Task;
 import com.android.systemui.shared.system.ActivityManagerWrapper;
 import com.android.systemui.shared.system.BackgroundExecutor;
diff --git a/quickstep/src/com/android/quickstep/RecentsActivityTracker.java b/quickstep/src/com/android/quickstep/RecentsActivityTracker.java
index 5e58eb1..bd6ccfc 100644
--- a/quickstep/src/com/android/quickstep/RecentsActivityTracker.java
+++ b/quickstep/src/com/android/quickstep/RecentsActivityTracker.java
@@ -22,7 +22,7 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 
-import com.android.colorfulos.MainThreadExecutor;
+import com.aoleyun.os.MainThreadExecutor;
 import com.android.quickstep.ActivityControlHelper.ActivityInitListener;
 import com.android.quickstep.util.RemoteAnimationProvider;
 
diff --git a/quickstep/src/com/android/quickstep/RecentsModel.java b/quickstep/src/com/android/quickstep/RecentsModel.java
index 2277ce7..e29f3dd 100644
--- a/quickstep/src/com/android/quickstep/RecentsModel.java
+++ b/quickstep/src/com/android/quickstep/RecentsModel.java
@@ -30,7 +30,7 @@ import android.os.Process;
 import android.os.RemoteException;
 import android.util.Log;
 
-import com.android.colorfulos.util.MainThreadInitializedObject;
+import com.aoleyun.os.util.MainThreadInitializedObject;
 import com.android.systemui.shared.recents.ISystemUiProxy;
 import com.android.systemui.shared.recents.model.Task;
 import com.android.systemui.shared.recents.model.ThumbnailData;
diff --git a/quickstep/src/com/android/quickstep/SysUINavigationMode.java b/quickstep/src/com/android/quickstep/SysUINavigationMode.java
index 1c5773d..2614771 100644
--- a/quickstep/src/com/android/quickstep/SysUINavigationMode.java
+++ b/quickstep/src/com/android/quickstep/SysUINavigationMode.java
@@ -16,7 +16,7 @@
 
 package com.android.quickstep;
 
-import static com.android.colorfulos.util.PackageManagerHelper.getPackageFilter;
+import static com.aoleyun.os.util.PackageManagerHelper.getPackageFilter;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -24,7 +24,7 @@ import android.content.Intent;
 import android.content.res.Resources;
 import android.util.Log;
 
-import com.android.colorfulos.util.MainThreadInitializedObject;
+import com.aoleyun.os.util.MainThreadInitializedObject;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/quickstep/src/com/android/quickstep/TaskIconCache.java b/quickstep/src/com/android/quickstep/TaskIconCache.java
index f945ad1..aa2d98e 100644
--- a/quickstep/src/com/android/quickstep/TaskIconCache.java
+++ b/quickstep/src/com/android/quickstep/TaskIconCache.java
@@ -15,7 +15,7 @@
  */
 package com.android.quickstep;
 
-import static com.android.colorfulos.uioverrides.RecentsUiFactory.GO_LOW_RAM_RECENTS_ENABLED;
+import static com.aoleyun.os.uioverrides.RecentsUiFactory.GO_LOW_RAM_RECENTS_ENABLED;
 
 import android.content.ComponentName;
 import android.content.Context;
@@ -27,12 +27,12 @@ import android.os.Looper;
 import android.util.LruCache;
 import android.view.accessibility.AccessibilityManager;
 
-import com.android.colorfulos.MainThreadExecutor;
-import com.android.colorfulos.R;
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.icons.cache.HandlerRunnable;
-import com.android.colorfulos.uioverrides.RecentsUiFactory;
-import com.android.colorfulos.util.Preconditions;
+import com.aoleyun.os.MainThreadExecutor;
+import com.aoleyun.os.R;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.icons.cache.HandlerRunnable;
+import com.aoleyun.os.uioverrides.RecentsUiFactory;
+import com.aoleyun.os.util.Preconditions;
 import com.android.systemui.shared.recents.model.Task;
 import com.android.systemui.shared.recents.model.TaskKeyLruCache;
 import com.android.systemui.shared.system.ActivityManagerWrapper;
diff --git a/quickstep/src/com/android/quickstep/TaskThumbnailCache.java b/quickstep/src/com/android/quickstep/TaskThumbnailCache.java
index 54c3138..8bc8c9a 100644
--- a/quickstep/src/com/android/quickstep/TaskThumbnailCache.java
+++ b/quickstep/src/com/android/quickstep/TaskThumbnailCache.java
@@ -20,11 +20,11 @@ import android.content.Context;
 import android.content.res.Resources;
 import android.os.Handler;
 import android.os.Looper;
-import com.android.colorfulos.MainThreadExecutor;
-import com.android.colorfulos.R;
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.icons.cache.HandlerRunnable;
-import com.android.colorfulos.util.Preconditions;
+import com.aoleyun.os.MainThreadExecutor;
+import com.aoleyun.os.R;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.icons.cache.HandlerRunnable;
+import com.aoleyun.os.util.Preconditions;
 import com.android.systemui.shared.recents.model.Task;
 import com.android.systemui.shared.recents.model.Task.TaskKey;
 import com.android.systemui.shared.recents.model.TaskKeyLruCache;
diff --git a/quickstep/src/com/android/quickstep/TaskUtils.java b/quickstep/src/com/android/quickstep/TaskUtils.java
index 7dffd62..fe6b2bf 100644
--- a/quickstep/src/com/android/quickstep/TaskUtils.java
+++ b/quickstep/src/com/android/quickstep/TaskUtils.java
@@ -23,9 +23,9 @@ import android.content.pm.PackageManager;
 import android.os.UserHandle;
 import android.util.Log;
 
-import com.android.colorfulos.compat.LauncherAppsCompat;
-import com.android.colorfulos.compat.UserManagerCompat;
-import com.android.colorfulos.util.ComponentKey;
+import com.aoleyun.os.compat.LauncherAppsCompat;
+import com.aoleyun.os.compat.UserManagerCompat;
+import com.aoleyun.os.util.ComponentKey;
 import com.android.systemui.shared.recents.model.Task;
 import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
 
diff --git a/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java b/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java
index b710c11..0ec6ce6 100644
--- a/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java
+++ b/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java
@@ -30,11 +30,11 @@ import static android.stats.launcher.nano.Launcher.OVERVIEW;
 
 import android.view.View;
 
-import com.android.colorfulos.ItemInfo;
-import com.android.colorfulos.logging.StatsLogManager;
-import com.android.colorfulos.logging.StatsLogUtils;
-import com.android.colorfulos.userevent.nano.LauncherLogProto.Target;
-import com.android.colorfulos.util.ComponentKey;
+import com.aoleyun.os.ItemInfo;
+import com.aoleyun.os.logging.StatsLogManager;
+import com.aoleyun.os.logging.StatsLogUtils;
+import com.aoleyun.os.userevent.nano.LauncherLogProto.Target;
+import com.aoleyun.os.util.ComponentKey;
 import com.android.systemui.shared.system.StatsLogCompat;
 import com.google.protobuf.nano.MessageNano;
 
diff --git a/quickstep/src/com/android/quickstep/logging/UserEventDispatcherExtension.java b/quickstep/src/com/android/quickstep/logging/UserEventDispatcherExtension.java
index 2be1564..70103c6 100644
--- a/quickstep/src/com/android/quickstep/logging/UserEventDispatcherExtension.java
+++ b/quickstep/src/com/android/quickstep/logging/UserEventDispatcherExtension.java
@@ -18,15 +18,15 @@ package com.android.quickstep.logging;
 import android.content.Context;
 import android.util.Log;
 
-import static com.android.colorfulos.logging.LoggerUtils.newLauncherEvent;
-import static com.android.colorfulos.userevent.nano.LauncherLogProto.ControlType.CANCEL_TARGET;
+import static com.aoleyun.os.logging.LoggerUtils.newLauncherEvent;
+import static com.aoleyun.os.userevent.nano.LauncherLogProto.ControlType.CANCEL_TARGET;
 import static com.android.systemui.shared.system.LauncherEventUtil.VISIBLE;
 import static com.android.systemui.shared.system.LauncherEventUtil.DISMISS;
 import static com.android.systemui.shared.system.LauncherEventUtil.RECENTS_QUICK_SCRUB_ONBOARDING_TIP;
 import static com.android.systemui.shared.system.LauncherEventUtil.RECENTS_SWIPE_UP_ONBOARDING_TIP;
 
-import com.android.colorfulos.logging.UserEventDispatcher;
-import com.android.colorfulos.userevent.nano.LauncherLogProto;
+import com.aoleyun.os.logging.UserEventDispatcher;
+import com.aoleyun.os.userevent.nano.LauncherLogProto;
 import com.android.systemui.shared.system.MetricsLoggerCompat;
 
 /**
diff --git a/quickstep/src/com/android/quickstep/util/BinderTracker.java b/quickstep/src/com/android/quickstep/util/BinderTracker.java
index c6e7569..f006f12 100644
--- a/quickstep/src/com/android/quickstep/util/BinderTracker.java
+++ b/quickstep/src/com/android/quickstep/util/BinderTracker.java
@@ -21,7 +21,7 @@ import android.os.IBinder;
 import android.os.Looper;
 import android.util.Log;
 
-import com.android.colorfulos.config.FeatureFlags;
+import com.aoleyun.os.config.FeatureFlags;
 
 /**
  * Utility class to test and check binder calls during development.
diff --git a/quickstep/src/com/android/quickstep/util/LayoutUtils.java b/quickstep/src/com/android/quickstep/util/LayoutUtils.java
index cfb2b1c..2a40d99 100644
--- a/quickstep/src/com/android/quickstep/util/LayoutUtils.java
+++ b/quickstep/src/com/android/quickstep/util/LayoutUtils.java
@@ -24,9 +24,9 @@ import android.graphics.Rect;
 import androidx.annotation.AnyThread;
 import androidx.annotation.IntDef;
 
-import com.android.colorfulos.DeviceProfile;
-import com.android.colorfulos.R;
-import com.android.colorfulos.config.FeatureFlags;
+import com.aoleyun.os.DeviceProfile;
+import com.aoleyun.os.R;
+import com.aoleyun.os.config.FeatureFlags;
 
 import java.lang.annotation.Retention;
 
diff --git a/quickstep/src/com/android/quickstep/util/MotionPauseDetector.java b/quickstep/src/com/android/quickstep/util/MotionPauseDetector.java
index 6428211..5b22e9f 100644
--- a/quickstep/src/com/android/quickstep/util/MotionPauseDetector.java
+++ b/quickstep/src/com/android/quickstep/util/MotionPauseDetector.java
@@ -19,9 +19,9 @@ import android.content.Context;
 import android.content.res.Resources;
 import android.view.MotionEvent;
 
-import com.android.colorfulos.Alarm;
-import com.android.colorfulos.R;
-import com.android.colorfulos.compat.AccessibilityManagerCompat;
+import com.aoleyun.os.Alarm;
+import com.aoleyun.os.R;
+import com.aoleyun.os.compat.AccessibilityManagerCompat;
 
 /**
  * Given positions along x- or y-axis, tracks velocity and acceleration and determines when there is
diff --git a/quickstep/src/com/android/quickstep/util/RemoteAnimationProvider.java b/quickstep/src/com/android/quickstep/util/RemoteAnimationProvider.java
index e8215c6..2664620 100644
--- a/quickstep/src/com/android/quickstep/util/RemoteAnimationProvider.java
+++ b/quickstep/src/com/android/quickstep/util/RemoteAnimationProvider.java
@@ -19,7 +19,7 @@ import android.animation.AnimatorSet;
 import android.app.ActivityOptions;
 import android.os.Handler;
 
-import com.android.colorfulos.LauncherAnimationRunner;
+import com.aoleyun.os.LauncherAnimationRunner;
 import com.android.systemui.shared.system.ActivityOptionsCompat;
 import com.android.systemui.shared.system.RemoteAnimationAdapterCompat;
 import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
diff --git a/quickstep/src/com/android/quickstep/views/ShelfScrimView.java b/quickstep/src/com/android/quickstep/views/ShelfScrimView.java
index f696e44..41025cb 100644
--- a/quickstep/src/com/android/quickstep/views/ShelfScrimView.java
+++ b/quickstep/src/com/android/quickstep/views/ShelfScrimView.java
@@ -15,13 +15,13 @@
  */
 package com.android.quickstep.views;
 
-import static com.android.colorfulos.LauncherState.ALL_APPS_HEADER_EXTRA;
-import static com.android.colorfulos.LauncherState.BACKGROUND_APP;
-import static com.android.colorfulos.LauncherState.OVERVIEW;
-import static com.android.colorfulos.anim.Interpolators.ACCEL;
-import static com.android.colorfulos.anim.Interpolators.ACCEL_2;
-import static com.android.colorfulos.anim.Interpolators.LINEAR;
-import static com.android.colorfulos.icons.GraphicsUtils.setColorAlphaBound;
+import static com.aoleyun.os.LauncherState.ALL_APPS_HEADER_EXTRA;
+import static com.aoleyun.os.LauncherState.BACKGROUND_APP;
+import static com.aoleyun.os.LauncherState.OVERVIEW;
+import static com.aoleyun.os.anim.Interpolators.ACCEL;
+import static com.aoleyun.os.anim.Interpolators.ACCEL_2;
+import static com.aoleyun.os.anim.Interpolators.LINEAR;
+import static com.aoleyun.os.icons.GraphicsUtils.setColorAlphaBound;
 
 import android.content.Context;
 import android.graphics.Canvas;
@@ -34,13 +34,13 @@ import android.graphics.Rect;
 import android.util.AttributeSet;
 import android.view.animation.Interpolator;
 
-import com.android.colorfulos.DeviceProfile;
-import com.android.colorfulos.R;
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.anim.Interpolators;
-import com.android.colorfulos.uioverrides.states.OverviewState;
-import com.android.colorfulos.util.Themes;
-import com.android.colorfulos.views.ScrimView;
+import com.aoleyun.os.DeviceProfile;
+import com.aoleyun.os.R;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.anim.Interpolators;
+import com.aoleyun.os.uioverrides.states.OverviewState;
+import com.aoleyun.os.util.Themes;
+import com.aoleyun.os.views.ScrimView;
 import com.android.quickstep.SysUINavigationMode;
 import com.android.quickstep.SysUINavigationMode.Mode;
 import com.android.quickstep.SysUINavigationMode.NavigationModeChangeListener;
diff --git a/quickstep/tests/src/com/android/quickstep/AbstractQuickStepTest.java b/quickstep/tests/src/com/android/quickstep/AbstractQuickStepTest.java
index d68858f..af4721b 100644
--- a/quickstep/tests/src/com/android/quickstep/AbstractQuickStepTest.java
+++ b/quickstep/tests/src/com/android/quickstep/AbstractQuickStepTest.java
@@ -16,7 +16,7 @@
 
 package com.android.quickstep;
 
-import com.android.colorfulos.ui.AbstractLauncherUiTest;
+import com.aoleyun.os.ui.AbstractLauncherUiTest;
 
 import org.junit.rules.RuleChain;
 import org.junit.rules.TestRule;
diff --git a/quickstep/tests/src/com/android/quickstep/AppPredictionsUITests.java b/quickstep/tests/src/com/android/quickstep/AppPredictionsUITests.java
index 9e8fbb9..247a463 100644
--- a/quickstep/tests/src/com/android/quickstep/AppPredictionsUITests.java
+++ b/quickstep/tests/src/com/android/quickstep/AppPredictionsUITests.java
@@ -30,13 +30,13 @@ import android.view.View;
 import androidx.test.filters.LargeTest;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.colorfulos.BubbleTextView;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.appprediction.PredictionRowView;
-import com.android.colorfulos.appprediction.PredictionUiStateManager;
-import com.android.colorfulos.appprediction.PredictionUiStateManager.Client;
-import com.android.colorfulos.compat.LauncherAppsCompat;
-import com.android.colorfulos.model.AppLaunchTracker;
+import com.aoleyun.os.BubbleTextView;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.appprediction.PredictionRowView;
+import com.aoleyun.os.appprediction.PredictionUiStateManager;
+import com.aoleyun.os.appprediction.PredictionUiStateManager.Client;
+import com.aoleyun.os.compat.LauncherAppsCompat;
+import com.aoleyun.os.model.AppLaunchTracker;
 
 import org.junit.After;
 import org.junit.Before;
diff --git a/quickstep/tests/src/com/android/quickstep/DigitalWellBeingToastTest.java b/quickstep/tests/src/com/android/quickstep/DigitalWellBeingToastTest.java
index f6b4365..bf13c78 100644
--- a/quickstep/tests/src/com/android/quickstep/DigitalWellBeingToastTest.java
+++ b/quickstep/tests/src/com/android/quickstep/DigitalWellBeingToastTest.java
@@ -2,7 +2,7 @@ package com.android.quickstep;
 
 import static androidx.test.InstrumentationRegistry.getInstrumentation;
 
-import static com.android.colorfulos.LauncherState.OVERVIEW;
+import static com.aoleyun.os.LauncherState.OVERVIEW;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -15,7 +15,7 @@ import android.content.Intent;
 import androidx.test.filters.LargeTest;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.colorfulos.Launcher;
+import com.aoleyun.os.Launcher;
 import com.android.quickstep.views.DigitalWellBeingToast;
 import com.android.quickstep.views.RecentsView;
 import com.android.quickstep.views.TaskView;
diff --git a/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java b/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java
index 73b5aca..fdbacec 100644
--- a/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java
+++ b/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java
@@ -19,12 +19,12 @@ import static android.content.pm.PackageManager.MATCH_DISABLED_COMPONENTS;
 
 import static androidx.test.InstrumentationRegistry.getInstrumentation;
 
-import static com.android.colorfulos.tapl.LauncherInstrumentation.WAIT_TIME_MS;
-import static com.android.colorfulos.tapl.TestHelpers.getHomeIntentInPackage;
-import static com.android.colorfulos.tapl.TestHelpers.getLauncherInMyProcess;
-import static com.android.colorfulos.ui.AbstractLauncherUiTest.resolveSystemApp;
-import static com.android.colorfulos.util.rule.ShellCommandRule.disableHeadsUpNotification;
-import static com.android.colorfulos.util.rule.ShellCommandRule.getLauncherCommand;
+import static com.aoleyun.os.tapl.LauncherInstrumentation.WAIT_TIME_MS;
+import static com.aoleyun.os.tapl.TestHelpers.getHomeIntentInPackage;
+import static com.aoleyun.os.tapl.TestHelpers.getLauncherInMyProcess;
+import static com.aoleyun.os.ui.AbstractLauncherUiTest.resolveSystemApp;
+import static com.aoleyun.os.util.rule.ShellCommandRule.disableHeadsUpNotification;
+import static com.aoleyun.os.util.rule.ShellCommandRule.getLauncherCommand;
 import static com.android.quickstep.NavigationModeSwitchRule.Mode.THREE_BUTTON;
 
 import static org.junit.Assert.assertTrue;
@@ -41,9 +41,9 @@ import androidx.test.uiautomator.By;
 import androidx.test.uiautomator.UiDevice;
 import androidx.test.uiautomator.Until;
 
-import com.android.colorfulos.tapl.LauncherInstrumentation;
-import com.android.colorfulos.testcomponent.TestCommandReceiver;
-import com.android.colorfulos.util.rule.FailureWatcher;
+import com.aoleyun.os.tapl.LauncherInstrumentation;
+import com.aoleyun.os.testcomponent.TestCommandReceiver;
+import com.aoleyun.os.util.rule.FailureWatcher;
 import com.android.quickstep.NavigationModeSwitchRule.NavigationModeSwitch;
 
 import org.junit.Rule;
diff --git a/quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java b/quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java
index 9c877c3..88e4421 100644
--- a/quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java
+++ b/quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java
@@ -31,8 +31,8 @@ import android.util.Log;
 
 import androidx.test.uiautomator.UiDevice;
 
-import com.android.colorfulos.tapl.LauncherInstrumentation;
-import com.android.colorfulos.tapl.TestHelpers;
+import com.aoleyun.os.tapl.LauncherInstrumentation;
+import com.aoleyun.os.tapl.TestHelpers;
 import com.android.systemui.shared.system.QuickStepContract;
 
 import org.junit.Assert;
diff --git a/quickstep/tests/src/com/android/quickstep/StartLauncherViaGestureTests.java b/quickstep/tests/src/com/android/quickstep/StartLauncherViaGestureTests.java
index c0742b6..4bd678b 100644
--- a/quickstep/tests/src/com/android/quickstep/StartLauncherViaGestureTests.java
+++ b/quickstep/tests/src/com/android/quickstep/StartLauncherViaGestureTests.java
@@ -16,16 +16,16 @@
 
 package com.android.quickstep;
 
-import static com.android.colorfulos.util.RaceConditionTracker.enterEvt;
-import static com.android.colorfulos.util.RaceConditionTracker.exitEvt;
+import static com.aoleyun.os.util.RaceConditionTracker.enterEvt;
+import static com.aoleyun.os.util.RaceConditionTracker.exitEvt;
 
 import android.content.Intent;
 
 import androidx.test.filters.LargeTest;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.util.RaceConditionReproducer;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.util.RaceConditionReproducer;
 import com.android.quickstep.NavigationModeSwitchRule.Mode;
 import com.android.quickstep.NavigationModeSwitchRule.NavigationModeSwitch;
 import com.android.quickstep.inputconsumers.OtherActivityInputConsumer;
diff --git a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
index 52c4cc5..e44cd45 100644
--- a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
+++ b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
@@ -16,7 +16,7 @@
 
 package com.android.quickstep;
 
-import static com.android.colorfulos.ui.TaplTestsLauncher3.getAppPackageName;
+import static com.aoleyun.os.ui.TaplTestsLauncher3.getAppPackageName;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -30,15 +30,15 @@ import androidx.test.runner.AndroidJUnit4;
 import androidx.test.uiautomator.By;
 import androidx.test.uiautomator.Until;
 
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.LauncherState;
-import com.android.colorfulos.tapl.AllApps;
-import com.android.colorfulos.tapl.AllAppsFromOverview;
-import com.android.colorfulos.tapl.Background;
-import com.android.colorfulos.tapl.Overview;
-import com.android.colorfulos.tapl.OverviewTask;
-import com.android.colorfulos.tapl.TestHelpers;
-import com.android.colorfulos.ui.TaplTestsLauncher3;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.LauncherState;
+import com.aoleyun.os.tapl.AllApps;
+import com.aoleyun.os.tapl.AllAppsFromOverview;
+import com.aoleyun.os.tapl.Background;
+import com.aoleyun.os.tapl.Overview;
+import com.aoleyun.os.tapl.OverviewTask;
+import com.aoleyun.os.tapl.TestHelpers;
+import com.aoleyun.os.ui.TaplTestsLauncher3;
 import com.android.quickstep.NavigationModeSwitchRule.NavigationModeSwitch;
 import com.android.quickstep.views.RecentsView;
 
diff --git a/res/drawable-hdpi/com_android_appstore.png b/res/drawable-hdpi/com_android_appstore.png
index 30862b0..3e9a2a2 100644
Binary files a/res/drawable-hdpi/com_android_appstore.png and b/res/drawable-hdpi/com_android_appstore.png differ
diff --git a/res/drawable-hdpi/com_android_browser.png b/res/drawable-hdpi/com_android_browser.png
index 892b435..4de3d1c 100644
Binary files a/res/drawable-hdpi/com_android_browser.png and b/res/drawable-hdpi/com_android_browser.png differ
diff --git a/res/drawable-hdpi/com_android_calculator2.png b/res/drawable-hdpi/com_android_calculator2.png
index 761fc13..0b4844d 100644
Binary files a/res/drawable-hdpi/com_android_calculator2.png and b/res/drawable-hdpi/com_android_calculator2.png differ
diff --git a/res/drawable-hdpi/com_android_calendar.png b/res/drawable-hdpi/com_android_calendar.png
index 93ef0a6..1781527 100644
Binary files a/res/drawable-hdpi/com_android_calendar.png and b/res/drawable-hdpi/com_android_calendar.png differ
diff --git a/res/drawable-hdpi/com_android_camera.png b/res/drawable-hdpi/com_android_camera.png
index 86e6155..ceecdde 100644
Binary files a/res/drawable-hdpi/com_android_camera.png and b/res/drawable-hdpi/com_android_camera.png differ
diff --git a/res/drawable-hdpi/com_android_clean.png b/res/drawable-hdpi/com_android_clean.png
index 7baf8a2..a76249d 100644
Binary files a/res/drawable-hdpi/com_android_clean.png and b/res/drawable-hdpi/com_android_clean.png differ
diff --git a/res/drawable-hdpi/com_android_contacts.png b/res/drawable-hdpi/com_android_contacts.png
index 686a553..db1d2f4 100644
Binary files a/res/drawable-hdpi/com_android_contacts.png and b/res/drawable-hdpi/com_android_contacts.png differ
diff --git a/res/drawable-hdpi/com_android_deskclock.png b/res/drawable-hdpi/com_android_deskclock.png
index ba985e6..dc21551 100644
Binary files a/res/drawable-hdpi/com_android_deskclock.png and b/res/drawable-hdpi/com_android_deskclock.png differ
diff --git a/res/drawable-hdpi/com_android_dialer.png b/res/drawable-hdpi/com_android_dialer.png
index 7083624..6e36b4b 100644
Binary files a/res/drawable-hdpi/com_android_dialer.png and b/res/drawable-hdpi/com_android_dialer.png differ
diff --git a/res/drawable-hdpi/com_android_email.png b/res/drawable-hdpi/com_android_email.png
index 6c2fcf5..e40e0b2 100644
Binary files a/res/drawable-hdpi/com_android_email.png and b/res/drawable-hdpi/com_android_email.png differ
diff --git a/res/drawable-hdpi/com_android_gallery3d_app.png b/res/drawable-hdpi/com_android_gallery3d_app.png
index 2704c93..56a935b 100644
Binary files a/res/drawable-hdpi/com_android_gallery3d_app.png and b/res/drawable-hdpi/com_android_gallery3d_app.png differ
diff --git a/res/drawable-hdpi/com_android_mms_ui.png b/res/drawable-hdpi/com_android_mms_ui.png
index aea3f99..085a66a 100644
Binary files a/res/drawable-hdpi/com_android_mms_ui.png and b/res/drawable-hdpi/com_android_mms_ui.png differ
diff --git a/res/drawable-hdpi/com_android_music.png b/res/drawable-hdpi/com_android_music.png
index afaa1cc..b65405f 100644
Binary files a/res/drawable-hdpi/com_android_music.png and b/res/drawable-hdpi/com_android_music.png differ
diff --git a/res/drawable-hdpi/com_android_providers_downloads_ui.png b/res/drawable-hdpi/com_android_providers_downloads_ui.png
index 3e7daad..3673546 100644
Binary files a/res/drawable-hdpi/com_android_providers_downloads_ui.png and b/res/drawable-hdpi/com_android_providers_downloads_ui.png differ
diff --git a/res/drawable-hdpi/com_android_quicksearchbox.png b/res/drawable-hdpi/com_android_quicksearchbox.png
index fed06bb..0312c4c 100644
Binary files a/res/drawable-hdpi/com_android_quicksearchbox.png and b/res/drawable-hdpi/com_android_quicksearchbox.png differ
diff --git a/res/drawable-hdpi/com_android_settings.png b/res/drawable-hdpi/com_android_settings.png
index c683b06..bce6eb3 100644
Binary files a/res/drawable-hdpi/com_android_settings.png and b/res/drawable-hdpi/com_android_settings.png differ
diff --git a/res/drawable-hdpi/com_android_soundrecorder.png b/res/drawable-hdpi/com_android_soundrecorder.png
index 4d10a8c..99a8438 100644
Binary files a/res/drawable-hdpi/com_android_soundrecorder.png and b/res/drawable-hdpi/com_android_soundrecorder.png differ
diff --git a/res/drawable-hdpi/com_android_stk_stkmain.png b/res/drawable-hdpi/com_android_stk_stkmain.png
index 6529029..9812360 100644
Binary files a/res/drawable-hdpi/com_android_stk_stkmain.png and b/res/drawable-hdpi/com_android_stk_stkmain.png differ
diff --git a/res/drawable-hdpi/com_android_vdieo.png b/res/drawable-hdpi/com_android_vdieo.png
index 22e10cc..92eaf78 100644
Binary files a/res/drawable-hdpi/com_android_vdieo.png and b/res/drawable-hdpi/com_android_vdieo.png differ
diff --git a/res/drawable-hdpi/com_mediatek_filemanager.png b/res/drawable-hdpi/com_mediatek_filemanager.png
index a68cc03..b020449 100644
Binary files a/res/drawable-hdpi/com_mediatek_filemanager.png and b/res/drawable-hdpi/com_mediatek_filemanager.png differ
diff --git a/res/drawable-hdpi/com_mediatek_fmradio.png b/res/drawable-hdpi/com_mediatek_fmradio.png
index 4bf4867..c47e2ed 100644
Binary files a/res/drawable-hdpi/com_mediatek_fmradio.png and b/res/drawable-hdpi/com_mediatek_fmradio.png differ
diff --git a/res/drawable-hdpi/mask.png b/res/drawable-hdpi/mask.png
index 5292631..4de28a2 100644
Binary files a/res/drawable-hdpi/mask.png and b/res/drawable-hdpi/mask.png differ
diff --git a/res/drawable-v24/ic_remove_shadow.xml b/res/drawable-v24/ic_remove_shadow.xml
index a9daf3f..af51cf5 100644
--- a/res/drawable-v24/ic_remove_shadow.xml
+++ b/res/drawable-v24/ic_remove_shadow.xml
@@ -13,7 +13,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.colorfulos.graphics.ShadowDrawable
+<com.aoleyun.os.graphics.ShadowDrawable
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:src="@drawable/ic_remove_no_shadow"
     android:elevation="@dimen/drop_target_shadow_elevation" />
diff --git a/res/drawable-v24/ic_setup_shadow.xml b/res/drawable-v24/ic_setup_shadow.xml
index c77ceb8..c245899 100644
--- a/res/drawable-v24/ic_setup_shadow.xml
+++ b/res/drawable-v24/ic_setup_shadow.xml
@@ -13,7 +13,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.colorfulos.graphics.ShadowDrawable
+<com.aoleyun.os.graphics.ShadowDrawable
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:src="@drawable/ic_setting"
     android:elevation="@dimen/drop_target_shadow_elevation" />
diff --git a/res/drawable-v24/ic_uninstall_shadow.xml b/res/drawable-v24/ic_uninstall_shadow.xml
index b033cb1..d7e2124 100644
--- a/res/drawable-v24/ic_uninstall_shadow.xml
+++ b/res/drawable-v24/ic_uninstall_shadow.xml
@@ -13,7 +13,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.colorfulos.graphics.ShadowDrawable
+<com.aoleyun.os.graphics.ShadowDrawable
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:src="@drawable/ic_uninstall_no_shadow"
     android:elevation="@dimen/drop_target_shadow_elevation" />
diff --git a/res/drawable-xhdpi/ic_uninstall.png b/res/drawable-xhdpi/ic_uninstall.png
index e2d34df..02ab8b4 100644
Binary files a/res/drawable-xhdpi/ic_uninstall.png and b/res/drawable-xhdpi/ic_uninstall.png differ
diff --git a/res/drawable/bg_dialog.xml b/res/drawable/bg_dialog.xml
new file mode 100644
index 0000000..470ebb3
--- /dev/null
+++ b/res/drawable/bg_dialog.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#ffffff" />
+    <stroke
+        android:width="0.8dp"
+        android:color="#ffffff" />
+    <!-- 圆角 -->
+    <corners android:radius="6dp" />
+</shape>
diff --git a/res/drawable/bt_sure_normnl.xml b/res/drawable/bt_sure_normnl.xml
new file mode 100644
index 0000000..0079f69
--- /dev/null
+++ b/res/drawable/bt_sure_normnl.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- 内部颜色 -->
+    <solid
+        android:color="@color/check_update_color" />
+    <!-- 圆角的幅度 -->
+    <corners
+        android:topLeftRadius="24dp"
+        android:topRightRadius="24dp"
+        android:bottomLeftRadius="24dp"
+        android:bottomRightRadius="24dp" />
+</shape>
\ No newline at end of file
diff --git a/res/drawable/edit_background.xml b/res/drawable/edit_background.xml
new file mode 100644
index 0000000..6790168
--- /dev/null
+++ b/res/drawable/edit_background.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#F4F4F4" />
+    <stroke
+        android:width="0.8dp"
+        android:color="#F4F4F4" />
+    <!-- 圆角 -->
+    <corners android:radius="12dp" />
+</shape>
diff --git a/res/layout/add_item_confirmation_activity.xml b/res/layout/add_item_confirmation_activity.xml
index 173600d..6d1180f 100644
--- a/res/layout/add_item_confirmation_activity.xml
+++ b/res/layout/add_item_confirmation_activity.xml
@@ -46,7 +46,7 @@
                 android:background="?android:attr/colorPrimaryDark"
                 android:theme="?attr/widgetsTheme">
 
-                <com.android.colorfulos.dragndrop.LivePreviewWidgetCell
+                <com.aoleyun.os.dragndrop.LivePreviewWidgetCell
                     android:id="@+id/widget_cell"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -59,7 +59,7 @@
 
                     <include layout="@layout/widget_cell_content"  />
 
-                </com.android.colorfulos.dragndrop.LivePreviewWidgetCell>
+                </com.aoleyun.os.dragndrop.LivePreviewWidgetCell>
             </FrameLayout>
         </LinearLayout>
     </ScrollView>
diff --git a/res/layout/all_apps.xml b/res/layout/all_apps.xml
index d30972b..72dc700 100644
--- a/res/layout/all_apps.xml
+++ b/res/layout/all_apps.xml
@@ -16,7 +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.colorfulos.allapps.AllAppsContainerView
+<com.aoleyun.os.allapps.AllAppsContainerView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/apps_view"
     android:layout_width="match_parent"
@@ -30,7 +30,7 @@
         layout="@layout/all_apps_rv_layout"
         android:visibility="gone" />
 
-    <com.android.colorfulos.allapps.FloatingHeaderView
+    <com.aoleyun.os.allapps.FloatingHeaderView
         android:id="@+id/all_apps_header"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -41,7 +41,7 @@
 
         <include layout="@layout/floating_header_content" />
 
-        <com.android.colorfulos.allapps.PersonalWorkSlidingTabStrip
+        <com.aoleyun.os.allapps.PersonalWorkSlidingTabStrip
             android:id="@+id/tabs"
             android:layout_width="match_parent"
             android:layout_height="@dimen/all_apps_header_tab_height"
@@ -71,12 +71,12 @@
                 android:textAllCaps="true"
                 android:textColor="@color/all_apps_tab_text"
                 android:textSize="14sp" />
-        </com.android.colorfulos.allapps.PersonalWorkSlidingTabStrip>
-    </com.android.colorfulos.allapps.FloatingHeaderView>
+        </com.aoleyun.os.allapps.PersonalWorkSlidingTabStrip>
+    </com.aoleyun.os.allapps.FloatingHeaderView>
 
     <include
         android:id="@id/search_container_all_apps"
         layout="@layout/search_container_all_apps"/>
 
     <include layout="@layout/all_apps_fast_scroller" />
-</com.android.colorfulos.allapps.AllAppsContainerView>
\ No newline at end of file
+</com.aoleyun.os.allapps.AllAppsContainerView>
\ No newline at end of file
diff --git a/res/layout/all_apps_fast_scroller.xml b/res/layout/all_apps_fast_scroller.xml
index 6c00448..da68bc4 100644
--- a/res/layout/all_apps_fast_scroller.xml
+++ b/res/layout/all_apps_fast_scroller.xml
@@ -24,7 +24,7 @@
         android:layout_below="@+id/search_container_all_apps"
         android:layout_marginEnd="@dimen/fastscroll_popup_margin" />
 
-    <com.android.colorfulos.views.RecyclerViewFastScroller
+    <com.aoleyun.os.views.RecyclerViewFastScroller
         android:id="@+id/fast_scroller"
         android:layout_width="@dimen/fastscroll_width"
         android:layout_height="wrap_content"
diff --git a/res/layout/all_apps_icon.xml b/res/layout/all_apps_icon.xml
index 943b5ce..39579ad 100644
--- a/res/layout/all_apps_icon.xml
+++ b/res/layout/all_apps_icon.xml
@@ -13,7 +13,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.colorfulos.BubbleTextView
+<com.aoleyun.os.BubbleTextView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:launcher="http://schemas.android.com/apk/res-auto"
     style="@style/BaseIcon"
diff --git a/res/layout/all_apps_rv_layout.xml b/res/layout/all_apps_rv_layout.xml
index c5a9bae..9285649 100644
--- a/res/layout/all_apps_rv_layout.xml
+++ b/res/layout/all_apps_rv_layout.xml
@@ -14,7 +14,7 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<com.android.colorfulos.allapps.AllAppsRecyclerView
+<com.aoleyun.os.allapps.AllAppsRecyclerView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/apps_list_view"
     android:layout_width="match_parent"
diff --git a/res/layout/all_apps_tabs.xml b/res/layout/all_apps_tabs.xml
index d743a0d..f932b5a 100644
--- a/res/layout/all_apps_tabs.xml
+++ b/res/layout/all_apps_tabs.xml
@@ -14,7 +14,7 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<com.android.colorfulos.allapps.AllAppsPagedView
+<com.aoleyun.os.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"
@@ -33,4 +33,4 @@
 
     <include layout="@layout/all_apps_rv_layout" />
 
-</com.android.colorfulos.allapps.AllAppsPagedView>
\ No newline at end of file
+</com.aoleyun.os.allapps.AllAppsPagedView>
\ No newline at end of file
diff --git a/res/layout/app_icon.xml b/res/layout/app_icon.xml
index 9fbcecc..629723b 100644
--- a/res/layout/app_icon.xml
+++ b/res/layout/app_icon.xml
@@ -14,4 +14,4 @@
      limitations under the License.
 -->
 
-<com.android.colorfulos.views.DoubleShadowBubbleTextView style="@style/BaseIcon.Workspace" />
+<com.aoleyun.os.views.DoubleShadowBubbleTextView style="@style/BaseIcon.Workspace" />
diff --git a/res/layout/app_widget_resize_frame.xml b/res/layout/app_widget_resize_frame.xml
index 608dae7..cf12e31 100644
--- a/res/layout/app_widget_resize_frame.xml
+++ b/res/layout/app_widget_resize_frame.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<com.android.colorfulos.AppWidgetResizeFrame
+<com.aoleyun.os.AppWidgetResizeFrame
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -64,4 +64,4 @@
             android:tint="?attr/workspaceTextColor" />
 
     </FrameLayout>
-</com.android.colorfulos.AppWidgetResizeFrame>
\ No newline at end of file
+</com.aoleyun.os.AppWidgetResizeFrame>
\ No newline at end of file
diff --git a/res/layout/custom_dialog.xml b/res/layout/custom_dialog.xml
new file mode 100644
index 0000000..c71c5c9
--- /dev/null
+++ b/res/layout/custom_dialog.xml
@@ -0,0 +1,146 @@
+<?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:orientation="vertical">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="400dp"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:background="@drawable/bg_dialog"
+        android:minWidth="300dp"
+        android:orientation="vertical"
+        android:paddingTop="8dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+
+        <LinearLayout
+            android:id="@+id/linearLayout2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="horizontal"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <ImageView
+                android:id="@+id/image"
+                android:layout_width="30dp"
+                android:layout_height="30dp"
+                android:layout_gravity="center"
+                android:layout_marginEnd="16dp"
+                android:maxWidth="80dp"
+                android:maxHeight="80dp"
+                android:visibility="gone" />
+
+            <TextView
+                android:id="@+id/title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:gravity="center_vertical"
+                android:textColor="#333333"
+                android:textSize="22sp"
+                android:textStyle="bold"
+                android:visibility="visible"
+                tools:text="请输入密码" />
+        </LinearLayout>
+
+        <EditText
+            android:id="@+id/message"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="64dp"
+            android:layout_marginTop="64dp"
+            android:layout_marginEnd="64dp"
+            android:background="@drawable/edit_background"
+            android:gravity="center|left"
+            android:hint="请输入应用锁密码"
+            android:textColorHint="#999999"
+            android:inputType="text"
+            android:lineSpacingExtra="3dp"
+            android:lineSpacingMultiplier="1.2"
+            android:maxLines="1"
+            android:minHeight="50dp"
+            android:paddingLeft="10dp"
+            android:paddingRight="10dp"
+            android:singleLine="true"
+            android:textColor="#000000"
+            android:textSize="18sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/linearLayout2"
+            tools:text="" />
+
+        <TextView
+            android:id="@+id/positive"
+            android:paddingStart="24dp"
+            android:paddingEnd="24dp"
+            android:layout_width="wrap_content"
+            android:layout_height="38dp"
+            android:layout_marginTop="40dp"
+            android:layout_marginBottom="32dp"
+            android:layout_weight="1"
+            android:background="@drawable/bt_sure_normnl"
+            android:gravity="center"
+            android:paddingTop="8dp"
+            android:paddingBottom="8dp"
+            android:singleLine="true"
+            android:textColor="#FFFFFF"
+            android:textSize="18sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/message"
+            tools:text="确定" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1px"
+            android:background="#E4E4E4"
+            android:visibility="gone"
+            app:layout_constraintBottom_toTopOf="@+id/linearLayout3" />
+
+        <LinearLayout
+            android:id="@+id/linearLayout3"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="64dp"
+            android:orientation="horizontal"
+            android:visibility="gone"
+            app:layout_constraintTop_toBottomOf="@+id/message">
+
+            <Button
+                android:id="@+id/negtive"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="10dp"
+                android:layout_weight="1"
+                android:background="@null"
+                android:gravity="center"
+                android:paddingTop="8dp"
+                android:paddingBottom="8dp"
+                android:singleLine="true"
+                android:textColor="#999999"
+                android:textSize="18sp"
+                android:visibility="gone"
+                tools:text="No" />
+
+            <View
+                android:id="@+id/column_line"
+                android:layout_width="1px"
+                android:layout_height="match_parent"
+                android:background="#E4E4E4"
+                android:visibility="gone" />
+
+
+        </LinearLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/res/layout/deep_shortcut.xml b/res/layout/deep_shortcut.xml
index 66a5ba5..f3f2325 100644
--- a/res/layout/deep_shortcut.xml
+++ b/res/layout/deep_shortcut.xml
@@ -14,14 +14,14 @@
      limitations under the License.
 -->
 
-<com.android.colorfulos.shortcuts.DeepShortcutView
+<com.aoleyun.os.shortcuts.DeepShortcutView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:launcher="http://schemas.android.com/apk/res-auto"
     android:layout_width="@dimen/bg_popup_item_width"
     android:layout_height="@dimen/bg_popup_item_height"
     android:theme="@style/PopupItem" >
 
-    <com.android.colorfulos.shortcuts.DeepShortcutTextView
+    <com.aoleyun.os.shortcuts.DeepShortcutTextView
         style="@style/BaseIcon"
         android:id="@+id/bubble_text"
         android:background="?android:attr/selectableItemBackground"
@@ -53,4 +53,4 @@
         android:visibility="gone"
         android:background="?attr/popupColorTertiary" />
 
-</com.android.colorfulos.shortcuts.DeepShortcutView>
+</com.aoleyun.os.shortcuts.DeepShortcutView>
diff --git a/res/layout/drop_target_bar.xml b/res/layout/drop_target_bar.xml
index e719be3..421b4a3 100644
--- a/res/layout/drop_target_bar.xml
+++ b/res/layout/drop_target_bar.xml
@@ -13,7 +13,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.colorfulos.DropTargetBar xmlns:android="http://schemas.android.com/apk/res/android"
+<com.aoleyun.os.DropTargetBar xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="@dimen/dynamic_grid_drop_target_size"
     android:layout_gravity="center_horizontal|top"
@@ -23,7 +23,7 @@
     android:visibility="invisible">
 
     <!-- Delete target -->
-    <com.android.colorfulos.DeleteDropTarget
+    <com.aoleyun.os.DeleteDropTarget
         android:id="@+id/delete_target_text"
         style="@style/DropTargetButton"
         android:layout_width="wrap_content"
@@ -34,7 +34,7 @@
         android:text="@string/remove_drop_target_label" />
 
     <!-- Uninstall target -->
-    <com.android.colorfulos.SecondaryDropTarget
+    <com.aoleyun.os.SecondaryDropTarget
         android:id="@+id/uninstall_target_text"
         style="@style/DropTargetButton"
         android:layout_width="wrap_content"
@@ -43,4 +43,4 @@
         android:gravity="center"
         android:text="@string/uninstall_drop_target_label" />
 
-</com.android.colorfulos.DropTargetBar>
\ No newline at end of file
+</com.aoleyun.os.DropTargetBar>
\ No newline at end of file
diff --git a/res/layout/floating_icon_view.xml b/res/layout/floating_icon_view.xml
index f63f453..88dd8ef 100644
--- a/res/layout/floating_icon_view.xml
+++ b/res/layout/floating_icon_view.xml
@@ -13,7 +13,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.colorfulos.views.FloatingIconView
+<com.aoleyun.os.views.FloatingIconView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content" />
diff --git a/res/layout/folder_application.xml b/res/layout/folder_application.xml
index 12690c1..439ca83 100644
--- a/res/layout/folder_application.xml
+++ b/res/layout/folder_application.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<com.android.colorfulos.BubbleTextView
+<com.aoleyun.os.BubbleTextView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:launcher="http://schemas.android.com/apk/res-auto"
     style="@style/BaseIcon"
diff --git a/res/layout/folder_icon.xml b/res/layout/folder_icon.xml
index 348895a..56fe996 100644
--- a/res/layout/folder_icon.xml
+++ b/res/layout/folder_icon.xml
@@ -14,17 +14,17 @@
      limitations under the License.
 -->
 
-<com.android.colorfulos.folder.FolderIcon
+<com.aoleyun.os.folder.FolderIcon
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:focusable="true" >
-    <com.android.colorfulos.views.DoubleShadowBubbleTextView
+    <com.aoleyun.os.views.DoubleShadowBubbleTextView
         style="@style/BaseIcon.Workspace"
         android:id="@+id/folder_icon_name"
         android:focusable="false"
         android:layout_gravity="top"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
-</com.android.colorfulos.folder.FolderIcon>
+</com.aoleyun.os.folder.FolderIcon>
diff --git a/res/layout/folder_page.xml b/res/layout/folder_page.xml
index fff59d7..3251b74 100644
--- a/res/layout/folder_page.xml
+++ b/res/layout/folder_page.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<com.android.colorfulos.CellLayout
+<com.aoleyun.os.CellLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:launcher="http://schemas.android.com/apk/res-auto"
     android:layout_width="wrap_content"
diff --git a/res/layout/hotseat.xml b/res/layout/hotseat.xml
index 8810007..b9f29e1 100644
--- a/res/layout/hotseat.xml
+++ b/res/layout/hotseat.xml
@@ -13,7 +13,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.colorfulos.Hotseat
+<com.aoleyun.os.Hotseat
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:launcher="http://schemas.android.com/apk/res-auto"
     android:id="@+id/hotseat"
diff --git a/res/layout/launcher.xml b/res/layout/launcher.xml
index a01eefa..c84af50 100644
--- a/res/layout/launcher.xml
+++ b/res/layout/launcher.xml
@@ -12,7 +12,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.colorfulos.LauncherRootView
+<com.aoleyun.os.LauncherRootView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:launcher="http://schemas.android.com/apk/res-auto"
     android:id="@+id/launcher"
@@ -20,7 +20,7 @@
     android:layout_height="match_parent"
     android:fitsSystemWindows="true">
 
-    <com.android.colorfulos.dragndrop.DragLayer
+    <com.aoleyun.os.dragndrop.DragLayer
         android:id="@+id/drag_layer"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -30,7 +30,7 @@
 
         <!-- The workspace contains 5 screens of cells -->
         <!-- DO NOT CHANGE THE ID -->
-        <com.android.colorfulos.Workspace
+        <com.aoleyun.os.Workspace
             android:id="@+id/workspace"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -50,7 +50,7 @@
 
         <!-- Keep these behind the workspace so that they are not visible when
          we go into AllApps -->
-        <com.android.colorfulos.pageindicators.PageIndicatorDots
+        <com.aoleyun.os.pageindicators.PageIndicatorDots
             android:id="@+id/page_indicator"
             android:layout_width="match_parent"
             android:layout_height="@dimen/vertical_drag_handle_size"
@@ -71,6 +71,6 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
 
-    </com.android.colorfulos.dragndrop.DragLayer>
+    </com.aoleyun.os.dragndrop.DragLayer>
 
-</com.android.colorfulos.LauncherRootView>
+</com.aoleyun.os.LauncherRootView>
diff --git a/res/layout/launcher_preview_layout.xml b/res/layout/launcher_preview_layout.xml
index 0a92dcf..5d550d0 100644
--- a/res/layout/launcher_preview_layout.xml
+++ b/res/layout/launcher_preview_layout.xml
@@ -13,13 +13,13 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.colorfulos.InsettableFrameLayout
+<com.aoleyun.os.InsettableFrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:launcher="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <com.android.colorfulos.CellLayout
+    <com.aoleyun.os.CellLayout
         android:id="@+id/workspace"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -28,7 +28,7 @@
         launcher:containerType="workspace"
         launcher:pageIndicator="@+id/page_indicator"/>
 
-    <com.android.colorfulos.Hotseat
+    <com.aoleyun.os.Hotseat
         android:id="@+id/hotseat"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -36,7 +36,7 @@
         android:theme="@style/HomeScreenElementTheme"
         launcher:containerType="hotseat" />
 
-    <com.android.colorfulos.InsettableFrameLayout
+    <com.aoleyun.os.InsettableFrameLayout
         android:id="@+id/apps_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent" >
@@ -45,6 +45,6 @@
             android:id="@id/search_container_all_apps"
             layout="@layout/search_container_all_apps"/>
 
-    </com.android.colorfulos.InsettableFrameLayout>
+    </com.aoleyun.os.InsettableFrameLayout>
 
-</com.android.colorfulos.InsettableFrameLayout>
\ No newline at end of file
+</com.aoleyun.os.InsettableFrameLayout>
\ No newline at end of file
diff --git a/res/layout/longpress_options_menu.xml b/res/layout/longpress_options_menu.xml
index 4911c12..db03aad 100644
--- a/res/layout/longpress_options_menu.xml
+++ b/res/layout/longpress_options_menu.xml
@@ -13,7 +13,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.colorfulos.views.OptionsPopupView
+<com.aoleyun.os.views.OptionsPopupView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/deep_shortcuts_container"
     android:layout_width="wrap_content"
diff --git a/res/layout/notification_content.xml b/res/layout/notification_content.xml
index df6f16d..837b4a3 100644
--- a/res/layout/notification_content.xml
+++ b/res/layout/notification_content.xml
@@ -47,7 +47,7 @@
     </FrameLayout>
 
     <!-- Main view -->
-    <com.android.colorfulos.notification.NotificationMainView
+    <com.aoleyun.os.notification.NotificationMainView
         android:id="@+id/main_view"
         android:layout_width="match_parent"
         android:layout_height="@dimen/notification_main_height"
@@ -94,7 +94,7 @@
             android:layout_marginBottom="7dp"
             android:layout_marginEnd="@dimen/notification_padding_end" />
 
-    </com.android.colorfulos.notification.NotificationMainView>
+    </com.aoleyun.os.notification.NotificationMainView>
 
     <!-- Divider -->
     <View
@@ -105,7 +105,7 @@
         android:background="?attr/popupColorTertiary" />
 
     <!-- Footer -->
-    <com.android.colorfulos.notification.NotificationFooterLayout
+    <com.aoleyun.os.notification.NotificationFooterLayout
         android:id="@+id/footer"
         android:layout_width="match_parent"
         android:layout_height="@dimen/notification_footer_height"
@@ -130,5 +130,5 @@
             android:layout_marginStart="@dimen/horizontal_ellipsis_offset"
             android:background="@drawable/horizontal_ellipsis" />
 
-    </com.android.colorfulos.notification.NotificationFooterLayout>
+    </com.aoleyun.os.notification.NotificationFooterLayout>
 </merge>
\ No newline at end of file
diff --git a/res/layout/popup_container.xml b/res/layout/popup_container.xml
index 3cb8335..c82d870 100644
--- a/res/layout/popup_container.xml
+++ b/res/layout/popup_container.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<com.android.colorfulos.popup.PopupContainerWithArrow
+<com.aoleyun.os.popup.PopupContainerWithArrow
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/deep_shortcuts_container"
     android:layout_width="wrap_content"
diff --git a/res/layout/scrim_view.xml b/res/layout/scrim_view.xml
index a7612f0..4db437e 100644
--- a/res/layout/scrim_view.xml
+++ b/res/layout/scrim_view.xml
@@ -13,7 +13,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.colorfulos.views.ScrimView
+<com.aoleyun.os.views.ScrimView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/res/layout/search_container_all_apps.xml b/res/layout/search_container_all_apps.xml
index 9af9bac..c56c6e2 100644
--- a/res/layout/search_container_all_apps.xml
+++ b/res/layout/search_container_all_apps.xml
@@ -13,7 +13,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.colorfulos.allapps.search.AppsSearchContainerLayout
+<com.aoleyun.os.allapps.search.AppsSearchContainerLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@id/search_container_all_apps"
     android:layout_width="match_parent"
diff --git a/res/layout/search_container_workspace.xml b/res/layout/search_container_workspace.xml
index 955dd24..da4d7b4 100644
--- a/res/layout/search_container_workspace.xml
+++ b/res/layout/search_container_workspace.xml
@@ -14,7 +14,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.colorfulos.qsb.QsbContainerView
+<com.aoleyun.os.qsb.QsbContainerView
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:orientation="vertical"
         android:layout_width="match_parent"
@@ -23,8 +23,8 @@
         android:padding="0dp" >
 
     <fragment
-        android:name="com.android.colorfulos.qsb.QsbContainerView$QsbFragment"
+        android:name="com.aoleyun.os.qsb.QsbContainerView$QsbFragment"
         android:layout_width="match_parent"
         android:tag="qsb_view"
         android:layout_height="0dp"/>
-</com.android.colorfulos.qsb.QsbContainerView>
\ No newline at end of file
+</com.aoleyun.os.qsb.QsbContainerView>
\ No newline at end of file
diff --git a/res/layout/system_shortcut.xml b/res/layout/system_shortcut.xml
index be37873..3e89a91 100644
--- a/res/layout/system_shortcut.xml
+++ b/res/layout/system_shortcut.xml
@@ -14,14 +14,14 @@
      limitations under the License.
 -->
 
-<com.android.colorfulos.shortcuts.DeepShortcutView
+<com.aoleyun.os.shortcuts.DeepShortcutView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:launcher="http://schemas.android.com/apk/res-auto"
     android:layout_width="@dimen/bg_popup_item_width"
     android:layout_height="@dimen/bg_popup_item_height"
     android:theme="@style/PopupItem" >
 
-    <com.android.colorfulos.BubbleTextView
+    <com.aoleyun.os.BubbleTextView
         style="@style/BaseIcon"
         android:id="@+id/bubble_text"
         android:background="?android:attr/selectableItemBackground"
@@ -51,4 +51,4 @@
         android:visibility="gone"
         android:background="?attr/popupColorTertiary" />
 
-</com.android.colorfulos.shortcuts.DeepShortcutView>
+</com.aoleyun.os.shortcuts.DeepShortcutView>
diff --git a/res/layout/user_folder_icon_normalized.xml b/res/layout/user_folder_icon_normalized.xml
index 5baac0a..e92fa51 100644
--- a/res/layout/user_folder_icon_normalized.xml
+++ b/res/layout/user_folder_icon_normalized.xml
@@ -14,7 +14,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.colorfulos.folder.Folder xmlns:android="http://schemas.android.com/apk/res/android"
+<com.aoleyun.os.folder.Folder xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:launcher="http://schemas.android.com/apk/res-auto"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
@@ -22,7 +22,7 @@
     android:elevation="5dp"
     android:orientation="vertical" >
 
-    <com.android.colorfulos.folder.FolderPagedView
+    <com.aoleyun.os.folder.FolderPagedView
         android:id="@+id/folder_content"
         android:clipToPadding="false"
         android:layout_width="match_parent"
@@ -41,7 +41,7 @@
         android:paddingLeft="12dp"
         android:paddingRight="12dp" >
 
-        <com.android.colorfulos.ExtendedEditText
+        <com.aoleyun.os.ExtendedEditText
             android:id="@+id/folder_name"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -61,7 +61,7 @@
             android:textColorHint="#ffffff"
             android:textSize="@dimen/folder_label_text_size" />
 
-        <com.android.colorfulos.pageindicators.PageIndicatorDots
+        <com.aoleyun.os.pageindicators.PageIndicatorDots
             android:id="@+id/folder_page_indicator"
             android:layout_gravity="center_vertical"
             android:layout_width="wrap_content"
@@ -71,4 +71,4 @@
 
     </LinearLayout>
 
-</com.android.colorfulos.folder.Folder>
+</com.aoleyun.os.folder.Folder>
diff --git a/res/layout/widget_cell.xml b/res/layout/widget_cell.xml
index e9355db..8b58861 100644
--- a/res/layout/widget_cell.xml
+++ b/res/layout/widget_cell.xml
@@ -13,7 +13,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.colorfulos.widget.WidgetCell
+<com.aoleyun.os.widget.WidgetCell
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
@@ -25,4 +25,4 @@
 
     <include layout="@layout/widget_cell_content"  />
 
-</com.android.colorfulos.widget.WidgetCell>
\ No newline at end of file
+</com.aoleyun.os.widget.WidgetCell>
\ No newline at end of file
diff --git a/res/layout/widget_cell_content.xml b/res/layout/widget_cell_content.xml
index 95e520e..19fc826 100644
--- a/res/layout/widget_cell_content.xml
+++ b/res/layout/widget_cell_content.xml
@@ -55,7 +55,7 @@
 
     <!-- The image of the widget. This view does not support padding. Any placement adjustment
          should be done using margins. -->
-    <com.android.colorfulos.widget.WidgetImageView
+    <com.aoleyun.os.widget.WidgetImageView
         android:id="@+id/widget_preview"
         android:layout_width="match_parent"
         android:layout_height="0dp"
diff --git a/res/layout/widgets_bottom_sheet.xml b/res/layout/widgets_bottom_sheet.xml
index cfe224c..913c572 100644
--- a/res/layout/widgets_bottom_sheet.xml
+++ b/res/layout/widgets_bottom_sheet.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<com.android.colorfulos.widget.WidgetsBottomSheet
+<com.aoleyun.os.widget.WidgetsBottomSheet
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
     android:layout_width="match_parent"
@@ -51,4 +51,4 @@
          android:layout_marginTop="45dp"
          android:layout_marginBottom="40dp"/>
 
-</com.android.colorfulos.widget.WidgetsBottomSheet>
\ No newline at end of file
+</com.aoleyun.os.widget.WidgetsBottomSheet>
\ No newline at end of file
diff --git a/res/layout/widgets_full_sheet.xml b/res/layout/widgets_full_sheet.xml
index d2564b9..095356f 100644
--- a/res/layout/widgets_full_sheet.xml
+++ b/res/layout/widgets_full_sheet.xml
@@ -13,21 +13,21 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.colorfulos.widget.WidgetsFullSheet
+<com.aoleyun.os.widget.WidgetsFullSheet
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:theme="?attr/widgetsTheme" >
 
-    <com.android.colorfulos.views.TopRoundedCornerView
+    <com.aoleyun.os.views.TopRoundedCornerView
         android:id="@+id/container"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="?android:attr/colorPrimary"
         android:elevation="4dp">
 
-        <com.android.colorfulos.widget.WidgetsRecyclerView
+        <com.aoleyun.os.widget.WidgetsRecyclerView
             android:id="@+id/widgets_list_view"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -41,12 +41,12 @@
             android:layout_alignParentTop="true"
             android:layout_marginEnd="@dimen/fastscroll_popup_margin" />
 
-        <com.android.colorfulos.views.RecyclerViewFastScroller
+        <com.aoleyun.os.views.RecyclerViewFastScroller
             android:id="@+id/fast_scroller"
             android:layout_width="@dimen/fastscroll_width"
             android:layout_height="match_parent"
             android:layout_alignParentEnd="true"
             android:layout_alignParentTop="true"
             android:layout_marginEnd="@dimen/fastscroll_end_margin" />
-    </com.android.colorfulos.views.TopRoundedCornerView>
-</com.android.colorfulos.widget.WidgetsFullSheet>
\ No newline at end of file
+    </com.aoleyun.os.views.TopRoundedCornerView>
+</com.aoleyun.os.widget.WidgetsFullSheet>
\ No newline at end of file
diff --git a/res/layout/widgets_list_row_view.xml b/res/layout/widgets_list_row_view.xml
index 77a3693..074efd3 100644
--- a/res/layout/widgets_list_row_view.xml
+++ b/res/layout/widgets_list_row_view.xml
@@ -25,7 +25,7 @@
 
     <!-- Section info -->
 
-    <com.android.colorfulos.BubbleTextView
+    <com.aoleyun.os.BubbleTextView
         android:id="@+id/section"
         android:layout_width="match_parent"
         android:layout_height="@dimen/widget_section_height"
diff --git a/res/layout/work_tab_bottom_user_education_view.xml b/res/layout/work_tab_bottom_user_education_view.xml
index 3651f46..1cc8f88 100644
--- a/res/layout/work_tab_bottom_user_education_view.xml
+++ b/res/layout/work_tab_bottom_user_education_view.xml
@@ -13,7 +13,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.colorfulos.views.BottomUserEducationView
+<com.aoleyun.os.views.BottomUserEducationView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -66,4 +66,4 @@
 
   </LinearLayout>
 
-</com.android.colorfulos.views.BottomUserEducationView>
\ No newline at end of file
+</com.aoleyun.os.views.BottomUserEducationView>
\ No newline at end of file
diff --git a/res/layout/work_tab_footer.xml b/res/layout/work_tab_footer.xml
index 62bb0dd..064b413 100644
--- a/res/layout/work_tab_footer.xml
+++ b/res/layout/work_tab_footer.xml
@@ -13,7 +13,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.colorfulos.views.WorkFooterContainer
+<com.aoleyun.os.views.WorkFooterContainer
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -34,7 +34,7 @@
         android:scaleType="fitXY"
         android:src="@drawable/all_apps_divider"/>
 
-    <com.android.colorfulos.allapps.WorkModeSwitch
+    <com.aoleyun.os.allapps.WorkModeSwitch
         android:id="@+id/work_mode_toggle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -76,4 +76,4 @@
         android:textColor="?android:attr/textColorHint"
         android:textSize="13sp"/>
 
-</com.android.colorfulos.views.WorkFooterContainer>
\ No newline at end of file
+</com.aoleyun.os.views.WorkFooterContainer>
\ No newline at end of file
diff --git a/res/layout/workspace_screen.xml b/res/layout/workspace_screen.xml
index d97cb98..3ad08a3 100644
--- a/res/layout/workspace_screen.xml
+++ b/res/layout/workspace_screen.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<com.android.colorfulos.CellLayout
+<com.aoleyun.os.CellLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:launcher="http://schemas.android.com/apk/res-auto"
     android:layout_width="wrap_content"
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 55aa54e..59bb8e2 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -42,5 +42,8 @@
     <color name="hour_hand_color">#494949</color>
 
     <color name="IndicatorInColor">#33FFFFFF</color>
+    <color name="check_update_color">#4880ff</color>
+
+    <color name="toast_color">#CD000000</color>
 
 </resources>
diff --git a/res/values/config.xml b/res/values/config.xml
index 52fc2c5..f8f0d65 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -19,7 +19,7 @@
     <string name="delete_package_intent" translatable="false">#Intent;action=android.intent.action.DELETE;launchFlags=0x10800000;end</string>
 
     <!-- String representing the fragment class for settings activity.-->
-    <string name="settings_fragment_name" translatable="false">com.android.colorfulos.settings.SettingsActivity$LauncherSettingsFragment</string>
+    <string name="settings_fragment_name" translatable="false">com.aoleyun.os.settings.SettingsActivity$LauncherSettingsFragment</string>
 
 <!-- DragController -->
     <item type="id" name="drag_event_parity" />
diff --git a/res/values/strings.xml b/res/values/strings.xml
index a971af3..0c5c142 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -23,7 +23,7 @@
 
     <!-- Application name -->
     <string name="app_name">Launcher3</string>
-    <string name="app_uiui">ColorfulOS</string>
+    <string name="app_uiui">桌面</string>
 
     <!-- Default folder name -->
     <string name="folder_name"></string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 881f65d..797cd9a 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -226,4 +226,17 @@
         <item name="android:colorControlHighlight">#DFE1E5</item>
         <item name="android:colorForeground">@color/all_apps_bg_hand_fill_dark</item>
     </style>
+    <style name="CustomDialog" parent="Theme.AppCompat.Dialog.Alert">
+        <!--背景颜色及和透明程度-->
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <!--是否去除标题 -->
+        <item name="android:windowNoTitle">true</item>
+        <!--是否去除边框-->
+        <item name="android:windowFrame">@null</item>
+        <!--是否浮现在activity之上-->
+<!--        <item name="android:windowIsFloating">true</item>-->
+        <!--是否模糊-->
+        <item name="android:backgroundDimEnabled">true</item>
+    </style>
+
 </resources>
diff --git a/res/xml/backupscheme.xml b/res/xml/backupscheme.xml
index 3d05f86..f56af1a 100644
--- a/res/xml/backupscheme.xml
+++ b/res/xml/backupscheme.xml
@@ -2,7 +2,7 @@
 <full-backup-content xmlns:android="http://schemas.android.com/apk/res/android">
 
     <include domain="database" path="launcher.db" />
-    <include domain="sharedpref" path="com.android.colorfulos.prefs.xml" />
+    <include domain="sharedpref" path="com.aoleyun.os.prefs.xml" />
     <include domain="file" path="downgrade_schema.json" />
 
 </full-backup-content>
\ No newline at end of file
diff --git a/res/xml/default_workspace_6x4.xml b/res/xml/default_workspace_6x4.xml
index f593580..aa7d61c 100644
--- a/res/xml/default_workspace_6x4.xml
+++ b/res/xml/default_workspace_6x4.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2009 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -19,63 +18,71 @@
     <!-- Hotseat (We use the screen as the position of the item in the hotseat) -->
     <!-- Dialer, Messaging, [Maps/Music], Browser, Camera -->
     <favorite
-        launcher:className="com.info.jgy.activity.main.MainActivity"
-        launcher:packageName="com.info.jgy"
+        launcher:container="-101"
+        launcher:className="com.aoleyun.sn.activity.SplashActivity"
+        launcher:packageName="com.aoleyun.sn"
         launcher:screen="0"
         launcher:x="0"
         launcher:y="0" />
     <favorite
-        launcher:className="com.store.jgy.activity.MainActivity"
-        launcher:packageName="com.store.jgy"
-        launcher:screen="0"
+        launcher:container="-101"
+        launcher:className="com.aoleyun.appstore.activity.SplashActivity"
+        launcher:packageName="com.aoleyun.appstore"
+        launcher:screen="1"
         launcher:x="1"
         launcher:y="0" />
-<!--    <resolve-->
-<!--        launcher:container="-101"-->
-<!--        launcher:screen="0"-->
-<!--        launcher:x="0"-->
-<!--        launcher:y="0" >-->
-<!--        <favorite launcher:uri="#Intent;action=android.intent.action.DIAL;end" />-->
-<!--        <favorite launcher:uri="tel:123" />-->
-<!--        <favorite launcher:uri="#Intent;action=android.intent.action.CALL_BUTTON;end" />-->
-<!--    </resolve>-->
+    <!--    <resolve-->
+    <!--        launcher:container="-101"-->
+    <!--        launcher:screen="0"-->
+    <!--        launcher:x="0"-->
+    <!--        launcher:y="0" >-->
+    <!--        <favorite launcher:uri="#Intent;action=android.intent.action.DIAL;end" />-->
+    <!--        <favorite launcher:uri="tel:123" />-->
+    <!--        <favorite launcher:uri="#Intent;action=android.intent.action.CALL_BUTTON;end" />-->
+    <!--    </resolve>-->
 
-<!--    <resolve-->
-<!--        launcher:container="-101"-->
-<!--        launcher:screen="1"-->
-<!--        launcher:x="1"-->
-<!--        launcher:y="0" >-->
-<!--        <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_MESSAGING;end" />-->
-<!--        <favorite launcher:uri="sms:" />-->
-<!--        <favorite launcher:uri="smsto:" />-->
-<!--        <favorite launcher:uri="mms:" />-->
-<!--        <favorite launcher:uri="mmsto:" />-->
-<!--    </resolve>-->
+    <!--    <resolve-->
+    <!--        launcher:container="-101"-->
+    <!--        launcher:screen="1"-->
+    <!--        launcher:x="1"-->
+    <!--        launcher:y="0" >-->
+    <!--        <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_MESSAGING;end" />-->
+    <!--        <favorite launcher:uri="sms:" />-->
+    <!--        <favorite launcher:uri="smsto:" />-->
+    <!--        <favorite launcher:uri="mms:" />-->
+    <!--        <favorite launcher:uri="mmsto:" />-->
+    <!--    </resolve>-->
 
-    <resolve
+    <!--    <resolve-->
+    <!--        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" />-->
+    <!--    </resolve>-->
+
+    <favorite
         launcher:container="-101"
+        launcher:className="com.uiui.browser.activity.MainActivity"
+        launcher:packageName="com.uiui.browser"
         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" />
-    </resolve>
+        launcher:y="0" />
 
-    <resolve
+    <favorite
         launcher:container="-101"
+        launcher:className="com.android.settings.Settings"
+        launcher:packageName="com.android.settings"
         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/" />
-    </resolve>
+        launcher:y="0" />
 
     <resolve
         launcher:container="-101"
         launcher:screen="4"
         launcher:x="4"
-        launcher:y="0" >
+        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>
@@ -84,46 +91,46 @@
         launcher:container="-101"
         launcher:screen="5"
         launcher:x="5"
-        launcher:y="0" >
+        launcher:y="0">
         <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;component=com.android.deskclock/.DeskClock;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:" />-->
+    <!--    <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:" />-->
 
-<!--    </resolve>-->
+    <!--    </resolve>-->
 
-<!--    <resolve-->
-<!--        launcher:screen="0"-->
-<!--        launcher:x="1"-->
-<!--        launcher:y="-1" >-->
-<!--	    <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_GALLERY;end" />-->
-<!--	    <favorite launcher:uri="#Intent;type=images/*;end" />-->
+    <!--    <resolve-->
+    <!--        launcher:screen="0"-->
+    <!--        launcher:x="1"-->
+    <!--        launcher:y="-1" >-->
+    <!--	    <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_GALLERY;end" />-->
+    <!--	    <favorite launcher:uri="#Intent;type=images/*;end" />-->
 
-<!--    </resolve>-->
+    <!--    </resolve>-->
 
-<!--    <resolve-->
-<!--        launcher:screen="0"-->
-<!--        launcher:x="4"-->
-<!--        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>-->
-<!--    <favorite-->
-<!--        launcher:className="com.info.sn.activity.MainActivity"-->
-<!--        launcher:packageName="com.info.sn"-->
-<!--        launcher:screen="0"-->
-<!--        launcher:x="0"-->
-<!--        launcher:y="0" />-->
-<!--    <favorite-->
-<!--        launcher:className="com.jiaoguanyi.sysc.activity.MainActivity"-->
-<!--        launcher:packageName="com.jiaoguanyi.sysc"-->
-<!--        launcher:screen="0"-->
-<!--        launcher:x="1"-->
-<!--        launcher:y="0" />-->
+    <!--    <resolve-->
+    <!--        launcher:screen="0"-->
+    <!--        launcher:x="4"-->
+    <!--        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>-->
+    <!--    <favorite-->
+    <!--        launcher:className="com.info.sn.activity.MainActivity"-->
+    <!--        launcher:packageName="com.info.sn"-->
+    <!--        launcher:screen="0"-->
+    <!--        launcher:x="0"-->
+    <!--        launcher:y="0" />-->
+    <!--    <favorite-->
+    <!--        launcher:className="com.jiaoguanyi.sysc.activity.MainActivity"-->
+    <!--        launcher:packageName="com.jiaoguanyi.sysc"-->
+    <!--        launcher:screen="0"-->
+    <!--        launcher:x="1"-->
+    <!--        launcher:y="0" />-->
 </favorites>
diff --git a/res/xml/launcher_preferences.xml b/res/xml/launcher_preferences.xml
index 85e5205..275376b 100644
--- a/res/xml/launcher_preferences.xml
+++ b/res/xml/launcher_preferences.xml
@@ -17,7 +17,7 @@
 <androidx.preference.PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <com.android.colorfulos.settings.NotificationDotsPreference
+    <com.aoleyun.os.settings.NotificationDotsPreference
         android:key="pref_icon_badging"
         android:title="@string/notification_dots_title"
         android:persistent="false"
@@ -28,7 +28,7 @@
                 android:name=":settings:fragment_args_key"
                 android:value="notification_badging" />
         </intent>
-    </com.android.colorfulos.settings.NotificationDotsPreference>
+    </com.aoleyun.os.settings.NotificationDotsPreference>
 
     <SwitchPreference
         android:key="pref_add_icon_to_home"
@@ -54,6 +54,6 @@
         android:key="pref_developer_options"
         android:persistent="false"
         android:title="Developer Options"
-        android:fragment="com.android.colorfulos.settings.DeveloperOptionsFragment"/>
+        android:fragment="com.aoleyun.os.settings.DeveloperOptionsFragment"/>
 
 </androidx.preference.PreferenceScreen>
diff --git a/robolectric_tests/resources/cache_data_updated_task_data.txt b/robolectric_tests/resources/cache_data_updated_task_data.txt
index 9f011ee..afa1c62 100644
--- a/robolectric_tests/resources/cache_data_updated_task_data.txt
+++ b/robolectric_tests/resources/cache_data_updated_task_data.txt
@@ -1,6 +1,6 @@
 # Model data used by CacheDataUpdatedTaskTest
 
-classMap s com.android.colorfulos.WorkspaceItemInfo
+classMap s com.aoleyun.os.WorkspaceItemInfo
 
 # Items for the BgDataModel
 
diff --git a/robolectric_tests/resources/package_install_state_change_task_data.txt b/robolectric_tests/resources/package_install_state_change_task_data.txt
index 027f7a0..61fc21f 100644
--- a/robolectric_tests/resources/package_install_state_change_task_data.txt
+++ b/robolectric_tests/resources/package_install_state_change_task_data.txt
@@ -1,7 +1,7 @@
 # Model data used by PackageInstallStateChangeTaskTest
 
-classMap s com.android.colorfulos.WorkspaceItemInfo
-classMap w com.android.colorfulos.LauncherAppWidgetInfo
+classMap s com.aoleyun.os.WorkspaceItemInfo
+classMap w com.aoleyun.os.LauncherAppWidgetInfo
 
 # Items for the BgDataModel
 
diff --git a/robolectric_tests/src/com/android/launcher3/config/FlagOverrideRule.java b/robolectric_tests/src/com/android/launcher3/config/FlagOverrideRule.java
index 0d82343..e26a70a 100644
--- a/robolectric_tests/src/com/android/launcher3/config/FlagOverrideRule.java
+++ b/robolectric_tests/src/com/android/launcher3/config/FlagOverrideRule.java
@@ -1,4 +1,4 @@
-package com.android.colorfulos.config;
+package com.aoleyun.os.config;
 
 
 import org.junit.rules.TestRule;
diff --git a/robolectric_tests/src/com/android/launcher3/config/FlagOverrideSampleTest.java b/robolectric_tests/src/com/android/launcher3/config/FlagOverrideSampleTest.java
index c5f4051..302548a 100644
--- a/robolectric_tests/src/com/android/launcher3/config/FlagOverrideSampleTest.java
+++ b/robolectric_tests/src/com/android/launcher3/config/FlagOverrideSampleTest.java
@@ -1,6 +1,6 @@
-package com.android.colorfulos.config;
+package com.aoleyun.os.config;
 
-import com.android.colorfulos.config.FlagOverrideRule.FlagOverride;
+import com.aoleyun.os.config.FlagOverrideRule.FlagOverride;
 
 import org.junit.Rule;
 import org.junit.Test;
diff --git a/robolectric_tests/src/com/android/launcher3/logging/FileLogTest.java b/robolectric_tests/src/com/android/launcher3/logging/FileLogTest.java
index 02f329d..c1e0394 100644
--- a/robolectric_tests/src/com/android/launcher3/logging/FileLogTest.java
+++ b/robolectric_tests/src/com/android/launcher3/logging/FileLogTest.java
@@ -1,4 +1,4 @@
-package com.android.colorfulos.logging;
+package com.aoleyun.os.logging;
 
 import org.junit.After;
 import org.junit.Before;
diff --git a/robolectric_tests/src/com/android/launcher3/model/AddWorkspaceItemsTaskTest.java b/robolectric_tests/src/com/android/launcher3/model/AddWorkspaceItemsTaskTest.java
index fbd0800..1b5ca7a 100644
--- a/robolectric_tests/src/com/android/launcher3/model/AddWorkspaceItemsTaskTest.java
+++ b/robolectric_tests/src/com/android/launcher3/model/AddWorkspaceItemsTaskTest.java
@@ -1,4 +1,4 @@
-package com.android.colorfulos.model;
+package com.aoleyun.os.model;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -11,14 +11,14 @@ import android.content.Intent;
 import android.graphics.Rect;
 import android.util.Pair;
 
-import com.android.colorfulos.ItemInfo;
-import com.android.colorfulos.LauncherSettings;
-import com.android.colorfulos.LauncherSettings.Favorites;
-import com.android.colorfulos.WorkspaceItemInfo;
-import com.android.colorfulos.util.ContentWriter;
-import com.android.colorfulos.util.GridOccupancy;
-import com.android.colorfulos.util.IntArray;
-import com.android.colorfulos.util.IntSparseArrayMap;
+import com.aoleyun.os.ItemInfo;
+import com.aoleyun.os.LauncherSettings;
+import com.aoleyun.os.LauncherSettings.Favorites;
+import com.aoleyun.os.WorkspaceItemInfo;
+import com.aoleyun.os.util.ContentWriter;
+import com.aoleyun.os.util.GridOccupancy;
+import com.aoleyun.os.util.IntArray;
+import com.aoleyun.os.util.IntSparseArrayMap;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/robolectric_tests/src/com/android/launcher3/model/BaseGridChangesTestCase.java b/robolectric_tests/src/com/android/launcher3/model/BaseGridChangesTestCase.java
index 5384abc..25ad0df 100644
--- a/robolectric_tests/src/com/android/launcher3/model/BaseGridChangesTestCase.java
+++ b/robolectric_tests/src/com/android/launcher3/model/BaseGridChangesTestCase.java
@@ -1,13 +1,13 @@
-package com.android.colorfulos.model;
+package com.aoleyun.os.model;
 
 import android.content.ContentValues;
 import android.content.Context;
 import android.content.Intent;
 import android.database.sqlite.SQLiteDatabase;
 
-import com.android.colorfulos.LauncherProvider;
-import com.android.colorfulos.LauncherSettings;
-import com.android.colorfulos.util.TestLauncherProvider;
+import com.aoleyun.os.LauncherProvider;
+import com.aoleyun.os.LauncherSettings;
+import com.aoleyun.os.util.TestLauncherProvider;
 
 import org.junit.Before;
 import org.robolectric.Robolectric;
@@ -25,7 +25,7 @@ public abstract class BaseGridChangesTestCase {
     public static final int SHORTCUT = LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT;
     public static final int NO__ICON = -1;
 
-    public static final String TEST_PACKAGE = "com.android.colorfulos.validpackage";
+    public static final String TEST_PACKAGE = "com.aoleyun.os.validpackage";
 
     public Context mContext;
     public TestLauncherProvider mProvider;
diff --git a/robolectric_tests/src/com/android/launcher3/model/BaseModelUpdateTaskTestCase.java b/robolectric_tests/src/com/android/launcher3/model/BaseModelUpdateTaskTestCase.java
index a487803..48f018c 100644
--- a/robolectric_tests/src/com/android/launcher3/model/BaseModelUpdateTaskTestCase.java
+++ b/robolectric_tests/src/com/android/launcher3/model/BaseModelUpdateTaskTestCase.java
@@ -1,4 +1,4 @@
-package com.android.colorfulos.model;
+package com.aoleyun.os.model;
 
 import static org.mockito.Matchers.anyBoolean;
 import static org.mockito.Mockito.atLeast;
@@ -15,20 +15,20 @@ import android.graphics.Color;
 import android.os.Process;
 import android.os.UserHandle;
 
-import com.android.colorfulos.AllAppsList;
-import com.android.colorfulos.AppFilter;
-import com.android.colorfulos.AppInfo;
-import com.android.colorfulos.InvariantDeviceProfile;
-import com.android.colorfulos.ItemInfo;
-import com.android.colorfulos.LauncherAppState;
-import com.android.colorfulos.LauncherModel;
-import com.android.colorfulos.LauncherModel.Callbacks;
-import com.android.colorfulos.LauncherModel.ModelUpdateTask;
-import com.android.colorfulos.LauncherProvider;
-import com.android.colorfulos.icons.IconCache;
-import com.android.colorfulos.icons.cache.CachingLogic;
-import com.android.colorfulos.util.ComponentKey;
-import com.android.colorfulos.util.TestLauncherProvider;
+import com.aoleyun.os.AllAppsList;
+import com.aoleyun.os.AppFilter;
+import com.aoleyun.os.AppInfo;
+import com.aoleyun.os.InvariantDeviceProfile;
+import com.aoleyun.os.ItemInfo;
+import com.aoleyun.os.LauncherAppState;
+import com.aoleyun.os.LauncherModel;
+import com.aoleyun.os.LauncherModel.Callbacks;
+import com.aoleyun.os.LauncherModel.ModelUpdateTask;
+import com.aoleyun.os.LauncherProvider;
+import com.aoleyun.os.icons.IconCache;
+import com.aoleyun.os.icons.cache.CachingLogic;
+import com.aoleyun.os.util.ComponentKey;
+import com.aoleyun.os.util.TestLauncherProvider;
 
 import org.junit.Before;
 import org.mockito.ArgumentCaptor;
diff --git a/robolectric_tests/src/com/android/launcher3/model/CacheDataUpdatedTaskTest.java b/robolectric_tests/src/com/android/launcher3/model/CacheDataUpdatedTaskTest.java
index be033e5..5fb9e00 100644
--- a/robolectric_tests/src/com/android/launcher3/model/CacheDataUpdatedTaskTest.java
+++ b/robolectric_tests/src/com/android/launcher3/model/CacheDataUpdatedTaskTest.java
@@ -1,4 +1,4 @@
-package com.android.colorfulos.model;
+package com.aoleyun.os.model;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -6,9 +6,9 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.assertNull;
 
-import com.android.colorfulos.AppInfo;
-import com.android.colorfulos.ItemInfo;
-import com.android.colorfulos.WorkspaceItemInfo;
+import com.aoleyun.os.AppInfo;
+import com.aoleyun.os.ItemInfo;
+import com.aoleyun.os.WorkspaceItemInfo;
 
 import org.junit.Before;
 import org.junit.Ignore;
diff --git a/robolectric_tests/src/com/android/launcher3/model/DbDowngradeHelperTest.java b/robolectric_tests/src/com/android/launcher3/model/DbDowngradeHelperTest.java
index e1ac1b5..af1afc6 100644
--- a/robolectric_tests/src/com/android/launcher3/model/DbDowngradeHelperTest.java
+++ b/robolectric_tests/src/com/android/launcher3/model/DbDowngradeHelperTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.model;
+package com.aoleyun.os.model;
 
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertFalse;
@@ -32,10 +32,10 @@ import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
 
-import com.android.colorfulos.LauncherProvider;
-import com.android.colorfulos.LauncherProvider.DatabaseHelper;
-import com.android.colorfulos.LauncherSettings.Favorites;
-import com.android.colorfulos.R;
+import com.aoleyun.os.LauncherProvider;
+import com.aoleyun.os.LauncherProvider.DatabaseHelper;
+import com.aoleyun.os.LauncherSettings.Favorites;
+import com.aoleyun.os.R;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/robolectric_tests/src/com/android/launcher3/model/GridBackupTableTest.java b/robolectric_tests/src/com/android/launcher3/model/GridBackupTableTest.java
index 608cc7f..0600fc7 100644
--- a/robolectric_tests/src/com/android/launcher3/model/GridBackupTableTest.java
+++ b/robolectric_tests/src/com/android/launcher3/model/GridBackupTableTest.java
@@ -1,11 +1,11 @@
-package com.android.colorfulos.model;
+package com.aoleyun.os.model;
 
 
 import static android.database.DatabaseUtils.queryNumEntries;
 
-import static com.android.colorfulos.LauncherSettings.Favorites.BACKUP_TABLE_NAME;
-import static com.android.colorfulos.LauncherSettings.Favorites.TABLE_NAME;
-import static com.android.colorfulos.provider.LauncherDbUtils.tableExists;
+import static com.aoleyun.os.LauncherSettings.Favorites.BACKUP_TABLE_NAME;
+import static com.aoleyun.os.LauncherSettings.Favorites.TABLE_NAME;
+import static com.aoleyun.os.provider.LauncherDbUtils.tableExists;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -14,8 +14,8 @@ import static org.junit.Assert.assertTrue;
 import android.content.ContentValues;
 import android.graphics.Point;
 
-import com.android.colorfulos.LauncherSettings.Favorites;
-import com.android.colorfulos.LauncherSettings.Settings;
+import com.aoleyun.os.LauncherSettings.Favorites;
+import com.aoleyun.os.LauncherSettings.Settings;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/robolectric_tests/src/com/android/launcher3/model/GridSizeMigrationTaskTest.java b/robolectric_tests/src/com/android/launcher3/model/GridSizeMigrationTaskTest.java
index 3f636f5..1f5a1ac 100644
--- a/robolectric_tests/src/com/android/launcher3/model/GridSizeMigrationTaskTest.java
+++ b/robolectric_tests/src/com/android/launcher3/model/GridSizeMigrationTaskTest.java
@@ -1,6 +1,6 @@
-package com.android.colorfulos.model;
+package com.aoleyun.os.model;
 
-import static com.android.colorfulos.model.GridSizeMigrationTask.getWorkspaceScreenIds;
+import static com.aoleyun.os.model.GridSizeMigrationTask.getWorkspaceScreenIds;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -8,12 +8,12 @@ import static org.junit.Assert.assertTrue;
 import android.database.Cursor;
 import android.graphics.Point;
 
-import com.android.colorfulos.InvariantDeviceProfile;
-import com.android.colorfulos.LauncherSettings;
-import com.android.colorfulos.config.FeatureFlags;
-import com.android.colorfulos.config.FlagOverrideRule;
-import com.android.colorfulos.model.GridSizeMigrationTask.MultiStepMigrationTask;
-import com.android.colorfulos.util.IntArray;
+import com.aoleyun.os.InvariantDeviceProfile;
+import com.aoleyun.os.LauncherSettings;
+import com.aoleyun.os.config.FeatureFlags;
+import com.aoleyun.os.config.FlagOverrideRule;
+import com.aoleyun.os.model.GridSizeMigrationTask.MultiStepMigrationTask;
+import com.aoleyun.os.util.IntArray;
 
 import org.junit.Before;
 import org.junit.Rule;
diff --git a/robolectric_tests/src/com/android/launcher3/model/PackageInstallStateChangedTaskTest.java b/robolectric_tests/src/com/android/launcher3/model/PackageInstallStateChangedTaskTest.java
index c1c85a1..3e78067 100644
--- a/robolectric_tests/src/com/android/launcher3/model/PackageInstallStateChangedTaskTest.java
+++ b/robolectric_tests/src/com/android/launcher3/model/PackageInstallStateChangedTaskTest.java
@@ -1,12 +1,12 @@
-package com.android.colorfulos.model;
+package com.aoleyun.os.model;
 
 import static org.junit.Assert.assertEquals;
 
-import com.android.colorfulos.ItemInfo;
-import com.android.colorfulos.LauncherAppWidgetInfo;
-import com.android.colorfulos.WorkspaceItemInfo;
-import com.android.colorfulos.compat.PackageInstallerCompat;
-import com.android.colorfulos.compat.PackageInstallerCompat.PackageInstallInfo;
+import com.aoleyun.os.ItemInfo;
+import com.aoleyun.os.LauncherAppWidgetInfo;
+import com.aoleyun.os.WorkspaceItemInfo;
+import com.aoleyun.os.compat.PackageInstallerCompat;
+import com.aoleyun.os.compat.PackageInstallerCompat.PackageInstallInfo;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/robolectric_tests/src/com/android/launcher3/popup/PopupPopulatorTest.java b/robolectric_tests/src/com/android/launcher3/popup/PopupPopulatorTest.java
index b4e8038..05dd6a1 100644
--- a/robolectric_tests/src/com/android/launcher3/popup/PopupPopulatorTest.java
+++ b/robolectric_tests/src/com/android/launcher3/popup/PopupPopulatorTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.popup;
+package com.aoleyun.os.popup;
 
-import static com.android.colorfulos.popup.PopupPopulator.MAX_SHORTCUTS;
-import static com.android.colorfulos.popup.PopupPopulator.NUM_DYNAMIC;
+import static com.aoleyun.os.popup.PopupPopulator.MAX_SHORTCUTS;
+import static com.aoleyun.os.popup.PopupPopulator.NUM_DYNAMIC;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
diff --git a/robolectric_tests/src/com/android/launcher3/util/GridOccupancyTest.java b/robolectric_tests/src/com/android/launcher3/util/GridOccupancyTest.java
index 870a874..ecdf58c 100644
--- a/robolectric_tests/src/com/android/launcher3/util/GridOccupancyTest.java
+++ b/robolectric_tests/src/com/android/launcher3/util/GridOccupancyTest.java
@@ -1,4 +1,4 @@
-package com.android.colorfulos.util;
+package com.aoleyun.os.util;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/robolectric_tests/src/com/android/launcher3/util/IntSetTest.java b/robolectric_tests/src/com/android/launcher3/util/IntSetTest.java
index 2710a3b..87e2183 100644
--- a/robolectric_tests/src/com/android/launcher3/util/IntSetTest.java
+++ b/robolectric_tests/src/com/android/launcher3/util/IntSetTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.util;
+package com.aoleyun.os.util;
 
 import static com.google.common.truth.Truth.assertThat;
 
diff --git a/robolectric_tests/src/com/android/launcher3/util/TestLauncherProvider.java b/robolectric_tests/src/com/android/launcher3/util/TestLauncherProvider.java
index 3c04c4f..be2035f 100644
--- a/robolectric_tests/src/com/android/launcher3/util/TestLauncherProvider.java
+++ b/robolectric_tests/src/com/android/launcher3/util/TestLauncherProvider.java
@@ -1,10 +1,10 @@
-package com.android.colorfulos.util;
+package com.aoleyun.os.util;
 
 import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
 
-import com.android.colorfulos.LauncherProvider;
+import com.aoleyun.os.LauncherProvider;
 
 /**
  * An extension of LauncherProvider backed up by in-memory database.
diff --git a/src/com/android/colorfulos/TTUtils/Utils.java b/src/com/android/colorfulos/TTUtils/Utils.java
deleted file mode 100644
index b563694..0000000
--- a/src/com/android/colorfulos/TTUtils/Utils.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.android.colorfulos.TTUtils;
-
-import android.annotation.SuppressLint;
-import android.os.Build;
-import android.util.Log;
-
-import java.lang.reflect.Method;
-
-public class Utils {
-    /**
-     * 获取设备序列号
-     *
-     * @return
-     */
-    @SuppressLint({"MissingPermission", "NewApi"})
-    public static String getSerial() {
-        String serial = "unknow";
-        try {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {//9.0+
-                serial = Build.getSerial();
-            } else if (Build.VERSION.SDK_INT > Build.VERSION_CODES.N) {//8.0+
-                serial = Build.SERIAL;
-            } else {//8.0-
-                Class<?> c = Class.forName("android.os.SystemProperties");
-                Method get = c.getMethod("get", String.class);
-                serial = (String) get.invoke(c, "ro.serialno");
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            Log.e("e", "读取设备序列号异常：" + e.toString());
-        }
-        return serial;
-    }
-}
diff --git a/src/com/android/colorfulos/base/MyApplication.java b/src/com/android/colorfulos/base/MyApplication.java
deleted file mode 100644
index be03b45..0000000
--- a/src/com/android/colorfulos/base/MyApplication.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.android.colorfulos.base;
-
-import android.app.Application;
-
-import com.android.colorfulos.BuildConfig;
-import com.android.colorfulos.network.NetWorkManager;
-import com.android.colorfulos.uiuiutils.JGYUtils;
-import com.arialyy.aria.core.Aria;
-
-import cn.jpush.android.api.JPushInterface;
-
-public class MyApplication extends Application {
-    private static MyApplication app;
-
-    public static MyApplication getInstance() {
-        return app;
-    }
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        app = this;
-        initJPush();
-        JGYUtils.init(this);
-        Aria.init(this);
-        NetWorkManager.init(this);
-    }
-
-    private void initJPush() {
-        JPushInterface.setDebugMode(BuildConfig.DEBUG);    // 设置开启日志,发布时请关闭日志
-        JPushInterface.init(this);
-    }
-
-    private String appPackageName;
-    private long runTime = 0;
-    private long onClickTime = 0;
-
-    public void setOnClickTime(long time) {
-        this.onClickTime = time;
-    }
-
-    public long getOnClickTime() {
-        return onClickTime;
-    }
-
-    public void setAppPackageName(String name) {
-        this.appPackageName = name;
-    }
-
-    public String getAppPackageName() {
-        return appPackageName;
-    }
-
-    public void setTime(long time) {
-        this.runTime = time;
-    }
-
-    public long getRunTime() {
-        return runTime;
-    }
-}
diff --git a/src/com/android/colorfulos/jpush/PushMessageReceiver.java b/src/com/android/colorfulos/jpush/PushMessageReceiver.java
deleted file mode 100644
index a9bb5df..0000000
--- a/src/com/android/colorfulos/jpush/PushMessageReceiver.java
+++ /dev/null
@@ -1,143 +0,0 @@
-package com.android.colorfulos.jpush;
-
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.util.Log;
-
-import com.android.colorfulos.Launcher;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import cn.jpush.android.api.CmdMessage;
-import cn.jpush.android.api.CustomMessage;
-import cn.jpush.android.api.JPushInterface;
-import cn.jpush.android.api.JPushMessage;
-import cn.jpush.android.api.NotificationMessage;
-import cn.jpush.android.service.JPushMessageReceiver;
-
-public class PushMessageReceiver extends JPushMessageReceiver{
-    private static final String TAG = "PushMessageReceiver";
-    @Override
-    public void onMessage(Context context, CustomMessage customMessage) {
-        Log.e(TAG,"[onMessage] "+customMessage);
-        super.onMessage(context,customMessage);
-//        processCustomMessage(context,customMessage);
-    }
-
-    @Override
-    public void onNotifyMessageOpened(Context context, NotificationMessage message) {
-        Log.e(TAG,"[onNotifyMessageOpened] "+message);
-        try{
-            //打开自定义的Activity
-            Intent i = new Intent(context, TestActivity.class);
-            Bundle bundle = new Bundle();
-            bundle.putString(JPushInterface.EXTRA_NOTIFICATION_TITLE,message.notificationTitle);
-            bundle.putString(JPushInterface.EXTRA_ALERT,message.notificationContent);
-            i.putExtras(bundle);
-            //i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP );
-            context.startActivity(i);
-        }catch (Throwable throwable){
-
-        }
-    }
-
-    @Override
-    public void onMultiActionClicked(Context context, Intent intent) {
-        Log.e(TAG, "[onMultiActionClicked] 用户点击了通知栏按钮");
-        String nActionExtra = intent.getExtras().getString(JPushInterface.EXTRA_NOTIFICATION_ACTION_EXTRA);
-
-        //开发者根据不同 Action 携带的 extra 字段来分配不同的动作。
-        if(nActionExtra==null){
-            Log.d(TAG,"ACTION_NOTIFICATION_CLICK_ACTION nActionExtra is null");
-            return;
-        }
-        if (nActionExtra.equals("my_extra1")) {
-            Log.e(TAG, "[onMultiActionClicked] 用户点击通知栏按钮一");
-        } else if (nActionExtra.equals("my_extra2")) {
-            Log.e(TAG, "[onMultiActionClicked] 用户点击通知栏按钮二");
-        } else if (nActionExtra.equals("my_extra3")) {
-            Log.e(TAG, "[onMultiActionClicked] 用户点击通知栏按钮三");
-        } else {
-            Log.e(TAG, "[onMultiActionClicked] 用户点击通知栏按钮未定义");
-        }
-    }
-
-    @Override
-    public void onNotifyMessageArrived(Context context, NotificationMessage message) {
-        Log.e(TAG,"[onNotifyMessageArrived] "+message);
-    }
-
-    @Override
-    public void onNotifyMessageDismiss(Context context, NotificationMessage message) {
-        Log.e(TAG,"[onNotifyMessageDismiss] "+message);
-    }
-
-    @Override
-    public void onRegister(Context context, String registrationId) {
-        Log.e(TAG,"[onRegister] "+registrationId);
-    }
-
-    @Override
-    public void onConnected(Context context, boolean isConnected) {
-        Log.e(TAG,"[onConnected] "+isConnected);
-    }
-
-    @Override
-    public void onCommandResult(Context context, CmdMessage cmdMessage) {
-        Log.e(TAG,"[onCommandResult] "+cmdMessage);
-    }
-
-    @Override
-    public void onTagOperatorResult(Context context,JPushMessage jPushMessage) {
-        TagAliasOperatorHelper.getInstance().onTagOperatorResult(context,jPushMessage);
-        super.onTagOperatorResult(context, jPushMessage);
-    }
-    @Override
-    public void onCheckTagOperatorResult(Context context,JPushMessage jPushMessage){
-        TagAliasOperatorHelper.getInstance().onCheckTagOperatorResult(context,jPushMessage);
-        super.onCheckTagOperatorResult(context, jPushMessage);
-    }
-    @Override
-    public void onAliasOperatorResult(Context context, JPushMessage jPushMessage) {
-        TagAliasOperatorHelper.getInstance().onAliasOperatorResult(context,jPushMessage);
-        super.onAliasOperatorResult(context, jPushMessage);
-    }
-
-    @Override
-    public void onMobileNumberOperatorResult(Context context, JPushMessage jPushMessage) {
-        TagAliasOperatorHelper.getInstance().onMobileNumberOperatorResult(context,jPushMessage);
-        super.onMobileNumberOperatorResult(context, jPushMessage);
-    }
-
-    //send msg to MainActivity
-    private void processCustomMessage(Context context, CustomMessage customMessage) {
-        if (Launcher.isForeground) {
-            String message = customMessage.message;
-            String extras = customMessage.extra;
-            Intent msgIntent = new Intent(Launcher.MESSAGE_RECEIVED_ACTION);
-            msgIntent.putExtra(Launcher.KEY_MESSAGE, message);
-            if (!ExampleUtil.isEmpty(extras)) {
-                try {
-                    JSONObject extraJson = new JSONObject(extras);
-                    if (extraJson.length() > 0) {
-                        msgIntent.putExtra(Launcher.KEY_EXTRAS, extras);
-                    }
-                } catch (JSONException e) {
-
-                }
-
-            }
-            LocalBroadcastManager.getInstance(context).sendBroadcast(msgIntent);
-        }
-    }
-
-    @Override
-    public void onNotificationSettingsCheck(Context context, boolean isOn, int source) {
-        super.onNotificationSettingsCheck(context, isOn, source);
-        Log.e(TAG,"[onNotificationSettingsCheck] isOn:"+isOn+",source:"+source);
-    }
-    
-}
diff --git a/src/com/android/colorfulos/network/NewestAppUpdateResult.java b/src/com/android/colorfulos/network/NewestAppUpdateResult.java
deleted file mode 100644
index eed016e..0000000
--- a/src/com/android/colorfulos/network/NewestAppUpdateResult.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package com.android.colorfulos.network;
-
-import java.io.Serializable;
-
-public class NewestAppUpdateResult implements Serializable {
-
-    String app_name;
-    String app_package;
-    String app_version_name;
-    int app_version_code;
-    long app_size;
-    String app_desc;
-    String app_md5;
-    String app_url;
-    String url;
-
-    public String getApp_name() {
-        return app_name;
-    }
-
-    public void setApp_name(String app_name) {
-        this.app_name = app_name;
-    }
-
-    public String getApp_package() {
-        return app_package;
-    }
-
-    public void setApp_package(String app_package) {
-        this.app_package = app_package;
-    }
-
-    public String getApp_version_name() {
-        return app_version_name;
-    }
-
-    public void setApp_version_name(String app_version_name) {
-        this.app_version_name = app_version_name;
-    }
-
-    public int getApp_version_code() {
-        return app_version_code;
-    }
-
-    public void setApp_version_code(int app_version_code) {
-        this.app_version_code = app_version_code;
-    }
-
-    public long getApp_size() {
-        return app_size;
-    }
-
-    public void setApp_size(long app_size) {
-        this.app_size = app_size;
-    }
-
-    public String getApp_desc() {
-        return app_desc;
-    }
-
-    public void setApp_desc(String app_desc) {
-        this.app_desc = app_desc;
-    }
-
-    public String getApp_md5() {
-        return app_md5;
-    }
-
-    public void setApp_md5(String app_md5) {
-        this.app_md5 = app_md5;
-    }
-
-    public String getApp_url() {
-        return app_url;
-    }
-
-    public void setApp_url(String app_url) {
-        this.app_url = app_url;
-    }
-
-    public String getUrl() {
-        return url;
-    }
-
-    public void setUrl(String url) {
-        this.url = url;
-    }
-}
diff --git a/src/com/android/colorfulos/network/URLPath.java b/src/com/android/colorfulos/network/URLPath.java
deleted file mode 100644
index f2162dd..0000000
--- a/src/com/android/colorfulos/network/URLPath.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.android.colorfulos.network;
-
-public class URLPath {
-    public static final String ROOT_URL = "http://name.uiuios.com/api/";
-    public static final String APP_LOG = "app/addAppLog";
-    public static final String RUN_NEW_APP = "app/runNewApp";
-    public final static String GET_NEWESTAPPUPDATE = "Silent/silent";
-
-}
diff --git a/src/com/android/colorfulos/AbstractFloatingView.java b/src/com/aoleyun/os/AbstractFloatingView.java
similarity index 94%
rename from src/com/android/colorfulos/AbstractFloatingView.java
rename to src/com/aoleyun/os/AbstractFloatingView.java
index ef334f3..2c37d9a 100644
--- a/src/com/android/colorfulos/AbstractFloatingView.java
+++ b/src/com/aoleyun/os/AbstractFloatingView.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos;
+package com.aoleyun.os;
 
 import static android.view.accessibility.AccessibilityEvent.TYPE_VIEW_FOCUSED;
 import static android.view.accessibility.AccessibilityEvent.TYPE_WINDOW_CONTENT_CHANGED;
 import static android.view.accessibility.AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED;
 
-import static com.android.colorfulos.compat.AccessibilityManagerCompat.isAccessibilityEnabled;
-import static com.android.colorfulos.compat.AccessibilityManagerCompat.sendCustomAccessibilityEvent;
+import static com.aoleyun.os.compat.AccessibilityManagerCompat.isAccessibilityEnabled;
+import static com.aoleyun.os.compat.AccessibilityManagerCompat.sendCustomAccessibilityEvent;
 
 import android.animation.Animator;
 import android.annotation.SuppressLint;
@@ -35,11 +35,11 @@ import android.widget.LinearLayout;
 import androidx.annotation.IntDef;
 import androidx.annotation.Nullable;
 
-import com.android.colorfulos.userevent.nano.LauncherLogProto.Action;
-import com.android.colorfulos.userevent.nano.LauncherLogProto.ContainerType;
-import com.android.colorfulos.util.TouchController;
-import com.android.colorfulos.views.ActivityContext;
-import com.android.colorfulos.views.BaseDragLayer;
+import com.aoleyun.os.userevent.nano.LauncherLogProto.Action;
+import com.aoleyun.os.userevent.nano.LauncherLogProto.ContainerType;
+import com.aoleyun.os.util.TouchController;
+import com.aoleyun.os.views.ActivityContext;
+import com.aoleyun.os.views.BaseDragLayer;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/src/com/android/colorfulos/Alarm.java b/src/com/aoleyun/os/Alarm.java
similarity index 98%
rename from src/com/android/colorfulos/Alarm.java
rename to src/com/aoleyun/os/Alarm.java
index 122f0d4..5ea6cb4 100644
--- a/src/com/android/colorfulos/Alarm.java
+++ b/src/com/aoleyun/os/Alarm.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos;
+package com.aoleyun.os;
 
 import android.os.Handler;
 import android.os.SystemClock;
diff --git a/src/com/android/colorfulos/AllAppsList.java b/src/com/aoleyun/os/AllAppsList.java
similarity index 96%
rename from src/com/android/colorfulos/AllAppsList.java
rename to src/com/aoleyun/os/AllAppsList.java
index ea7eae0..ba8526c 100644
--- a/src/com/android/colorfulos/AllAppsList.java
+++ b/src/com/aoleyun/os/AllAppsList.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos;
+package com.aoleyun.os;
 
 import android.content.ComponentName;
 import android.content.Context;
@@ -24,11 +24,11 @@ import android.os.Process;
 import android.os.UserHandle;
 import android.util.Log;
 
-import com.android.colorfulos.compat.LauncherAppsCompat;
-import com.android.colorfulos.compat.PackageInstallerCompat;
-import com.android.colorfulos.icons.IconCache;
-import com.android.colorfulos.util.FlagOp;
-import com.android.colorfulos.util.ItemInfoMatcher;
+import com.aoleyun.os.compat.LauncherAppsCompat;
+import com.aoleyun.os.compat.PackageInstallerCompat;
+import com.aoleyun.os.icons.IconCache;
+import com.aoleyun.os.util.FlagOp;
+import com.aoleyun.os.util.ItemInfoMatcher;
 
 import java.util.ArrayList;
 import java.util.HashSet;
diff --git a/src/com/android/colorfulos/AppFilter.java b/src/com/aoleyun/os/AppFilter.java
similarity index 78%
rename from src/com/android/colorfulos/AppFilter.java
rename to src/com/aoleyun/os/AppFilter.java
index e744ae6..39d8a4e 100644
--- a/src/com/android/colorfulos/AppFilter.java
+++ b/src/com/aoleyun/os/AppFilter.java
@@ -1,9 +1,10 @@
-package com.android.colorfulos;
+package com.aoleyun.os;
 
 import android.content.ComponentName;
 import android.content.Context;
 
-import com.android.colorfulos.util.ResourceBasedOverride;
+import com.aoleyun.os.R;
+import com.aoleyun.os.util.ResourceBasedOverride;
 
 public class AppFilter implements ResourceBasedOverride {
 
diff --git a/src/com/android/colorfulos/AppInfo.java b/src/com/aoleyun/os/AppInfo.java
similarity index 94%
rename from src/com/android/colorfulos/AppInfo.java
rename to src/com/aoleyun/os/AppInfo.java
index 74d1652..395129e 100644
--- a/src/com/android/colorfulos/AppInfo.java
+++ b/src/com/aoleyun/os/AppInfo.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos;
+package com.aoleyun.os;
 
 import android.content.ComponentName;
 import android.content.Context;
@@ -25,9 +25,9 @@ import android.os.Build;
 import android.os.Process;
 import android.os.UserHandle;
 
-import com.android.colorfulos.compat.UserManagerCompat;
-import com.android.colorfulos.util.ComponentKey;
-import com.android.colorfulos.util.PackageManagerHelper;
+import com.aoleyun.os.compat.UserManagerCompat;
+import com.aoleyun.os.util.ComponentKey;
+import com.aoleyun.os.util.PackageManagerHelper;
 
 /**
  * Represents an app in AllAppsView.
@@ -59,7 +59,7 @@ public class AppInfo extends ItemInfoWithIcon {
 
     public AppInfo(LauncherActivityInfo info, UserHandle user, boolean quietModeEnabled) {
         this.componentName = info.getComponentName();
-        this.container = ItemInfo.NO_ID;
+        this.container = NO_ID;
         this.user = user;
         intent = makeLaunchIntent(info);
 
diff --git a/src/com/android/colorfulos/AppWidgetResizeFrame.java b/src/com/aoleyun/os/AppWidgetResizeFrame.java
similarity index 96%
rename from src/com/android/colorfulos/AppWidgetResizeFrame.java
rename to src/com/aoleyun/os/AppWidgetResizeFrame.java
index 8b18a8d..75ca671 100644
--- a/src/com/android/colorfulos/AppWidgetResizeFrame.java
+++ b/src/com/aoleyun/os/AppWidgetResizeFrame.java
@@ -1,9 +1,4 @@
-package com.android.colorfulos;
-
-import static com.android.colorfulos.LauncherAnimUtils.LAYOUT_HEIGHT;
-import static com.android.colorfulos.LauncherAnimUtils.LAYOUT_WIDTH;
-import static com.android.colorfulos.views.BaseDragLayer.LAYOUT_X;
-import static com.android.colorfulos.views.BaseDragLayer.LAYOUT_Y;
+package com.aoleyun.os;
 
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
@@ -19,10 +14,12 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.android.colorfulos.accessibility.DragViewStateAnnouncer;
-import com.android.colorfulos.dragndrop.DragLayer;
-import com.android.colorfulos.util.FocusLogic;
-import com.android.colorfulos.widget.LauncherAppWidgetHostView;
+import com.aoleyun.os.R;
+import com.aoleyun.os.accessibility.DragViewStateAnnouncer;
+import com.aoleyun.os.dragndrop.DragLayer;
+import com.aoleyun.os.util.FocusLogic;
+import com.aoleyun.os.widget.LauncherAppWidgetHostView;
+import com.aoleyun.os.views.BaseDragLayer;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -455,10 +452,10 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O
             requestLayout();
         } else {
             ObjectAnimator oa = ObjectAnimator.ofPropertyValuesHolder(lp,
-                    PropertyValuesHolder.ofInt(LAYOUT_WIDTH, lp.width, newWidth),
-                    PropertyValuesHolder.ofInt(LAYOUT_HEIGHT, lp.height, newHeight),
-                    PropertyValuesHolder.ofInt(LAYOUT_X, lp.x, newX),
-                    PropertyValuesHolder.ofInt(LAYOUT_Y, lp.y, newY));
+                    PropertyValuesHolder.ofInt(LauncherAnimUtils.LAYOUT_WIDTH, lp.width, newWidth),
+                    PropertyValuesHolder.ofInt(LauncherAnimUtils.LAYOUT_HEIGHT, lp.height, newHeight),
+                    PropertyValuesHolder.ofInt(BaseDragLayer.LAYOUT_X, lp.x, newX),
+                    PropertyValuesHolder.ofInt(BaseDragLayer.LAYOUT_Y, lp.y, newY));
             mFirstFrameAnimatorHelper.addTo(oa).addUpdateListener(a -> requestLayout());
 
             AnimatorSet set = new AnimatorSet();
diff --git a/src/com/android/colorfulos/AppWidgetsRestoredReceiver.java b/src/com/aoleyun/os/AppWidgetsRestoredReceiver.java
similarity index 90%
rename from src/com/android/colorfulos/AppWidgetsRestoredReceiver.java
rename to src/com/aoleyun/os/AppWidgetsRestoredReceiver.java
index e78eec8..2bd8549 100644
--- a/src/com/android/colorfulos/AppWidgetsRestoredReceiver.java
+++ b/src/com/aoleyun/os/AppWidgetsRestoredReceiver.java
@@ -1,4 +1,4 @@
-package com.android.colorfulos;
+package com.aoleyun.os;
 
 import android.appwidget.AppWidgetHost;
 import android.appwidget.AppWidgetManager;
@@ -10,11 +10,10 @@ import android.content.Intent;
 import android.database.Cursor;
 import android.util.Log;
 
-import com.android.colorfulos.LauncherSettings.Favorites;
-import com.android.colorfulos.config.FeatureFlags;
-import com.android.colorfulos.model.LoaderTask;
-import com.android.colorfulos.provider.RestoreDbTask;
-import com.android.colorfulos.util.ContentWriter;
+import com.aoleyun.os.config.FeatureFlags;
+import com.aoleyun.os.model.LoaderTask;
+import com.aoleyun.os.provider.RestoreDbTask;
+import com.aoleyun.os.util.ContentWriter;
 
 import androidx.annotation.WorkerThread;
 
@@ -85,8 +84,8 @@ public class AppWidgetsRestoredReceiver extends BroadcastReceiver {
                     .commit();
 
             if (result == 0) {
-                Cursor cursor = cr.query(Favorites.CONTENT_URI,
-                        new String[] {Favorites.APPWIDGET_ID},
+                Cursor cursor = cr.query(LauncherSettings.Favorites.CONTENT_URI,
+                        new String[] {LauncherSettings.Favorites.APPWIDGET_ID},
                         "appWidgetId=?", widgetIdParams, null);
                 try {
                     if (!cursor.moveToFirst()) {
diff --git a/src/com/android/colorfulos/AutoInstallsLayout.java b/src/com/aoleyun/os/AutoInstallsLayout.java
similarity index 98%
rename from src/com/android/colorfulos/AutoInstallsLayout.java
rename to src/com/aoleyun/os/AutoInstallsLayout.java
index 9bf1a3c..e84060f 100644
--- a/src/com/android/colorfulos/AutoInstallsLayout.java
+++ b/src/com/aoleyun/os/AutoInstallsLayout.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos;
+package com.aoleyun.os;
 
 import android.appwidget.AppWidgetHost;
 import android.content.ComponentName;
@@ -38,12 +38,12 @@ import android.util.Pair;
 import android.util.Patterns;
 import android.util.Xml;
 
-import com.android.colorfulos.LauncherProvider.SqlArguments;
-import com.android.colorfulos.LauncherSettings.Favorites;
-import com.android.colorfulos.icons.GraphicsUtils;
-import com.android.colorfulos.icons.LauncherIcons;
-import com.android.colorfulos.util.IntArray;
-import com.android.colorfulos.util.Thunk;
+import com.aoleyun.os.LauncherSettings.Favorites;
+import com.aoleyun.os.R;
+import com.aoleyun.os.icons.GraphicsUtils;
+import com.aoleyun.os.icons.LauncherIcons;
+import com.aoleyun.os.util.IntArray;
+import com.aoleyun.os.util.Thunk;
 
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
@@ -147,7 +147,8 @@ public class AutoInstallsLayout {
     private static final String HOTSEAT_CONTAINER_NAME =
             Favorites.containerToString(Favorites.CONTAINER_HOTSEAT);
 
-    @Thunk final Context mContext;
+    @Thunk
+    final Context mContext;
     @Thunk final AppWidgetHost mAppWidgetHost;
     protected final LayoutParserCallback mCallback;
 
@@ -597,7 +598,7 @@ public class AutoInstallsLayout {
             if (folderItems.size() < 2) {
                 // Delete the folder
                 Uri uri = Favorites.getContentUri(folderId);
-                SqlArguments args = new SqlArguments(uri, null, null);
+                LauncherProvider.SqlArguments args = new LauncherProvider.SqlArguments(uri, null, null);
                 mDb.delete(args.table, args.where, args.args);
                 addedId = -1;
 
diff --git a/src/com/android/colorfulos/BaseActivity.java b/src/com/aoleyun/os/BaseActivity.java
similarity index 90%
rename from src/com/android/colorfulos/BaseActivity.java
rename to src/com/aoleyun/os/BaseActivity.java
index 8adbeef..bced68e 100644
--- a/src/com/android/colorfulos/BaseActivity.java
+++ b/src/com/aoleyun/os/BaseActivity.java
@@ -14,9 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos;
-
-import static com.android.colorfulos.util.SystemUiController.UI_STATE_OVERVIEW;
+package com.aoleyun.os;
 
 import static java.lang.annotation.RetentionPolicy.SOURCE;
 
@@ -27,17 +25,15 @@ import android.content.Intent;
 import android.content.res.Configuration;
 import android.view.ContextThemeWrapper;
 
-import com.android.colorfulos.DeviceProfile.OnDeviceProfileChangeListener;
-import com.android.colorfulos.logging.StatsLogManager;
-import com.android.colorfulos.logging.StatsLogUtils;
-import com.android.colorfulos.logging.StatsLogUtils.LogStateProvider;
-import com.android.colorfulos.logging.UserEventDispatcher;
-import com.android.colorfulos.logging.UserEventDispatcher.UserEventDelegate;
-import com.android.colorfulos.uioverrides.UiFactory;
-import com.android.colorfulos.userevent.nano.LauncherLogProto;
-import com.android.colorfulos.util.SystemUiController;
-import com.android.colorfulos.util.ViewCache;
-import com.android.colorfulos.views.ActivityContext;
+import com.aoleyun.os.DeviceProfile.OnDeviceProfileChangeListener;
+import com.aoleyun.os.logging.StatsLogManager;
+import com.aoleyun.os.logging.StatsLogUtils;
+import com.aoleyun.os.logging.UserEventDispatcher;
+import com.aoleyun.os.uioverrides.UiFactory;
+import com.aoleyun.os.userevent.nano.LauncherLogProto;
+import com.aoleyun.os.util.SystemUiController;
+import com.aoleyun.os.util.ViewCache;
+import com.aoleyun.os.views.ActivityContext;
 
 import java.io.FileDescriptor;
 import java.io.PrintWriter;
@@ -47,7 +43,7 @@ import java.util.ArrayList;
 import androidx.annotation.IntDef;
 
 public abstract class BaseActivity extends Activity
-        implements UserEventDelegate, LogStateProvider, ActivityContext {
+        implements UserEventDispatcher.UserEventDelegate, StatsLogUtils.LogStateProvider, ActivityContext {
 
     public static final int INVISIBLE_BY_STATE_HANDLER = 1 << 0;
     public static final int INVISIBLE_BY_APP_TRANSITIONS = 1 << 1;
@@ -178,7 +174,7 @@ public abstract class BaseActivity extends Activity
 
         // Reset the overridden sysui flags used for the task-swipe launch animation, this is a
         // catch all for if we do not get resumed (and therefore not paused below)
-        getSystemUiController().updateUiState(UI_STATE_OVERVIEW, 0);
+        getSystemUiController().updateUiState(SystemUiController.UI_STATE_OVERVIEW, 0);
     }
 
     @Override
@@ -190,7 +186,7 @@ public abstract class BaseActivity extends Activity
         // here instead of at the end of the animation because the start of the new activity does
         // not happen immediately, which would cause us to reset to launcher's sysui flags and then
         // back to the new app (causing a flash)
-        getSystemUiController().updateUiState(UI_STATE_OVERVIEW, 0);
+        getSystemUiController().updateUiState(SystemUiController.UI_STATE_OVERVIEW, 0);
     }
 
     public boolean isStarted() {
diff --git a/src/com/android/colorfulos/BaseDraggingActivity.java b/src/com/aoleyun/os/BaseDraggingActivity.java
similarity index 95%
rename from src/com/android/colorfulos/BaseDraggingActivity.java
rename to src/com/aoleyun/os/BaseDraggingActivity.java
index 930d8b1..f321653 100644
--- a/src/com/android/colorfulos/BaseDraggingActivity.java
+++ b/src/com/aoleyun/os/BaseDraggingActivity.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos;
+package com.aoleyun.os;
 
 import android.app.ActivityOptions;
 import android.content.ActivityNotFoundException;
@@ -30,14 +30,15 @@ import android.view.ActionMode;
 import android.view.View;
 import android.widget.Toast;
 
-import com.android.colorfulos.LauncherSettings.Favorites;
-import com.android.colorfulos.compat.LauncherAppsCompat;
-import com.android.colorfulos.model.AppLaunchTracker;
-import com.android.colorfulos.shortcuts.DeepShortcutManager;
-import com.android.colorfulos.testing.TestProtocol;
-import com.android.colorfulos.uioverrides.DisplayRotationListener;
-import com.android.colorfulos.uioverrides.WallpaperColorInfo;
-import com.android.colorfulos.util.Themes;
+import com.aoleyun.os.LauncherSettings.Favorites;
+import com.aoleyun.os.R;
+import com.aoleyun.os.compat.LauncherAppsCompat;
+import com.aoleyun.os.model.AppLaunchTracker;
+import com.aoleyun.os.shortcuts.DeepShortcutManager;
+import com.aoleyun.os.testing.TestProtocol;
+import com.aoleyun.os.uioverrides.DisplayRotationListener;
+import com.aoleyun.os.uioverrides.WallpaperColorInfo;
+import com.aoleyun.os.util.Themes;
 
 import androidx.annotation.Nullable;
 
diff --git a/src/com/android/colorfulos/BaseRecyclerView.java b/src/com/aoleyun/os/BaseRecyclerView.java
similarity index 98%
rename from src/com/android/colorfulos/BaseRecyclerView.java
rename to src/com/aoleyun/os/BaseRecyclerView.java
index 8245136..5a007d5 100644
--- a/src/com/android/colorfulos/BaseRecyclerView.java
+++ b/src/com/aoleyun/os/BaseRecyclerView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos;
+package com.aoleyun.os;
 
 import android.content.Context;
 import android.util.AttributeSet;
@@ -22,7 +22,8 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.android.colorfulos.views.RecyclerViewFastScroller;
+import com.aoleyun.os.R;
+import com.aoleyun.os.views.RecyclerViewFastScroller;
 
 import androidx.recyclerview.widget.RecyclerView;
 
diff --git a/src/com/android/colorfulos/BubbleTextView.java b/src/com/aoleyun/os/BubbleTextView.java
similarity index 95%
rename from src/com/android/colorfulos/BubbleTextView.java
rename to src/com/aoleyun/os/BubbleTextView.java
index c04cec1..cef7f98 100644
--- a/src/com/android/colorfulos/BubbleTextView.java
+++ b/src/com/aoleyun/os/BubbleTextView.java
@@ -14,9 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos;
-
-import static com.android.colorfulos.icons.GraphicsUtils.setColorAlphaBound;
+package com.aoleyun.os;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -42,20 +40,20 @@ import android.view.ViewConfiguration;
 import android.view.ViewDebug;
 import android.widget.TextView;
 
-import com.android.colorfulos.Launcher.OnResumeCallback;
-import com.android.colorfulos.accessibility.LauncherAccessibilityDelegate;
-import com.android.colorfulos.dot.DotInfo;
-import com.android.colorfulos.folder.FolderIcon;
-import com.android.colorfulos.graphics.DrawableFactory;
-import com.android.colorfulos.graphics.IconPalette;
-import com.android.colorfulos.graphics.IconShape;
-import com.android.colorfulos.graphics.PreloadIconDrawable;
-import com.android.colorfulos.icons.DotRenderer;
-import com.android.colorfulos.icons.IconCache.IconLoadRequest;
-import com.android.colorfulos.icons.IconCache.ItemInfoUpdateReceiver;
-import com.android.colorfulos.model.PackageItemInfo;
-import com.android.colorfulos.testing.TestProtocol;
-import com.android.colorfulos.views.ActivityContext;
+import com.aoleyun.os.R;
+import com.aoleyun.os.accessibility.LauncherAccessibilityDelegate;
+import com.aoleyun.os.dot.DotInfo;
+import com.aoleyun.os.folder.FolderIcon;
+import com.aoleyun.os.graphics.DrawableFactory;
+import com.aoleyun.os.graphics.IconPalette;
+import com.aoleyun.os.graphics.IconShape;
+import com.aoleyun.os.graphics.PreloadIconDrawable;
+import com.aoleyun.os.icons.DotRenderer;
+import com.aoleyun.os.model.PackageItemInfo;
+import com.aoleyun.os.testing.TestProtocol;
+import com.aoleyun.os.views.ActivityContext;
+import com.aoleyun.os.icons.GraphicsUtils;
+import com.aoleyun.os.icons.IconCache;
 
 import java.text.NumberFormat;
 
@@ -64,7 +62,7 @@ import java.text.NumberFormat;
  * because we want to make the bubble taller than the text and TextView's clip is
  * too aggressive.
  */
-public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver, OnResumeCallback {
+public class BubbleTextView extends TextView implements IconCache.ItemInfoUpdateReceiver, Launcher.OnResumeCallback {
 
     private static final int DISPLAY_WORKSPACE = 0;
     private static final int DISPLAY_ALL_APPS = 1;
@@ -133,7 +131,7 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
     @ViewDebug.ExportedProperty(category = "launcher")
     private boolean mDisableRelayout = false;
 
-    private IconLoadRequest mIconLoadRequest;
+    private IconCache.IconLoadRequest mIconLoadRequest;
 
     public BubbleTextView(Context context) {
         this(context, null, 0);
@@ -495,7 +493,7 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
             // Special case to prevent text shadows in high contrast mode
             return Color.TRANSPARENT;
         }
-        return setColorAlphaBound(mTextColor, Math.round(Color.alpha(mTextColor) * mTextAlpha));
+        return GraphicsUtils.setColorAlphaBound(mTextColor, Math.round(Color.alpha(mTextColor) * mTextAlpha));
     }
 
     /**
diff --git a/src/com/android/colorfulos/ButtonDropTarget.java b/src/com/aoleyun/os/ButtonDropTarget.java
similarity index 95%
rename from src/com/android/colorfulos/ButtonDropTarget.java
rename to src/com/aoleyun/os/ButtonDropTarget.java
index 0191daa..5fb9933 100644
--- a/src/com/android/colorfulos/ButtonDropTarget.java
+++ b/src/com/aoleyun/os/ButtonDropTarget.java
@@ -14,12 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos;
+package com.aoleyun.os;
 
 import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
 
-import static com.android.colorfulos.LauncherState.NORMAL;
-
 import android.animation.AnimatorSet;
 import android.animation.FloatArrayEvaluator;
 import android.animation.ObjectAnimator;
@@ -41,14 +39,15 @@ import android.view.accessibility.AccessibilityEvent;
 import android.widget.PopupWindow;
 import android.widget.TextView;
 
-import com.android.colorfulos.anim.Interpolators;
-import com.android.colorfulos.dragndrop.DragController;
-import com.android.colorfulos.dragndrop.DragLayer;
-import com.android.colorfulos.dragndrop.DragOptions;
-import com.android.colorfulos.dragndrop.DragView;
-import com.android.colorfulos.userevent.nano.LauncherLogProto.Target;
-import com.android.colorfulos.util.Themes;
-import com.android.colorfulos.util.Thunk;
+import com.aoleyun.os.R;
+import com.aoleyun.os.anim.Interpolators;
+import com.aoleyun.os.dragndrop.DragController;
+import com.aoleyun.os.dragndrop.DragLayer;
+import com.aoleyun.os.dragndrop.DragOptions;
+import com.aoleyun.os.dragndrop.DragView;
+import com.aoleyun.os.userevent.nano.LauncherLogProto.Target;
+import com.aoleyun.os.util.Themes;
+import com.aoleyun.os.util.Thunk;
 
 /**
  * Implements a DropTarget.
@@ -101,7 +100,8 @@ public abstract class ButtonDropTarget extends TextView
     private int mToolTipLocation;
 
     private AnimatorSet mCurrentColorAnim;
-    @Thunk ColorMatrix mSrcFilter, mDstFilter, mCurrentFilter;
+    @Thunk
+    ColorMatrix mSrcFilter, mDstFilter, mCurrentFilter;
 
     public ButtonDropTarget(Context context, AttributeSet attrs) {
         this(context, attrs, 0);
@@ -294,7 +294,7 @@ public abstract class ButtonDropTarget extends TextView
         Runnable onAnimationEndRunnable = () -> {
             completeDrop(d);
             mDropTargetBar.onDragEnd();
-            mLauncher.getStateManager().goToState(NORMAL);
+            mLauncher.getStateManager().goToState(LauncherState.NORMAL);
         };
 
         dragLayer.animateView(d.dragView, from, to, scale, 1f, 1f, 0.1f, 0.1f,
diff --git a/src/com/android/colorfulos/CellLayout.java b/src/com/aoleyun/os/CellLayout.java
similarity index 98%
rename from src/com/android/colorfulos/CellLayout.java
rename to src/com/aoleyun/os/CellLayout.java
index ba2fac3..91b22fc 100644
--- a/src/com/android/colorfulos/CellLayout.java
+++ b/src/com/aoleyun/os/CellLayout.java
@@ -14,9 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos;
-
-import static com.android.colorfulos.anim.Interpolators.DEACCEL_1_5;
+package com.aoleyun.os;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -51,24 +49,24 @@ import android.view.accessibility.AccessibilityEvent;
 import androidx.annotation.IntDef;
 import androidx.core.view.ViewCompat;
 
-import com.android.colorfulos.LauncherSettings.Favorites;
-import com.android.colorfulos.accessibility.DragAndDropAccessibilityDelegate;
-import com.android.colorfulos.accessibility.FolderAccessibilityHelper;
-import com.android.colorfulos.accessibility.WorkspaceAccessibilityHelper;
-import com.android.colorfulos.anim.Interpolators;
-import com.android.colorfulos.anim.PropertyListBuilder;
-import com.android.colorfulos.config.FeatureFlags;
-import com.android.colorfulos.folder.PreviewBackground;
-import com.android.colorfulos.graphics.DragPreviewProvider;
-import com.android.colorfulos.graphics.RotationMode;
-import com.android.colorfulos.util.CellAndSpan;
-import com.android.colorfulos.util.GridOccupancy;
-import com.android.colorfulos.util.ParcelableSparseArray;
-import com.android.colorfulos.util.Themes;
-import com.android.colorfulos.util.Thunk;
-import com.android.colorfulos.views.ActivityContext;
-import com.android.colorfulos.views.Transposable;
-import com.android.colorfulos.widget.LauncherAppWidgetHostView;
+import com.aoleyun.os.R;
+import com.aoleyun.os.accessibility.DragAndDropAccessibilityDelegate;
+import com.aoleyun.os.accessibility.FolderAccessibilityHelper;
+import com.aoleyun.os.accessibility.WorkspaceAccessibilityHelper;
+import com.aoleyun.os.anim.Interpolators;
+import com.aoleyun.os.anim.PropertyListBuilder;
+import com.aoleyun.os.config.FeatureFlags;
+import com.aoleyun.os.folder.PreviewBackground;
+import com.aoleyun.os.graphics.DragPreviewProvider;
+import com.aoleyun.os.graphics.RotationMode;
+import com.aoleyun.os.util.CellAndSpan;
+import com.aoleyun.os.util.GridOccupancy;
+import com.aoleyun.os.util.ParcelableSparseArray;
+import com.aoleyun.os.util.Themes;
+import com.aoleyun.os.util.Thunk;
+import com.aoleyun.os.views.ActivityContext;
+import com.aoleyun.os.views.Transposable;
+import com.aoleyun.os.widget.LauncherAppWidgetHostView;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -87,7 +85,8 @@ public class CellLayout extends ViewGroup implements Transposable {
 
     protected final ActivityContext mActivity;
     @ViewDebug.ExportedProperty(category = "launcher")
-    @Thunk int mCellWidth;
+    @Thunk
+    int mCellWidth;
     @ViewDebug.ExportedProperty(category = "launcher")
     @Thunk int mCellHeight;
     private int mFixedCellWidth;
@@ -948,7 +947,7 @@ public class CellLayout extends ViewGroup implements Transposable {
     }
 
     void visualizeDropLocation(View v, DragPreviewProvider outlineProvider, int cellX, int cellY,
-            int spanX, int spanY, boolean resize, DropTarget.DragObject dragObject) {
+                               int spanX, int spanY, boolean resize, DropTarget.DragObject dragObject) {
         final int oldDragCellX = mDragCell[0];
         final int oldDragCellY = mDragCell[1];
 
@@ -2075,7 +2074,7 @@ public class CellLayout extends ViewGroup implements Transposable {
                     .build(child)
                     .setDuration(REORDER_ANIMATION_DURATION);
             Launcher.cast(mActivity).getDragController().addFirstFrameAnimationHelper(a);
-            a.setInterpolator(DEACCEL_1_5);
+            a.setInterpolator(Interpolators.DEACCEL_1_5);
             a.start();
         }
     }
@@ -2091,11 +2090,11 @@ public class CellLayout extends ViewGroup implements Transposable {
         mTmpOccupied.copyTo(mOccupied);
 
         int screenId = Launcher.cast(mActivity).getWorkspace().getIdForScreen(this);
-        int container = Favorites.CONTAINER_DESKTOP;
+        int container = LauncherSettings.Favorites.CONTAINER_DESKTOP;
 
         if (mContainerType == HOTSEAT) {
             screenId = -1;
-            container = Favorites.CONTAINER_HOTSEAT;
+            container = LauncherSettings.Favorites.CONTAINER_HOTSEAT;
         }
 
         int childCount = mShortcutsAndWidgets.getChildCount();
diff --git a/src/com/android/colorfulos/CheckLongPressHelper.java b/src/com/aoleyun/os/CheckLongPressHelper.java
similarity index 96%
rename from src/com/android/colorfulos/CheckLongPressHelper.java
rename to src/com/aoleyun/os/CheckLongPressHelper.java
index 9fa7eb7..032dfc5 100644
--- a/src/com/android/colorfulos/CheckLongPressHelper.java
+++ b/src/com/aoleyun/os/CheckLongPressHelper.java
@@ -14,18 +14,19 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos;
+package com.aoleyun.os;
 
 import android.view.View;
 import android.view.ViewConfiguration;
 
-import com.android.colorfulos.util.Thunk;
+import com.aoleyun.os.util.Thunk;
 
 public class CheckLongPressHelper {
 
     public static final float DEFAULT_LONG_PRESS_TIMEOUT_FACTOR = 0.75f;
 
-    @Thunk View mView;
+    @Thunk
+    View mView;
     @Thunk View.OnLongClickListener mListener;
     @Thunk boolean mHasPerformedLongPress;
     private float mLongPressTimeoutFactor = DEFAULT_LONG_PRESS_TIMEOUT_FACTOR;
diff --git a/src/com/android/colorfulos/DefaultLayoutParser.java b/src/com/aoleyun/os/DefaultLayoutParser.java
similarity index 98%
rename from src/com/android/colorfulos/DefaultLayoutParser.java
rename to src/com/aoleyun/os/DefaultLayoutParser.java
index ad3a763..c96dbbc 100644
--- a/src/com/android/colorfulos/DefaultLayoutParser.java
+++ b/src/com/aoleyun/os/DefaultLayoutParser.java
@@ -1,4 +1,4 @@
-package com.android.colorfulos;
+package com.aoleyun.os;
 
 import android.appwidget.AppWidgetHost;
 import android.appwidget.AppWidgetManager;
@@ -14,8 +14,9 @@ import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.ArrayMap;
 import android.util.Log;
-import com.android.colorfulos.LauncherSettings.Favorites;
-import com.android.colorfulos.util.Thunk;
+import com.aoleyun.os.LauncherSettings.Favorites;
+import com.aoleyun.os.util.Thunk;
+
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.util.List;
@@ -55,7 +56,8 @@ public class DefaultLayoutParser extends AutoInstallsLayout {
         return getFolderElementsMap(mSourceRes);
     }
 
-    @Thunk ArrayMap<String, TagParser> getFolderElementsMap(Resources res) {
+    @Thunk
+    ArrayMap<String, TagParser> getFolderElementsMap(Resources res) {
         ArrayMap<String, TagParser> parsers = new ArrayMap<>();
         parsers.put(TAG_FAVORITE, new AppShortcutWithUriParser());
         parsers.put(TAG_SHORTCUT, new UriShortcutParser(res));
diff --git a/src/com/android/colorfulos/DeleteDropTarget.java b/src/com/aoleyun/os/DeleteDropTarget.java
similarity index 90%
rename from src/com/android/colorfulos/DeleteDropTarget.java
rename to src/com/aoleyun/os/DeleteDropTarget.java
index 1a4581b..fbcbbfd 100644
--- a/src/com/android/colorfulos/DeleteDropTarget.java
+++ b/src/com/aoleyun/os/DeleteDropTarget.java
@@ -14,22 +14,23 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos;
+package com.aoleyun.os;
 
-import static com.android.colorfulos.userevent.nano.LauncherLogProto.Action.Touch.TAP;
-import static com.android.colorfulos.userevent.nano.LauncherLogProto.ControlType.UNDO;
+import static com.aoleyun.os.userevent.nano.LauncherLogProto.Action.Touch.TAP;
+import static com.aoleyun.os.userevent.nano.LauncherLogProto.ControlType.UNDO;
 
 import android.content.Context;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.View;
 
-import com.android.colorfulos.accessibility.LauncherAccessibilityDelegate;
-import com.android.colorfulos.dragndrop.DragOptions;
-import com.android.colorfulos.logging.LoggerUtils;
-import com.android.colorfulos.model.ModelWriter;
-import com.android.colorfulos.userevent.nano.LauncherLogProto.ControlType;
-import com.android.colorfulos.userevent.nano.LauncherLogProto.Target;
+import com.aoleyun.os.R;
+import com.aoleyun.os.accessibility.LauncherAccessibilityDelegate;
+import com.aoleyun.os.dragndrop.DragOptions;
+import com.aoleyun.os.logging.LoggerUtils;
+import com.aoleyun.os.model.ModelWriter;
+import com.aoleyun.os.userevent.nano.LauncherLogProto.ControlType;
+import com.aoleyun.os.userevent.nano.LauncherLogProto.Target;
 
 public class DeleteDropTarget extends ButtonDropTarget {
 
diff --git a/src/com/android/colorfulos/DeviceProfile.java b/src/com/aoleyun/os/DeviceProfile.java
similarity index 99%
rename from src/com/android/colorfulos/DeviceProfile.java
rename to src/com/aoleyun/os/DeviceProfile.java
index 9c55854..1fa1915 100644
--- a/src/com/android/colorfulos/DeviceProfile.java
+++ b/src/com/aoleyun/os/DeviceProfile.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos;
+package com.aoleyun.os;
 
 import android.content.Context;
 import android.content.res.Configuration;
@@ -26,10 +26,11 @@ import android.util.DisplayMetrics;
 import android.view.Surface;
 import android.view.WindowManager;
 
-import com.android.colorfulos.CellLayout.ContainerType;
-import com.android.colorfulos.graphics.IconShape;
-import com.android.colorfulos.icons.DotRenderer;
-import com.android.colorfulos.icons.IconNormalizer;
+import com.aoleyun.os.CellLayout.ContainerType;
+import com.aoleyun.os.R;
+import com.aoleyun.os.graphics.IconShape;
+import com.aoleyun.os.icons.DotRenderer;
+import com.aoleyun.os.icons.IconNormalizer;
 
 public class DeviceProfile {
 
diff --git a/src/com/android/colorfulos/DragSource.java b/src/com/aoleyun/os/DragSource.java
similarity index 80%
rename from src/com/android/colorfulos/DragSource.java
rename to src/com/aoleyun/os/DragSource.java
index 8fdd55b..66c6634 100644
--- a/src/com/android/colorfulos/DragSource.java
+++ b/src/com/aoleyun/os/DragSource.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos;
+package com.aoleyun.os;
 
 import android.view.View;
 
-import com.android.colorfulos.DropTarget.DragObject;
-import com.android.colorfulos.logging.StatsLogUtils.LogContainerProvider;
+import com.aoleyun.os.DropTarget.DragObject;
+import com.aoleyun.os.logging.StatsLogUtils;
 
 /**
  * Interface defining an object that can originate a drag.
  */
-public interface DragSource extends LogContainerProvider {
+public interface DragSource extends StatsLogUtils.LogContainerProvider {
 
     /**
      * A callback made back to the source after an item from this source has been dropped on a
diff --git a/src/com/android/colorfulos/DropTarget.java b/src/com/aoleyun/os/DropTarget.java
similarity index 95%
rename from src/com/android/colorfulos/DropTarget.java
rename to src/com/aoleyun/os/DropTarget.java
index b436d8b..ff24146 100644
--- a/src/com/android/colorfulos/DropTarget.java
+++ b/src/com/aoleyun/os/DropTarget.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos;
+package com.aoleyun.os;
 
 import android.graphics.Rect;
 
-import com.android.colorfulos.accessibility.DragViewStateAnnouncer;
-import com.android.colorfulos.dragndrop.DragOptions;
-import com.android.colorfulos.dragndrop.DragView;
+import com.aoleyun.os.accessibility.DragViewStateAnnouncer;
+import com.aoleyun.os.dragndrop.DragOptions;
+import com.aoleyun.os.dragndrop.DragView;
 
 /**
  * Interface defining an object that can receive a drag.
diff --git a/src/com/android/colorfulos/DropTargetBar.java b/src/com/aoleyun/os/DropTargetBar.java
similarity index 91%
rename from src/com/android/colorfulos/DropTargetBar.java
rename to src/com/aoleyun/os/DropTargetBar.java
index fa144e3..a585ea2 100644
--- a/src/com/android/colorfulos/DropTargetBar.java
+++ b/src/com/aoleyun/os/DropTargetBar.java
@@ -14,12 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos;
-
-import static com.android.colorfulos.ButtonDropTarget.TOOLTIP_DEFAULT;
-import static com.android.colorfulos.ButtonDropTarget.TOOLTIP_LEFT;
-import static com.android.colorfulos.ButtonDropTarget.TOOLTIP_RIGHT;
-import static com.android.colorfulos.anim.AlphaUpdateListener.updateVisibility;
+package com.aoleyun.os;
 
 import android.animation.TimeInterpolator;
 import android.content.Context;
@@ -31,22 +26,23 @@ import android.view.ViewDebug;
 import android.view.ViewPropertyAnimator;
 import android.widget.FrameLayout;
 
-import com.android.colorfulos.anim.Interpolators;
-import com.android.colorfulos.dragndrop.DragController;
-import com.android.colorfulos.dragndrop.DragController.DragListener;
-import com.android.colorfulos.dragndrop.DragOptions;
+import com.aoleyun.os.R;
+import com.aoleyun.os.anim.Interpolators;
+import com.aoleyun.os.dragndrop.DragController;
+import com.aoleyun.os.dragndrop.DragOptions;
+import com.aoleyun.os.anim.AlphaUpdateListener;
 
 /*
  * The top bar containing various drop targets: Delete/App Info/Uninstall.
  */
 public class DropTargetBar extends FrameLayout
-        implements DragListener, Insettable {
+        implements DragController.DragListener, Insettable {
 
     protected static final int DEFAULT_DRAG_FADE_DURATION = 175;
     protected static final TimeInterpolator DEFAULT_INTERPOLATOR = Interpolators.ACCEL;
 
     private final Runnable mFadeAnimationEndRunnable =
-            () -> updateVisibility(DropTargetBar.this);
+            () -> AlphaUpdateListener.updateVisibility(DropTargetBar.this);
 
     @ViewDebug.ExportedProperty(category = "launcher")
     protected boolean mDeferOnDragEnd;
@@ -87,13 +83,13 @@ public class DropTargetBar extends FrameLayout
         lp.topMargin = insets.top;
         lp.bottomMargin = insets.bottom;
         lp.rightMargin = insets.right;
-        int tooltipLocation = TOOLTIP_DEFAULT;
+        int tooltipLocation = ButtonDropTarget.TOOLTIP_DEFAULT;
 
         if (grid.isVerticalBarLayout()) {
             lp.width = grid.dropTargetBarSizePx;
             lp.height = grid.availableHeightPx - 2 * grid.edgeMarginPx;
             lp.gravity = grid.isSeascape() ? Gravity.RIGHT : Gravity.LEFT;
-            tooltipLocation = grid.isSeascape() ? TOOLTIP_LEFT : TOOLTIP_RIGHT;
+            tooltipLocation = grid.isSeascape() ? ButtonDropTarget.TOOLTIP_LEFT : ButtonDropTarget.TOOLTIP_RIGHT;
         } else {
             int gap;
             if (grid.isTablet) {
diff --git a/src/com/android/colorfulos/ExtendedEditText.java b/src/com/aoleyun/os/ExtendedEditText.java
similarity index 98%
rename from src/com/android/colorfulos/ExtendedEditText.java
rename to src/com/aoleyun/os/ExtendedEditText.java
index 6558a9a..be3108b 100644
--- a/src/com/android/colorfulos/ExtendedEditText.java
+++ b/src/com/aoleyun/os/ExtendedEditText.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos;
+package com.aoleyun.os;
 
 import android.content.Context;
 import android.text.TextUtils;
@@ -24,7 +24,7 @@ import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
 
-import com.android.colorfulos.util.UiThreadHelper;
+import com.aoleyun.os.util.UiThreadHelper;
 
 
 /**
diff --git a/src/com/android/colorfulos/FastBitmapDrawable.java b/src/com/aoleyun/os/FastBitmapDrawable.java
similarity index 97%
rename from src/com/android/colorfulos/FastBitmapDrawable.java
rename to src/com/aoleyun/os/FastBitmapDrawable.java
index 4cc0948..4241bd9 100644
--- a/src/com/android/colorfulos/FastBitmapDrawable.java
+++ b/src/com/aoleyun/os/FastBitmapDrawable.java
@@ -14,10 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos;
-
-import static com.android.colorfulos.anim.Interpolators.ACCEL;
-import static com.android.colorfulos.anim.Interpolators.DEACCEL;
+package com.aoleyun.os;
 
 import android.animation.ObjectAnimator;
 import android.graphics.Bitmap;
@@ -35,7 +32,8 @@ import android.graphics.drawable.Drawable;
 import android.util.Property;
 import android.util.SparseArray;
 
-import com.android.colorfulos.icons.BitmapInfo;
+import com.aoleyun.os.icons.BitmapInfo;
+import com.aoleyun.os.anim.Interpolators;
 
 public class FastBitmapDrawable extends Drawable {
 
@@ -224,13 +222,13 @@ public class FastBitmapDrawable extends Drawable {
                 // Animate when going to pressed state
                 mScaleAnimation = ObjectAnimator.ofFloat(this, SCALE, PRESSED_SCALE);
                 mScaleAnimation.setDuration(CLICK_FEEDBACK_DURATION);
-                mScaleAnimation.setInterpolator(ACCEL);
+                mScaleAnimation.setInterpolator(Interpolators.ACCEL);
                 mScaleAnimation.start();
             } else {
                 if (isVisible()) {
                     mScaleAnimation = ObjectAnimator.ofFloat(this, SCALE, 1f);
                     mScaleAnimation.setDuration(CLICK_FEEDBACK_DURATION);
-                    mScaleAnimation.setInterpolator(DEACCEL);
+                    mScaleAnimation.setInterpolator(Interpolators.DEACCEL);
                     mScaleAnimation.start();
                 } else {
                     mScale = 1f;
diff --git a/src/com/android/colorfulos/FirstFrameAnimatorHelper.java b/src/com/aoleyun/os/FirstFrameAnimatorHelper.java
similarity index 94%
rename from src/com/android/colorfulos/FirstFrameAnimatorHelper.java
rename to src/com/aoleyun/os/FirstFrameAnimatorHelper.java
index 22efe07..dd02a8a 100644
--- a/src/com/android/colorfulos/FirstFrameAnimatorHelper.java
+++ b/src/com/aoleyun/os/FirstFrameAnimatorHelper.java
@@ -13,9 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos;
-
-import static com.android.colorfulos.Utilities.SINGLE_FRAME_MS;
+package com.aoleyun.os;
 
 import android.animation.ValueAnimator;
 import android.animation.ValueAnimator.AnimatorUpdateListener;
@@ -110,9 +108,9 @@ public class FirstFrameAnimatorHelper implements OnDrawListener, OnAttachStateCh
                     // prevents a large jump in the animation due to an expensive first frame
                 } else if (frameNum == 1 && currentTime < mStartTime + MAX_DELAY &&
                         !mAdjustedSecondFrameTime &&
-                        currentTime > mStartTime + SINGLE_FRAME_MS &&
-                        currentPlayTime > SINGLE_FRAME_MS) {
-                    animation.setCurrentPlayTime(SINGLE_FRAME_MS);
+                        currentTime > mStartTime + Utilities.SINGLE_FRAME_MS &&
+                        currentPlayTime > Utilities.SINGLE_FRAME_MS) {
+                    animation.setCurrentPlayTime(Utilities.SINGLE_FRAME_MS);
                     mAdjustedSecondFrameTime = true;
                 } else {
                     if (frameNum > 1) {
diff --git a/src/com/android/colorfulos/FocusHelper.java b/src/com/aoleyun/os/FocusHelper.java
similarity index 98%
rename from src/com/android/colorfulos/FocusHelper.java
rename to src/com/aoleyun/os/FocusHelper.java
index ea3ee6d..78037ef 100644
--- a/src/com/android/colorfulos/FocusHelper.java
+++ b/src/com/aoleyun/os/FocusHelper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos;
+package com.aoleyun.os;
 
 import android.util.Log;
 import android.view.KeyEvent;
@@ -22,11 +22,12 @@ import android.view.SoundEffectConstants;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.android.colorfulos.config.FeatureFlags;
-import com.android.colorfulos.folder.Folder;
-import com.android.colorfulos.folder.FolderPagedView;
-import com.android.colorfulos.util.FocusLogic;
-import com.android.colorfulos.util.Thunk;
+import com.aoleyun.os.R;
+import com.aoleyun.os.config.FeatureFlags;
+import com.aoleyun.os.folder.Folder;
+import com.aoleyun.os.folder.FolderPagedView;
+import com.aoleyun.os.util.FocusLogic;
+import com.aoleyun.os.util.Thunk;
 
 /**
  * A keyboard listener we set on all the workspace icons.
@@ -473,7 +474,8 @@ public class FocusHelper {
     /**
      * Private helper method to get the CellLayoutChildren given a CellLayout index.
      */
-    @Thunk static ShortcutAndWidgetContainer getCellLayoutChildrenForIndex(
+    @Thunk
+    static ShortcutAndWidgetContainer getCellLayoutChildrenForIndex(
             ViewGroup container, int i) {
         CellLayout parent = (CellLayout) container.getChildAt(i);
         return parent.getShortcutsAndWidgets();
diff --git a/src/com/android/colorfulos/FolderInfo.java b/src/com/aoleyun/os/FolderInfo.java
similarity index 97%
rename from src/com/android/colorfulos/FolderInfo.java
rename to src/com/aoleyun/os/FolderInfo.java
index 7d23ac1..94edb4e 100644
--- a/src/com/android/colorfulos/FolderInfo.java
+++ b/src/com/aoleyun/os/FolderInfo.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos;
+package com.aoleyun.os;
 
 import android.os.Process;
 
-import com.android.colorfulos.model.ModelWriter;
-import com.android.colorfulos.util.ContentWriter;
+import com.aoleyun.os.model.ModelWriter;
+import com.aoleyun.os.util.ContentWriter;
 
 import java.util.ArrayList;
 
diff --git a/src/com/android/colorfulos/Hotseat.java b/src/com/aoleyun/os/Hotseat.java
similarity index 89%
rename from src/com/android/colorfulos/Hotseat.java
rename to src/com/aoleyun/os/Hotseat.java
index d7f00b5..1566251 100644
--- a/src/com/android/colorfulos/Hotseat.java
+++ b/src/com/aoleyun/os/Hotseat.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos;
+package com.aoleyun.os;
 
 import android.content.Context;
 import android.graphics.Rect;
@@ -26,13 +26,13 @@ import android.view.ViewDebug;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
-import com.android.colorfulos.graphics.RotationMode;
-import com.android.colorfulos.logging.StatsLogUtils.LogContainerProvider;
-import com.android.colorfulos.userevent.nano.LauncherLogProto;
-import com.android.colorfulos.userevent.nano.LauncherLogProto.Target;
-import com.android.colorfulos.views.Transposable;
+import com.aoleyun.os.graphics.RotationMode;
+import com.aoleyun.os.userevent.nano.LauncherLogProto;
+import com.aoleyun.os.userevent.nano.LauncherLogProto.Target;
+import com.aoleyun.os.views.Transposable;
+import com.aoleyun.os.logging.StatsLogUtils;
 
-public class Hotseat extends CellLayout implements LogContainerProvider, Insettable, Transposable {
+public class Hotseat extends CellLayout implements StatsLogUtils.LogContainerProvider, Insettable, Transposable {
 
     @ViewDebug.ExportedProperty(category = "launcher")
     private boolean mHasVerticalHotseat;
diff --git a/src/com/android/colorfulos/IconProvider.java b/src/com/aoleyun/os/IconProvider.java
similarity index 89%
rename from src/com/android/colorfulos/IconProvider.java
rename to src/com/aoleyun/os/IconProvider.java
index 37a3d78..8c764e1 100644
--- a/src/com/android/colorfulos/IconProvider.java
+++ b/src/com/aoleyun/os/IconProvider.java
@@ -1,10 +1,11 @@
-package com.android.colorfulos;
+package com.aoleyun.os;
 
 import android.content.Context;
 import android.content.pm.LauncherActivityInfo;
 import android.graphics.drawable.Drawable;
 
-import com.android.colorfulos.util.ResourceBasedOverride;
+import com.aoleyun.os.R;
+import com.aoleyun.os.util.ResourceBasedOverride;
 
 public class IconProvider implements ResourceBasedOverride {
 
diff --git a/src/com/android/colorfulos/Insettable.java b/src/com/aoleyun/os/Insettable.java
similarity index 96%
rename from src/com/android/colorfulos/Insettable.java
rename to src/com/aoleyun/os/Insettable.java
index 3f6c83a..9237f51 100644
--- a/src/com/android/colorfulos/Insettable.java
+++ b/src/com/aoleyun/os/Insettable.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos;
+package com.aoleyun.os;
 
 import android.graphics.Rect;
 
diff --git a/src/com/android/colorfulos/InsettableFrameLayout.java b/src/com/aoleyun/os/InsettableFrameLayout.java
similarity index 98%
rename from src/com/android/colorfulos/InsettableFrameLayout.java
rename to src/com/aoleyun/os/InsettableFrameLayout.java
index 3d1944f..ec109c7 100644
--- a/src/com/android/colorfulos/InsettableFrameLayout.java
+++ b/src/com/aoleyun/os/InsettableFrameLayout.java
@@ -1,4 +1,4 @@
-package com.android.colorfulos;
+package com.aoleyun.os;
 
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -9,6 +9,8 @@ import android.view.ViewDebug;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
+import com.aoleyun.os.R;
+
 public class InsettableFrameLayout extends FrameLayout implements Insettable {
 
     @ViewDebug.ExportedProperty(category = "launcher")
diff --git a/src/com/android/colorfulos/InstallShortcutReceiver.java b/src/com/aoleyun/os/InstallShortcutReceiver.java
similarity index 97%
rename from src/com/android/colorfulos/InstallShortcutReceiver.java
rename to src/com/aoleyun/os/InstallShortcutReceiver.java
index bc7b0bf..b83f045 100644
--- a/src/com/android/colorfulos/InstallShortcutReceiver.java
+++ b/src/com/aoleyun/os/InstallShortcutReceiver.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos;
+package com.aoleyun.os;
 
 import android.appwidget.AppWidgetManager;
 import android.appwidget.AppWidgetProviderInfo;
@@ -39,16 +39,16 @@ import android.util.Base64;
 import android.util.Log;
 import android.util.Pair;
 
-import com.android.colorfulos.compat.LauncherAppsCompat;
-import com.android.colorfulos.compat.UserManagerCompat;
-import com.android.colorfulos.icons.BitmapInfo;
-import com.android.colorfulos.icons.GraphicsUtils;
-import com.android.colorfulos.icons.LauncherIcons;
-import com.android.colorfulos.shortcuts.DeepShortcutManager;
-import com.android.colorfulos.shortcuts.ShortcutKey;
-import com.android.colorfulos.util.PackageManagerHelper;
-import com.android.colorfulos.util.Preconditions;
-import com.android.colorfulos.util.Thunk;
+import com.aoleyun.os.compat.LauncherAppsCompat;
+import com.aoleyun.os.compat.UserManagerCompat;
+import com.aoleyun.os.icons.BitmapInfo;
+import com.aoleyun.os.icons.GraphicsUtils;
+import com.aoleyun.os.icons.LauncherIcons;
+import com.aoleyun.os.shortcuts.DeepShortcutManager;
+import com.aoleyun.os.shortcuts.ShortcutKey;
+import com.aoleyun.os.util.PackageManagerHelper;
+import com.aoleyun.os.util.Preconditions;
+import com.aoleyun.os.util.Thunk;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -311,7 +311,8 @@ public class InstallShortcutReceiver extends BroadcastReceiver {
      * Ensures that we have a valid, non-null name.  If the provided name is null, we will return
      * the application name instead.
      */
-    @Thunk static CharSequence ensureValidName(Context context, Intent intent, CharSequence name) {
+    @Thunk
+    static CharSequence ensureValidName(Context context, Intent intent, CharSequence name) {
         if (name == null) {
             try {
                 PackageManager pm = context.getPackageManager();
diff --git a/src/com/android/colorfulos/InterruptibleInOutAnimator.java b/src/com/aoleyun/os/InterruptibleInOutAnimator.java
similarity index 97%
rename from src/com/android/colorfulos/InterruptibleInOutAnimator.java
rename to src/com/aoleyun/os/InterruptibleInOutAnimator.java
index 4d791b1..3922fbd 100644
--- a/src/com/android/colorfulos/InterruptibleInOutAnimator.java
+++ b/src/com/aoleyun/os/InterruptibleInOutAnimator.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos;
+package com.aoleyun.os;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -22,7 +22,7 @@ import android.animation.ObjectAnimator;
 import android.animation.ValueAnimator;
 import android.util.Property;
 
-import com.android.colorfulos.util.Thunk;
+import com.aoleyun.os.util.Thunk;
 
 /**
  * A convenience class for two-way animations, e.g. a fadeIn/fadeOut animation.
@@ -62,7 +62,8 @@ public class InterruptibleInOutAnimator {
     private static final int OUT = 2;
 
     // TODO: This isn't really necessary, but is here to help diagnose a bug in the drag viz
-    @Thunk int mDirection = STOPPED;
+    @Thunk
+    int mDirection = STOPPED;
 
     public InterruptibleInOutAnimator(long duration, float fromValue, float toValue) {
         mAnimator = ObjectAnimator.ofFloat(this, VALUE, fromValue, toValue).setDuration(duration);
diff --git a/src/com/android/colorfulos/InvariantDeviceProfile.java b/src/com/aoleyun/os/InvariantDeviceProfile.java
similarity index 96%
rename from src/com/android/colorfulos/InvariantDeviceProfile.java
rename to src/com/aoleyun/os/InvariantDeviceProfile.java
index 57e143b..b1d4aec 100644
--- a/src/com/android/colorfulos/InvariantDeviceProfile.java
+++ b/src/com/aoleyun/os/InvariantDeviceProfile.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos;
+package com.aoleyun.os;
 
-import static com.android.colorfulos.Utilities.getDevicePrefs;
-import static com.android.colorfulos.config.FeatureFlags.APPLY_CONFIG_AT_RUNTIME;
-import static com.android.colorfulos.util.PackageManagerHelper.getPackageFilter;
+import static com.aoleyun.os.Utilities.getDevicePrefs;
+import static com.aoleyun.os.config.FeatureFlags.APPLY_CONFIG_AT_RUNTIME;
+import static com.aoleyun.os.util.PackageManagerHelper.getPackageFilter;
 
 import android.annotation.TargetApi;
 import android.appwidget.AppWidgetHostView;
@@ -42,11 +42,11 @@ import android.util.Xml;
 import android.view.Display;
 import android.view.WindowManager;
 
-import com.android.colorfulos.graphics.IconShape;
-import com.android.colorfulos.util.ConfigMonitor;
-import com.android.colorfulos.util.IntArray;
-import com.android.colorfulos.util.MainThreadInitializedObject;
-import com.android.colorfulos.util.Themes;
+import com.aoleyun.os.graphics.IconShape;
+import com.aoleyun.os.util.ConfigMonitor;
+import com.aoleyun.os.util.IntArray;
+import com.aoleyun.os.util.MainThreadInitializedObject;
+import com.aoleyun.os.util.Themes;
 
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
@@ -265,13 +265,13 @@ public class InvariantDeviceProfile {
     }
 
     public void verifyConfigChangedInBackground(final Context context) {
-        String savedIconMaskPath = getDevicePrefs(context).getString(KEY_ICON_PATH_REF, "");
+        String savedIconMaskPath = Utilities.getDevicePrefs(context).getString(KEY_ICON_PATH_REF, "");
         // Good place to check if grid size changed in themepicker when launcher was dead.
         if (savedIconMaskPath.isEmpty()) {
-            getDevicePrefs(context).edit().putString(KEY_ICON_PATH_REF, getIconShapePath(context))
+            Utilities.getDevicePrefs(context).edit().putString(KEY_ICON_PATH_REF, getIconShapePath(context))
                     .apply();
         } else if (!savedIconMaskPath.equals(getIconShapePath(context))) {
-            getDevicePrefs(context).edit().putString(KEY_ICON_PATH_REF, getIconShapePath(context))
+            Utilities.getDevicePrefs(context).edit().putString(KEY_ICON_PATH_REF, getIconShapePath(context))
                     .apply();
             apply(context, CHANGE_FLAG_ICON_PARAMS);
         }
diff --git a/src/com/android/colorfulos/ItemInfo.java b/src/com/aoleyun/os/ItemInfo.java
similarity index 98%
rename from src/com/android/colorfulos/ItemInfo.java
rename to src/com/aoleyun/os/ItemInfo.java
index 7d81cc7..c425647 100644
--- a/src/com/android/colorfulos/ItemInfo.java
+++ b/src/com/aoleyun/os/ItemInfo.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos;
+package com.aoleyun.os;
 
 import android.content.ComponentName;
 import android.content.ContentValues;
@@ -22,7 +22,7 @@ import android.content.Intent;
 import android.os.Process;
 import android.os.UserHandle;
 
-import com.android.colorfulos.util.ContentWriter;
+import com.aoleyun.os.util.ContentWriter;
 
 /**
  * Represents an item in the launcher.
diff --git a/src/com/android/colorfulos/ItemInfoWithIcon.java b/src/com/aoleyun/os/ItemInfoWithIcon.java
similarity index 94%
rename from src/com/android/colorfulos/ItemInfoWithIcon.java
rename to src/com/aoleyun/os/ItemInfoWithIcon.java
index 8f6a491..ef611f9 100644
--- a/src/com/android/colorfulos/ItemInfoWithIcon.java
+++ b/src/com/aoleyun/os/ItemInfoWithIcon.java
@@ -14,13 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos;
-
-import static com.android.colorfulos.icons.BitmapInfo.LOW_RES_ICON;
+package com.aoleyun.os;
 
 import android.graphics.Bitmap;
 
-import com.android.colorfulos.icons.BitmapInfo;
+import com.aoleyun.os.icons.BitmapInfo;
 
 /**
  * Represents an ItemInfo which also holds an icon.
@@ -118,7 +116,7 @@ public abstract class ItemInfoWithIcon extends ItemInfo {
      * Indicates whether we're using a low res icon
      */
     public boolean usingLowResIcon() {
-        return iconBitmap == LOW_RES_ICON;
+        return iconBitmap == BitmapInfo.LOW_RES_ICON;
     }
 
     public void applyFrom(BitmapInfo info) {
diff --git a/src/com/android/colorfulos/Launcher.java b/src/com/aoleyun/os/Launcher.java
similarity index 94%
rename from src/com/android/colorfulos/Launcher.java
rename to src/com/aoleyun/os/Launcher.java
index 10ef44e..77a18bb 100644
--- a/src/com/android/colorfulos/Launcher.java
+++ b/src/com/aoleyun/os/Launcher.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos;
+package com.aoleyun.os;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -28,7 +28,6 @@ import android.appwidget.AppWidgetHostView;
 import android.appwidget.AppWidgetManager;
 import android.content.ActivityNotFoundException;
 import android.content.BroadcastReceiver;
-import android.content.ComponentCallbacks2;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
@@ -50,6 +49,7 @@ import android.os.Handler;
 import android.os.Parcelable;
 import android.os.Process;
 import android.os.StrictMode;
+import android.provider.Settings;
 import android.text.TextUtils;
 import android.text.method.TextKeyListener;
 import android.util.Log;
@@ -67,92 +67,100 @@ import android.view.animation.OvershootInterpolator;
 import android.widget.Toast;
 
 import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
 
-import com.android.colorfulos.DropTarget.DragObject;
-import com.android.colorfulos.TTUtils.Utils;
-import com.android.colorfulos.accessibility.LauncherAccessibilityDelegate;
-import com.android.colorfulos.allapps.AllAppsContainerView;
-import com.android.colorfulos.allapps.AllAppsStore;
-import com.android.colorfulos.allapps.AllAppsTransitionController;
-import com.android.colorfulos.allapps.DiscoveryBounce;
-import com.android.colorfulos.anim.PropertyListBuilder;
-import com.android.colorfulos.base.MyApplication;
-import com.android.colorfulos.compat.AppWidgetManagerCompat;
-import com.android.colorfulos.compat.LauncherAppsCompatVO;
-import com.android.colorfulos.config.FeatureFlags;
-import com.android.colorfulos.dot.DotInfo;
-import com.android.colorfulos.dragndrop.DragController;
-import com.android.colorfulos.dragndrop.DragLayer;
-import com.android.colorfulos.dragndrop.DragView;
-import com.android.colorfulos.folder.Folder;
-import com.android.colorfulos.folder.FolderIcon;
-import com.android.colorfulos.folder.FolderIconPreviewVerifier;
-import com.android.colorfulos.graphics.RotationMode;
-import com.android.colorfulos.icons.IconCache;
-import com.android.colorfulos.jpush.ExampleUtil;
-import com.android.colorfulos.jpush.LocalBroadcastManager;
-import com.android.colorfulos.jpush.TagAliasOperatorHelper;
-import com.android.colorfulos.keyboard.CustomActionsPopup;
-import com.android.colorfulos.keyboard.ViewGroupFocusHelper;
-import com.android.colorfulos.logging.FileLog;
-import com.android.colorfulos.logging.StatsLogUtils;
-import com.android.colorfulos.logging.UserEventDispatcher;
-import com.android.colorfulos.logging.UserEventDispatcher.UserEventDelegate;
-import com.android.colorfulos.model.AppLaunchTracker;
-import com.android.colorfulos.model.ModelWriter;
-import com.android.colorfulos.network.BaseResponse;
-import com.android.colorfulos.network.NetWorkManager;
-import com.android.colorfulos.network.NewestAppUpdateResult;
-import com.android.colorfulos.network.api.AddAppLog;
-import com.android.colorfulos.notification.NotificationListener;
-import com.android.colorfulos.pageindicators.PageIndicatorDots;
-import com.android.colorfulos.popup.PopupContainerWithArrow;
-import com.android.colorfulos.popup.PopupDataProvider;
-import com.android.colorfulos.service.MainService;
-import com.android.colorfulos.shortcuts.DeepShortcutManager;
-import com.android.colorfulos.states.InternalStateHandler;
-import com.android.colorfulos.states.RotationHelper;
-import com.android.colorfulos.testing.TestProtocol;
-import com.android.colorfulos.touch.ItemClickHandler;
-import com.android.colorfulos.uioverrides.UiFactory;
-import com.android.colorfulos.uiuiutils.JGYUtils;
-import com.android.colorfulos.userevent.nano.LauncherLogProto;
-import com.android.colorfulos.userevent.nano.LauncherLogProto.Action;
-import com.android.colorfulos.userevent.nano.LauncherLogProto.ContainerType;
-import com.android.colorfulos.userevent.nano.LauncherLogProto.Target;
-import com.android.colorfulos.util.ActivityResultInfo;
-import com.android.colorfulos.util.ComponentKey;
-import com.android.colorfulos.util.IntArray;
-import com.android.colorfulos.util.ItemInfoMatcher;
-import com.android.colorfulos.util.MultiValueAlpha;
-import com.android.colorfulos.util.MultiValueAlpha.AlphaProperty;
-import com.android.colorfulos.util.PackageManagerHelper;
-import com.android.colorfulos.util.PackageUserKey;
-import com.android.colorfulos.util.PendingRequestArgs;
-import com.android.colorfulos.util.RaceConditionTracker;
-import com.android.colorfulos.util.SystemUiController;
-import com.android.colorfulos.util.Themes;
-import com.android.colorfulos.util.Thunk;
-import com.android.colorfulos.util.TraceHelper;
-import com.android.colorfulos.util.UiThreadHelper;
-import com.android.colorfulos.util.ViewOnDrawExecutor;
-import com.android.colorfulos.views.ActivityContext;
-import com.android.colorfulos.views.OptionsPopupView;
-import com.android.colorfulos.views.ScrimView;
-import com.android.colorfulos.widget.LauncherAppWidgetHostView;
-import com.android.colorfulos.widget.PendingAddShortcutInfo;
-import com.android.colorfulos.widget.PendingAddWidgetInfo;
-import com.android.colorfulos.widget.PendingAppWidgetHostView;
-import com.android.colorfulos.widget.WidgetAddFlowHandler;
-import com.android.colorfulos.widget.WidgetHostViewLoader;
-import com.android.colorfulos.widget.WidgetListRowEntry;
-import com.android.colorfulos.widget.WidgetsFullSheet;
-import com.android.colorfulos.widget.custom.CustomWidgetParser;
+import com.aoleyun.os.DropTarget.DragObject;
+import com.aoleyun.os.TTUtils.APKUtils;
+import com.aoleyun.os.TTUtils.Utils;
+import com.aoleyun.os.accessibility.LauncherAccessibilityDelegate;
+import com.aoleyun.os.allapps.AllAppsContainerView;
+import com.aoleyun.os.allapps.AllAppsStore;
+import com.aoleyun.os.allapps.AllAppsTransitionController;
+import com.aoleyun.os.allapps.DiscoveryBounce;
+import com.aoleyun.os.anim.PropertyListBuilder;
+import com.aoleyun.os.base.MyApplication;
+import com.aoleyun.os.compat.AppWidgetManagerCompat;
+import com.aoleyun.os.compat.LauncherAppsCompatVO;
+import com.aoleyun.os.config.FeatureFlags;
+import com.aoleyun.os.dot.DotInfo;
+import com.aoleyun.os.dragndrop.DragController;
+import com.aoleyun.os.dragndrop.DragLayer;
+import com.aoleyun.os.dragndrop.DragView;
+import com.aoleyun.os.folder.Folder;
+import com.aoleyun.os.folder.FolderIcon;
+import com.aoleyun.os.folder.FolderIconPreviewVerifier;
+import com.aoleyun.os.graphics.RotationMode;
+import com.aoleyun.os.icons.IconCache;
+import com.aoleyun.os.jpush.ExampleUtil;
+import com.aoleyun.os.jpush.LocalBroadcastManager;
+import com.aoleyun.os.keyboard.CustomActionsPopup;
+import com.aoleyun.os.keyboard.ViewGroupFocusHelper;
+import com.aoleyun.os.logging.FileLog;
+import com.aoleyun.os.logging.StatsLogUtils;
+import com.aoleyun.os.logging.UserEventDispatcher;
+import com.aoleyun.os.logging.UserEventDispatcher.UserEventDelegate;
+import com.aoleyun.os.model.AppLaunchTracker;
+import com.aoleyun.os.model.ModelWriter;
+import com.aoleyun.os.network.AppPasswdBean;
+import com.aoleyun.os.network.BaseResponse;
+import com.aoleyun.os.network.HTTPInterface;
+import com.aoleyun.os.network.NetWorkManager;
+import com.aoleyun.os.network.NewestAppUpdateResult;
+import com.aoleyun.os.network.api.AddAppLog;
+import com.aoleyun.os.notification.NotificationListener;
+import com.aoleyun.os.pageindicators.PageIndicatorDots;
+import com.aoleyun.os.popup.PopupContainerWithArrow;
+import com.aoleyun.os.popup.PopupDataProvider;
+import com.aoleyun.os.service.MainService;
+import com.aoleyun.os.shortcuts.DeepShortcutManager;
+import com.aoleyun.os.states.InternalStateHandler;
+import com.aoleyun.os.states.RotationHelper;
+import com.aoleyun.os.testing.TestProtocol;
+import com.aoleyun.os.touch.ItemClickHandler;
+import com.aoleyun.os.uioverrides.UiFactory;
+import com.aoleyun.os.uiuiutils.JGYUtils;
+import com.aoleyun.os.userevent.nano.LauncherLogProto;
+import com.aoleyun.os.userevent.nano.LauncherLogProto.Action;
+import com.aoleyun.os.userevent.nano.LauncherLogProto.ContainerType;
+import com.aoleyun.os.userevent.nano.LauncherLogProto.Target;
+import com.aoleyun.os.util.ActivityResultInfo;
+import com.aoleyun.os.util.ComponentKey;
+import com.aoleyun.os.util.IntArray;
+import com.aoleyun.os.util.ItemInfoMatcher;
+import com.aoleyun.os.util.MultiValueAlpha;
+import com.aoleyun.os.util.MultiValueAlpha.AlphaProperty;
+import com.aoleyun.os.util.PackageManagerHelper;
+import com.aoleyun.os.util.PackageUserKey;
+import com.aoleyun.os.util.PendingRequestArgs;
+import com.aoleyun.os.util.RaceConditionTracker;
+import com.aoleyun.os.util.SystemUiController;
+import com.aoleyun.os.util.Themes;
+import com.aoleyun.os.util.Thunk;
+import com.aoleyun.os.util.TraceHelper;
+import com.aoleyun.os.util.UiThreadHelper;
+import com.aoleyun.os.util.ViewOnDrawExecutor;
+import com.aoleyun.os.views.ActivityContext;
+import com.aoleyun.os.views.OptionsPopupView;
+import com.aoleyun.os.views.ScrimView;
+import com.aoleyun.os.widget.LauncherAppWidgetHostView;
+import com.aoleyun.os.widget.PendingAddShortcutInfo;
+import com.aoleyun.os.widget.PendingAddWidgetInfo;
+import com.aoleyun.os.widget.PendingAppWidgetHostView;
+import com.aoleyun.os.widget.WidgetAddFlowHandler;
+import com.aoleyun.os.widget.WidgetHostViewLoader;
+import com.aoleyun.os.widget.WidgetListRowEntry;
+import com.aoleyun.os.widget.WidgetsFullSheet;
+import com.aoleyun.os.widget.custom.CustomWidgetParser;
 import com.arialyy.aria.core.Aria;
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+import com.tencent.mmkv.MMKV;
 
+import java.io.File;
 import java.io.FileDescriptor;
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -174,20 +182,18 @@ import io.reactivex.schedulers.Schedulers;
 import static android.content.pm.ActivityInfo.CONFIG_LOCALE;
 import static android.content.pm.ActivityInfo.CONFIG_ORIENTATION;
 import static android.content.pm.ActivityInfo.CONFIG_SCREEN_SIZE;
-import static com.android.colorfulos.AbstractFloatingView.TYPE_SNACKBAR;
-import static com.android.colorfulos.LauncherAnimUtils.SPRING_LOADED_EXIT_DELAY;
-import static com.android.colorfulos.LauncherState.ALL_APPS;
-import static com.android.colorfulos.LauncherState.NORMAL;
-import static com.android.colorfulos.LauncherState.OVERVIEW;
-import static com.android.colorfulos.LauncherState.OVERVIEW_PEEK;
-import static com.android.colorfulos.dragndrop.DragLayer.ALPHA_INDEX_LAUNCHER_LOAD;
-import static com.android.colorfulos.jpush.TagAliasOperatorHelper.ACTION_SET;
-import static com.android.colorfulos.jpush.TagAliasOperatorHelper.sequence;
-import static com.android.colorfulos.logging.LoggerUtils.newContainerTarget;
-import static com.android.colorfulos.logging.LoggerUtils.newTarget;
-import static com.android.colorfulos.states.RotationHelper.REQUEST_NONE;
-import static com.android.colorfulos.util.RaceConditionTracker.ENTER;
-import static com.android.colorfulos.util.RaceConditionTracker.EXIT;
+import static com.aoleyun.os.AbstractFloatingView.TYPE_SNACKBAR;
+import static com.aoleyun.os.LauncherAnimUtils.SPRING_LOADED_EXIT_DELAY;
+import static com.aoleyun.os.LauncherState.ALL_APPS;
+import static com.aoleyun.os.LauncherState.NORMAL;
+import static com.aoleyun.os.LauncherState.OVERVIEW;
+import static com.aoleyun.os.LauncherState.OVERVIEW_PEEK;
+import static com.aoleyun.os.dragndrop.DragLayer.ALPHA_INDEX_LAUNCHER_LOAD;
+import static com.aoleyun.os.logging.LoggerUtils.newContainerTarget;
+import static com.aoleyun.os.logging.LoggerUtils.newTarget;
+import static com.aoleyun.os.states.RotationHelper.REQUEST_NONE;
+import static com.aoleyun.os.util.RaceConditionTracker.ENTER;
+import static com.aoleyun.os.util.RaceConditionTracker.EXIT;
 
 /**
  * Default launcher application.
@@ -416,7 +422,7 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns,
         if (!isDefaultHome()) {
             setDefaultL();
         }
-        SharedPreferences sharedPref = getPreferences(Context.MODE_PRIVATE);
+        SharedPreferences sharedPref = getPreferences(MODE_PRIVATE);
         int i = sharedPref.getInt("SetWallPaper", 0);
         if (i == 0) {
             SetWallPaper();
@@ -464,12 +470,6 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns,
         });
         registerMessageReceiver();  // used for receive msg
         JPushInterface.init(this);
-        TagAliasOperatorHelper.TagAliasBean tagAliasBean = new TagAliasOperatorHelper.TagAliasBean();
-        tagAliasBean.action = ACTION_SET;
-        sequence++;
-        tagAliasBean.alias = Utils.getSerial();
-        tagAliasBean.isAliasAction = true;
-        TagAliasOperatorHelper.getInstance().handleAction(this, sequence, tagAliasBean);
         String rid = JPushInterface.getRegistrationID(this);
         if (!TextUtils.isEmpty(rid)) {
             Log.e("setJpushAlias", "RegId:" + rid);
@@ -477,6 +477,7 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns,
         JPushInterface.getAlias(this, new Random().nextInt(100));
     }
 
+
     //for receive customer msg from jpush server
     private MessageReceiver mMessageReceiver;
     public static final String MESSAGE_RECEIVED_ACTION = "com.example.jpushdemo.MESSAGE_RECEIVED_ACTION";
@@ -520,7 +521,7 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns,
             e.printStackTrace();
             Log.e("TT", e.getMessage());
         }
-        SharedPreferences sharedPref = getPreferences(Context.MODE_PRIVATE);
+        SharedPreferences sharedPref = getPreferences(MODE_PRIVATE);
         SharedPreferences.Editor editor = sharedPref.edit();
         editor.putInt("SetWallPaper", 1);
         editor.apply();
@@ -1089,7 +1090,7 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns,
         }
         RaceConditionTracker.onEvent(ON_START_EVT, ENTER);
         super.onStart();
-
+        removeRecentTask();
         String packagename = MyApplication.getInstance().getAppPackageName();
         Log.e("SendcloseApp", "packagename=" + packagename);
         if (packagename != null && packagename.length() > 0) {
@@ -1218,9 +1219,11 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns,
 
     @Override
     protected void onResume() {
+        Log.e(TAG, "onResume: ");
         RaceConditionTracker.onEvent(ON_RESUME_EVT, ENTER);
         TraceHelper.beginSection("ON_RESUME");
         super.onResume();
+        removeRecentTask();
         start.onstar(System.currentTimeMillis());
         TraceHelper.partitionSection("ON_RESUME", "superCall");
 
@@ -1245,9 +1248,36 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns,
         isForeground = true;
         MyApplication.getInstance().setAppPackageName(BuildConfig.APPLICATION_ID);
         MyApplication.getInstance().setOnClickTime(System.currentTimeMillis());
+        HTTPInterface.getAppPasswd();
         start.onstar(System.currentTimeMillis());
+        String always_top_packagename = Settings.System.getString(getContentResolver(), "always_top_packagename");
+        if (!TextUtils.isEmpty(always_top_packagename)) {
+            APKUtils.openPackage(Launcher.this, always_top_packagename);
+        }
+
     }
 
+
+    private void removeRecentTask() {
+        Handler.getMain().postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                String ApplicationLock = MMKV.defaultMMKV().decodeString("ApplicationLock");
+                Type type = new TypeToken<List<AppPasswdBean>>() {
+                }.getType();
+                Gson gson = new Gson();
+                List<AppPasswdBean> appPasswdBeans = gson.fromJson(ApplicationLock, type);
+                if (appPasswdBeans != null) {
+                    for (AppPasswdBean bean : appPasswdBeans) {
+                        Log.e(TAG, "removeRecentTask: " + bean.getApp_package());
+                        Utils.removeTask(bean.getApp_package());
+                    }
+                }
+            }
+        }, 1000);
+    }
+
+
     private Start start;
 
     private interface Start {
@@ -1323,7 +1353,7 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns,
     }
 
     private void checkAppUpdate(NewestAppUpdateResult result) {
-        int app_version_code = result.getApp_version_code();
+        int app_version_code = result.getVersion_code();
         String app_package = result.getApp_package();
         String url = result.getUrl();
         PackageInfo info = null;
@@ -1335,7 +1365,9 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns,
         if (info == null || info.versionCode < app_version_code || info.getLongVersionCode() < app_version_code) {
             Aria.download(this)
                     .load(url)
-                    .setFilePath(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS) + "/jgy/" + getFileNamefromURL(url), true)
+                    .setExtendField(result.toString())
+                    .setFilePath(ContextCompat.getExternalFilesDirs(Launcher.this, Environment.DIRECTORY_DOWNLOADS)[0].getAbsolutePath() + File.separator + getFileNamefromURL(url))
+                    .ignoreFilePathOccupy()
                     .create();
         } else {
             Log.e(TAG, "checkAppUpdate: " + app_package + " :无需更新");
@@ -1360,6 +1392,7 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns,
             mLauncherCallbacks.onPause();
         }
         isForeground = false;
+//        removeRecentTask();
     }
 
     @Override
@@ -2238,7 +2271,7 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns,
     @Override
     public void onTrimMemory(int level) {
         super.onTrimMemory(level);
-        if (level >= ComponentCallbacks2.TRIM_MEMORY_UI_HIDDEN) {
+        if (level >= TRIM_MEMORY_UI_HIDDEN) {
             // The widget preview db can result in holding onto over
             // 3MB of memory for caching which isn't necessary.
             SQLiteDatabase.releaseMemory();
diff --git a/src/com/android/colorfulos/LauncherAnimUtils.java b/src/com/aoleyun/os/LauncherAnimUtils.java
similarity index 99%
rename from src/com/android/colorfulos/LauncherAnimUtils.java
rename to src/com/aoleyun/os/LauncherAnimUtils.java
index aa71ecb..6864022 100644
--- a/src/com/android/colorfulos/LauncherAnimUtils.java
+++ b/src/com/aoleyun/os/LauncherAnimUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos;
+package com.aoleyun.os;
 
 import android.graphics.drawable.Drawable;
 import android.util.FloatProperty;
diff --git a/src/com/android/colorfulos/LauncherAppState.java b/src/com/aoleyun/os/LauncherAppState.java
similarity index 88%
rename from src/com/android/colorfulos/LauncherAppState.java
rename to src/com/aoleyun/os/LauncherAppState.java
index 58f181e..62e436f 100644
--- a/src/com/android/colorfulos/LauncherAppState.java
+++ b/src/com/aoleyun/os/LauncherAppState.java
@@ -14,10 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos;
+package com.aoleyun.os;
 
-import static com.android.colorfulos.InvariantDeviceProfile.CHANGE_FLAG_ICON_PARAMS;
-import static com.android.colorfulos.util.SecureSettingsObserver.newNotificationSettingsObserver;
+import static com.aoleyun.os.InvariantDeviceProfile.CHANGE_FLAG_ICON_PARAMS;
 
 import android.content.ComponentName;
 import android.content.ContentProviderClient;
@@ -27,16 +26,17 @@ import android.content.IntentFilter;
 import android.os.Handler;
 import android.util.Log;
 
-import com.android.colorfulos.compat.LauncherAppsCompat;
-import com.android.colorfulos.compat.PackageInstallerCompat;
-import com.android.colorfulos.compat.UserManagerCompat;
-import com.android.colorfulos.config.FeatureFlags;
-import com.android.colorfulos.icons.IconCache;
-import com.android.colorfulos.icons.LauncherIcons;
-import com.android.colorfulos.notification.NotificationListener;
-import com.android.colorfulos.util.MainThreadInitializedObject;
-import com.android.colorfulos.util.Preconditions;
-import com.android.colorfulos.util.SecureSettingsObserver;
+import com.aoleyun.os.R;
+import com.aoleyun.os.compat.LauncherAppsCompat;
+import com.aoleyun.os.compat.PackageInstallerCompat;
+import com.aoleyun.os.compat.UserManagerCompat;
+import com.aoleyun.os.config.FeatureFlags;
+import com.aoleyun.os.icons.IconCache;
+import com.aoleyun.os.icons.LauncherIcons;
+import com.aoleyun.os.notification.NotificationListener;
+import com.aoleyun.os.util.MainThreadInitializedObject;
+import com.aoleyun.os.util.Preconditions;
+import com.aoleyun.os.util.SecureSettingsObserver;
 
 public class LauncherAppState {
 
@@ -115,7 +115,7 @@ public class LauncherAppState {
         } else {
             // Register an observer to rebind the notification listener when dots are re-enabled.
             mNotificationDotsObserver =
-                    newNotificationSettingsObserver(mContext, this::onNotificationSettingsChanged);
+                    SecureSettingsObserver.newNotificationSettingsObserver(mContext, this::onNotificationSettingsChanged);
             mNotificationDotsObserver.register();
             mNotificationDotsObserver.dispatchOnChange();
         }
diff --git a/src/com/android/colorfulos/LauncherAppTransitionManager.java b/src/com/aoleyun/os/LauncherAppTransitionManager.java
similarity index 95%
rename from src/com/android/colorfulos/LauncherAppTransitionManager.java
rename to src/com/aoleyun/os/LauncherAppTransitionManager.java
index 18b8b98..2bd004a 100644
--- a/src/com/android/colorfulos/LauncherAppTransitionManager.java
+++ b/src/com/aoleyun/os/LauncherAppTransitionManager.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos;
+package com.aoleyun.os;
 
 
 import android.animation.Animator;
@@ -24,7 +24,8 @@ import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.view.View;
 
-import com.android.colorfulos.util.ResourceBasedOverride;
+import com.aoleyun.os.R;
+import com.aoleyun.os.util.ResourceBasedOverride;
 
 /**
  * Manages the opening and closing app transitions from Launcher.
diff --git a/src/com/android/colorfulos/LauncherAppWidgetHost.java b/src/com/aoleyun/os/LauncherAppWidgetHost.java
similarity index 97%
rename from src/com/android/colorfulos/LauncherAppWidgetHost.java
rename to src/com/aoleyun/os/LauncherAppWidgetHost.java
index 670df42..ee1ed09 100644
--- a/src/com/android/colorfulos/LauncherAppWidgetHost.java
+++ b/src/com/aoleyun/os/LauncherAppWidgetHost.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos;
+package com.aoleyun.os;
 
 import static android.app.Activity.RESULT_CANCELED;
 
@@ -30,9 +30,10 @@ import android.util.SparseArray;
 import android.view.LayoutInflater;
 import android.widget.Toast;
 
-import com.android.colorfulos.config.FeatureFlags;
-import com.android.colorfulos.widget.DeferredAppWidgetHostView;
-import com.android.colorfulos.widget.LauncherAppWidgetHostView;
+import com.aoleyun.os.R;
+import com.aoleyun.os.config.FeatureFlags;
+import com.aoleyun.os.widget.DeferredAppWidgetHostView;
+import com.aoleyun.os.widget.LauncherAppWidgetHostView;
 
 import java.util.ArrayList;
 
diff --git a/src/com/android/colorfulos/LauncherAppWidgetInfo.java b/src/com/aoleyun/os/LauncherAppWidgetInfo.java
similarity index 97%
rename from src/com/android/colorfulos/LauncherAppWidgetInfo.java
rename to src/com/aoleyun/os/LauncherAppWidgetInfo.java
index 5f2edbf..08ed71b 100644
--- a/src/com/android/colorfulos/LauncherAppWidgetInfo.java
+++ b/src/com/aoleyun/os/LauncherAppWidgetInfo.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos;
+package com.aoleyun.os;
 
 import android.appwidget.AppWidgetHostView;
 import android.content.ComponentName;
 import android.content.Intent;
 import android.os.Process;
 
-import com.android.colorfulos.model.PackageItemInfo;
-import com.android.colorfulos.util.ContentWriter;
+import com.aoleyun.os.model.PackageItemInfo;
+import com.aoleyun.os.util.ContentWriter;
 
 /**
  * Represents a widget (either instantiated or about to be) in the Launcher.
diff --git a/src/com/android/colorfulos/LauncherAppWidgetProviderInfo.java b/src/com/aoleyun/os/LauncherAppWidgetProviderInfo.java
similarity index 97%
rename from src/com/android/colorfulos/LauncherAppWidgetProviderInfo.java
rename to src/com/aoleyun/os/LauncherAppWidgetProviderInfo.java
index 6cb8c16..6c1adbe 100644
--- a/src/com/android/colorfulos/LauncherAppWidgetProviderInfo.java
+++ b/src/com/aoleyun/os/LauncherAppWidgetProviderInfo.java
@@ -1,4 +1,4 @@
-package com.android.colorfulos;
+package com.aoleyun.os;
 
 import android.appwidget.AppWidgetHostView;
 import android.appwidget.AppWidgetProviderInfo;
@@ -10,7 +10,7 @@ import android.graphics.Rect;
 import android.os.Parcel;
 import android.os.UserHandle;
 
-import com.android.colorfulos.icons.ComponentWithLabel;
+import com.aoleyun.os.icons.ComponentWithLabel;
 
 /**
  * This class is a thin wrapper around the framework AppWidgetProviderInfo class. This class affords
diff --git a/src/com/android/colorfulos/LauncherBackupAgent.java b/src/com/aoleyun/os/LauncherBackupAgent.java
similarity index 87%
rename from src/com/android/colorfulos/LauncherBackupAgent.java
rename to src/com/aoleyun/os/LauncherBackupAgent.java
index 31b8368..c5206f1 100644
--- a/src/com/android/colorfulos/LauncherBackupAgent.java
+++ b/src/com/aoleyun/os/LauncherBackupAgent.java
@@ -1,12 +1,12 @@
-package com.android.colorfulos;
+package com.aoleyun.os;
 
 import android.app.backup.BackupAgent;
 import android.app.backup.BackupDataInput;
 import android.app.backup.BackupDataOutput;
 import android.os.ParcelFileDescriptor;
 
-import com.android.colorfulos.logging.FileLog;
-import com.android.colorfulos.provider.RestoreDbTask;
+import com.aoleyun.os.logging.FileLog;
+import com.aoleyun.os.provider.RestoreDbTask;
 
 public class LauncherBackupAgent extends BackupAgent {
 
diff --git a/src/com/android/colorfulos/LauncherCallbacks.java b/src/com/aoleyun/os/LauncherCallbacks.java
similarity index 98%
rename from src/com/android/colorfulos/LauncherCallbacks.java
rename to src/com/aoleyun/os/LauncherCallbacks.java
index 546bd7f..566e831 100644
--- a/src/com/android/colorfulos/LauncherCallbacks.java
+++ b/src/com/aoleyun/os/LauncherCallbacks.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos;
+package com.aoleyun.os;
 
 import android.content.Intent;
 import android.os.Bundle;
diff --git a/src/com/android/colorfulos/LauncherExterns.java b/src/com/aoleyun/os/LauncherExterns.java
similarity index 97%
rename from src/com/android/colorfulos/LauncherExterns.java
rename to src/com/aoleyun/os/LauncherExterns.java
index 33afcc3..1eaa5e6 100644
--- a/src/com/android/colorfulos/LauncherExterns.java
+++ b/src/com/aoleyun/os/LauncherExterns.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos;
+package com.aoleyun.os;
 
 import android.content.SharedPreferences;
 
diff --git a/src/com/android/colorfulos/LauncherFiles.java b/src/com/aoleyun/os/LauncherFiles.java
similarity index 79%
rename from src/com/android/colorfulos/LauncherFiles.java
rename to src/com/aoleyun/os/LauncherFiles.java
index ff26629..1e4e322 100644
--- a/src/com/android/colorfulos/LauncherFiles.java
+++ b/src/com/aoleyun/os/LauncherFiles.java
@@ -1,4 +1,4 @@
-package com.android.colorfulos;
+package com.aoleyun.os;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -15,10 +15,10 @@ public class LauncherFiles {
     private static final String XML = ".xml";
 
     public static final String LAUNCHER_DB = "launcher.db";
-    public static final String SHARED_PREFERENCES_KEY = "com.android.colorfulos.prefs";
-    public static final String MANAGED_USER_PREFERENCES_KEY = "com.android.colorfulos.managedusers.prefs";
+    public static final String SHARED_PREFERENCES_KEY = "com.aoleyun.os.prefs";
+    public static final String MANAGED_USER_PREFERENCES_KEY = "com.aoleyun.os.managedusers.prefs";
     // This preference file is not backed up to cloud.
-    public static final String DEVICE_PREFERENCES_KEY = "com.android.colorfulos.device.prefs";
+    public static final String DEVICE_PREFERENCES_KEY = "com.aoleyun.os.device.prefs";
 
     public static final String WIDGET_PREVIEWS_DB = "widgetpreviews.db";
     public static final String APP_ICONS_DB = "app_icons.db";
diff --git a/src/com/android/colorfulos/LauncherModel.java b/src/com/aoleyun/os/LauncherModel.java
similarity index 93%
rename from src/com/android/colorfulos/LauncherModel.java
rename to src/com/aoleyun/os/LauncherModel.java
index f8c90c6..41a405a 100644
--- a/src/com/android/colorfulos/LauncherModel.java
+++ b/src/com/aoleyun/os/LauncherModel.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos;
+package com.aoleyun.os;
 
-import static com.android.colorfulos.LauncherAppState.ACTION_FORCE_ROLOAD;
-import static com.android.colorfulos.config.FeatureFlags.IS_DOGFOOD_BUILD;
+import static com.aoleyun.os.LauncherAppState.ACTION_FORCE_ROLOAD;
+import static com.aoleyun.os.config.FeatureFlags.IS_DOGFOOD_BUILD;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -32,31 +32,31 @@ import android.text.TextUtils;
 import android.util.Log;
 import android.util.Pair;
 
-import com.android.colorfulos.compat.LauncherAppsCompat;
-import com.android.colorfulos.compat.PackageInstallerCompat.PackageInstallInfo;
-import com.android.colorfulos.compat.UserManagerCompat;
-import com.android.colorfulos.icons.IconCache;
-import com.android.colorfulos.icons.LauncherIcons;
-import com.android.colorfulos.model.AddWorkspaceItemsTask;
-import com.android.colorfulos.model.BaseModelUpdateTask;
-import com.android.colorfulos.model.BgDataModel;
-import com.android.colorfulos.model.CacheDataUpdatedTask;
-import com.android.colorfulos.model.LoaderResults;
-import com.android.colorfulos.model.LoaderTask;
-import com.android.colorfulos.model.ModelWriter;
-import com.android.colorfulos.model.PackageInstallStateChangedTask;
-import com.android.colorfulos.model.PackageUpdatedTask;
-import com.android.colorfulos.model.ShortcutsChangedTask;
-import com.android.colorfulos.model.UserLockStateChangedTask;
-import com.android.colorfulos.shortcuts.DeepShortcutManager;
-import com.android.colorfulos.util.ComponentKey;
-import com.android.colorfulos.util.IntArray;
-import com.android.colorfulos.util.ItemInfoMatcher;
-import com.android.colorfulos.util.PackageUserKey;
-import com.android.colorfulos.util.Preconditions;
-import com.android.colorfulos.util.Thunk;
-import com.android.colorfulos.util.ViewOnDrawExecutor;
-import com.android.colorfulos.widget.WidgetListRowEntry;
+import com.aoleyun.os.compat.LauncherAppsCompat;
+import com.aoleyun.os.compat.PackageInstallerCompat.PackageInstallInfo;
+import com.aoleyun.os.compat.UserManagerCompat;
+import com.aoleyun.os.icons.IconCache;
+import com.aoleyun.os.icons.LauncherIcons;
+import com.aoleyun.os.model.AddWorkspaceItemsTask;
+import com.aoleyun.os.model.BaseModelUpdateTask;
+import com.aoleyun.os.model.BgDataModel;
+import com.aoleyun.os.model.CacheDataUpdatedTask;
+import com.aoleyun.os.model.LoaderResults;
+import com.aoleyun.os.model.LoaderTask;
+import com.aoleyun.os.model.ModelWriter;
+import com.aoleyun.os.model.PackageInstallStateChangedTask;
+import com.aoleyun.os.model.PackageUpdatedTask;
+import com.aoleyun.os.model.ShortcutsChangedTask;
+import com.aoleyun.os.model.UserLockStateChangedTask;
+import com.aoleyun.os.shortcuts.DeepShortcutManager;
+import com.aoleyun.os.util.ComponentKey;
+import com.aoleyun.os.util.IntArray;
+import com.aoleyun.os.util.ItemInfoMatcher;
+import com.aoleyun.os.util.PackageUserKey;
+import com.aoleyun.os.util.Preconditions;
+import com.aoleyun.os.util.Thunk;
+import com.aoleyun.os.util.ViewOnDrawExecutor;
+import com.aoleyun.os.widget.WidgetListRowEntry;
 
 import java.io.FileDescriptor;
 import java.io.PrintWriter;
@@ -301,7 +301,7 @@ public class LauncherModel extends BroadcastReceiver
                     enqueueModelUpdateTask(new UserLockStateChangedTask(user));
                 }
             }
-        } else if (IS_DOGFOOD_BUILD && ACTION_FORCE_ROLOAD.equals(action)) {
+        } else if (IS_DOGFOOD_BUILD && LauncherAppState.ACTION_FORCE_ROLOAD.equals(action)) {
             Launcher l = (Launcher) getCallback();
             l.reload();
         }else if (Intent.ACTION_DATE_CHANGED.equals(action)        //日历更新
diff --git a/src/com/android/colorfulos/LauncherProvider.java b/src/com/aoleyun/os/LauncherProvider.java
similarity index 94%
rename from src/com/android/colorfulos/LauncherProvider.java
rename to src/com/aoleyun/os/LauncherProvider.java
index 7dde6cd..5de21e7 100644
--- a/src/com/android/colorfulos/LauncherProvider.java
+++ b/src/com/aoleyun/os/LauncherProvider.java
@@ -14,10 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos;
-
-import static com.android.colorfulos.provider.LauncherDbUtils.dropTable;
-import static com.android.colorfulos.provider.LauncherDbUtils.tableExists;
+package com.aoleyun.os;
 
 import android.annotation.TargetApi;
 import android.app.backup.BackupManager;
@@ -55,21 +52,20 @@ import android.text.TextUtils;
 import android.util.Log;
 import android.util.Xml;
 
-import com.android.colorfulos.AutoInstallsLayout.LayoutParserCallback;
-import com.android.colorfulos.LauncherSettings.Favorites;
-import com.android.colorfulos.compat.UserManagerCompat;
-import com.android.colorfulos.config.FeatureFlags;
-import com.android.colorfulos.logging.FileLog;
-import com.android.colorfulos.model.DbDowngradeHelper;
-import com.android.colorfulos.provider.LauncherDbUtils;
-import com.android.colorfulos.provider.LauncherDbUtils.SQLiteTransaction;
-import com.android.colorfulos.provider.RestoreDbTask;
-import com.android.colorfulos.util.IOUtils;
-import com.android.colorfulos.util.IntArray;
-import com.android.colorfulos.util.IntSet;
-import com.android.colorfulos.util.NoLocaleSQLiteHelper;
-import com.android.colorfulos.util.Preconditions;
-import com.android.colorfulos.util.Thunk;
+import com.aoleyun.os.AutoInstallsLayout.LayoutParserCallback;
+import com.aoleyun.os.LauncherSettings.Favorites;
+import com.aoleyun.os.compat.UserManagerCompat;
+import com.aoleyun.os.config.FeatureFlags;
+import com.aoleyun.os.logging.FileLog;
+import com.aoleyun.os.model.DbDowngradeHelper;
+import com.aoleyun.os.provider.LauncherDbUtils;
+import com.aoleyun.os.provider.RestoreDbTask;
+import com.aoleyun.os.util.IOUtils;
+import com.aoleyun.os.util.IntArray;
+import com.aoleyun.os.util.IntSet;
+import com.aoleyun.os.util.NoLocaleSQLiteHelper;
+import com.aoleyun.os.util.Preconditions;
+import com.aoleyun.os.util.Thunk;
 
 import org.xmlpull.v1.XmlPullParser;
 
@@ -182,8 +178,9 @@ public class LauncherProvider extends ContentProvider {
         return result;
     }
 
-    @Thunk static int dbInsertAndCheck(DatabaseHelper helper,
-            SQLiteDatabase db, String table, String nullColumnHack, ContentValues values) {
+    @Thunk
+    static int dbInsertAndCheck(DatabaseHelper helper,
+                                SQLiteDatabase db, String table, String nullColumnHack, ContentValues values) {
         if (values == null) {
             throw new RuntimeException("Error: attempting to insert null values");
         }
@@ -270,7 +267,7 @@ public class LauncherProvider extends ContentProvider {
         SqlArguments args = new SqlArguments(uri);
 
         SQLiteDatabase db = mOpenHelper.getWritableDatabase();
-        try (SQLiteTransaction t = new SQLiteTransaction(db)) {
+        try (LauncherDbUtils.SQLiteTransaction t = new LauncherDbUtils.SQLiteTransaction(db)) {
             int numValues = values.length;
             for (int i = 0; i < numValues; i++) {
                 addModifiedTime(values[i]);
@@ -292,7 +289,7 @@ public class LauncherProvider extends ContentProvider {
     public ContentProviderResult[] applyBatch(ArrayList<ContentProviderOperation> operations)
             throws OperationApplicationException {
         createDbIfNotExists();
-        try (SQLiteTransaction t = new SQLiteTransaction(mOpenHelper.getWritableDatabase())) {
+        try (LauncherDbUtils.SQLiteTransaction t = new LauncherDbUtils.SQLiteTransaction(mOpenHelper.getWritableDatabase())) {
             boolean isAddOrDelete = false;
 
             final int numOperations = operations.size();
@@ -397,12 +394,12 @@ public class LauncherProvider extends ContentProvider {
             case LauncherSettings.Settings.METHOD_NEW_TRANSACTION: {
                 Bundle result = new Bundle();
                 result.putBinder(LauncherSettings.Settings.EXTRA_VALUE,
-                        new SQLiteTransaction(mOpenHelper.getWritableDatabase()));
+                        new LauncherDbUtils.SQLiteTransaction(mOpenHelper.getWritableDatabase()));
                 return result;
             }
             case LauncherSettings.Settings.METHOD_REFRESH_BACKUP_TABLE: {
                 mOpenHelper.mBackupTableExists =
-                        tableExists(mOpenHelper.getReadableDatabase(), Favorites.BACKUP_TABLE_NAME);
+                        LauncherDbUtils.tableExists(mOpenHelper.getReadableDatabase(), Favorites.BACKUP_TABLE_NAME);
                 return null;
             }
         }
@@ -415,7 +412,7 @@ public class LauncherProvider extends ContentProvider {
      */
     private IntArray deleteEmptyFolders() {
         SQLiteDatabase db = mOpenHelper.getWritableDatabase();
-        try (SQLiteTransaction t = new SQLiteTransaction(db)) {
+        try (LauncherDbUtils.SQLiteTransaction t = new LauncherDbUtils.SQLiteTransaction(db)) {
             // Select folders whose id do not match any container value.
             String selection = LauncherSettings.Favorites.ITEM_TYPE + " = "
                     + LauncherSettings.Favorites.ITEM_TYPE_FOLDER + " AND "
@@ -575,12 +572,12 @@ public class LauncherProvider extends ContentProvider {
             // Table creation sometimes fails silently, which leads to a crash loop.
             // This way, we will try to create a table every time after crash, so the device
             // would eventually be able to recover.
-            if (!tableExists(getReadableDatabase(), Favorites.TABLE_NAME)) {
+            if (!LauncherDbUtils.tableExists(getReadableDatabase(), Favorites.TABLE_NAME)) {
                 Log.e(TAG, "Tables are missing after onCreate has been called. Trying to recreate");
                 // This operation is a no-op if the table already exists.
                 addFavoritesTable(getWritableDatabase(), true);
             }
-            mBackupTableExists = tableExists(getReadableDatabase(), Favorites.BACKUP_TABLE_NAME);
+            mBackupTableExists = LauncherDbUtils.tableExists(getReadableDatabase(), Favorites.BACKUP_TABLE_NAME);
 
             initIds();
         }
@@ -623,7 +620,7 @@ public class LauncherProvider extends ContentProvider {
 
         protected void onAddOrDeleteOp(SQLiteDatabase db) {
             if (mBackupTableExists) {
-                dropTable(db, Favorites.BACKUP_TABLE_NAME);
+                LauncherDbUtils.dropTable(db, Favorites.BACKUP_TABLE_NAME);
                 mBackupTableExists = false;
             }
         }
@@ -693,7 +690,7 @@ public class LauncherProvider extends ContentProvider {
                 case 12:
                     // No-op
                 case 13: {
-                    try (SQLiteTransaction t = new SQLiteTransaction(db)) {
+                    try (LauncherDbUtils.SQLiteTransaction t = new LauncherDbUtils.SQLiteTransaction(db)) {
                         // Insert new column for holding widget provider name
                         db.execSQL("ALTER TABLE favorites " +
                                 "ADD COLUMN appWidgetProvider TEXT;");
@@ -774,7 +771,7 @@ public class LauncherProvider extends ContentProvider {
                                 Favorites.CONTAINER, Favorites.CONTAINER_DESKTOP);
                         db.execSQL(query);
                     }
-                    dropTable(db, "workspaceScreens");
+                    LauncherDbUtils.dropTable(db, "workspaceScreens");
                 }
                 case 28:
                     // DB Upgraded successfully
@@ -802,9 +799,9 @@ public class LauncherProvider extends ContentProvider {
          * Clears all the data for a fresh start.
          */
         public void createEmptyDB(SQLiteDatabase db) {
-            try (SQLiteTransaction t = new SQLiteTransaction(db)) {
-                dropTable(db, Favorites.TABLE_NAME);
-                dropTable(db, "workspaceScreens");
+            try (LauncherDbUtils.SQLiteTransaction t = new LauncherDbUtils.SQLiteTransaction(db)) {
+                LauncherDbUtils.dropTable(db, Favorites.TABLE_NAME);
+                LauncherDbUtils.dropTable(db, "workspaceScreens");
                 onCreate(db);
                 t.commit();
             }
@@ -847,7 +844,7 @@ public class LauncherProvider extends ContentProvider {
          * launcher activity target with {@link Favorites#ITEM_TYPE_APPLICATION}.
          */
         @Thunk void convertShortcutsToLauncherActivities(SQLiteDatabase db) {
-            try (SQLiteTransaction t = new SQLiteTransaction(db);
+            try (LauncherDbUtils.SQLiteTransaction t = new LauncherDbUtils.SQLiteTransaction(db);
                  // Only consider the primary user as other users can't have a shortcut.
                  Cursor c = db.query(Favorites.TABLE_NAME,
                          new String[] { Favorites._ID, Favorites.INTENT},
@@ -885,7 +882,7 @@ public class LauncherProvider extends ContentProvider {
         }
 
         @Thunk boolean updateFolderItemsRank(SQLiteDatabase db, boolean addRankColumn) {
-            try (SQLiteTransaction t = new SQLiteTransaction(db)) {
+            try (LauncherDbUtils.SQLiteTransaction t = new LauncherDbUtils.SQLiteTransaction(db)) {
                 if (addRankColumn) {
                     // Insert new column for holding rank
                     db.execSQL("ALTER TABLE favorites ADD COLUMN rank INTEGER NOT NULL DEFAULT 0;");
@@ -914,7 +911,7 @@ public class LauncherProvider extends ContentProvider {
         }
 
         private boolean addIntegerColumn(SQLiteDatabase db, String columnName, long defaultValue) {
-            try (SQLiteTransaction t = new SQLiteTransaction(db)) {
+            try (LauncherDbUtils.SQLiteTransaction t = new LauncherDbUtils.SQLiteTransaction(db)) {
                 db.execSQL("ALTER TABLE favorites ADD COLUMN "
                         + columnName + " INTEGER NOT NULL DEFAULT " + defaultValue + ";");
                 t.commit();
diff --git a/src/com/android/colorfulos/LauncherProviderChangeListener.java b/src/com/aoleyun/os/LauncherProviderChangeListener.java
similarity index 91%
rename from src/com/android/colorfulos/LauncherProviderChangeListener.java
rename to src/com/aoleyun/os/LauncherProviderChangeListener.java
index 6cb5b9c..7080d4c 100644
--- a/src/com/android/colorfulos/LauncherProviderChangeListener.java
+++ b/src/com/aoleyun/os/LauncherProviderChangeListener.java
@@ -1,4 +1,4 @@
-package com.android.colorfulos;
+package com.aoleyun.os;
 
 /**
  * This class is a listener for {@link LauncherProvider} changes. It gets notified in the
diff --git a/src/com/android/colorfulos/LauncherRootView.java b/src/com/aoleyun/os/LauncherRootView.java
similarity index 96%
rename from src/com/android/colorfulos/LauncherRootView.java
rename to src/com/aoleyun/os/LauncherRootView.java
index 8952fa8..daac52f 100644
--- a/src/com/android/colorfulos/LauncherRootView.java
+++ b/src/com/aoleyun/os/LauncherRootView.java
@@ -1,7 +1,4 @@
-package com.android.colorfulos;
-
-import static com.android.colorfulos.util.SystemUiController.FLAG_DARK_NAV;
-import static com.android.colorfulos.util.SystemUiController.UI_STATE_ROOT_VIEW;
+package com.aoleyun.os;
 
 import android.annotation.TargetApi;
 import android.app.ActivityManager;
@@ -16,6 +13,8 @@ import android.view.View;
 import android.view.ViewDebug;
 import android.view.WindowInsets;
 
+import com.aoleyun.os.util.SystemUiController;
+
 import java.util.Collections;
 import java.util.List;
 
@@ -78,7 +77,7 @@ public class LauncherRootView extends InsettableFrameLayout {
         }
 
         mLauncher.getSystemUiController().updateUiState(
-                UI_STATE_ROOT_VIEW, drawInsetBar ? FLAG_DARK_NAV : 0);
+                SystemUiController.UI_STATE_ROOT_VIEW, drawInsetBar ? SystemUiController.FLAG_DARK_NAV : 0);
 
         // Update device profile before notifying th children.
         mLauncher.updateInsets(insets);
diff --git a/src/com/android/colorfulos/LauncherSettings.java b/src/com/aoleyun/os/LauncherSettings.java
similarity index 99%
rename from src/com/android/colorfulos/LauncherSettings.java
rename to src/com/aoleyun/os/LauncherSettings.java
index 246bfa5..b88f38b 100644
--- a/src/com/android/colorfulos/LauncherSettings.java
+++ b/src/com/aoleyun/os/LauncherSettings.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos;
+package com.aoleyun.os;
 
 import android.content.ContentResolver;
 import android.database.sqlite.SQLiteDatabase;
diff --git a/src/com/android/colorfulos/LauncherState.java b/src/com/aoleyun/os/LauncherState.java
similarity index 79%
rename from src/com/android/colorfulos/LauncherState.java
rename to src/com/aoleyun/os/LauncherState.java
index 6d4b78b..96a339a 100644
--- a/src/com/android/colorfulos/LauncherState.java
+++ b/src/com/aoleyun/os/LauncherState.java
@@ -13,40 +13,26 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos;
+package com.aoleyun.os;
 
 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.colorfulos.anim.AnimatorSetBuilder.ANIM_OVERVIEW_FADE;
-import static com.android.colorfulos.anim.AnimatorSetBuilder.ANIM_OVERVIEW_SCALE;
-import static com.android.colorfulos.anim.AnimatorSetBuilder.ANIM_OVERVIEW_TRANSLATE_X;
-import static com.android.colorfulos.anim.AnimatorSetBuilder.ANIM_WORKSPACE_FADE;
-import static com.android.colorfulos.anim.AnimatorSetBuilder.ANIM_WORKSPACE_SCALE;
-import static com.android.colorfulos.anim.Interpolators.ACCEL;
-import static com.android.colorfulos.anim.Interpolators.DEACCEL;
-import static com.android.colorfulos.anim.Interpolators.DEACCEL_1_7;
-import static com.android.colorfulos.anim.Interpolators.clampToProgress;
-import static com.android.colorfulos.testing.TestProtocol.ALL_APPS_STATE_ORDINAL;
-import static com.android.colorfulos.testing.TestProtocol.BACKGROUND_APP_STATE_ORDINAL;
-import static com.android.colorfulos.testing.TestProtocol.NORMAL_STATE_ORDINAL;
-import static com.android.colorfulos.testing.TestProtocol.OVERVIEW_PEEK_STATE_ORDINAL;
-import static com.android.colorfulos.testing.TestProtocol.OVERVIEW_STATE_ORDINAL;
-import static com.android.colorfulos.testing.TestProtocol.QUICK_SWITCH_STATE_ORDINAL;
-import static com.android.colorfulos.testing.TestProtocol.SPRING_LOADED_STATE_ORDINAL;
-import static com.android.colorfulos.anim.Interpolators.ACCEL_2;
-import static com.android.colorfulos.states.RotationHelper.REQUEST_NONE;
-
 import android.view.animation.Interpolator;
 
-import com.android.colorfulos.anim.AnimatorSetBuilder;
-import com.android.colorfulos.states.SpringLoadedState;
-import com.android.colorfulos.uioverrides.UiFactory;
-import com.android.colorfulos.uioverrides.states.AllAppsState;
-import com.android.colorfulos.uioverrides.states.OverviewState;
-import com.android.colorfulos.userevent.nano.LauncherLogProto.ContainerType;
+import com.aoleyun.os.anim.AnimatorSetBuilder;
+import com.aoleyun.os.states.SpringLoadedState;
+import com.aoleyun.os.uioverrides.UiFactory;
+import com.aoleyun.os.uioverrides.states.AllAppsState;
+import com.aoleyun.os.uioverrides.states.OverviewState;
+import com.aoleyun.os.userevent.nano.LauncherLogProto.ContainerType;
+import com.aoleyun.os.allapps.AllAppsTransitionController;
+import com.aoleyun.os.anim.Interpolators;
+import com.aoleyun.os.logging.UserEventDispatcher;
+import com.aoleyun.os.states.RotationHelper;
+import com.aoleyun.os.testing.TestProtocol;
 
 import java.util.Arrays;
 
@@ -82,7 +68,7 @@ public class LauncherState {
     protected static final int FLAG_HAS_SYS_UI_SCRIM = 1 << 9;
 
     protected static final PageAlphaProvider DEFAULT_ALPHA_PROVIDER =
-            new PageAlphaProvider(ACCEL_2) {
+            new PageAlphaProvider(Interpolators.ACCEL_2) {
                 @Override
                 public float getPageAlpha(int pageIndex) {
                     return 1;
@@ -94,7 +80,7 @@ public class LauncherState {
     /**
      * TODO: Create a separate class for NORMAL state.
      */
-    public static final LauncherState NORMAL = new LauncherState(NORMAL_STATE_ORDINAL,
+    public static final LauncherState NORMAL = new LauncherState(TestProtocol.NORMAL_STATE_ORDINAL,
             ContainerType.WORKSPACE, 0,
             FLAG_DISABLE_RESTORE | FLAG_WORKSPACE_ICONS_CAN_BE_DRAGGED | FLAG_HIDE_BACK_BUTTON |
             FLAG_HAS_SYS_UI_SCRIM);
@@ -103,21 +89,21 @@ public class LauncherState {
      * 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 ALL_APPS = new AllAppsState(ALL_APPS_STATE_ORDINAL);
+            TestProtocol.SPRING_LOADED_STATE_ORDINAL);
+    public static final LauncherState ALL_APPS = new AllAppsState(TestProtocol.ALL_APPS_STATE_ORDINAL);
 
-    public static final LauncherState OVERVIEW = new OverviewState(OVERVIEW_STATE_ORDINAL);
+    public static final LauncherState OVERVIEW = new OverviewState(TestProtocol.OVERVIEW_STATE_ORDINAL);
     public static final LauncherState OVERVIEW_PEEK =
-            OverviewState.newPeekState(OVERVIEW_PEEK_STATE_ORDINAL);
+            OverviewState.newPeekState(TestProtocol.OVERVIEW_PEEK_STATE_ORDINAL);
     public static final LauncherState QUICK_SWITCH =
-            OverviewState.newSwitchState(QUICK_SWITCH_STATE_ORDINAL);
+            OverviewState.newSwitchState(TestProtocol.QUICK_SWITCH_STATE_ORDINAL);
     public static final LauncherState BACKGROUND_APP =
-            OverviewState.newBackgroundState(BACKGROUND_APP_STATE_ORDINAL);
+            OverviewState.newBackgroundState(TestProtocol.BACKGROUND_APP_STATE_ORDINAL);
 
     public final int ordinal;
 
     /**
-     * Used for containerType in {@link com.android.colorfulos.logging.UserEventDispatcher}
+     * Used for containerType in {@link UserEventDispatcher}
      */
     public final int containerType;
 
@@ -233,7 +219,7 @@ public class LauncherState {
     /**
      * Fraction shift in the vertical translation UI and related properties
      *
-     * @see com.android.colorfulos.allapps.AllAppsTransitionController
+     * @see AllAppsTransitionController
      */
     public float getVerticalProgress(Launcher launcher) {
         return 1f;
@@ -252,7 +238,7 @@ public class LauncherState {
             return DEFAULT_ALPHA_PROVIDER;
         }
         final int centerPage = launcher.getWorkspace().getNextPage();
-        return new PageAlphaProvider(ACCEL_2) {
+        return new PageAlphaProvider(Interpolators.ACCEL_2) {
             @Override
             public float getPageAlpha(int pageIndex) {
                 return  pageIndex != centerPage ? 0 : 1f;
@@ -271,7 +257,7 @@ public class LauncherState {
     public void onStateTransitionEnd(Launcher launcher) {
         if (this == NORMAL) {
             // Clear any rotation locks when going to normal state
-            launcher.getRotationHelper().setCurrentStateRequest(REQUEST_NONE);
+            launcher.getRotationHelper().setCurrentStateRequest(RotationHelper.REQUEST_NONE);
         }
     }
 
@@ -292,11 +278,11 @@ public class LauncherState {
     public void prepareForAtomicAnimation(Launcher launcher, LauncherState fromState,
             AnimatorSetBuilder builder) {
         if (this == NORMAL && fromState == OVERVIEW) {
-            builder.setInterpolator(ANIM_WORKSPACE_SCALE, DEACCEL);
-            builder.setInterpolator(ANIM_WORKSPACE_FADE, ACCEL);
-            builder.setInterpolator(ANIM_OVERVIEW_SCALE, clampToProgress(ACCEL, 0, 0.9f));
-            builder.setInterpolator(ANIM_OVERVIEW_TRANSLATE_X, ACCEL);
-            builder.setInterpolator(ANIM_OVERVIEW_FADE, DEACCEL_1_7);
+            builder.setInterpolator(AnimatorSetBuilder.ANIM_WORKSPACE_SCALE, Interpolators.DEACCEL);
+            builder.setInterpolator(AnimatorSetBuilder.ANIM_WORKSPACE_FADE, Interpolators.ACCEL);
+            builder.setInterpolator(AnimatorSetBuilder.ANIM_OVERVIEW_SCALE, Interpolators.clampToProgress(Interpolators.ACCEL, 0, 0.9f));
+            builder.setInterpolator(AnimatorSetBuilder.ANIM_OVERVIEW_TRANSLATE_X, Interpolators.ACCEL);
+            builder.setInterpolator(AnimatorSetBuilder.ANIM_OVERVIEW_FADE, Interpolators.DEACCEL_1_7);
             Workspace workspace = launcher.getWorkspace();
 
             // Start from a higher workspace scale, but only if we're invisible so we don't jump.
@@ -319,7 +305,7 @@ public class LauncherState {
             }
         } else if (this == NORMAL && fromState == OVERVIEW_PEEK) {
             // Keep fully visible until the very end (when overview is offscreen) to make invisible.
-            builder.setInterpolator(ANIM_OVERVIEW_FADE, t -> t < 1 ? 0 : 1);
+            builder.setInterpolator(AnimatorSetBuilder.ANIM_OVERVIEW_FADE, t -> t < 1 ? 0 : 1);
         }
     }
 
diff --git a/src/com/android/colorfulos/LauncherStateManager.java b/src/com/aoleyun/os/LauncherStateManager.java
similarity index 95%
rename from src/com/android/colorfulos/LauncherStateManager.java
rename to src/com/aoleyun/os/LauncherStateManager.java
index 409d9d1..6df17f5 100644
--- a/src/com/android/colorfulos/LauncherStateManager.java
+++ b/src/com/aoleyun/os/LauncherStateManager.java
@@ -14,10 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos;
-
-import static com.android.colorfulos.LauncherState.NORMAL;
-import static com.android.colorfulos.anim.PropertySetter.NO_ANIM_PROPERTY_SETTER;
+package com.aoleyun.os;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -26,14 +23,13 @@ import android.os.Handler;
 import android.os.Looper;
 import android.util.Log;
 
-import com.android.colorfulos.anim.AnimationSuccessListener;
-import com.android.colorfulos.anim.AnimatorPlaybackController;
-import com.android.colorfulos.anim.AnimatorSetBuilder;
-import com.android.colorfulos.anim.PropertySetter;
-import com.android.colorfulos.anim.PropertySetter.AnimatedPropertySetter;
-import com.android.colorfulos.compat.AccessibilityManagerCompat;
-import com.android.colorfulos.testing.TestProtocol;
-import com.android.colorfulos.uioverrides.UiFactory;
+import com.aoleyun.os.anim.AnimationSuccessListener;
+import com.aoleyun.os.anim.AnimatorPlaybackController;
+import com.aoleyun.os.anim.AnimatorSetBuilder;
+import com.aoleyun.os.anim.PropertySetter;
+import com.aoleyun.os.compat.AccessibilityManagerCompat;
+import com.aoleyun.os.testing.TestProtocol;
+import com.aoleyun.os.uioverrides.UiFactory;
 
 import java.io.PrintWriter;
 import java.lang.annotation.Retention;
@@ -115,10 +111,10 @@ public class LauncherStateManager {
     private Animator[] mStateElementAnimators;
 
     private StateHandler[] mStateHandlers;
-    private LauncherState mState = NORMAL;
+    private LauncherState mState = LauncherState.NORMAL;
 
-    private LauncherState mLastStableState = NORMAL;
-    private LauncherState mCurrentStableState = NORMAL;
+    private LauncherState mLastStableState = LauncherState.NORMAL;
+    private LauncherState mCurrentStableState = LauncherState.NORMAL;
 
     private LauncherState mRestState;
 
@@ -287,7 +283,7 @@ public class LauncherStateManager {
             Runnable onCompleteRunnable) {
         // Since state NORMAL can be reached from multiple states, just assume that the
         // transition plays in reverse and use the same duration as previous state.
-        mConfig.duration = state == NORMAL ? fromState.transitionDuration : state.transitionDuration;
+        mConfig.duration = state == LauncherState.NORMAL ? fromState.transitionDuration : state.transitionDuration;
 
         AnimatorSetBuilder builder = new AnimatorSetBuilder();
         prepareForAtomicAnimation(fromState, state, builder);
@@ -441,7 +437,7 @@ public class LauncherStateManager {
         mLauncher.getWorkspace().setClipChildren(!state.disablePageClipping);
         mLauncher.finishAutoCancelActionMode();
 
-        if (state == NORMAL) {
+        if (state == LauncherState.NORMAL) {
             setRestState(null);
         }
 
@@ -470,12 +466,12 @@ public class LauncherStateManager {
         if (mState.disableRestore) {
             goToState(getRestState());
             // Reset history
-            mLastStableState = NORMAL;
+            mLastStableState = LauncherState.NORMAL;
         }
     }
 
     public LauncherState getRestState() {
-        return mRestState == null ? NORMAL : mRestState;
+        return mRestState == null ? LauncherState.NORMAL : mRestState;
     }
 
     public void setRestState(LauncherState restState) {
@@ -633,8 +629,8 @@ public class LauncherStateManager {
 
         public PropertySetter getPropertySetter(AnimatorSetBuilder builder) {
             if (mPropertySetter == null) {
-                mPropertySetter = duration == 0 ? NO_ANIM_PROPERTY_SETTER
-                        : new AnimatedPropertySetter(duration, builder);
+                mPropertySetter = duration == 0 ? PropertySetter.NO_ANIM_PROPERTY_SETTER
+                        : new PropertySetter.AnimatedPropertySetter(duration, builder);
             }
             return mPropertySetter;
         }
diff --git a/src/com/android/colorfulos/LogAccelerateInterpolator.java b/src/com/aoleyun/os/LogAccelerateInterpolator.java
similarity index 96%
rename from src/com/android/colorfulos/LogAccelerateInterpolator.java
rename to src/com/aoleyun/os/LogAccelerateInterpolator.java
index 908f05f..dacdefb 100644
--- a/src/com/android/colorfulos/LogAccelerateInterpolator.java
+++ b/src/com/aoleyun/os/LogAccelerateInterpolator.java
@@ -1,4 +1,4 @@
-package com.android.colorfulos;
+package com.aoleyun.os;
 
 import android.animation.TimeInterpolator;
 
diff --git a/src/com/android/colorfulos/LogDecelerateInterpolator.java b/src/com/aoleyun/os/LogDecelerateInterpolator.java
similarity index 96%
rename from src/com/android/colorfulos/LogDecelerateInterpolator.java
rename to src/com/aoleyun/os/LogDecelerateInterpolator.java
index 20dc445..7bb72ff 100644
--- a/src/com/android/colorfulos/LogDecelerateInterpolator.java
+++ b/src/com/aoleyun/os/LogDecelerateInterpolator.java
@@ -1,4 +1,4 @@
-package com.android.colorfulos;
+package com.aoleyun.os;
 
 import android.animation.TimeInterpolator;
 
diff --git a/src/com/android/colorfulos/MainProcessInitializer.java b/src/com/aoleyun/os/MainProcessInitializer.java
similarity index 84%
rename from src/com/android/colorfulos/MainProcessInitializer.java
rename to src/com/aoleyun/os/MainProcessInitializer.java
index c622020..68518dc 100644
--- a/src/com/android/colorfulos/MainProcessInitializer.java
+++ b/src/com/aoleyun/os/MainProcessInitializer.java
@@ -14,14 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos;
+package com.aoleyun.os;
 
 import android.content.Context;
 
-import com.android.colorfulos.config.FeatureFlags;
-import com.android.colorfulos.graphics.IconShape;
-import com.android.colorfulos.logging.FileLog;
-import com.android.colorfulos.util.ResourceBasedOverride;
+import com.aoleyun.os.R;
+import com.aoleyun.os.config.FeatureFlags;
+import com.aoleyun.os.graphics.IconShape;
+import com.aoleyun.os.logging.FileLog;
+import com.aoleyun.os.util.ResourceBasedOverride;
 
 /**
  * Utility class to handle one time initializations of the main process
diff --git a/src/com/android/colorfulos/MainThreadExecutor.java b/src/com/aoleyun/os/MainThreadExecutor.java
similarity index 91%
rename from src/com/android/colorfulos/MainThreadExecutor.java
rename to src/com/aoleyun/os/MainThreadExecutor.java
index cbccd1f..132296d 100644
--- a/src/com/android/colorfulos/MainThreadExecutor.java
+++ b/src/com/aoleyun/os/MainThreadExecutor.java
@@ -14,11 +14,11 @@
  * limitations under the License
  */
 
-package com.android.colorfulos;
+package com.aoleyun.os;
 
 import android.os.Looper;
 
-import com.android.colorfulos.util.LooperExecutor;
+import com.aoleyun.os.util.LooperExecutor;
 
 /**
  * An executor service that executes its tasks on the main thread.
diff --git a/src/com/android/colorfulos/OnAlarmListener.java b/src/com/aoleyun/os/OnAlarmListener.java
similarity index 70%
rename from src/com/android/colorfulos/OnAlarmListener.java
rename to src/com/aoleyun/os/OnAlarmListener.java
index a78508c..7a2f1ab 100644
--- a/src/com/android/colorfulos/OnAlarmListener.java
+++ b/src/com/aoleyun/os/OnAlarmListener.java
@@ -1,4 +1,4 @@
-package com.android.colorfulos;
+package com.aoleyun.os;
 
 public interface OnAlarmListener {
     public void onAlarm(Alarm alarm);
diff --git a/src/com/android/colorfulos/PagedView.java b/src/com/aoleyun/os/PagedView.java
similarity index 98%
rename from src/com/android/colorfulos/PagedView.java
rename to src/com/aoleyun/os/PagedView.java
index 483d7c8..87af00e 100644
--- a/src/com/android/colorfulos/PagedView.java
+++ b/src/com/aoleyun/os/PagedView.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos;
+package com.aoleyun.os;
 
-import static com.android.colorfulos.Utilities.shouldDisableGestures;
-import static com.android.colorfulos.compat.AccessibilityManagerCompat.isAccessibilityEnabled;
-import static com.android.colorfulos.compat.AccessibilityManagerCompat.isObservedEventType;
-import static com.android.colorfulos.config.FeatureFlags.QUICKSTEP_SPRINGS;
-import static com.android.colorfulos.touch.OverScroll.OVERSCROLL_DAMP_FACTOR;
+import static com.aoleyun.os.Utilities.shouldDisableGestures;
+import static com.aoleyun.os.compat.AccessibilityManagerCompat.isAccessibilityEnabled;
+import static com.aoleyun.os.compat.AccessibilityManagerCompat.isObservedEventType;
+import static com.aoleyun.os.config.FeatureFlags.QUICKSTEP_SPRINGS;
+import static com.aoleyun.os.touch.OverScroll.OVERSCROLL_DAMP_FACTOR;
 
 import android.animation.LayoutTransition;
 import android.animation.TimeInterpolator;
@@ -47,12 +47,13 @@ import android.view.accessibility.AccessibilityNodeInfo;
 import android.view.animation.Interpolator;
 import android.widget.ScrollView;
 
-import com.android.colorfulos.anim.Interpolators;
-import com.android.colorfulos.config.FeatureFlags;
-import com.android.colorfulos.pageindicators.PageIndicator;
-import com.android.colorfulos.touch.OverScroll;
-import com.android.colorfulos.util.OverScroller;
-import com.android.colorfulos.util.Thunk;
+import com.aoleyun.os.R;
+import com.aoleyun.os.anim.Interpolators;
+import com.aoleyun.os.config.FeatureFlags;
+import com.aoleyun.os.pageindicators.PageIndicator;
+import com.aoleyun.os.touch.OverScroll;
+import com.aoleyun.os.util.OverScroller;
+import com.aoleyun.os.util.Thunk;
 
 import java.util.ArrayList;
 
diff --git a/src/com/android/colorfulos/Partner.java b/src/com/aoleyun/os/Partner.java
similarity index 97%
rename from src/com/android/colorfulos/Partner.java
rename to src/com/aoleyun/os/Partner.java
index eb28e10..d40a396 100644
--- a/src/com/android/colorfulos/Partner.java
+++ b/src/com/aoleyun/os/Partner.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos;
+package com.aoleyun.os;
 
 import android.content.pm.PackageManager;
 import android.content.res.Resources;
@@ -35,7 +35,7 @@ public class Partner {
 
     /** Marker action used to discover partner */
     private static final String
-            ACTION_PARTNER_CUSTOMIZATION = "com.android.colorfulos.action.PARTNER_CUSTOMIZATION";
+            ACTION_PARTNER_CUSTOMIZATION = "com.aoleyun.os.action.PARTNER_CUSTOMIZATION";
 
     public static final String RES_FOLDER = "partner_folder";
     public static final String RES_WALLPAPERS = "partner_wallpapers";
diff --git a/src/com/android/colorfulos/PendingAddItemInfo.java b/src/com/aoleyun/os/PendingAddItemInfo.java
similarity index 97%
rename from src/com/android/colorfulos/PendingAddItemInfo.java
rename to src/com/aoleyun/os/PendingAddItemInfo.java
index 1c8eb33..12fe2bd 100644
--- a/src/com/android/colorfulos/PendingAddItemInfo.java
+++ b/src/com/aoleyun/os/PendingAddItemInfo.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos;
+package com.aoleyun.os;
 
 import android.content.ComponentName;
 
diff --git a/src/com/android/colorfulos/PromiseAppInfo.java b/src/com/aoleyun/os/PromiseAppInfo.java
similarity index 92%
rename from src/com/android/colorfulos/PromiseAppInfo.java
rename to src/com/aoleyun/os/PromiseAppInfo.java
index 927e6e9..59b2d5e 100644
--- a/src/com/android/colorfulos/PromiseAppInfo.java
+++ b/src/com/aoleyun/os/PromiseAppInfo.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos;
+package com.aoleyun.os;
 
 import android.content.Context;
 import android.content.Intent;
 
-import com.android.colorfulos.compat.PackageInstallerCompat;
-import com.android.colorfulos.util.PackageManagerHelper;
+import com.aoleyun.os.compat.PackageInstallerCompat;
+import com.aoleyun.os.util.PackageManagerHelper;
 
 import androidx.annotation.NonNull;
 
diff --git a/src/com/android/colorfulos/ResourceUtils.java b/src/com/aoleyun/os/ResourceUtils.java
similarity index 98%
rename from src/com/android/colorfulos/ResourceUtils.java
rename to src/com/aoleyun/os/ResourceUtils.java
index 604b1f1..e489c6e 100644
--- a/src/com/android/colorfulos/ResourceUtils.java
+++ b/src/com/aoleyun/os/ResourceUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos;
+package com.aoleyun.os;
 
 import android.content.res.Resources;
 import android.util.DisplayMetrics;
diff --git a/src/com/android/colorfulos/SecondaryDropTarget.java b/src/com/aoleyun/os/SecondaryDropTarget.java
similarity index 87%
rename from src/com/android/colorfulos/SecondaryDropTarget.java
rename to src/com/aoleyun/os/SecondaryDropTarget.java
index b84ca9a..5ee52a4 100644
--- a/src/com/android/colorfulos/SecondaryDropTarget.java
+++ b/src/com/aoleyun/os/SecondaryDropTarget.java
@@ -1,12 +1,7 @@
-package com.android.colorfulos;
+package com.aoleyun.os;
 
 import static android.appwidget.AppWidgetManager.INVALID_APPWIDGET_ID;
 import static android.appwidget.AppWidgetProviderInfo.WIDGET_FEATURE_RECONFIGURABLE;
-import static com.android.colorfulos.ItemInfoWithIcon.FLAG_SYSTEM_MASK;
-import static com.android.colorfulos.ItemInfoWithIcon.FLAG_SYSTEM_NO;
-import static com.android.colorfulos.LauncherSettings.Favorites.CONTAINER_DESKTOP;
-import static com.android.colorfulos.accessibility.LauncherAccessibilityDelegate.RECONFIGURE;
-import static com.android.colorfulos.accessibility.LauncherAccessibilityDelegate.UNINSTALL;
 
 import android.appwidget.AppWidgetHostView;
 import android.appwidget.AppWidgetProviderInfo;
@@ -26,13 +21,14 @@ import android.util.Log;
 import android.view.View;
 import android.widget.Toast;
 
-import com.android.colorfulos.Launcher.OnResumeCallback;
-import com.android.colorfulos.compat.LauncherAppsCompat;
-import com.android.colorfulos.dragndrop.DragOptions;
-import com.android.colorfulos.logging.LoggerUtils;
-import com.android.colorfulos.userevent.nano.LauncherLogProto.ControlType;
-import com.android.colorfulos.userevent.nano.LauncherLogProto.Target;
-import com.android.colorfulos.util.Themes;
+import com.aoleyun.os.R;
+import com.aoleyun.os.compat.LauncherAppsCompat;
+import com.aoleyun.os.dragndrop.DragOptions;
+import com.aoleyun.os.logging.LoggerUtils;
+import com.aoleyun.os.userevent.nano.LauncherLogProto.ControlType;
+import com.aoleyun.os.userevent.nano.LauncherLogProto.Target;
+import com.aoleyun.os.util.Themes;
+import com.aoleyun.os.accessibility.LauncherAccessibilityDelegate;
 
 import java.net.URISyntaxException;
 
@@ -65,7 +61,7 @@ public class SecondaryDropTarget extends ButtonDropTarget implements OnAlarmList
     @Override
     protected void onFinishInflate() {
         super.onFinishInflate();
-        setupUi(UNINSTALL);
+        setupUi(LauncherAccessibilityDelegate.UNINSTALL);
     }
 
     protected void setupUi(int action) {
@@ -74,7 +70,7 @@ public class SecondaryDropTarget extends ButtonDropTarget implements OnAlarmList
         }
         mCurrentAccessibilityAction = action;
 
-        if (action == UNINSTALL) {
+        if (action == LauncherAccessibilityDelegate.UNINSTALL) {
             mHoverColor = getResources().getColor(R.color.uninstall_target_hover_tint);
             setDrawable(R.drawable.ic_uninstall);
             updateText(R.string.uninstall_drop_target_label);
@@ -98,7 +94,7 @@ public class SecondaryDropTarget extends ButtonDropTarget implements OnAlarmList
     @Override
     public Target getDropTargetForLogging() {
         Target t = LoggerUtils.newTarget(Target.Type.CONTROL);
-        t.controlType = mCurrentAccessibilityAction == UNINSTALL ? ControlType.UNINSTALL_TARGET
+        t.controlType = mCurrentAccessibilityAction == LauncherAccessibilityDelegate.UNINSTALL ? ControlType.UNINSTALL_TARGET
                 : ControlType.SETTINGS_BUTTON;
         return t;
     }
@@ -112,13 +108,13 @@ public class SecondaryDropTarget extends ButtonDropTarget implements OnAlarmList
     public boolean supportsAccessibilityDrop(ItemInfo info, View view) {
         if (view instanceof AppWidgetHostView) {
             if (getReconfigurableWidgetId(view) != INVALID_APPWIDGET_ID) {
-                setupUi(RECONFIGURE);
+                setupUi(LauncherAccessibilityDelegate.RECONFIGURE);
                 return true;
             }
             return false;
         }
 
-        setupUi(UNINSTALL);
+        setupUi(LauncherAccessibilityDelegate.UNINSTALL);
         Boolean uninstallDisabled = mUninstallDisabledCache.get(info.user);
         if (uninstallDisabled == null) {
             UserManager userManager =
@@ -136,8 +132,8 @@ public class SecondaryDropTarget extends ButtonDropTarget implements OnAlarmList
 
         if (info instanceof ItemInfoWithIcon) {
             ItemInfoWithIcon iconInfo = (ItemInfoWithIcon) info;
-            if ((iconInfo.runtimeStatusFlags & FLAG_SYSTEM_MASK) != 0) {
-                return (iconInfo.runtimeStatusFlags & FLAG_SYSTEM_NO) != 0;
+            if ((iconInfo.runtimeStatusFlags & ItemInfoWithIcon.FLAG_SYSTEM_MASK) != 0) {
+                return (iconInfo.runtimeStatusFlags & ItemInfoWithIcon.FLAG_SYSTEM_NO) != 0;
             }
         }
         return getUninstallTarget(info) != null;
@@ -187,7 +183,7 @@ public class SecondaryDropTarget extends ButtonDropTarget implements OnAlarmList
     }
 
     private View getViewUnderDrag(ItemInfo info) {
-        if (info instanceof LauncherAppWidgetInfo && info.container == CONTAINER_DESKTOP &&
+        if (info instanceof LauncherAppWidgetInfo && info.container == LauncherSettings.Favorites.CONTAINER_DESKTOP &&
                 mLauncher.getWorkspace().getDragInfo() != null) {
             return mLauncher.getWorkspace().getDragInfo().cell;
         }
@@ -219,7 +215,7 @@ public class SecondaryDropTarget extends ButtonDropTarget implements OnAlarmList
      * the action was not performed.
      */
     protected ComponentName performDropAction(View view, ItemInfo info) {
-        if (mCurrentAccessibilityAction == RECONFIGURE) {
+        if (mCurrentAccessibilityAction == LauncherAccessibilityDelegate.RECONFIGURE) {
             int widgetId = getReconfigurableWidgetId(view);
             if (widgetId != INVALID_APPWIDGET_ID) {
                 mLauncher.getAppWidgetHost().startConfigActivity(mLauncher, widgetId, -1);
@@ -256,7 +252,7 @@ public class SecondaryDropTarget extends ButtonDropTarget implements OnAlarmList
      * A wrapper around {@link DragSource} which delays the {@link #onDropCompleted} action until
      * {@link #onLauncherResume}
      */
-    private class DeferredOnComplete implements DragSource, OnResumeCallback {
+    private class DeferredOnComplete implements DragSource, Launcher.OnResumeCallback {
 
         private final DragSource mOriginal;
         private final Context mContext;
diff --git a/src/com/android/colorfulos/SessionCommitReceiver.java b/src/com/aoleyun/os/SessionCommitReceiver.java
similarity index 98%
rename from src/com/android/colorfulos/SessionCommitReceiver.java
rename to src/com/aoleyun/os/SessionCommitReceiver.java
index 1008528..e2bbf85 100644
--- a/src/com/android/colorfulos/SessionCommitReceiver.java
+++ b/src/com/aoleyun/os/SessionCommitReceiver.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos;
+package com.aoleyun.os;
 
 import android.annotation.TargetApi;
 import android.content.BroadcastReceiver;
@@ -35,7 +35,7 @@ import android.provider.Settings;
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.android.colorfulos.compat.LauncherAppsCompat;
+import com.aoleyun.os.compat.LauncherAppsCompat;
 
 import java.util.List;
 
diff --git a/src/com/android/colorfulos/ShortcutAndWidgetContainer.java b/src/com/aoleyun/os/ShortcutAndWidgetContainer.java
similarity index 97%
rename from src/com/android/colorfulos/ShortcutAndWidgetContainer.java
rename to src/com/aoleyun/os/ShortcutAndWidgetContainer.java
index 93b4e6b..7ef594c 100644
--- a/src/com/android/colorfulos/ShortcutAndWidgetContainer.java
+++ b/src/com/aoleyun/os/ShortcutAndWidgetContainer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos;
+package com.aoleyun.os;
 
 import static android.view.MotionEvent.ACTION_DOWN;
 
@@ -25,9 +25,9 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.android.colorfulos.CellLayout.ContainerType;
-import com.android.colorfulos.views.ActivityContext;
-import com.android.colorfulos.widget.LauncherAppWidgetHostView;
+import com.aoleyun.os.CellLayout.ContainerType;
+import com.aoleyun.os.views.ActivityContext;
+import com.aoleyun.os.widget.LauncherAppWidgetHostView;
 
 public class ShortcutAndWidgetContainer extends ViewGroup {
     static final String TAG = "ShortcutAndWidgetContainer";
diff --git a/src/com/android/colorfulos/SimpleOnStylusPressListener.java b/src/com/aoleyun/os/SimpleOnStylusPressListener.java
similarity index 84%
rename from src/com/android/colorfulos/SimpleOnStylusPressListener.java
rename to src/com/aoleyun/os/SimpleOnStylusPressListener.java
index 732bee4..6245743 100644
--- a/src/com/android/colorfulos/SimpleOnStylusPressListener.java
+++ b/src/com/aoleyun/os/SimpleOnStylusPressListener.java
@@ -1,9 +1,9 @@
-package com.android.colorfulos;
+package com.aoleyun.os;
 
 import android.view.MotionEvent;
 import android.view.View;
 
-import com.android.colorfulos.StylusEventHelper.StylusButtonListener;
+import com.aoleyun.os.StylusEventHelper.StylusButtonListener;
 
 /**
  * Simple listener that performs a long click on the view after a stylus button press.
diff --git a/src/com/android/colorfulos/Statistics/AppInformation.java b/src/com/aoleyun/os/Statistics/AppInformation.java
similarity index 98%
rename from src/com/android/colorfulos/Statistics/AppInformation.java
rename to src/com/aoleyun/os/Statistics/AppInformation.java
index 838bd29..6a45889 100644
--- a/src/com/android/colorfulos/Statistics/AppInformation.java
+++ b/src/com/aoleyun/os/Statistics/AppInformation.java
@@ -1,4 +1,4 @@
-package com.android.colorfulos.Statistics;
+package com.aoleyun.os.Statistics;
 
 import android.app.usage.UsageStats;
 import android.content.Context;
diff --git a/src/com/android/colorfulos/Statistics/StatisticsInfo.java b/src/com/aoleyun/os/Statistics/StatisticsInfo.java
similarity index 98%
rename from src/com/android/colorfulos/Statistics/StatisticsInfo.java
rename to src/com/aoleyun/os/Statistics/StatisticsInfo.java
index e2a524a..b244a99 100644
--- a/src/com/android/colorfulos/Statistics/StatisticsInfo.java
+++ b/src/com/aoleyun/os/Statistics/StatisticsInfo.java
@@ -1,4 +1,4 @@
-package com.android.colorfulos.Statistics;
+package com.aoleyun.os.Statistics;
 
 import android.annotation.TargetApi;
 import android.app.usage.UsageEvents;
@@ -14,7 +14,7 @@ import java.util.Calendar;
 import java.util.HashMap;
 import java.util.List;
 
-import static com.android.colorfulos.Statistics.AppInformation.bootTime;
+import static com.aoleyun.os.Statistics.AppInformation.bootTime;
 
 
 public class StatisticsInfo {
diff --git a/src/com/android/colorfulos/StylusEventHelper.java b/src/com/aoleyun/os/StylusEventHelper.java
similarity index 99%
rename from src/com/android/colorfulos/StylusEventHelper.java
rename to src/com/aoleyun/os/StylusEventHelper.java
index 21d47d3..f88f1ac 100644
--- a/src/com/android/colorfulos/StylusEventHelper.java
+++ b/src/com/aoleyun/os/StylusEventHelper.java
@@ -1,4 +1,4 @@
-package com.android.colorfulos;
+package com.aoleyun.os;
 
 import android.view.MotionEvent;
 import android.view.View;
diff --git a/src/com/android/colorfulos/TTUtils/APKUtils.java b/src/com/aoleyun/os/TTUtils/APKUtils.java
similarity index 77%
rename from src/com/android/colorfulos/TTUtils/APKUtils.java
rename to src/com/aoleyun/os/TTUtils/APKUtils.java
index 6094767..9a11060 100644
--- a/src/com/android/colorfulos/TTUtils/APKUtils.java
+++ b/src/com/aoleyun/os/TTUtils/APKUtils.java
@@ -1,20 +1,22 @@
-package com.android.colorfulos.TTUtils;
+package com.aoleyun.os.TTUtils;
 
 import android.app.PendingIntent;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageInstaller;
 import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
 import android.os.Build;
 import android.text.TextUtils;
 import android.util.Log;
 
 import androidx.annotation.RequiresApi;
 
-import com.android.colorfulos.BuildConfig;
-import com.android.colorfulos.receiver.InstallResultReceiver;
+import com.aoleyun.os.BuildConfig;
+import com.aoleyun.os.receiver.InstallResultReceiver;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -22,8 +24,61 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
+import java.util.List;
 
 public class APKUtils {
+    public static boolean openPackage(Context context, String packageName) {
+        Context pkgContext = getPackageContext(context, packageName);
+        Intent intent = getAppOpenIntentByPackageName(context, packageName);
+        if (pkgContext != null && intent != null) {
+            pkgContext.startActivity(intent);
+            return true;
+        }
+        return false;
+    }
+
+    public static Context getPackageContext(Context context, String packageName) {
+        Context pkgContext = null;
+        if (context.getPackageName().equals(packageName)) {
+            pkgContext = context;
+        } else {
+            // 创建第三方应用的上下文环境
+            try {
+                pkgContext = context.createPackageContext(packageName,
+                        Context.CONTEXT_IGNORE_SECURITY
+                                | Context.CONTEXT_INCLUDE_CODE);
+            } catch (PackageManager.NameNotFoundException e) {
+                e.printStackTrace();
+            }
+        }
+        return pkgContext;
+    }
+
+    public static Intent getAppOpenIntentByPackageName(Context context, String packageName) {
+        //Activity完整名
+        String mainAct = null;
+        //根据包名寻找
+        PackageManager pkgMag = context.getPackageManager();
+        Intent intent = new Intent(Intent.ACTION_MAIN);
+        intent.addCategory(Intent.CATEGORY_LAUNCHER);
+        intent.setFlags(Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED | Intent.FLAG_ACTIVITY_NEW_TASK);
+
+        List<ResolveInfo> list = pkgMag.queryIntentActivities(intent,
+                PackageManager.GET_ACTIVITIES);
+        for (int i = 0; i < list.size(); i++) {
+            ResolveInfo info = list.get(i);
+            if (info.activityInfo.packageName.equals(packageName)) {
+                mainAct = info.activityInfo.name;
+                break;
+            }
+        }
+        if (TextUtils.isEmpty(mainAct)) {
+            return null;
+        }
+        intent.setComponent(new ComponentName(packageName, mainAct));
+        return intent;
+    }
+
     //判断是否为系统应用
     public static boolean isSystemApp(Context context, String pkgName) {
         boolean isSystemApp = false;
diff --git a/src/com/android/colorfulos/TTUtils/BitmapUtils.java b/src/com/aoleyun/os/TTUtils/BitmapUtils.java
similarity index 98%
rename from src/com/android/colorfulos/TTUtils/BitmapUtils.java
rename to src/com/aoleyun/os/TTUtils/BitmapUtils.java
index c68d7bd..2f5fe82 100644
--- a/src/com/android/colorfulos/TTUtils/BitmapUtils.java
+++ b/src/com/aoleyun/os/TTUtils/BitmapUtils.java
@@ -1,4 +1,4 @@
-package com.android.colorfulos.TTUtils;
+package com.aoleyun.os.TTUtils;
 
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -14,8 +14,8 @@ import android.graphics.drawable.AdaptiveIconDrawable;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 
-import com.android.colorfulos.R;
-import com.android.colorfulos.icons.LauncherIcons;
+import com.aoleyun.os.R;
+import com.aoleyun.os.icons.LauncherIcons;
 
 import java.util.Calendar;
 
diff --git a/src/com/aoleyun/os/TTUtils/CustomDialog.java b/src/com/aoleyun/os/TTUtils/CustomDialog.java
new file mode 100644
index 0000000..cbd0909
--- /dev/null
+++ b/src/com/aoleyun/os/TTUtils/CustomDialog.java
@@ -0,0 +1,266 @@
+package com.aoleyun.os.TTUtils;
+
+
+import android.content.Context;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.KeyEvent;
+import android.view.View;
+import android.view.inputmethod.EditorInfo;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.appcompat.app.AlertDialog;
+
+import com.aoleyun.os.R;
+
+
+/**
+ * description:自定义dialog
+ */
+public class CustomDialog extends AlertDialog {
+    /**
+     * 显示的图片
+     */
+    private ImageView imageIv;
+
+    /**
+     * 显示的标题
+     */
+    private TextView titleTv;
+
+    /**
+     * 显示的消息
+     */
+    public EditText messageTv;
+
+    /**
+     * 确认和取消按钮
+     */
+    private Button negtiveBn;
+    private TextView positiveBn;
+
+    /**
+     * 按钮之间的分割线
+     */
+    private View columnLineView;
+
+    private Context mContext;
+
+    public CustomDialog(Context context) {
+        super(context, R.style.CustomDialog);
+        this.mContext = context;
+    }
+
+    /**
+     * 都是内容数据
+     */
+    private String message;
+    private String title;
+    private String positive, negtive;
+    private int imageResId = -1;
+
+    /**
+     * 底部是否只有一个按钮
+     */
+    private boolean isSingle = false;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.custom_dialog);
+        //按空白处不能取消动画
+        setCanceledOnTouchOutside(false);
+        //初始化界面控件
+        initView();
+        //初始化界面数据
+        refreshView();
+        //初始化界面控件的事件
+        initEvent();
+    }
+
+    /**
+     * 初始化界面的确定和取消监听器
+     */
+    private void initEvent() {
+        //设置确定按钮被点击后，向外界提供监听
+        positiveBn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (onClickBottomListener != null) {
+                    onClickBottomListener.onPositiveClick();
+                }
+            }
+        });
+        //设置取消按钮被点击后，向外界提供监听
+        negtiveBn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (onClickBottomListener != null) {
+                    onClickBottomListener.onNegtiveClick();
+                }
+            }
+        });
+    }
+
+    /**
+     * 初始化界面控件的显示数据
+     */
+    private void refreshView() {
+        //如果用户自定了title和message
+        if (!TextUtils.isEmpty(title)) {
+            titleTv.setText(title);
+            titleTv.setVisibility(View.VISIBLE);
+        } else {
+            titleTv.setVisibility(View.GONE);
+        }
+        if (!TextUtils.isEmpty(message)) {
+//            messageTv.setText(message);
+        }
+        //如果设置按钮的文字
+        if (!TextUtils.isEmpty(positive)) {
+            positiveBn.setText(positive);
+        } else {
+            positiveBn.setText("确定");
+        }
+        if (!TextUtils.isEmpty(negtive)) {
+            negtiveBn.setText(negtive);
+        } else {
+            negtiveBn.setText("取消");
+        }
+
+        if (imageResId != -1) {
+            imageIv.setImageResource(imageResId);
+            imageIv.setVisibility(View.VISIBLE);
+        } else {
+            imageIv.setVisibility(View.GONE);
+        }
+        /**
+         * 只显示一个按钮的时候隐藏取消按钮，回掉只执行确定的事件
+         */
+        if (isSingle) {
+            columnLineView.setVisibility(View.GONE);
+            negtiveBn.setVisibility(View.GONE);
+        } else {
+            negtiveBn.setVisibility(View.VISIBLE);
+            columnLineView.setVisibility(View.VISIBLE);
+        }
+    }
+
+    @Override
+    public void show() {
+        super.show();
+        refreshView();
+    }
+
+    /**
+     * 初始化界面控件
+     */
+    private void initView() {
+        negtiveBn = findViewById(R.id.negtive);
+        positiveBn = findViewById(R.id.positive);
+        titleTv = findViewById(R.id.title);
+        messageTv = findViewById(R.id.message);
+        messageTv.setOnEditorActionListener(new TextView.OnEditorActionListener() {
+            @Override
+            public boolean onEditorAction(TextView textView, int i, KeyEvent keyEvent) {
+                if (i == EditorInfo.IME_ACTION_DONE) {
+                    if (onClickBottomListener != null) {
+                        onClickBottomListener.onPositiveClick();
+                    }
+                    return true;
+                }
+                return false;
+            }
+        });
+        imageIv = findViewById(R.id.image);
+        columnLineView = findViewById(R.id.column_line);
+    }
+
+    /**
+     * 设置确定取消按钮的回调
+     */
+    private OnClickBottomListener onClickBottomListener;
+
+    public void setOnClickBottomListener(OnClickBottomListener onClickBottomListener) {
+        this.onClickBottomListener = onClickBottomListener;
+    }
+
+    public interface OnClickBottomListener {
+        /**
+         * 点击确定按钮事件
+         */
+        void onPositiveClick();
+
+        /**
+         * 点击取消按钮事件
+         */
+        void onNegtiveClick();
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public CustomDialog setMessage(String message) {
+        this.message = message;
+        return this;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public CustomDialog setTitle(String title) {
+        this.title = title;
+        return this;
+    }
+
+    public String getPositive() {
+        return positive;
+    }
+
+    public CustomDialog setPositive(String positive) {
+        this.positive = positive;
+        return this;
+    }
+
+    public String getNegtive() {
+        return negtive;
+    }
+
+    public CustomDialog setNegtive(String negtive) {
+        this.negtive = negtive;
+        return this;
+    }
+
+    public CustomDialog setNegtiveText(String negtive) {
+        negtiveBn.setText(negtive);
+        return this;
+    }
+
+    public int getImageResId() {
+        return imageResId;
+    }
+
+    public boolean isSingle() {
+        return isSingle;
+    }
+
+    public CustomDialog setSingle(boolean single) {
+        isSingle = single;
+        return this;
+    }
+
+    public CustomDialog setImageResId(int imageResId) {
+        this.imageResId = imageResId;
+        return this;
+    }
+
+    @Override
+    public void dismiss() {
+        super.dismiss();
+    }
+}
diff --git a/src/com/android/colorfulos/TTUtils/DateUtils.java b/src/com/aoleyun/os/TTUtils/DateUtils.java
similarity index 97%
rename from src/com/android/colorfulos/TTUtils/DateUtils.java
rename to src/com/aoleyun/os/TTUtils/DateUtils.java
index f9a0fed..e76d579 100644
--- a/src/com/android/colorfulos/TTUtils/DateUtils.java
+++ b/src/com/aoleyun/os/TTUtils/DateUtils.java
@@ -1,4 +1,4 @@
-package com.android.colorfulos.TTUtils;
+package com.aoleyun.os.TTUtils;
 
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
diff --git a/src/com/aoleyun/os/TTUtils/ToastUtil.java b/src/com/aoleyun/os/TTUtils/ToastUtil.java
new file mode 100644
index 0000000..6d388e0
--- /dev/null
+++ b/src/com/aoleyun/os/TTUtils/ToastUtil.java
@@ -0,0 +1,106 @@
+package com.aoleyun.os.TTUtils;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.graphics.Color;
+import android.os.Build;
+import android.os.Handler;
+import android.os.Looper;
+import android.util.Log;
+import android.view.Gravity;
+import android.widget.Toast;
+
+import com.aoleyun.os.BuildConfig;
+import com.aoleyun.os.R;
+import com.aoleyun.os.uiuiutils.JGYUtils;
+import com.blankj.utilcode.util.ColorUtils;
+import com.blankj.utilcode.util.ToastUtils;
+
+
+/**
+ * Created by haoge on 2017/3/2.
+ */
+
+public class ToastUtil {
+    private static final String TAG = ToastUtil.class.getSimpleName();
+    @SuppressLint("StaticFieldLeak")
+    private static Context mContext;
+    private static Handler mainHandler = new Handler(Looper.getMainLooper());
+    private static Toast debugToast;
+    private static Toast toast;
+
+
+    @SuppressLint("ShowToast")
+    public static void init(Context context) {
+        mContext = context;
+        toast = Toast.makeText(mContext, "", Toast.LENGTH_SHORT);
+        debugToast = Toast.makeText(mContext, "", Toast.LENGTH_SHORT);
+
+    }
+
+    private static long time1 = 0L;
+    private static long time2 = 0L;
+
+    public static void show(final String msg) {
+        ToastUtils.make()
+//                .setBgColor(ColorUtils.getColor(R.color.toast_color))
+                .setTextColor(Color.DKGRAY)
+//                .setGravity(Gravity.CENTER, 0, 0)
+                .setNotUseSystemToast()
+                .show(msg);
+    }
+
+    public static void betaShow(final String msg) {
+        if (JGYUtils.isBetaVersion() || BuildConfig.DEBUG) {
+            ToastUtils.make()
+//                    .setBgColor(ColorUtils.getColor(R.color.toast_color))
+                    .setTextColor(Color.RED)
+//                    .setGravity(Gravity.CENTER, 0, 0)
+                    .setNotUseSystemToast()
+                    .setDurationIsLong(true)
+                    .show(msg);
+        } else {
+            Log.e(TAG, "debugShow: " + msg);
+        }
+    }
+
+    public static void showCenter(final String msg) {
+        ToastUtils.make()
+                .setBgColor(ColorUtils.getColor(R.color.toast_color))
+                .setTextColor(Color.WHITE)
+                .setGravity(Gravity.CENTER, 0, 0)
+                .setNotUseSystemToast()
+                .show(msg);
+    }
+
+    private static Toast mToast = null;
+
+    //android 8.0以后限制
+    //https://www.jianshu.com/p/d9813ad03d59
+    //https://www.jianshu.com/p/050ce052b873
+    public static void showToast(Context context, String text, int duration) {
+        if (Build.VERSION.SDK_INT == Build.VERSION_CODES.P) {
+            Toast.makeText(context, text, duration).show();
+        } else {
+            if (mToast == null) {
+                mToast = Toast.makeText(context, text, duration);
+            } else {
+                mToast.setText(text);
+                mToast.setDuration(duration);
+            }
+            mToast.show();
+        }
+    }
+
+    //    public static void showInCenter(String msg) {
+//        mainHandler.post(() -> {
+//            if (toast != null) {
+//                toast.setGravity(Gravity.CENTER, 0, 0);
+//                toast.setText(msg);
+//                toast.show();
+//            }
+//        });
+//    }
+
+
+}
diff --git a/src/com/aoleyun/os/TTUtils/Utils.java b/src/com/aoleyun/os/TTUtils/Utils.java
new file mode 100644
index 0000000..a588b1a
--- /dev/null
+++ b/src/com/aoleyun/os/TTUtils/Utils.java
@@ -0,0 +1,123 @@
+package com.aoleyun.os.TTUtils;
+
+import android.annotation.SuppressLint;
+import android.app.ActivityManager;
+import android.app.ActivityManagerNative;
+import android.app.ActivityTaskManager;
+import android.content.Context;
+import android.content.pm.UserInfo;
+import android.os.Build;
+import android.os.RemoteException;
+import android.text.TextUtils;
+import android.util.Log;
+
+import com.aoleyun.os.BuildConfig;
+
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+import static android.app.ActivityManager.RECENT_IGNORE_UNAVAILABLE;
+
+public class Utils {
+    private static String TAG = Utils.class.getSimpleName();
+
+    /**
+     * 获取设备序列号
+     *
+     * @return
+     */
+    @SuppressLint({"MissingPermission", "NewApi"})
+    public static String getSerial() {
+        String serial = "unknow";
+        try {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {//9.0+
+                serial = Build.getSerial();
+            } else if (Build.VERSION.SDK_INT > Build.VERSION_CODES.N) {//8.0+
+                serial = Build.SERIAL;
+            } else {//8.0-
+                Class<?> c = Class.forName("android.os.SystemProperties");
+                Method get = c.getMethod("get", String.class);
+                serial = (String) get.invoke(c, "ro.serialno");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            Log.e("e", "读取设备序列号异常：" + e.toString());
+        }
+        return serial;
+    }
+
+
+    /**
+     * 清除所有最近记录
+     */
+    public void removeAllTask(Context context) {
+        List<ActivityManager.RecentTaskInfo> list = getRecentTasks(ActivityManager.getMaxRecentTasksStatic(), getCurrentUserId());
+
+        for (ActivityManager.RecentTaskInfo info : list) {
+            if (info.realActivity != null) {
+                Log.e(TAG, "removeAllTask: " + info.realActivity.getPackageName());
+                //排除自身
+                if (BuildConfig.APPLICATION_ID.equals(info.realActivity.getPackageName())) {
+                    continue;
+                }
+            }
+            try {
+                ActivityManagerNative.getDefault().removeTask(info.id);
+            } catch (RemoteException e) {
+                e.printStackTrace();
+                Log.e(TAG, "removeAllTask: " + e.getMessage());
+            }
+        }
+    }
+
+    /**
+     * 如果界面正在最近任务列表，有些app可能不会被清理
+     */
+    public static void removeTask(String packageName) {
+        if (TextUtils.isEmpty(packageName)) return;
+        List<ActivityManager.RecentTaskInfo> list = getRecentTasks(ActivityManager.getMaxRecentTasksStatic(), getCurrentUserId());
+        HashMap<String, Integer> taskMap = new HashMap<>();
+        for (ActivityManager.RecentTaskInfo info : list) {
+            taskMap.put(info.realActivity.getPackageName(), info.id);
+        }
+        try {
+            ActivityManagerNative.getDefault().removeTask(taskMap.get(packageName));
+        } catch (RemoteException e) {
+            e.printStackTrace();
+            Log.e(TAG, "removeTask: " + e.getMessage());
+        } catch (NullPointerException e) {
+            e.printStackTrace();
+            Log.e(TAG, "removeTask: " + e.getMessage());
+        }
+    }
+
+    /**
+     * @return a list of the recents tasks.
+     * 获取近期任务列表
+     */
+    public static List<ActivityManager.RecentTaskInfo> getRecentTasks(int numTasks, int userId) {
+        try {
+            return ActivityTaskManager.getService().getRecentTasks(numTasks,
+                    RECENT_IGNORE_UNAVAILABLE, userId).getList();
+        } catch (RemoteException e) {
+            Log.e(TAG, "Failed to get recent tasks " + e);
+            return new ArrayList<>();
+        }
+    }
+
+    /**
+     * @return the current user's id.
+     * 获取userId
+     */
+    public static int getCurrentUserId() {
+        UserInfo ui;
+        try {
+            ui = ActivityManager.getService().getCurrentUser();
+            return ui != null ? ui.id : 0;
+        } catch (RemoteException e) {
+            throw e.rethrowFromSystemServer();
+        }
+    }
+}
diff --git a/src/com/android/colorfulos/Utilities.java b/src/com/aoleyun/os/Utilities.java
similarity index 96%
rename from src/com/android/colorfulos/Utilities.java
rename to src/com/aoleyun/os/Utilities.java
index 814783b..1dc2183 100644
--- a/src/com/android/colorfulos/Utilities.java
+++ b/src/com/aoleyun/os/Utilities.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos;
+package com.aoleyun.os;
 
 import android.animation.ValueAnimator;
 import android.annotation.TargetApi;
@@ -64,19 +64,20 @@ import android.view.View;
 import android.view.ViewConfiguration;
 import android.view.animation.Interpolator;
 
-import com.android.colorfulos.compat.LauncherAppsCompat;
-import com.android.colorfulos.compat.ShortcutConfigActivityInfo;
-import com.android.colorfulos.config.FeatureFlags;
-import com.android.colorfulos.dragndrop.FolderAdaptiveIcon;
-import com.android.colorfulos.graphics.RotationMode;
-import com.android.colorfulos.graphics.TintedDrawableSpan;
-import com.android.colorfulos.icons.LauncherIcons;
-import com.android.colorfulos.shortcuts.DeepShortcutManager;
-import com.android.colorfulos.shortcuts.ShortcutKey;
-import com.android.colorfulos.util.IntArray;
-import com.android.colorfulos.util.PackageManagerHelper;
-import com.android.colorfulos.views.Transposable;
-import com.android.colorfulos.widget.PendingAddShortcutInfo;
+import com.aoleyun.os.R;
+import com.aoleyun.os.compat.LauncherAppsCompat;
+import com.aoleyun.os.compat.ShortcutConfigActivityInfo;
+import com.aoleyun.os.config.FeatureFlags;
+import com.aoleyun.os.dragndrop.FolderAdaptiveIcon;
+import com.aoleyun.os.graphics.RotationMode;
+import com.aoleyun.os.graphics.TintedDrawableSpan;
+import com.aoleyun.os.icons.LauncherIcons;
+import com.aoleyun.os.shortcuts.DeepShortcutManager;
+import com.aoleyun.os.shortcuts.ShortcutKey;
+import com.aoleyun.os.util.IntArray;
+import com.aoleyun.os.util.PackageManagerHelper;
+import com.aoleyun.os.views.Transposable;
+import com.aoleyun.os.widget.PendingAddShortcutInfo;
 
 import java.io.Closeable;
 import java.io.IOException;
@@ -92,7 +93,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static com.android.colorfulos.ItemInfoWithIcon.FLAG_ICON_BADGED;
+import static com.aoleyun.os.ItemInfoWithIcon.FLAG_ICON_BADGED;
 
 /**
  * Various utilities shared amongst the Launcher's classes.
@@ -151,8 +152,8 @@ public final class Utilities {
     }
 
     // An intent extra to indicate the horizontal scroll of the wallpaper.
-    public static final String EXTRA_WALLPAPER_OFFSET = "com.android.colorfulos.WALLPAPER_OFFSET";
-    public static final String EXTRA_WALLPAPER_FLAVOR = "com.android.colorfulos.WALLPAPER_FLAVOR";
+    public static final String EXTRA_WALLPAPER_OFFSET = "com.aoleyun.os.WALLPAPER_OFFSET";
+    public static final String EXTRA_WALLPAPER_FLAVOR = "com.aoleyun.os.WALLPAPER_FLAVOR";
 
     // These values are same as that in {@link AsyncTask}.
     private static final int CPU_COUNT = Runtime.getRuntime().availableProcessors();
diff --git a/src/com/android/colorfulos/WidgetPreviewLoader.java b/src/com/aoleyun/os/WidgetPreviewLoader.java
similarity index 97%
rename from src/com/android/colorfulos/WidgetPreviewLoader.java
rename to src/com/aoleyun/os/WidgetPreviewLoader.java
index 59235ba..3ff3e6c 100644
--- a/src/com/android/colorfulos/WidgetPreviewLoader.java
+++ b/src/com/aoleyun/os/WidgetPreviewLoader.java
@@ -1,4 +1,4 @@
-package com.android.colorfulos;
+package com.aoleyun.os;
 
 import android.content.ComponentName;
 import android.content.ContentValues;
@@ -29,20 +29,21 @@ import android.os.UserHandle;
 import android.util.Log;
 import android.util.LongSparseArray;
 
-import com.android.colorfulos.compat.AppWidgetManagerCompat;
-import com.android.colorfulos.compat.ShortcutConfigActivityInfo;
-import com.android.colorfulos.compat.UserManagerCompat;
-import com.android.colorfulos.icons.GraphicsUtils;
-import com.android.colorfulos.icons.LauncherIcons;
-import com.android.colorfulos.icons.ShadowGenerator;
-import com.android.colorfulos.icons.IconCache;
-import com.android.colorfulos.model.WidgetItem;
-import com.android.colorfulos.util.ComponentKey;
-import com.android.colorfulos.util.PackageUserKey;
-import com.android.colorfulos.util.Preconditions;
-import com.android.colorfulos.util.SQLiteCacheHelper;
-import com.android.colorfulos.util.Thunk;
-import com.android.colorfulos.widget.WidgetCell;
+import com.aoleyun.os.R;
+import com.aoleyun.os.compat.AppWidgetManagerCompat;
+import com.aoleyun.os.compat.ShortcutConfigActivityInfo;
+import com.aoleyun.os.compat.UserManagerCompat;
+import com.aoleyun.os.icons.GraphicsUtils;
+import com.aoleyun.os.icons.LauncherIcons;
+import com.aoleyun.os.icons.ShadowGenerator;
+import com.aoleyun.os.icons.IconCache;
+import com.aoleyun.os.model.WidgetItem;
+import com.aoleyun.os.util.ComponentKey;
+import com.aoleyun.os.util.PackageUserKey;
+import com.aoleyun.os.util.Preconditions;
+import com.aoleyun.os.util.SQLiteCacheHelper;
+import com.aoleyun.os.util.Thunk;
+import com.aoleyun.os.widget.WidgetCell;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -68,7 +69,8 @@ public class WidgetPreviewLoader {
      * Note: synchronized block used for this variable is expensive and the block should always
      * be posted to a background thread.
      */
-    @Thunk final Set<Bitmap> mUnusedBitmaps =
+    @Thunk
+    final Set<Bitmap> mUnusedBitmaps =
             Collections.newSetFromMap(new WeakHashMap<Bitmap, Boolean>());
 
     private final Context mContext;
@@ -94,7 +96,7 @@ public class WidgetPreviewLoader {
      * @return a request id which can be used to cancel the request.
      */
     public CancellationSignal getPreview(WidgetItem item, int previewWidth,
-            int previewHeight, WidgetCell caller) {
+                                         int previewHeight, WidgetCell caller) {
         String size = previewWidth + "x" + previewHeight;
         WidgetCacheKey key = new WidgetCacheKey(item.componentName, item.user, size);
 
diff --git a/src/com/android/colorfulos/Workspace.java b/src/com/aoleyun/os/Workspace.java
similarity index 97%
rename from src/com/android/colorfulos/Workspace.java
rename to src/com/aoleyun/os/Workspace.java
index 3f99a06..7b231bf 100644
--- a/src/com/android/colorfulos/Workspace.java
+++ b/src/com/aoleyun/os/Workspace.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos;
+package com.aoleyun.os;
 
-import static com.android.colorfulos.LauncherAnimUtils.OVERVIEW_TRANSITION_MS;
-import static com.android.colorfulos.LauncherAnimUtils.SPRING_LOADED_EXIT_DELAY;
-import static com.android.colorfulos.LauncherAnimUtils.SPRING_LOADED_TRANSITION_MS;
-import static com.android.colorfulos.LauncherSettings.Favorites.ITEM_TYPE_APPLICATION;
-import static com.android.colorfulos.LauncherState.ALL_APPS;
-import static com.android.colorfulos.LauncherState.NORMAL;
-import static com.android.colorfulos.LauncherState.SPRING_LOADED;
-import static com.android.colorfulos.config.FeatureFlags.ADAPTIVE_ICON_WINDOW_ANIM;
-import static com.android.colorfulos.dragndrop.DragLayer.ALPHA_INDEX_OVERLAY;
+import static com.aoleyun.os.LauncherAnimUtils.OVERVIEW_TRANSITION_MS;
+import static com.aoleyun.os.LauncherAnimUtils.SPRING_LOADED_EXIT_DELAY;
+import static com.aoleyun.os.LauncherAnimUtils.SPRING_LOADED_TRANSITION_MS;
+import static com.aoleyun.os.LauncherSettings.Favorites.ITEM_TYPE_APPLICATION;
+import static com.aoleyun.os.LauncherState.ALL_APPS;
+import static com.aoleyun.os.LauncherState.NORMAL;
+import static com.aoleyun.os.LauncherState.SPRING_LOADED;
+import static com.aoleyun.os.config.FeatureFlags.ADAPTIVE_ICON_WINDOW_ANIM;
+import static com.aoleyun.os.dragndrop.DragLayer.ALPHA_INDEX_OVERLAY;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -60,45 +60,45 @@ import android.view.ViewTreeObserver;
 import android.view.accessibility.AccessibilityNodeInfo;
 import android.widget.Toast;
 
-import com.android.colorfulos.Launcher.LauncherOverlay;
-import com.android.colorfulos.LauncherAppWidgetHost.ProviderChangedListener;
-import com.android.colorfulos.LauncherStateManager.AnimationConfig;
-import com.android.colorfulos.accessibility.AccessibleDragListenerAdapter;
-import com.android.colorfulos.accessibility.WorkspaceAccessibilityHelper;
-import com.android.colorfulos.anim.AnimatorSetBuilder;
-import com.android.colorfulos.anim.Interpolators;
-import com.android.colorfulos.dot.FolderDotInfo;
-import com.android.colorfulos.compat.AppWidgetManagerCompat;
-import com.android.colorfulos.config.FeatureFlags;
-import com.android.colorfulos.dragndrop.DragController;
-import com.android.colorfulos.dragndrop.DragLayer;
-import com.android.colorfulos.dragndrop.DragOptions;
-import com.android.colorfulos.dragndrop.DragView;
-import com.android.colorfulos.dragndrop.SpringLoadedDragController;
-import com.android.colorfulos.folder.Folder;
-import com.android.colorfulos.folder.FolderIcon;
-import com.android.colorfulos.folder.PreviewBackground;
-import com.android.colorfulos.graphics.DragPreviewProvider;
-import com.android.colorfulos.graphics.PreloadIconDrawable;
-import com.android.colorfulos.graphics.RotationMode;
-import com.android.colorfulos.pageindicators.PageIndicatorDots;
-import com.android.colorfulos.shortcuts.ShortcutDragPreviewProvider;
-import com.android.colorfulos.testing.TestProtocol;
-import com.android.colorfulos.touch.WorkspaceTouchListener;
-import com.android.colorfulos.userevent.nano.LauncherLogProto.Action;
-import com.android.colorfulos.userevent.nano.LauncherLogProto.ContainerType;
-import com.android.colorfulos.userevent.nano.LauncherLogProto.Target;
-import com.android.colorfulos.util.IntArray;
-import com.android.colorfulos.util.IntSet;
-import com.android.colorfulos.util.IntSparseArrayMap;
-import com.android.colorfulos.util.ItemInfoMatcher;
-import com.android.colorfulos.util.PackageUserKey;
-import com.android.colorfulos.util.Thunk;
-import com.android.colorfulos.util.WallpaperOffsetInterpolator;
-import com.android.colorfulos.widget.LauncherAppWidgetHostView;
-import com.android.colorfulos.widget.PendingAddShortcutInfo;
-import com.android.colorfulos.widget.PendingAddWidgetInfo;
-import com.android.colorfulos.widget.PendingAppWidgetHostView;
+import com.aoleyun.os.LauncherAppWidgetHost.ProviderChangedListener;
+import com.aoleyun.os.LauncherStateManager.AnimationConfig;
+import com.aoleyun.os.R;
+import com.aoleyun.os.accessibility.AccessibleDragListenerAdapter;
+import com.aoleyun.os.accessibility.WorkspaceAccessibilityHelper;
+import com.aoleyun.os.anim.AnimatorSetBuilder;
+import com.aoleyun.os.anim.Interpolators;
+import com.aoleyun.os.dot.FolderDotInfo;
+import com.aoleyun.os.compat.AppWidgetManagerCompat;
+import com.aoleyun.os.config.FeatureFlags;
+import com.aoleyun.os.dragndrop.DragController;
+import com.aoleyun.os.dragndrop.DragLayer;
+import com.aoleyun.os.dragndrop.DragOptions;
+import com.aoleyun.os.dragndrop.DragView;
+import com.aoleyun.os.dragndrop.SpringLoadedDragController;
+import com.aoleyun.os.folder.Folder;
+import com.aoleyun.os.folder.FolderIcon;
+import com.aoleyun.os.folder.PreviewBackground;
+import com.aoleyun.os.graphics.DragPreviewProvider;
+import com.aoleyun.os.graphics.PreloadIconDrawable;
+import com.aoleyun.os.graphics.RotationMode;
+import com.aoleyun.os.pageindicators.PageIndicatorDots;
+import com.aoleyun.os.shortcuts.ShortcutDragPreviewProvider;
+import com.aoleyun.os.testing.TestProtocol;
+import com.aoleyun.os.touch.WorkspaceTouchListener;
+import com.aoleyun.os.userevent.nano.LauncherLogProto.Action;
+import com.aoleyun.os.userevent.nano.LauncherLogProto.ContainerType;
+import com.aoleyun.os.userevent.nano.LauncherLogProto.Target;
+import com.aoleyun.os.util.IntArray;
+import com.aoleyun.os.util.IntSet;
+import com.aoleyun.os.util.IntSparseArrayMap;
+import com.aoleyun.os.util.ItemInfoMatcher;
+import com.aoleyun.os.util.PackageUserKey;
+import com.aoleyun.os.util.Thunk;
+import com.aoleyun.os.util.WallpaperOffsetInterpolator;
+import com.aoleyun.os.widget.LauncherAppWidgetHostView;
+import com.aoleyun.os.widget.PendingAddShortcutInfo;
+import com.aoleyun.os.widget.PendingAddWidgetInfo;
+import com.aoleyun.os.widget.PendingAppWidgetHostView;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -236,7 +236,7 @@ public class Workspace extends PagedView<PageIndicatorDots>
     private float mTransitionProgress;
 
     // State related to Launcher Overlay
-    LauncherOverlay mLauncherOverlay;
+    Launcher.LauncherOverlay mLauncherOverlay;
     boolean mScrollInteractionBegan;
     boolean mStartedSendingScrollEvents;
     float mLastOverlayScroll = 0;
@@ -501,7 +501,7 @@ public class Workspace extends PagedView<PageIndicatorDots>
             return;
         }
         // Add the first page
-        CellLayout firstPage = insertNewWorkspaceScreen(Workspace.FIRST_SCREEN_ID, 0);
+        CellLayout firstPage = insertNewWorkspaceScreen(FIRST_SCREEN_ID, 0);
         // Always add a QSB on the first screen.
 //        if (qsb == null) {
 //            // In transposed layout, we add the QSB in the Grid. As workspace does not touch the
@@ -965,7 +965,7 @@ public class Workspace extends PagedView<PageIndicatorDots>
         }
     }
 
-    public void setLauncherOverlay(LauncherOverlay overlay) {
+    public void setLauncherOverlay(Launcher.LauncherOverlay overlay) {
         mLauncherOverlay = overlay;
         // A new overlay has been set. Reset event tracking
         mStartedSendingScrollEvents = false;
@@ -1261,7 +1261,7 @@ public class Workspace extends PagedView<PageIndicatorDots>
     @Override
     public int getDescendantFocusability() {
         if (workspaceInModalState()) {
-            return ViewGroup.FOCUS_BLOCK_DESCENDANTS;
+            return FOCUS_BLOCK_DESCENDANTS;
         }
         return super.getDescendantFocusability();
     }
diff --git a/src/com/android/colorfulos/WorkspaceItemInfo.java b/src/com/aoleyun/os/WorkspaceItemInfo.java
similarity index 96%
rename from src/com/android/colorfulos/WorkspaceItemInfo.java
rename to src/com/aoleyun/os/WorkspaceItemInfo.java
index b11b739..4084afa 100644
--- a/src/com/android/colorfulos/WorkspaceItemInfo.java
+++ b/src/com/aoleyun/os/WorkspaceItemInfo.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos;
+package com.aoleyun.os;
 
 import android.content.ComponentName;
 import android.content.Context;
@@ -22,10 +22,10 @@ import android.content.Intent;
 import android.content.pm.ShortcutInfo;
 import android.text.TextUtils;
 
-import com.android.colorfulos.LauncherSettings.Favorites;
-import com.android.colorfulos.icons.IconCache;
-import com.android.colorfulos.shortcuts.ShortcutKey;
-import com.android.colorfulos.util.ContentWriter;
+import com.aoleyun.os.LauncherSettings.Favorites;
+import com.aoleyun.os.icons.IconCache;
+import com.aoleyun.os.shortcuts.ShortcutKey;
+import com.aoleyun.os.util.ContentWriter;
 
 /**
  * Represents a launchable icon on the workspaces and in folders.
diff --git a/src/com/android/colorfulos/WorkspaceLayoutManager.java b/src/com/aoleyun/os/WorkspaceLayoutManager.java
similarity index 96%
rename from src/com/android/colorfulos/WorkspaceLayoutManager.java
rename to src/com/aoleyun/os/WorkspaceLayoutManager.java
index 06eedb0..2b517a8 100644
--- a/src/com/android/colorfulos/WorkspaceLayoutManager.java
+++ b/src/com/aoleyun/os/WorkspaceLayoutManager.java
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos;
+package com.aoleyun.os;
 
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.android.colorfulos.folder.Folder;
-import com.android.colorfulos.folder.FolderIcon;
-import com.android.colorfulos.touch.ItemLongClickListener;
+import com.aoleyun.os.folder.Folder;
+import com.aoleyun.os.folder.FolderIcon;
+import com.aoleyun.os.touch.ItemLongClickListener;
 
 public interface WorkspaceLayoutManager {
 
diff --git a/src/com/android/colorfulos/WorkspaceStateTransitionAnimation.java b/src/com/aoleyun/os/WorkspaceStateTransitionAnimation.java
similarity index 64%
rename from src/com/android/colorfulos/WorkspaceStateTransitionAnimation.java
rename to src/com/aoleyun/os/WorkspaceStateTransitionAnimation.java
index 35937fa..93d90f2 100644
--- a/src/com/android/colorfulos/WorkspaceStateTransitionAnimation.java
+++ b/src/com/aoleyun/os/WorkspaceStateTransitionAnimation.java
@@ -14,32 +14,16 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos;
-
-import static com.android.colorfulos.LauncherAnimUtils.DRAWABLE_ALPHA;
-import static com.android.colorfulos.LauncherAnimUtils.SCALE_PROPERTY;
-import static com.android.colorfulos.LauncherState.HOTSEAT_ICONS;
-import static com.android.colorfulos.anim.AnimatorSetBuilder.ANIM_HOTSEAT_SCALE;
-import static com.android.colorfulos.anim.AnimatorSetBuilder.ANIM_HOTSEAT_TRANSLATE;
-import static com.android.colorfulos.anim.AnimatorSetBuilder.ANIM_WORKSPACE_FADE;
-import static com.android.colorfulos.anim.AnimatorSetBuilder.ANIM_WORKSPACE_SCALE;
-import static com.android.colorfulos.anim.AnimatorSetBuilder.ANIM_WORKSPACE_TRANSLATE;
-import static com.android.colorfulos.anim.Interpolators.LINEAR;
-import static com.android.colorfulos.anim.Interpolators.ZOOM_OUT;
-import static com.android.colorfulos.anim.PropertySetter.NO_ANIM_PROPERTY_SETTER;
-import static com.android.colorfulos.graphics.WorkspaceAndHotseatScrim.SCRIM_PROGRESS;
-import static com.android.colorfulos.graphics.WorkspaceAndHotseatScrim.SYSUI_PROGRESS;
+package com.aoleyun.os;
 
 import android.view.View;
 import android.view.animation.Interpolator;
 
-import com.android.colorfulos.LauncherState.PageAlphaProvider;
-import com.android.colorfulos.LauncherState.ScaleAndTranslation;
-import com.android.colorfulos.LauncherStateManager.AnimationConfig;
-import com.android.colorfulos.anim.AnimatorSetBuilder;
-import com.android.colorfulos.anim.PropertySetter;
-import com.android.colorfulos.dragndrop.DragLayer;
-import com.android.colorfulos.graphics.WorkspaceAndHotseatScrim;
+import com.aoleyun.os.anim.AnimatorSetBuilder;
+import com.aoleyun.os.anim.PropertySetter;
+import com.aoleyun.os.dragndrop.DragLayer;
+import com.aoleyun.os.graphics.WorkspaceAndHotseatScrim;
+import com.aoleyun.os.anim.Interpolators;
 
 /**
  * Manages the animations between each of the workspace states.
@@ -57,12 +41,12 @@ public class WorkspaceStateTransitionAnimation {
     }
 
     public void setState(LauncherState toState) {
-        setWorkspaceProperty(toState, NO_ANIM_PROPERTY_SETTER, new AnimatorSetBuilder(),
-                new AnimationConfig());
+        setWorkspaceProperty(toState, PropertySetter.NO_ANIM_PROPERTY_SETTER, new AnimatorSetBuilder(),
+                new LauncherStateManager.AnimationConfig());
     }
 
     public void setStateWithAnimation(LauncherState toState, AnimatorSetBuilder builder,
-            AnimationConfig config) {
+            LauncherStateManager.AnimationConfig config) {
         setWorkspaceProperty(toState, config.getPropertySetter(builder), builder, config);
     }
 
@@ -74,12 +58,12 @@ public class WorkspaceStateTransitionAnimation {
      * Starts a transition animation for the workspace.
      */
     private void setWorkspaceProperty(LauncherState state, PropertySetter propertySetter,
-            AnimatorSetBuilder builder, AnimationConfig config) {
-        ScaleAndTranslation scaleAndTranslation = state.getWorkspaceScaleAndTranslation(mLauncher);
-        ScaleAndTranslation hotseatScaleAndTranslation = state.getHotseatScaleAndTranslation(
+            AnimatorSetBuilder builder, LauncherStateManager.AnimationConfig config) {
+        LauncherState.ScaleAndTranslation scaleAndTranslation = state.getWorkspaceScaleAndTranslation(mLauncher);
+        LauncherState.ScaleAndTranslation hotseatScaleAndTranslation = state.getHotseatScaleAndTranslation(
                 mLauncher);
         mNewScale = scaleAndTranslation.scale;
-        PageAlphaProvider pageAlphaProvider = state.getWorkspacePageAlphaProvider(mLauncher);
+        LauncherState.PageAlphaProvider pageAlphaProvider = state.getWorkspacePageAlphaProvider(mLauncher);
         final int childCount = mWorkspace.getChildCount();
         for (int i = 0; i < childCount; i++) {
             applyChildState(state, (CellLayout) mWorkspace.getChildAt(i), i, pageAlphaProvider,
@@ -87,13 +71,13 @@ public class WorkspaceStateTransitionAnimation {
         }
 
         int elements = state.getVisibleElements(mLauncher);
-        Interpolator fadeInterpolator = builder.getInterpolator(ANIM_WORKSPACE_FADE,
+        Interpolator fadeInterpolator = builder.getInterpolator(AnimatorSetBuilder.ANIM_WORKSPACE_FADE,
                 pageAlphaProvider.interpolator);
         boolean playAtomicComponent = config.playAtomicOverviewScaleComponent();
         Hotseat hotseat = mWorkspace.getHotseat();
         if (playAtomicComponent) {
-            Interpolator scaleInterpolator = builder.getInterpolator(ANIM_WORKSPACE_SCALE, ZOOM_OUT);
-            propertySetter.setFloat(mWorkspace, SCALE_PROPERTY, mNewScale, scaleInterpolator);
+            Interpolator scaleInterpolator = builder.getInterpolator(AnimatorSetBuilder.ANIM_WORKSPACE_SCALE, Interpolators.ZOOM_OUT);
+            propertySetter.setFloat(mWorkspace, LauncherAnimUtils.SCALE_PROPERTY, mNewScale, scaleInterpolator);
 
             if (!hotseat.getRotationMode().isTransposed) {
                 // Set the hotseat's pivot point to match the workspace's, so that it scales together.
@@ -106,12 +90,12 @@ public class WorkspaceStateTransitionAnimation {
                 hotseat.setPivotY(workspacePivot[1]);
             }
             float hotseatScale = hotseatScaleAndTranslation.scale;
-            Interpolator hotseatScaleInterpolator = builder.getInterpolator(ANIM_HOTSEAT_SCALE,
+            Interpolator hotseatScaleInterpolator = builder.getInterpolator(AnimatorSetBuilder.ANIM_HOTSEAT_SCALE,
                     scaleInterpolator);
-            propertySetter.setFloat(hotseat, SCALE_PROPERTY, hotseatScale,
+            propertySetter.setFloat(hotseat, LauncherAnimUtils.SCALE_PROPERTY, hotseatScale,
                     hotseatScaleInterpolator);
 
-            float hotseatIconsAlpha = (elements & HOTSEAT_ICONS) != 0 ? 1 : 0;
+            float hotseatIconsAlpha = (elements & LauncherState.HOTSEAT_ICONS) != 0 ? 1 : 0;
             propertySetter.setViewAlpha(hotseat, hotseatIconsAlpha, fadeInterpolator);
             propertySetter.setViewAlpha(mLauncher.getWorkspace().getPageIndicator(),
                     hotseatIconsAlpha, fadeInterpolator);
@@ -123,15 +107,15 @@ public class WorkspaceStateTransitionAnimation {
         }
 
         Interpolator translationInterpolator = !playAtomicComponent
-                ? LINEAR
-                : builder.getInterpolator(ANIM_WORKSPACE_TRANSLATE, ZOOM_OUT);
+                ? Interpolators.LINEAR
+                : builder.getInterpolator(AnimatorSetBuilder.ANIM_WORKSPACE_TRANSLATE, Interpolators.ZOOM_OUT);
         propertySetter.setFloat(mWorkspace, View.TRANSLATION_X,
                 scaleAndTranslation.translationX, translationInterpolator);
         propertySetter.setFloat(mWorkspace, View.TRANSLATION_Y,
                 scaleAndTranslation.translationY, translationInterpolator);
 
         Interpolator hotseatTranslationInterpolator = builder.getInterpolator(
-                ANIM_HOTSEAT_TRANSLATE, translationInterpolator);
+                AnimatorSetBuilder.ANIM_HOTSEAT_TRANSLATE, translationInterpolator);
         propertySetter.setFloat(hotseat, View.TRANSLATION_Y,
                 hotseatScaleAndTranslation.translationY, hotseatTranslationInterpolator);
         propertySetter.setFloat(mWorkspace.getPageIndicator(), View.TRANSLATION_Y,
@@ -142,28 +126,28 @@ public class WorkspaceStateTransitionAnimation {
 
     public void setScrim(PropertySetter propertySetter, LauncherState state) {
         WorkspaceAndHotseatScrim scrim = mLauncher.getDragLayer().getScrim();
-        propertySetter.setFloat(scrim, SCRIM_PROGRESS, state.getWorkspaceScrimAlpha(mLauncher),
-                LINEAR);
-        propertySetter.setFloat(scrim, SYSUI_PROGRESS, state.hasSysUiScrim ? 1 : 0, LINEAR);
+        propertySetter.setFloat(scrim, WorkspaceAndHotseatScrim.SCRIM_PROGRESS, state.getWorkspaceScrimAlpha(mLauncher),
+                Interpolators.LINEAR);
+        propertySetter.setFloat(scrim, WorkspaceAndHotseatScrim.SYSUI_PROGRESS, state.hasSysUiScrim ? 1 : 0, Interpolators.LINEAR);
     }
 
     public void applyChildState(LauncherState state, CellLayout cl, int childIndex) {
         applyChildState(state, cl, childIndex, state.getWorkspacePageAlphaProvider(mLauncher),
-                NO_ANIM_PROPERTY_SETTER, new AnimatorSetBuilder(), new AnimationConfig());
+                PropertySetter.NO_ANIM_PROPERTY_SETTER, new AnimatorSetBuilder(), new LauncherStateManager.AnimationConfig());
     }
 
     private void applyChildState(LauncherState state, CellLayout cl, int childIndex,
-            PageAlphaProvider pageAlphaProvider, PropertySetter propertySetter,
-            AnimatorSetBuilder builder, AnimationConfig config) {
+                                 LauncherState.PageAlphaProvider pageAlphaProvider, PropertySetter propertySetter,
+                                 AnimatorSetBuilder builder, LauncherStateManager.AnimationConfig config) {
         float pageAlpha = pageAlphaProvider.getPageAlpha(childIndex);
         int drawableAlpha = Math.round(pageAlpha * (state.hasWorkspacePageBackground ? 255 : 0));
 
         if (config.playNonAtomicComponent()) {
             propertySetter.setInt(cl.getScrimBackground(),
-                    DRAWABLE_ALPHA, drawableAlpha, ZOOM_OUT);
+                    LauncherAnimUtils.DRAWABLE_ALPHA, drawableAlpha, Interpolators.ZOOM_OUT);
         }
         if (config.playAtomicOverviewScaleComponent()) {
-            Interpolator fadeInterpolator = builder.getInterpolator(ANIM_WORKSPACE_FADE,
+            Interpolator fadeInterpolator = builder.getInterpolator(AnimatorSetBuilder.ANIM_WORKSPACE_FADE,
                     pageAlphaProvider.interpolator);
             propertySetter.setFloat(cl.getShortcutsAndWidgets(), View.ALPHA,
                     pageAlpha, fadeInterpolator);
diff --git a/src/com/android/colorfulos/accessibility/AccessibleDragListenerAdapter.java b/src/com/aoleyun/os/accessibility/AccessibleDragListenerAdapter.java
similarity index 86%
rename from src/com/android/colorfulos/accessibility/AccessibleDragListenerAdapter.java
rename to src/com/aoleyun/os/accessibility/AccessibleDragListenerAdapter.java
index d9700cf..2a7e436 100644
--- a/src/com/android/colorfulos/accessibility/AccessibleDragListenerAdapter.java
+++ b/src/com/aoleyun/os/accessibility/AccessibleDragListenerAdapter.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.accessibility;
+package com.aoleyun.os.accessibility;
 
 import android.view.ViewGroup;
 
-import com.android.colorfulos.CellLayout;
-import com.android.colorfulos.DropTarget.DragObject;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.dragndrop.DragController.DragListener;
-import com.android.colorfulos.dragndrop.DragOptions;
+import com.aoleyun.os.CellLayout;
+import com.aoleyun.os.DropTarget.DragObject;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.dragndrop.DragController.DragListener;
+import com.aoleyun.os.dragndrop.DragOptions;
 
 /**
  * Utility listener to enable/disable accessibility drag flags for a ViewGroup
diff --git a/src/com/android/colorfulos/accessibility/DragAndDropAccessibilityDelegate.java b/src/com/aoleyun/os/accessibility/DragAndDropAccessibilityDelegate.java
similarity index 96%
rename from src/com/android/colorfulos/accessibility/DragAndDropAccessibilityDelegate.java
rename to src/com/aoleyun/os/accessibility/DragAndDropAccessibilityDelegate.java
index 282c1b3..6164dc1 100644
--- a/src/com/android/colorfulos/accessibility/DragAndDropAccessibilityDelegate.java
+++ b/src/com/aoleyun/os/accessibility/DragAndDropAccessibilityDelegate.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.accessibility;
+package com.aoleyun.os.accessibility;
 
 import android.content.Context;
 import android.graphics.Rect;
@@ -23,9 +23,9 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.accessibility.AccessibilityEvent;
 
-import com.android.colorfulos.CellLayout;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.R;
+import com.aoleyun.os.CellLayout;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.R;
 
 import java.util.List;
 
diff --git a/src/com/android/colorfulos/accessibility/DragViewStateAnnouncer.java b/src/com/aoleyun/os/accessibility/DragViewStateAnnouncer.java
similarity index 91%
rename from src/com/android/colorfulos/accessibility/DragViewStateAnnouncer.java
rename to src/com/aoleyun/os/accessibility/DragViewStateAnnouncer.java
index a86b938..d17fc42 100644
--- a/src/com/android/colorfulos/accessibility/DragViewStateAnnouncer.java
+++ b/src/com/aoleyun/os/accessibility/DragViewStateAnnouncer.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.accessibility;
+package com.aoleyun.os.accessibility;
 
-import static com.android.colorfulos.compat.AccessibilityManagerCompat.isAccessibilityEnabled;
+import static com.aoleyun.os.compat.AccessibilityManagerCompat.isAccessibilityEnabled;
 
 import android.view.View;
 import android.view.accessibility.AccessibilityEvent;
 
-import com.android.colorfulos.Launcher;
+import com.aoleyun.os.Launcher;
 
 /**
  * Periodically sends accessibility events to announce ongoing state changed. Based on the
diff --git a/src/com/android/colorfulos/accessibility/FolderAccessibilityHelper.java b/src/com/aoleyun/os/accessibility/FolderAccessibilityHelper.java
similarity index 90%
rename from src/com/android/colorfulos/accessibility/FolderAccessibilityHelper.java
rename to src/com/aoleyun/os/accessibility/FolderAccessibilityHelper.java
index 5e278a3..02da2ec 100644
--- a/src/com/android/colorfulos/accessibility/FolderAccessibilityHelper.java
+++ b/src/com/aoleyun/os/accessibility/FolderAccessibilityHelper.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.accessibility;
+package com.aoleyun.os.accessibility;
 
-import com.android.colorfulos.CellLayout;
-import com.android.colorfulos.R;
-import com.android.colorfulos.folder.FolderPagedView;
+import com.aoleyun.os.CellLayout;
+import com.aoleyun.os.R;
+import com.aoleyun.os.folder.FolderPagedView;
 
 /**
  * Implementation of {@link DragAndDropAccessibilityDelegate} to support DnD in a folder.
diff --git a/src/com/android/colorfulos/accessibility/LauncherAccessibilityDelegate.java b/src/com/aoleyun/os/accessibility/LauncherAccessibilityDelegate.java
similarity index 92%
rename from src/com/android/colorfulos/accessibility/LauncherAccessibilityDelegate.java
rename to src/com/aoleyun/os/accessibility/LauncherAccessibilityDelegate.java
index 0774144..87736b1 100644
--- a/src/com/android/colorfulos/accessibility/LauncherAccessibilityDelegate.java
+++ b/src/com/aoleyun/os/accessibility/LauncherAccessibilityDelegate.java
@@ -1,6 +1,6 @@
-package com.android.colorfulos.accessibility;
+package com.aoleyun.os.accessibility;
 
-import static com.android.colorfulos.LauncherState.NORMAL;
+import static com.aoleyun.os.LauncherState.NORMAL;
 
 import android.app.AlertDialog;
 import android.appwidget.AppWidgetProviderInfo;
@@ -16,32 +16,32 @@ import android.view.View.AccessibilityDelegate;
 import android.view.accessibility.AccessibilityNodeInfo;
 import android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction;
 
-import com.android.colorfulos.AppInfo;
-import com.android.colorfulos.AppWidgetResizeFrame;
-import com.android.colorfulos.BubbleTextView;
-import com.android.colorfulos.ButtonDropTarget;
-import com.android.colorfulos.CellLayout;
-import com.android.colorfulos.DropTarget.DragObject;
-import com.android.colorfulos.FolderInfo;
-import com.android.colorfulos.ItemInfo;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.LauncherAppWidgetInfo;
-import com.android.colorfulos.LauncherSettings;
-import com.android.colorfulos.LauncherSettings.Favorites;
-import com.android.colorfulos.PendingAddItemInfo;
-import com.android.colorfulos.R;
-import com.android.colorfulos.WorkspaceItemInfo;
-import com.android.colorfulos.Workspace;
-import com.android.colorfulos.dragndrop.DragController.DragListener;
-import com.android.colorfulos.dragndrop.DragOptions;
-import com.android.colorfulos.folder.Folder;
-import com.android.colorfulos.notification.NotificationListener;
-import com.android.colorfulos.popup.PopupContainerWithArrow;
-import com.android.colorfulos.shortcuts.DeepShortcutManager;
-import com.android.colorfulos.touch.ItemLongClickListener;
-import com.android.colorfulos.util.IntArray;
-import com.android.colorfulos.util.Thunk;
-import com.android.colorfulos.widget.LauncherAppWidgetHostView;
+import com.aoleyun.os.AppInfo;
+import com.aoleyun.os.AppWidgetResizeFrame;
+import com.aoleyun.os.BubbleTextView;
+import com.aoleyun.os.ButtonDropTarget;
+import com.aoleyun.os.CellLayout;
+import com.aoleyun.os.DropTarget.DragObject;
+import com.aoleyun.os.FolderInfo;
+import com.aoleyun.os.ItemInfo;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.LauncherAppWidgetInfo;
+import com.aoleyun.os.LauncherSettings;
+import com.aoleyun.os.LauncherSettings.Favorites;
+import com.aoleyun.os.PendingAddItemInfo;
+import com.aoleyun.os.R;
+import com.aoleyun.os.WorkspaceItemInfo;
+import com.aoleyun.os.Workspace;
+import com.aoleyun.os.dragndrop.DragController.DragListener;
+import com.aoleyun.os.dragndrop.DragOptions;
+import com.aoleyun.os.folder.Folder;
+import com.aoleyun.os.notification.NotificationListener;
+import com.aoleyun.os.popup.PopupContainerWithArrow;
+import com.aoleyun.os.shortcuts.DeepShortcutManager;
+import com.aoleyun.os.touch.ItemLongClickListener;
+import com.aoleyun.os.util.IntArray;
+import com.aoleyun.os.util.Thunk;
+import com.aoleyun.os.widget.LauncherAppWidgetHostView;
 
 import java.util.ArrayList;
 
diff --git a/src/com/android/colorfulos/accessibility/ShortcutMenuAccessibilityDelegate.java b/src/com/aoleyun/os/accessibility/ShortcutMenuAccessibilityDelegate.java
similarity index 87%
rename from src/com/android/colorfulos/accessibility/ShortcutMenuAccessibilityDelegate.java
rename to src/com/aoleyun/os/accessibility/ShortcutMenuAccessibilityDelegate.java
index 0b3b69b..9c22a36 100644
--- a/src/com/android/colorfulos/accessibility/ShortcutMenuAccessibilityDelegate.java
+++ b/src/com/aoleyun/os/accessibility/ShortcutMenuAccessibilityDelegate.java
@@ -14,22 +14,22 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.accessibility;
+package com.aoleyun.os.accessibility;
 
-import static com.android.colorfulos.LauncherState.NORMAL;
+import static com.aoleyun.os.LauncherState.NORMAL;
 
 import android.view.View;
 import android.view.accessibility.AccessibilityNodeInfo;
 import android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction;
 
-import com.android.colorfulos.AbstractFloatingView;
-import com.android.colorfulos.ItemInfo;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.LauncherSettings;
-import com.android.colorfulos.R;
-import com.android.colorfulos.WorkspaceItemInfo;
-import com.android.colorfulos.notification.NotificationMainView;
-import com.android.colorfulos.shortcuts.DeepShortcutView;
+import com.aoleyun.os.AbstractFloatingView;
+import com.aoleyun.os.ItemInfo;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.LauncherSettings;
+import com.aoleyun.os.R;
+import com.aoleyun.os.WorkspaceItemInfo;
+import com.aoleyun.os.notification.NotificationMainView;
+import com.aoleyun.os.shortcuts.DeepShortcutView;
 
 import java.util.ArrayList;
 
diff --git a/src/com/android/colorfulos/accessibility/WorkspaceAccessibilityHelper.java b/src/com/aoleyun/os/accessibility/WorkspaceAccessibilityHelper.java
similarity index 93%
rename from src/com/android/colorfulos/accessibility/WorkspaceAccessibilityHelper.java
rename to src/com/aoleyun/os/accessibility/WorkspaceAccessibilityHelper.java
index 548d64e..8c9c6a7 100644
--- a/src/com/android/colorfulos/accessibility/WorkspaceAccessibilityHelper.java
+++ b/src/com/aoleyun/os/accessibility/WorkspaceAccessibilityHelper.java
@@ -14,22 +14,22 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.accessibility;
+package com.aoleyun.os.accessibility;
 
 import android.content.Context;
 import android.graphics.Rect;
 import android.text.TextUtils;
 import android.view.View;
 
-import com.android.colorfulos.AppInfo;
-import com.android.colorfulos.CellLayout;
-import com.android.colorfulos.FolderInfo;
-import com.android.colorfulos.ItemInfo;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.R;
-import com.android.colorfulos.WorkspaceItemInfo;
-import com.android.colorfulos.accessibility.LauncherAccessibilityDelegate.DragType;
-import com.android.colorfulos.dragndrop.DragLayer;
+import com.aoleyun.os.AppInfo;
+import com.aoleyun.os.CellLayout;
+import com.aoleyun.os.FolderInfo;
+import com.aoleyun.os.ItemInfo;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.R;
+import com.aoleyun.os.WorkspaceItemInfo;
+import com.aoleyun.os.accessibility.LauncherAccessibilityDelegate.DragType;
+import com.aoleyun.os.dragndrop.DragLayer;
 
 import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
 
diff --git a/src/com/android/colorfulos/allapps/AllAppsBackgroundDrawable.java b/src/com/aoleyun/os/allapps/AllAppsBackgroundDrawable.java
similarity index 97%
rename from src/com/android/colorfulos/allapps/AllAppsBackgroundDrawable.java
rename to src/com/aoleyun/os/allapps/AllAppsBackgroundDrawable.java
index bb9caea..154e4b7 100644
--- a/src/com/android/colorfulos/allapps/AllAppsBackgroundDrawable.java
+++ b/src/com/aoleyun/os/allapps/AllAppsBackgroundDrawable.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.allapps;
+package com.aoleyun.os.allapps;
 
 import android.animation.ObjectAnimator;
 import android.content.Context;
@@ -26,9 +26,9 @@ import android.graphics.drawable.Drawable;
 import android.view.ContextThemeWrapper;
 import android.view.Gravity;
 
-import com.android.colorfulos.LauncherAnimUtils;
-import com.android.colorfulos.R;
-import com.android.colorfulos.util.Themes;
+import com.aoleyun.os.LauncherAnimUtils;
+import com.aoleyun.os.R;
+import com.aoleyun.os.util.Themes;
 
 /**
  * This is a custom composite drawable that has a fixed virtual size and dynamically lays out its
diff --git a/src/com/android/colorfulos/allapps/AllAppsContainerView.java b/src/com/aoleyun/os/allapps/AllAppsContainerView.java
similarity index 94%
rename from src/com/android/colorfulos/allapps/AllAppsContainerView.java
rename to src/com/aoleyun/os/allapps/AllAppsContainerView.java
index e8689d5..4a2dbd8 100644
--- a/src/com/android/colorfulos/allapps/AllAppsContainerView.java
+++ b/src/com/aoleyun/os/allapps/AllAppsContainerView.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.allapps;
+package com.aoleyun.os.allapps;
 
 import android.animation.ValueAnimator;
 import android.content.Context;
@@ -34,30 +34,30 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowInsets;
 
-import com.android.colorfulos.AppInfo;
-import com.android.colorfulos.DeviceProfile;
-import com.android.colorfulos.DeviceProfile.OnDeviceProfileChangeListener;
-import com.android.colorfulos.DragSource;
-import com.android.colorfulos.DropTarget.DragObject;
-import com.android.colorfulos.Insettable;
-import com.android.colorfulos.InsettableFrameLayout;
-import com.android.colorfulos.ItemInfo;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.LauncherState;
-import com.android.colorfulos.R;
-import com.android.colorfulos.testing.TestProtocol;
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.compat.AccessibilityManagerCompat;
-import com.android.colorfulos.config.FeatureFlags;
-import com.android.colorfulos.keyboard.FocusedItemDecorator;
-import com.android.colorfulos.userevent.nano.LauncherLogProto.Target;
-import com.android.colorfulos.util.ItemInfoMatcher;
-import com.android.colorfulos.util.MultiValueAlpha;
-import com.android.colorfulos.util.MultiValueAlpha.AlphaProperty;
-import com.android.colorfulos.util.Themes;
-import com.android.colorfulos.views.BottomUserEducationView;
-import com.android.colorfulos.views.RecyclerViewFastScroller;
-import com.android.colorfulos.views.SpringRelativeLayout;
+import com.aoleyun.os.AppInfo;
+import com.aoleyun.os.DeviceProfile;
+import com.aoleyun.os.DeviceProfile.OnDeviceProfileChangeListener;
+import com.aoleyun.os.DragSource;
+import com.aoleyun.os.DropTarget.DragObject;
+import com.aoleyun.os.Insettable;
+import com.aoleyun.os.InsettableFrameLayout;
+import com.aoleyun.os.ItemInfo;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.LauncherState;
+import com.aoleyun.os.R;
+import com.aoleyun.os.testing.TestProtocol;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.compat.AccessibilityManagerCompat;
+import com.aoleyun.os.config.FeatureFlags;
+import com.aoleyun.os.keyboard.FocusedItemDecorator;
+import com.aoleyun.os.userevent.nano.LauncherLogProto.Target;
+import com.aoleyun.os.util.ItemInfoMatcher;
+import com.aoleyun.os.util.MultiValueAlpha;
+import com.aoleyun.os.util.MultiValueAlpha.AlphaProperty;
+import com.aoleyun.os.util.Themes;
+import com.aoleyun.os.views.BottomUserEducationView;
+import com.aoleyun.os.views.RecyclerViewFastScroller;
+import com.aoleyun.os.views.SpringRelativeLayout;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
diff --git a/src/com/android/colorfulos/allapps/AllAppsFastScrollHelper.java b/src/com/aoleyun/os/allapps/AllAppsFastScrollHelper.java
similarity index 99%
rename from src/com/android/colorfulos/allapps/AllAppsFastScrollHelper.java
rename to src/com/aoleyun/os/allapps/AllAppsFastScrollHelper.java
index 2120fd6..e28376c 100644
--- a/src/com/android/colorfulos/allapps/AllAppsFastScrollHelper.java
+++ b/src/com/aoleyun/os/allapps/AllAppsFastScrollHelper.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.allapps;
+package com.aoleyun.os.allapps;
 
-import com.android.colorfulos.util.Thunk;
+import com.aoleyun.os.util.Thunk;
 
 import java.util.HashSet;
 import java.util.List;
diff --git a/src/com/android/colorfulos/allapps/AllAppsGridAdapter.java b/src/com/aoleyun/os/allapps/AllAppsGridAdapter.java
similarity index 95%
rename from src/com/android/colorfulos/allapps/AllAppsGridAdapter.java
rename to src/com/aoleyun/os/allapps/AllAppsGridAdapter.java
index 5d515cf..0d734a0 100644
--- a/src/com/android/colorfulos/allapps/AllAppsGridAdapter.java
+++ b/src/com/aoleyun/os/allapps/AllAppsGridAdapter.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.allapps;
+package com.aoleyun.os.allapps;
 
 import android.content.Context;
 import android.content.Intent;
@@ -26,16 +26,15 @@ import android.view.ViewGroup;
 import android.view.accessibility.AccessibilityEvent;
 import android.widget.TextView;
 
-import com.android.colorfulos.AppInfo;
-import com.android.colorfulos.BubbleTextView;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.R;
-import com.android.colorfulos.allapps.AlphabeticalAppsList.AdapterItem;
-import com.android.colorfulos.compat.UserManagerCompat;
-import com.android.colorfulos.model.AppLaunchTracker;
-import com.android.colorfulos.touch.ItemClickHandler;
-import com.android.colorfulos.touch.ItemLongClickListener;
-import com.android.colorfulos.util.PackageManagerHelper;
+import com.aoleyun.os.AppInfo;
+import com.aoleyun.os.BubbleTextView;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.R;
+import com.aoleyun.os.compat.UserManagerCompat;
+import com.aoleyun.os.model.AppLaunchTracker;
+import com.aoleyun.os.touch.ItemClickHandler;
+import com.aoleyun.os.touch.ItemLongClickListener;
+import com.aoleyun.os.util.PackageManagerHelper;
 
 import java.util.List;
 
@@ -141,7 +140,7 @@ public class AllAppsGridAdapter extends RecyclerView.Adapter<AllAppsGridAdapter.
          * which should not be counted towards the collection info.
          */
         private int getRowsNotForAccessibility(int adapterPosition) {
-            List<AdapterItem> items = mApps.getAdapterItems();
+            List<AlphabeticalAppsList.AdapterItem> items = mApps.getAdapterItems();
             adapterPosition = Math.max(adapterPosition, mApps.getAdapterItems().size() - 1);
             int extraRows = 0;
             for (int i = 0; i <= adapterPosition; i++) {
diff --git a/src/com/android/colorfulos/allapps/AllAppsPagedView.java b/src/com/aoleyun/os/allapps/AllAppsPagedView.java
similarity index 97%
rename from src/com/android/colorfulos/allapps/AllAppsPagedView.java
rename to src/com/aoleyun/os/allapps/AllAppsPagedView.java
index 824ed79..b104b46 100644
--- a/src/com/android/colorfulos/allapps/AllAppsPagedView.java
+++ b/src/com/aoleyun/os/allapps/AllAppsPagedView.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.allapps;
+package com.aoleyun.os.allapps;
 
 import android.content.Context;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 
-import com.android.colorfulos.PagedView;
+import com.aoleyun.os.PagedView;
 
 public class AllAppsPagedView extends PagedView<PersonalWorkSlidingTabStrip> {
 
diff --git a/src/com/android/colorfulos/allapps/AllAppsRecyclerView.java b/src/com/aoleyun/os/allapps/AllAppsRecyclerView.java
similarity index 95%
rename from src/com/android/colorfulos/allapps/AllAppsRecyclerView.java
rename to src/com/aoleyun/os/allapps/AllAppsRecyclerView.java
index 5b4263b..b8677f5 100644
--- a/src/com/android/colorfulos/allapps/AllAppsRecyclerView.java
+++ b/src/com/aoleyun/os/allapps/AllAppsRecyclerView.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.allapps;
+package com.aoleyun.os.allapps;
 
 import static android.view.View.MeasureSpec.UNSPECIFIED;
 
@@ -26,17 +26,17 @@ import android.util.SparseIntArray;
 import android.view.MotionEvent;
 import android.view.View;
 
-import com.android.colorfulos.BaseRecyclerView;
-import com.android.colorfulos.DeviceProfile;
-import com.android.colorfulos.ItemInfo;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.LauncherAppState;
-import com.android.colorfulos.R;
-import com.android.colorfulos.compat.AccessibilityManagerCompat;
-import com.android.colorfulos.logging.StatsLogUtils.LogContainerProvider;
-import com.android.colorfulos.userevent.nano.LauncherLogProto.ContainerType;
-import com.android.colorfulos.userevent.nano.LauncherLogProto.Target;
-import com.android.colorfulos.views.RecyclerViewFastScroller;
+import com.aoleyun.os.BaseRecyclerView;
+import com.aoleyun.os.DeviceProfile;
+import com.aoleyun.os.ItemInfo;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.LauncherAppState;
+import com.aoleyun.os.R;
+import com.aoleyun.os.compat.AccessibilityManagerCompat;
+import com.aoleyun.os.userevent.nano.LauncherLogProto.ContainerType;
+import com.aoleyun.os.userevent.nano.LauncherLogProto.Target;
+import com.aoleyun.os.views.RecyclerViewFastScroller;
+import com.aoleyun.os.logging.StatsLogUtils;
 
 import java.util.List;
 
@@ -45,7 +45,7 @@ import androidx.recyclerview.widget.RecyclerView;
 /**
  * A RecyclerView with custom fast scroll support for the all apps view.
  */
-public class AllAppsRecyclerView extends BaseRecyclerView implements LogContainerProvider {
+public class AllAppsRecyclerView extends BaseRecyclerView implements StatsLogUtils.LogContainerProvider {
 
     private AlphabeticalAppsList mApps;
     private AllAppsFastScrollHelper mFastScrollHelper;
diff --git a/src/com/android/colorfulos/allapps/AllAppsStore.java b/src/com/aoleyun/os/allapps/AllAppsStore.java
similarity index 94%
rename from src/com/android/colorfulos/allapps/AllAppsStore.java
rename to src/com/aoleyun/os/allapps/AllAppsStore.java
index e64b17c..38ee1a0 100644
--- a/src/com/android/colorfulos/allapps/AllAppsStore.java
+++ b/src/com/aoleyun/os/allapps/AllAppsStore.java
@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.allapps;
+package com.aoleyun.os.allapps;
 
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.android.colorfulos.AppInfo;
-import com.android.colorfulos.BubbleTextView;
-import com.android.colorfulos.ItemInfo;
-import com.android.colorfulos.PromiseAppInfo;
-import com.android.colorfulos.util.ComponentKey;
-import com.android.colorfulos.util.PackageUserKey;
+import com.aoleyun.os.AppInfo;
+import com.aoleyun.os.BubbleTextView;
+import com.aoleyun.os.ItemInfo;
+import com.aoleyun.os.PromiseAppInfo;
+import com.aoleyun.os.util.ComponentKey;
+import com.aoleyun.os.util.PackageUserKey;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/src/com/android/colorfulos/allapps/AllAppsTransitionController.java b/src/com/aoleyun/os/allapps/AllAppsTransitionController.java
similarity index 84%
rename from src/com/android/colorfulos/allapps/AllAppsTransitionController.java
rename to src/com/aoleyun/os/allapps/AllAppsTransitionController.java
index 7d9e15d..46a7ff3 100644
--- a/src/com/android/colorfulos/allapps/AllAppsTransitionController.java
+++ b/src/com/aoleyun/os/allapps/AllAppsTransitionController.java
@@ -1,18 +1,18 @@
-package com.android.colorfulos.allapps;
+package com.aoleyun.os.allapps;
 
-import static com.android.colorfulos.LauncherState.ALL_APPS_CONTENT;
-import static com.android.colorfulos.LauncherState.ALL_APPS_HEADER_EXTRA;
-import static com.android.colorfulos.LauncherState.BACKGROUND_APP;
-import static com.android.colorfulos.LauncherState.HOTSEAT_ICONS;
-import static com.android.colorfulos.LauncherState.OVERVIEW;
-import static com.android.colorfulos.LauncherState.VERTICAL_SWIPE_INDICATOR;
-import static com.android.colorfulos.anim.AnimatorSetBuilder.ANIM_ALL_APPS_FADE;
-import static com.android.colorfulos.anim.AnimatorSetBuilder.ANIM_OVERVIEW_SCALE;
-import static com.android.colorfulos.anim.AnimatorSetBuilder.ANIM_VERTICAL_PROGRESS;
-import static com.android.colorfulos.anim.Interpolators.FAST_OUT_SLOW_IN;
-import static com.android.colorfulos.anim.Interpolators.LINEAR;
-import static com.android.colorfulos.anim.PropertySetter.NO_ANIM_PROPERTY_SETTER;
-import static com.android.colorfulos.util.SystemUiController.UI_STATE_ALL_APPS;
+import static com.aoleyun.os.LauncherState.ALL_APPS_CONTENT;
+import static com.aoleyun.os.LauncherState.ALL_APPS_HEADER_EXTRA;
+import static com.aoleyun.os.LauncherState.BACKGROUND_APP;
+import static com.aoleyun.os.LauncherState.HOTSEAT_ICONS;
+import static com.aoleyun.os.LauncherState.OVERVIEW;
+import static com.aoleyun.os.LauncherState.VERTICAL_SWIPE_INDICATOR;
+import static com.aoleyun.os.anim.AnimatorSetBuilder.ANIM_ALL_APPS_FADE;
+import static com.aoleyun.os.anim.AnimatorSetBuilder.ANIM_OVERVIEW_SCALE;
+import static com.aoleyun.os.anim.AnimatorSetBuilder.ANIM_VERTICAL_PROGRESS;
+import static com.aoleyun.os.anim.Interpolators.FAST_OUT_SLOW_IN;
+import static com.aoleyun.os.anim.Interpolators.LINEAR;
+import static com.aoleyun.os.anim.PropertySetter.NO_ANIM_PROPERTY_SETTER;
+import static com.aoleyun.os.util.SystemUiController.UI_STATE_ALL_APPS;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -20,20 +20,20 @@ import android.util.FloatProperty;
 import android.util.Log;
 import android.view.animation.Interpolator;
 
-import com.android.colorfulos.DeviceProfile;
-import com.android.colorfulos.DeviceProfile.OnDeviceProfileChangeListener;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.LauncherState;
-import com.android.colorfulos.LauncherStateManager.AnimationConfig;
-import com.android.colorfulos.LauncherStateManager.StateHandler;
-import com.android.colorfulos.R;
-import com.android.colorfulos.anim.AnimationSuccessListener;
-import com.android.colorfulos.anim.AnimatorSetBuilder;
-import com.android.colorfulos.anim.PropertySetter;
-import com.android.colorfulos.anim.SpringObjectAnimator;
-import com.android.colorfulos.testing.TestProtocol;
-import com.android.colorfulos.util.Themes;
-import com.android.colorfulos.views.ScrimView;
+import com.aoleyun.os.DeviceProfile;
+import com.aoleyun.os.DeviceProfile.OnDeviceProfileChangeListener;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.LauncherState;
+import com.aoleyun.os.LauncherStateManager.AnimationConfig;
+import com.aoleyun.os.LauncherStateManager.StateHandler;
+import com.aoleyun.os.R;
+import com.aoleyun.os.anim.AnimationSuccessListener;
+import com.aoleyun.os.anim.AnimatorSetBuilder;
+import com.aoleyun.os.anim.PropertySetter;
+import com.aoleyun.os.anim.SpringObjectAnimator;
+import com.aoleyun.os.testing.TestProtocol;
+import com.aoleyun.os.util.Themes;
+import com.aoleyun.os.views.ScrimView;
 
 /**
  * Handles AllApps view transition.
diff --git a/src/com/android/colorfulos/allapps/AlphabeticalAppsList.java b/src/com/aoleyun/os/allapps/AlphabeticalAppsList.java
similarity index 97%
rename from src/com/android/colorfulos/allapps/AlphabeticalAppsList.java
rename to src/com/aoleyun/os/allapps/AlphabeticalAppsList.java
index 4958c24..190a09a 100644
--- a/src/com/android/colorfulos/allapps/AlphabeticalAppsList.java
+++ b/src/com/aoleyun/os/allapps/AlphabeticalAppsList.java
@@ -13,20 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.allapps;
+package com.aoleyun.os.allapps;
 
 import android.content.Context;
 import android.content.pm.PackageManager;
 
-import com.android.colorfulos.AppInfo;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.compat.AlphabeticIndexCompat;
-import com.android.colorfulos.shortcuts.DeepShortcutManager;
-import com.android.colorfulos.testing.TestProtocol;
-import com.android.colorfulos.util.ComponentKey;
-import com.android.colorfulos.util.ItemInfoMatcher;
-import com.android.colorfulos.util.LabelComparator;
+import com.aoleyun.os.AppInfo;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.compat.AlphabeticIndexCompat;
+import com.aoleyun.os.shortcuts.DeepShortcutManager;
+import com.aoleyun.os.testing.TestProtocol;
+import com.aoleyun.os.util.ComponentKey;
+import com.aoleyun.os.util.ItemInfoMatcher;
+import com.aoleyun.os.util.LabelComparator;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/src/com/android/colorfulos/allapps/AppInfoComparator.java b/src/com/aoleyun/os/allapps/AppInfoComparator.java
similarity index 91%
rename from src/com/android/colorfulos/allapps/AppInfoComparator.java
rename to src/com/aoleyun/os/allapps/AppInfoComparator.java
index 405ff3c..e41b4b7 100644
--- a/src/com/android/colorfulos/allapps/AppInfoComparator.java
+++ b/src/com/aoleyun/os/allapps/AppInfoComparator.java
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.allapps;
+package com.aoleyun.os.allapps;
 
 import android.content.Context;
 import android.os.Process;
 import android.os.UserHandle;
 
-import com.android.colorfulos.AppInfo;
-import com.android.colorfulos.compat.UserManagerCompat;
-import com.android.colorfulos.util.LabelComparator;
+import com.aoleyun.os.AppInfo;
+import com.aoleyun.os.compat.UserManagerCompat;
+import com.aoleyun.os.util.LabelComparator;
 
 import java.util.Comparator;
 
diff --git a/src/com/android/colorfulos/allapps/DiscoveryBounce.java b/src/com/aoleyun/os/allapps/DiscoveryBounce.java
similarity index 91%
rename from src/com/android/colorfulos/allapps/DiscoveryBounce.java
rename to src/com/aoleyun/os/allapps/DiscoveryBounce.java
index be04889..e1590cc 100644
--- a/src/com/android/colorfulos/allapps/DiscoveryBounce.java
+++ b/src/com/aoleyun/os/allapps/DiscoveryBounce.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.allapps;
+package com.aoleyun.os.allapps;
 
-import static com.android.colorfulos.LauncherState.NORMAL;
-import static com.android.colorfulos.LauncherState.OVERVIEW;
-import static com.android.colorfulos.userevent.nano.LauncherLogProto.ContainerType.HOTSEAT;
-import static com.android.colorfulos.userevent.nano.LauncherLogProto.ContainerType.PREDICTION;
+import static com.aoleyun.os.LauncherState.NORMAL;
+import static com.aoleyun.os.LauncherState.OVERVIEW;
+import static com.aoleyun.os.userevent.nano.LauncherLogProto.ContainerType.HOTSEAT;
+import static com.aoleyun.os.userevent.nano.LauncherLogProto.ContainerType.PREDICTION;
 
 import android.animation.Animator;
 import android.animation.AnimatorInflater;
@@ -28,14 +28,14 @@ import android.content.SharedPreferences;
 import android.os.Handler;
 import android.view.MotionEvent;
 
-import com.android.colorfulos.AbstractFloatingView;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.LauncherState;
-import com.android.colorfulos.LauncherStateManager.StateListener;
-import com.android.colorfulos.R;
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.compat.UserManagerCompat;
-import com.android.colorfulos.states.InternalStateHandler;
+import com.aoleyun.os.AbstractFloatingView;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.LauncherState;
+import com.aoleyun.os.LauncherStateManager.StateListener;
+import com.aoleyun.os.R;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.compat.UserManagerCompat;
+import com.aoleyun.os.states.InternalStateHandler;
 
 /**
  * Abstract base class of floating view responsible for showing discovery bounce animation
diff --git a/src/com/android/colorfulos/allapps/FloatingHeaderRow.java b/src/com/aoleyun/os/allapps/FloatingHeaderRow.java
similarity index 92%
rename from src/com/android/colorfulos/allapps/FloatingHeaderRow.java
rename to src/com/aoleyun/os/allapps/FloatingHeaderRow.java
index 44ef185..ee1444a 100644
--- a/src/com/android/colorfulos/allapps/FloatingHeaderRow.java
+++ b/src/com/aoleyun/os/allapps/FloatingHeaderRow.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.allapps;
+package com.aoleyun.os.allapps;
 
 import android.graphics.Rect;
 import android.view.animation.Interpolator;
 
-import com.android.colorfulos.DeviceProfile;
-import com.android.colorfulos.anim.PropertySetter;
+import com.aoleyun.os.DeviceProfile;
+import com.aoleyun.os.anim.PropertySetter;
 
 /**
  * A abstract representation of a row in all-apps view
diff --git a/src/com/android/colorfulos/allapps/FloatingHeaderView.java b/src/com/aoleyun/os/allapps/FloatingHeaderView.java
similarity index 96%
rename from src/com/android/colorfulos/allapps/FloatingHeaderView.java
rename to src/com/aoleyun/os/allapps/FloatingHeaderView.java
index b5e40d3..6da6b64 100644
--- a/src/com/android/colorfulos/allapps/FloatingHeaderView.java
+++ b/src/com/aoleyun/os/allapps/FloatingHeaderView.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.allapps;
+package com.aoleyun.os.allapps;
 
 import android.animation.ValueAnimator;
 import android.content.Context;
@@ -27,14 +27,13 @@ import android.view.ViewGroup;
 import android.view.animation.Interpolator;
 import android.widget.LinearLayout;
 
-import com.android.colorfulos.DeviceProfile;
-import com.android.colorfulos.Insettable;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.R;
-import com.android.colorfulos.anim.PropertySetter;
-import com.android.colorfulos.uioverrides.plugins.PluginManagerWrapper;
-import com.android.systemui.plugins.AllAppsRow;
-import com.android.systemui.plugins.AllAppsRow.OnHeightUpdatedListener;
+import com.aoleyun.os.DeviceProfile;
+import com.aoleyun.os.Insettable;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.R;
+import com.aoleyun.os.anim.PropertySetter;
+import com.aoleyun.os.uioverrides.plugins.PluginManagerWrapper;
+import com.aoleyun.systemui.plugins.AllAppsRow;
 import com.android.systemui.plugins.PluginListener;
 
 import java.util.ArrayList;
@@ -46,7 +45,7 @@ import androidx.recyclerview.widget.RecyclerView;
 
 public class FloatingHeaderView extends LinearLayout implements
         ValueAnimator.AnimatorUpdateListener, PluginListener<AllAppsRow>, Insettable,
-        OnHeightUpdatedListener {
+        AllAppsRow.OnHeightUpdatedListener {
 
     private final Rect mClip = new Rect(0, 0, Integer.MAX_VALUE, Integer.MAX_VALUE);
     private final ValueAnimator mAnimator = ValueAnimator.ofInt(0, 0);
diff --git a/src/com/android/colorfulos/allapps/PersonalWorkSlidingTabStrip.java b/src/com/aoleyun/os/allapps/PersonalWorkSlidingTabStrip.java
similarity index 95%
rename from src/com/android/colorfulos/allapps/PersonalWorkSlidingTabStrip.java
rename to src/com/aoleyun/os/allapps/PersonalWorkSlidingTabStrip.java
index 11af5df..6191895 100644
--- a/src/com/android/colorfulos/allapps/PersonalWorkSlidingTabStrip.java
+++ b/src/com/aoleyun/os/allapps/PersonalWorkSlidingTabStrip.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.allapps;
+package com.aoleyun.os.allapps;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -24,11 +24,11 @@ import android.view.View;
 import android.widget.Button;
 import android.widget.LinearLayout;
 
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.R;
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.pageindicators.PageIndicator;
-import com.android.colorfulos.util.Themes;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.R;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.pageindicators.PageIndicator;
+import com.aoleyun.os.util.Themes;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
diff --git a/src/com/android/colorfulos/allapps/PluginHeaderRow.java b/src/com/aoleyun/os/allapps/PluginHeaderRow.java
similarity index 92%
rename from src/com/android/colorfulos/allapps/PluginHeaderRow.java
rename to src/com/aoleyun/os/allapps/PluginHeaderRow.java
index 6e017ec..c0f030a 100644
--- a/src/com/android/colorfulos/allapps/PluginHeaderRow.java
+++ b/src/com/aoleyun/os/allapps/PluginHeaderRow.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.allapps;
+package com.aoleyun.os.allapps;
 
 import static android.view.View.ALPHA;
 import static android.view.View.INVISIBLE;
@@ -23,9 +23,9 @@ import android.graphics.Rect;
 import android.view.View;
 import android.view.animation.Interpolator;
 
-import com.android.colorfulos.DeviceProfile;
-import com.android.colorfulos.anim.PropertySetter;
-import com.android.systemui.plugins.AllAppsRow;
+import com.aoleyun.os.DeviceProfile;
+import com.aoleyun.os.anim.PropertySetter;
+import com.aoleyun.systemui.plugins.AllAppsRow;
 
 /**
  * Wrapper over an {@link AllAppsRow} plugin with {@link FloatingHeaderRow} interface so that
diff --git a/src/com/android/colorfulos/allapps/SearchUiManager.java b/src/com/aoleyun/os/allapps/SearchUiManager.java
similarity index 94%
rename from src/com/android/colorfulos/allapps/SearchUiManager.java
rename to src/com/aoleyun/os/allapps/SearchUiManager.java
index a9f75b1..4372a37 100644
--- a/src/com/android/colorfulos/allapps/SearchUiManager.java
+++ b/src/com/aoleyun/os/allapps/SearchUiManager.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.allapps;
+package com.aoleyun.os.allapps;
 
 import android.graphics.Rect;
 import android.view.KeyEvent;
 import android.view.animation.Interpolator;
 
-import com.android.colorfulos.anim.PropertySetter;
+import com.aoleyun.os.anim.PropertySetter;
 
 /**
  * Interface for controlling the Apps search UI.
diff --git a/src/com/android/colorfulos/allapps/WorkModeSwitch.java b/src/com/aoleyun/os/allapps/WorkModeSwitch.java
similarity index 97%
rename from src/com/android/colorfulos/allapps/WorkModeSwitch.java
rename to src/com/aoleyun/os/allapps/WorkModeSwitch.java
index ec5c856..29a8fa3 100644
--- a/src/com/android/colorfulos/allapps/WorkModeSwitch.java
+++ b/src/com/aoleyun/os/allapps/WorkModeSwitch.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.allapps;
+package com.aoleyun.os.allapps;
 
 import android.content.Context;
 import android.os.AsyncTask;
@@ -23,7 +23,7 @@ import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.widget.Switch;
 
-import com.android.colorfulos.compat.UserManagerCompat;
+import com.aoleyun.os.compat.UserManagerCompat;
 
 import java.lang.ref.WeakReference;
 import java.util.List;
diff --git a/src/com/android/colorfulos/allapps/search/AllAppsSearchBarController.java b/src/com/aoleyun/os/allapps/search/AllAppsSearchBarController.java
similarity index 93%
rename from src/com/android/colorfulos/allapps/search/AllAppsSearchBarController.java
rename to src/com/aoleyun/os/allapps/search/AllAppsSearchBarController.java
index 5959e83..6fe4dc7 100644
--- a/src/com/android/colorfulos/allapps/search/AllAppsSearchBarController.java
+++ b/src/com/aoleyun/os/allapps/search/AllAppsSearchBarController.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.allapps.search;
+package com.aoleyun.os.allapps.search;
 
 import android.text.Editable;
 import android.text.TextUtils;
@@ -25,12 +25,12 @@ import android.view.inputmethod.EditorInfo;
 import android.widget.TextView;
 import android.widget.TextView.OnEditorActionListener;
 
-import com.android.colorfulos.ExtendedEditText;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.model.AppLaunchTracker;
-import com.android.colorfulos.util.ComponentKey;
-import com.android.colorfulos.util.PackageManagerHelper;
+import com.aoleyun.os.ExtendedEditText;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.model.AppLaunchTracker;
+import com.aoleyun.os.util.ComponentKey;
+import com.aoleyun.os.util.PackageManagerHelper;
 
 import java.util.ArrayList;
 
diff --git a/src/com/android/colorfulos/allapps/search/AppsSearchContainerLayout.java b/src/com/aoleyun/os/allapps/search/AppsSearchContainerLayout.java
similarity index 89%
rename from src/com/android/colorfulos/allapps/search/AppsSearchContainerLayout.java
rename to src/com/aoleyun/os/allapps/search/AppsSearchContainerLayout.java
index 171eeb1..6f81690 100644
--- a/src/com/android/colorfulos/allapps/search/AppsSearchContainerLayout.java
+++ b/src/com/aoleyun/os/allapps/search/AppsSearchContainerLayout.java
@@ -13,15 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.allapps.search;
+package com.aoleyun.os.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.colorfulos.LauncherState.ALL_APPS_HEADER;
-import static com.android.colorfulos.Utilities.prefixTextWithIcon;
-import static com.android.colorfulos.icons.IconNormalizer.ICON_VISIBLE_AREA_FACTOR;
+import static com.aoleyun.os.LauncherState.ALL_APPS_HEADER;
+import static com.aoleyun.os.Utilities.prefixTextWithIcon;
 
 import android.content.Context;
 import android.graphics.Rect;
@@ -34,17 +33,18 @@ import android.view.View;
 import android.view.ViewGroup.MarginLayoutParams;
 import android.view.animation.Interpolator;
 
-import com.android.colorfulos.DeviceProfile;
-import com.android.colorfulos.ExtendedEditText;
-import com.android.colorfulos.Insettable;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.R;
-import com.android.colorfulos.allapps.AllAppsContainerView;
-import com.android.colorfulos.allapps.AllAppsStore;
-import com.android.colorfulos.allapps.AlphabeticalAppsList;
-import com.android.colorfulos.allapps.SearchUiManager;
-import com.android.colorfulos.anim.PropertySetter;
-import com.android.colorfulos.util.ComponentKey;
+import com.aoleyun.os.DeviceProfile;
+import com.aoleyun.os.ExtendedEditText;
+import com.aoleyun.os.Insettable;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.R;
+import com.aoleyun.os.allapps.AllAppsContainerView;
+import com.aoleyun.os.allapps.AllAppsStore;
+import com.aoleyun.os.allapps.AlphabeticalAppsList;
+import com.aoleyun.os.allapps.SearchUiManager;
+import com.aoleyun.os.anim.PropertySetter;
+import com.aoleyun.os.util.ComponentKey;
+import com.aoleyun.os.icons.IconNormalizer;
 
 import java.util.ArrayList;
 
@@ -111,7 +111,7 @@ public class AppsSearchContainerLayout extends ExtendedEditText
                 - mAppsView.getActiveRecyclerView().getPaddingRight();
 
         int cellWidth = DeviceProfile.calculateCellWidth(rowWidth, dp.inv.numHotseatIcons);
-        int iconVisibleSize = Math.round(ICON_VISIBLE_AREA_FACTOR * dp.iconSizePx);
+        int iconVisibleSize = Math.round(IconNormalizer.ICON_VISIBLE_AREA_FACTOR * dp.iconSizePx);
         int iconPadding = cellWidth - iconVisibleSize;
 
         int myWidth = rowWidth - iconPadding + getPaddingLeft() + getPaddingRight();
diff --git a/src/com/android/colorfulos/allapps/search/DefaultAppSearchAlgorithm.java b/src/com/aoleyun/os/allapps/search/DefaultAppSearchAlgorithm.java
similarity index 98%
rename from src/com/android/colorfulos/allapps/search/DefaultAppSearchAlgorithm.java
rename to src/com/aoleyun/os/allapps/search/DefaultAppSearchAlgorithm.java
index a2853b2..5a6dea0 100644
--- a/src/com/android/colorfulos/allapps/search/DefaultAppSearchAlgorithm.java
+++ b/src/com/aoleyun/os/allapps/search/DefaultAppSearchAlgorithm.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.allapps.search;
+package com.aoleyun.os.allapps.search;
 
 import android.os.Handler;
 
-import com.android.colorfulos.AppInfo;
-import com.android.colorfulos.util.ComponentKey;
+import com.aoleyun.os.AppInfo;
+import com.aoleyun.os.util.ComponentKey;
 
 import java.text.Collator;
 import java.util.ArrayList;
diff --git a/src/com/android/colorfulos/allapps/search/SearchAlgorithm.java b/src/com/aoleyun/os/allapps/search/SearchAlgorithm.java
similarity index 95%
rename from src/com/android/colorfulos/allapps/search/SearchAlgorithm.java
rename to src/com/aoleyun/os/allapps/search/SearchAlgorithm.java
index 2eb3465..f6b4e17 100644
--- a/src/com/android/colorfulos/allapps/search/SearchAlgorithm.java
+++ b/src/com/aoleyun/os/allapps/search/SearchAlgorithm.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.allapps.search;
+package com.aoleyun.os.allapps.search;
 
 /**
  * An interface for handling search.
diff --git a/src/com/android/colorfulos/anim/AlphaUpdateListener.java b/src/com/aoleyun/os/anim/AlphaUpdateListener.java
similarity index 98%
rename from src/com/android/colorfulos/anim/AlphaUpdateListener.java
rename to src/com/aoleyun/os/anim/AlphaUpdateListener.java
index dc3a860..883e973 100644
--- a/src/com/android/colorfulos/anim/AlphaUpdateListener.java
+++ b/src/com/aoleyun/os/anim/AlphaUpdateListener.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.anim;
+package com.aoleyun.os.anim;
 
 import android.animation.Animator;
 import android.animation.ValueAnimator;
diff --git a/src/com/android/colorfulos/anim/AnimationSuccessListener.java b/src/com/aoleyun/os/anim/AnimationSuccessListener.java
similarity index 97%
rename from src/com/android/colorfulos/anim/AnimationSuccessListener.java
rename to src/com/aoleyun/os/anim/AnimationSuccessListener.java
index 1fc1556..a454608 100644
--- a/src/com/android/colorfulos/anim/AnimationSuccessListener.java
+++ b/src/com/aoleyun/os/anim/AnimationSuccessListener.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.anim;
+package com.aoleyun.os.anim;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
diff --git a/src/com/android/colorfulos/anim/AnimatorPlaybackController.java b/src/com/aoleyun/os/anim/AnimatorPlaybackController.java
similarity index 98%
rename from src/com/android/colorfulos/anim/AnimatorPlaybackController.java
rename to src/com/aoleyun/os/anim/AnimatorPlaybackController.java
index db0da7d..e2ef6bb 100644
--- a/src/com/android/colorfulos/anim/AnimatorPlaybackController.java
+++ b/src/com/aoleyun/os/anim/AnimatorPlaybackController.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.anim;
+package com.aoleyun.os.anim;
 
-import static com.android.colorfulos.anim.Interpolators.LINEAR;
-import static com.android.colorfulos.config.FeatureFlags.QUICKSTEP_SPRINGS;
+import static com.aoleyun.os.anim.Interpolators.LINEAR;
+import static com.aoleyun.os.config.FeatureFlags.QUICKSTEP_SPRINGS;
 
 import android.animation.Animator;
 import android.animation.Animator.AnimatorListener;
diff --git a/src/com/android/colorfulos/anim/AnimatorSetBuilder.java b/src/com/aoleyun/os/anim/AnimatorSetBuilder.java
similarity index 98%
rename from src/com/android/colorfulos/anim/AnimatorSetBuilder.java
rename to src/com/aoleyun/os/anim/AnimatorSetBuilder.java
index 72cf8d4..07951de 100644
--- a/src/com/android/colorfulos/anim/AnimatorSetBuilder.java
+++ b/src/com/aoleyun/os/anim/AnimatorSetBuilder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.anim;
+package com.aoleyun.os.anim;
 
 import android.animation.Animator;
 import android.animation.AnimatorSet;
diff --git a/src/com/android/colorfulos/anim/FlingSpringAnim.java b/src/com/aoleyun/os/anim/FlingSpringAnim.java
similarity index 98%
rename from src/com/android/colorfulos/anim/FlingSpringAnim.java
rename to src/com/aoleyun/os/anim/FlingSpringAnim.java
index 1db6bfa..50c57d6 100644
--- a/src/com/android/colorfulos/anim/FlingSpringAnim.java
+++ b/src/com/aoleyun/os/anim/FlingSpringAnim.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.anim;
+package com.aoleyun.os.anim;
 
 import androidx.dynamicanimation.animation.DynamicAnimation.OnAnimationEndListener;
 import androidx.dynamicanimation.animation.FlingAnimation;
diff --git a/src/com/android/colorfulos/anim/Interpolators.java b/src/com/aoleyun/os/anim/Interpolators.java
similarity index 98%
rename from src/com/android/colorfulos/anim/Interpolators.java
rename to src/com/aoleyun/os/anim/Interpolators.java
index aa2f1b2..548c134 100644
--- a/src/com/android/colorfulos/anim/Interpolators.java
+++ b/src/com/aoleyun/os/anim/Interpolators.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.anim;
+package com.aoleyun.os.anim;
 
-import static com.android.colorfulos.Utilities.SINGLE_FRAME_MS;
+import static com.aoleyun.os.Utilities.SINGLE_FRAME_MS;
 
 import android.graphics.Path;
 import android.view.animation.AccelerateDecelerateInterpolator;
@@ -27,7 +27,7 @@ import android.view.animation.LinearInterpolator;
 import android.view.animation.OvershootInterpolator;
 import android.view.animation.PathInterpolator;
 
-import com.android.colorfulos.Utilities;
+import com.aoleyun.os.Utilities;
 
 
 /**
diff --git a/src/com/android/colorfulos/anim/PropertyListBuilder.java b/src/com/aoleyun/os/anim/PropertyListBuilder.java
similarity index 97%
rename from src/com/android/colorfulos/anim/PropertyListBuilder.java
rename to src/com/aoleyun/os/anim/PropertyListBuilder.java
index 1d99bce..a175734 100644
--- a/src/com/android/colorfulos/anim/PropertyListBuilder.java
+++ b/src/com/aoleyun/os/anim/PropertyListBuilder.java
@@ -1,4 +1,4 @@
-package com.android.colorfulos.anim;
+package com.aoleyun.os.anim;
 
 import android.animation.ObjectAnimator;
 import android.animation.PropertyValuesHolder;
diff --git a/src/com/android/colorfulos/anim/PropertyResetListener.java b/src/com/aoleyun/os/anim/PropertyResetListener.java
similarity index 97%
rename from src/com/android/colorfulos/anim/PropertyResetListener.java
rename to src/com/aoleyun/os/anim/PropertyResetListener.java
index 8ee6535..8b52f3a 100644
--- a/src/com/android/colorfulos/anim/PropertyResetListener.java
+++ b/src/com/aoleyun/os/anim/PropertyResetListener.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.anim;
+package com.aoleyun.os.anim;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
diff --git a/src/com/android/colorfulos/anim/PropertySetter.java b/src/com/aoleyun/os/anim/PropertySetter.java
similarity index 98%
rename from src/com/android/colorfulos/anim/PropertySetter.java
rename to src/com/aoleyun/os/anim/PropertySetter.java
index eb155b2..44a9c6f 100644
--- a/src/com/android/colorfulos/anim/PropertySetter.java
+++ b/src/com/aoleyun/os/anim/PropertySetter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.anim;
+package com.aoleyun.os.anim;
 
 import android.animation.Animator;
 import android.animation.ObjectAnimator;
diff --git a/src/com/android/colorfulos/anim/RevealOutlineAnimation.java b/src/com/aoleyun/os/anim/RevealOutlineAnimation.java
similarity index 98%
rename from src/com/android/colorfulos/anim/RevealOutlineAnimation.java
rename to src/com/aoleyun/os/anim/RevealOutlineAnimation.java
index 09c7d57..e3f0e82 100644
--- a/src/com/android/colorfulos/anim/RevealOutlineAnimation.java
+++ b/src/com/aoleyun/os/anim/RevealOutlineAnimation.java
@@ -1,4 +1,4 @@
-package com.android.colorfulos.anim;
+package com.aoleyun.os.anim;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
diff --git a/src/com/android/colorfulos/anim/RoundedRectRevealOutlineProvider.java b/src/com/aoleyun/os/anim/RoundedRectRevealOutlineProvider.java
similarity index 98%
rename from src/com/android/colorfulos/anim/RoundedRectRevealOutlineProvider.java
rename to src/com/aoleyun/os/anim/RoundedRectRevealOutlineProvider.java
index 5b5910c..05aac25 100644
--- a/src/com/android/colorfulos/anim/RoundedRectRevealOutlineProvider.java
+++ b/src/com/aoleyun/os/anim/RoundedRectRevealOutlineProvider.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.anim;
+package com.aoleyun.os.anim;
 
 import android.graphics.Rect;
 
diff --git a/src/com/android/colorfulos/anim/SpringObjectAnimator.java b/src/com/aoleyun/os/anim/SpringObjectAnimator.java
similarity index 98%
rename from src/com/android/colorfulos/anim/SpringObjectAnimator.java
rename to src/com/aoleyun/os/anim/SpringObjectAnimator.java
index 7025f68..6d77a60 100644
--- a/src/com/android/colorfulos/anim/SpringObjectAnimator.java
+++ b/src/com/aoleyun/os/anim/SpringObjectAnimator.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.anim;
+package com.aoleyun.os.anim;
 
 import static androidx.dynamicanimation.animation.FloatPropertyCompat.createFloatPropertyCompat;
 
-import static com.android.colorfulos.config.FeatureFlags.QUICKSTEP_SPRINGS;
+import static com.aoleyun.os.config.FeatureFlags.QUICKSTEP_SPRINGS;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
diff --git a/src/com/aoleyun/os/base/MyApplication.java b/src/com/aoleyun/os/base/MyApplication.java
new file mode 100644
index 0000000..85c34f0
--- /dev/null
+++ b/src/com/aoleyun/os/base/MyApplication.java
@@ -0,0 +1,365 @@
+package com.aoleyun.os.base;
+
+import android.annotation.SuppressLint;
+import android.app.Application;
+import android.content.Context;
+import android.util.Log;
+
+import com.aoleyun.os.BuildConfig;
+import com.aoleyun.os.TTUtils.ToastUtil;
+import com.aoleyun.os.TTUtils.Utils;
+import com.aoleyun.os.jpush.TagAliasOperatorHelper;
+import com.aoleyun.os.network.HTTPInterface;
+import com.aoleyun.os.network.NetWorkManager;
+import com.aoleyun.os.network.URLPath;
+import com.aoleyun.os.uiuiutils.JGYUtils;
+import com.arialyy.aria.core.Aria;
+import com.tencent.mmkv.MMKV;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.io.IOException;
+import java.util.concurrent.TimeUnit;
+
+import cn.jpush.android.api.JPushInterface;
+import cn.jpush.android.api.JPushMessage;
+import io.reactivex.Observable;
+import io.reactivex.ObservableEmitter;
+import io.reactivex.ObservableOnSubscribe;
+import io.reactivex.Observer;
+import io.reactivex.disposables.Disposable;
+import okhttp3.Call;
+import okhttp3.Callback;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+
+public class MyApplication extends Application {
+    private static final String TAG = MyApplication.class.getSimpleName();
+    @SuppressLint("StaticFieldLeak")
+    private static MyApplication app;
+    @SuppressLint("StaticFieldLeak")
+    private static Context context;
+
+    public static MyApplication getInstance() {
+        return app;
+    }
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        app = this;
+        context = this;
+        String rootDir = MMKV.initialize(this);
+        Log.e(TAG, "onCreate: " + rootDir);
+        JGYUtils.init(this);
+        Aria.init(this);
+        NetWorkManager.init(this);
+        ToastUtil.init(this);
+
+        initJPush();
+    }
+
+    private void initJPush() {
+        JPushInterface.setDebugMode(BuildConfig.DEBUG);    // 设置开启日志,发布时请关闭日志
+        JPushInterface.init(this);
+        initAliasObservable();
+        initTagObservable();
+        setJpushAlias();
+        setJpushTags();
+    }
+
+    private String appPackageName;
+    private long runTime = 0;
+    private long onClickTime = 0;
+
+    public void setOnClickTime(long time) {
+        this.onClickTime = time;
+    }
+
+    public long getOnClickTime() {
+        return onClickTime;
+    }
+
+    public void setAppPackageName(String name) {
+        this.appPackageName = name;
+    }
+
+    public String getAppPackageName() {
+        return appPackageName;
+    }
+
+    public void setTime(long time) {
+        this.runTime = time;
+    }
+
+    public long getRunTime() {
+        return runTime;
+    }
+
+
+    private  void initAliasObservable() {
+        Log.e(TAG, "initAliasObservable: ");
+        Observable.create(new ObservableOnSubscribe<Integer>() {
+            @Override
+            public void subscribe(ObservableEmitter<Integer> emitter) throws Exception {
+                onAliasResult = new OnAliasResult() {
+                    @Override
+                    public void onResult(int code) {
+                        Log.e("initAliasObservable", "onResult: " + code);
+                        emitter.onNext(code);
+                    }
+                };
+            }
+        }).throttleLast(1, TimeUnit.HOURS)
+                .subscribe(new Observer<Integer>() {
+                    @Override
+                    public void onSubscribe(Disposable d) {
+
+                    }
+
+                    @Override
+                    public void onNext(Integer integer) {
+                        Log.e("initAliasObservable", "onNext: " + integer);
+                        String s = "alias:\t";
+                        switch (integer) {
+                            case 0:
+                                Log.e("jiguangInterface", s + "Alias绑定成功");
+                                break;
+                            case 6001:
+                                Log.e("jiguangInterface", s + "无效的设置");
+                                break;
+                            case 6011:
+                                Log.e("jiguangInterface", s + "短时间内操作过于频繁");
+                                break;
+                            case 6013:
+                                Log.e("jiguangInterface", s + "用户设备时间轴异常");
+                                ToastUtil.show("用户设备时间轴异常,修改后重新登陆\t" + s + "code:6013");
+                                break;
+                            case 6022:
+                                Log.e("jiguangInterface", s + "alias 操作正在进行中");
+                                break;
+                            //需要重新设置
+                            case 6002:
+                                Log.e("jiguangInterface", s + "设置超时，请重试");
+                                setJpushAlias();
+                                break;
+                            case 6014:
+                                Log.e("jiguangInterface", s + "服务器繁忙,建议重试");
+                                setJpushAlias();
+                                break;
+                            case 6020:
+                                Log.e("jiguangInterface", s + "建议过一段时间再设置");
+                                setJpushAlias();
+                                break;
+                            case 6024:
+                                Log.e("jiguangInterface", s + "服务器内部错误");
+                                setJpushAlias();
+                                break;
+                            case 6017:
+                            case 6027:
+                                Log.e("jiguangInterface", s + "别名绑定的设备数超过限制");
+                                cleanJpushAlias();
+                                setJpushAlias();
+                                break;
+                            default:
+                                break;
+                        }
+
+                    }
+
+                    @Override
+                    public void onError(Throwable e) {
+
+                    }
+
+                    @Override
+                    public void onComplete() {
+
+                    }
+                });
+    }
+
+    public void onAliasOperatorResult(JPushMessage jPushMessage) {
+        if (jPushMessage == null) {
+            return;
+        }
+        int errorCode = jPushMessage.getErrorCode();
+        onAliasResult.onResult(errorCode);
+    }
+
+    public static void setJpushAlias() {
+        Log.e("jiguangInterface", "30s后重新设置alias");
+        JPushInterface.setAlias(context, TagAliasOperatorHelper.sequence++, Utils.getSerial());
+    }
+
+    private  void initTagObservable() {
+        Log.e(TAG, "initTagObservable: ");
+        Observable.create(new ObservableOnSubscribe<Integer>() {
+            @Override
+            public void subscribe(ObservableEmitter<Integer> emitter) {
+                onTagResult = new OnTagResult() {
+                    @Override
+                    public void onResult(int code) {
+                        Log.e("initTagObservable", "onResult: " + code);
+                        emitter.onNext(code);
+                    }
+                };
+            }
+        }).throttleLast(1, TimeUnit.HOURS)
+                .subscribe(new Observer<Integer>() {
+                    @Override
+                    public void onSubscribe(Disposable d) {
+
+                    }
+
+                    @Override
+                    public void onNext(Integer integer) {
+                        Log.e("initTagObservable", "onNext: " + integer);
+                        String s = "tags:\t";
+                        switch (integer) {
+                            case 0:
+                                Log.e("jiguangInterface", s + "Tag绑定成功");
+                                break;
+                            case 6001:
+                                Log.e("jiguangInterface", s + "无效的设置");
+                                break;
+                            case 6005:
+                                Log.e("jiguangInterface", s + "某一个 tag 字符串不合法");
+                                ToastUtil.show("设备标签不合法,联系管理员修改\t" + "code:6005");
+                                break;
+                            case 6006:
+                                Log.e("jiguangInterface", s + "某一个 tag 超长");
+                                ToastUtil.show("设备标签过长,联系管理员修改\t" + "code:6006");
+                                break;
+                            case 6007:
+                                Log.e("jiguangInterface", s + "tags 数量超出限制");
+                                ToastUtil.show("设备标签数量超出限制,联系管理员修改\t" + "code:6007");
+                                break;
+                            case 6008:
+                                Log.e("jiguangInterface", s + "tag 超出总长度限制");
+                                ToastUtil.show("设备标签超出总长度限制,联系管理员修改\t" + "code:6008");
+                                break;
+                            case 6011:
+                                Log.e("jiguangInterface", s + "短时间内操作过于频繁");
+                                break;
+                            case 6013:
+                                Log.e("jiguangInterface", s + "用户设备时间轴异常");
+                                ToastUtil.show("用户设备时间轴异常,修改后重新登陆\t" + "code:6013");
+                                break;
+                            case 6018:
+                                Log.e("jiguangInterface", s + "Tags 过多");
+                                cleanJpushTag();
+                                ToastUtil.show("设备标签数量超出限制,联系管理员修改\t" + "code:6018");
+                                break;
+                            case 6021:
+                                Log.e("jiguangInterface", s + "tags 操作正在进行中");
+                                break;
+                            //需要重新设置
+                            case 6002:
+                                Log.e("jiguangInterface", s + "设置超时，请重试");
+                                setJpushTags();
+                                break;
+                            case 6014:
+                                Log.e("jiguangInterface", s + "服务器繁忙,建议重试");
+                                setJpushTags();
+                                break;
+                            case 6020:
+                                Log.e("jiguangInterface", s + "建议过一段时间再设置");
+                                setJpushTags();
+                                break;
+                            case 6024:
+                                Log.e("jiguangInterface", s + "服务器内部错误");
+                                setJpushTags();
+                                break;
+                            default:
+                                break;
+                        }
+                    }
+
+                    @Override
+                    public void onError(Throwable e) {
+
+                    }
+
+                    @Override
+                    public void onComplete() {
+
+                    }
+                });
+    }
+
+    public void onTagOperatorResult(JPushMessage jPushMessage) {
+        if (jPushMessage == null) {
+            return;
+        }
+        int errorCode = jPushMessage.getErrorCode();
+        onTagResult.onResult(errorCode);
+    }
+
+    public static void setJpushTags() {
+        Log.e("jiguangInterface", "30s后重新设置tags");
+        HTTPInterface.setJpushTags(context);
+    }
+
+    private static OnAliasResult onAliasResult;
+
+    interface OnAliasResult {
+        void onResult(int code);
+    }
+
+    private static OnTagResult onTagResult;
+
+    interface OnTagResult {
+        void onResult(int code);
+    }
+
+    private String key = "MGM3YmE1YTE2MjJkYmE3OGQ1YmQwMGNjOjFjOTJiODVjZjM0ODhiNTJkNDQyNDJlOA==";
+
+    synchronized public  void cleanJpushAlias() {
+        //alias的绑定的设备超过10个，但是alias应该是一个设备对应一个，在重置设备后jpush的regid会变动，所以需要清除
+        //https://docs.jiguang.cn/jpush/server/push/rest_api_v3_device/#_5
+        OkHttpClient client = new OkHttpClient();
+        Request request = new Request.Builder()
+                .url(URLPath.DELETE_JPUSH_ALIAS + Utils.getSerial())
+                .header("Authorization", key)
+                .delete()
+                .build();
+        Call call = client.newCall(request);
+        call.enqueue(new Callback() {
+            @Override
+            public void onFailure(@NotNull Call call, @NotNull IOException e) {
+                Log.e("cleanJpushAlias", "onFailure: " + e.getMessage());
+            }
+
+            @Override
+            public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException {
+                Log.e("cleanJpushAlias", "onResponse: " + response.toString());
+                Log.e(TAG, "onResponse: " + "清除Alias成功");
+            }
+        });
+    }
+
+    synchronized public  void cleanJpushTag() {
+        OkHttpClient client = new OkHttpClient();
+        Request request = new Request.Builder()
+                .url(URLPath.DELETE_JPUSH_TAG + Utils.getSerial())
+                .header("Authorization", key)
+                .delete()
+                .build();
+        Call call = client.newCall(request);
+        call.enqueue(new Callback() {
+            @Override
+            public void onFailure(@NotNull Call call, @NotNull IOException e) {
+                Log.e("cleanJpushTag", "onFailure: " + e.getMessage());
+            }
+
+            @Override
+            public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException {
+                Log.e("cleanJpushTag", "onResponse: " + response.toString());
+                Log.e(TAG, "onResponse: " + "清除Tag成功");
+            }
+        });
+    }
+
+}
diff --git a/src/com/android/colorfulos/compat/AccessibilityManagerCompat.java b/src/com/aoleyun/os/compat/AccessibilityManagerCompat.java
similarity index 96%
rename from src/com/android/colorfulos/compat/AccessibilityManagerCompat.java
rename to src/com/aoleyun/os/compat/AccessibilityManagerCompat.java
index fdfb396..d9a44b7 100644
--- a/src/com/android/colorfulos/compat/AccessibilityManagerCompat.java
+++ b/src/com/aoleyun/os/compat/AccessibilityManagerCompat.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.compat;
+package com.aoleyun.os.compat;
 
 import android.content.Context;
 import android.os.Bundle;
@@ -23,8 +23,8 @@ import android.view.accessibility.AccessibilityEvent;
 import android.view.accessibility.AccessibilityManager;
 import android.view.accessibility.AccessibilityNodeInfo;
 
-import com.android.colorfulos.testing.TestProtocol;
-import com.android.colorfulos.Utilities;
+import com.aoleyun.os.testing.TestProtocol;
+import com.aoleyun.os.Utilities;
 
 import java.util.function.Consumer;
 
@@ -53,7 +53,7 @@ public class AccessibilityManagerCompat {
     }
 
     public static void sendStateEventToTest(Context context, int stateOrdinal) {
-        if (com.android.colorfulos.testing.TestProtocol.sDebugTracing) {
+        if (TestProtocol.sDebugTracing) {
             android.util.Log.e(TestProtocol.NO_ALLAPPS_EVENT_TAG, "sendStateEventToTest");
         }
         final AccessibilityManager accessibilityManager = getAccessibilityManagerForTest(context);
diff --git a/src/com/android/colorfulos/compat/AlphabeticIndexCompat.java b/src/com/aoleyun/os/compat/AlphabeticIndexCompat.java
similarity index 98%
rename from src/com/android/colorfulos/compat/AlphabeticIndexCompat.java
rename to src/com/aoleyun/os/compat/AlphabeticIndexCompat.java
index 0b74ba3..943f6bb 100644
--- a/src/com/android/colorfulos/compat/AlphabeticIndexCompat.java
+++ b/src/com/aoleyun/os/compat/AlphabeticIndexCompat.java
@@ -1,11 +1,11 @@
-package com.android.colorfulos.compat;
+package com.aoleyun.os.compat;
 
 import android.content.Context;
 import android.icu.text.AlphabeticIndex;
 import android.os.LocaleList;
 import android.util.Log;
 
-import com.android.colorfulos.Utilities;
+import com.aoleyun.os.Utilities;
 
 import java.util.Locale;
 
diff --git a/src/com/android/colorfulos/compat/AppWidgetManagerCompat.java b/src/com/aoleyun/os/compat/AppWidgetManagerCompat.java
similarity index 87%
rename from src/com/android/colorfulos/compat/AppWidgetManagerCompat.java
rename to src/com/aoleyun/os/compat/AppWidgetManagerCompat.java
index a0d16d2..6dcc697 100644
--- a/src/com/android/colorfulos/compat/AppWidgetManagerCompat.java
+++ b/src/com/aoleyun/os/compat/AppWidgetManagerCompat.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.compat;
+package com.aoleyun.os.compat;
 
 import android.appwidget.AppWidgetManager;
 import android.appwidget.AppWidgetProviderInfo;
@@ -23,13 +23,13 @@ import android.content.Context;
 import android.os.Bundle;
 import android.os.UserHandle;
 
-import com.android.colorfulos.LauncherAppWidgetInfo;
-import com.android.colorfulos.LauncherAppWidgetProviderInfo;
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.config.FeatureFlags;
-import com.android.colorfulos.util.ComponentKey;
-import com.android.colorfulos.util.PackageUserKey;
-import com.android.colorfulos.widget.custom.CustomWidgetParser;
+import com.aoleyun.os.LauncherAppWidgetInfo;
+import com.aoleyun.os.LauncherAppWidgetProviderInfo;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.config.FeatureFlags;
+import com.aoleyun.os.util.ComponentKey;
+import com.aoleyun.os.util.PackageUserKey;
+import com.aoleyun.os.widget.custom.CustomWidgetParser;
 
 import java.util.HashMap;
 import java.util.List;
diff --git a/src/com/android/colorfulos/compat/AppWidgetManagerCompatVL.java b/src/com/aoleyun/os/compat/AppWidgetManagerCompatVL.java
similarity index 93%
rename from src/com/android/colorfulos/compat/AppWidgetManagerCompatVL.java
rename to src/com/aoleyun/os/compat/AppWidgetManagerCompatVL.java
index d136108..cdf39c1 100644
--- a/src/com/android/colorfulos/compat/AppWidgetManagerCompatVL.java
+++ b/src/com/aoleyun/os/compat/AppWidgetManagerCompatVL.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.compat;
+package com.aoleyun.os.compat;
 
 import android.appwidget.AppWidgetProviderInfo;
 import android.content.ComponentName;
@@ -24,12 +24,12 @@ import android.os.Process;
 import android.os.UserHandle;
 import android.os.UserManager;
 
-import com.android.colorfulos.LauncherAppWidgetInfo;
-import com.android.colorfulos.LauncherAppWidgetProviderInfo;
-import com.android.colorfulos.config.FeatureFlags;
-import com.android.colorfulos.util.ComponentKey;
-import com.android.colorfulos.util.PackageUserKey;
-import com.android.colorfulos.widget.custom.CustomWidgetParser;
+import com.aoleyun.os.LauncherAppWidgetInfo;
+import com.aoleyun.os.LauncherAppWidgetProviderInfo;
+import com.aoleyun.os.config.FeatureFlags;
+import com.aoleyun.os.util.ComponentKey;
+import com.aoleyun.os.util.PackageUserKey;
+import com.aoleyun.os.widget.custom.CustomWidgetParser;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/src/com/android/colorfulos/compat/AppWidgetManagerCompatVO.java b/src/com/aoleyun/os/compat/AppWidgetManagerCompatVO.java
similarity index 90%
rename from src/com/android/colorfulos/compat/AppWidgetManagerCompatVO.java
rename to src/com/aoleyun/os/compat/AppWidgetManagerCompatVO.java
index 8b09985..c2adf63 100644
--- a/src/com/android/colorfulos/compat/AppWidgetManagerCompatVO.java
+++ b/src/com/aoleyun/os/compat/AppWidgetManagerCompatVO.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.compat;
+package com.aoleyun.os.compat;
 
 import android.appwidget.AppWidgetProviderInfo;
 import android.content.Context;
 
-import com.android.colorfulos.config.FeatureFlags;
-import com.android.colorfulos.util.PackageUserKey;
+import com.aoleyun.os.config.FeatureFlags;
+import com.aoleyun.os.util.PackageUserKey;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/src/com/android/colorfulos/compat/LauncherAppsCompat.java b/src/com/aoleyun/os/compat/LauncherAppsCompat.java
similarity index 96%
rename from src/com/android/colorfulos/compat/LauncherAppsCompat.java
rename to src/com/aoleyun/os/compat/LauncherAppsCompat.java
index 558da7f..0fc1fc9 100644
--- a/src/com/android/colorfulos/compat/LauncherAppsCompat.java
+++ b/src/com/aoleyun/os/compat/LauncherAppsCompat.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.compat;
+package com.aoleyun.os.compat;
 
 import android.content.ComponentName;
 import android.content.Context;
@@ -27,8 +27,8 @@ import android.graphics.Rect;
 import android.os.Bundle;
 import android.os.UserHandle;
 
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.util.PackageUserKey;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.util.PackageUserKey;
 
 import java.util.List;
 
diff --git a/src/com/android/colorfulos/compat/LauncherAppsCompatVL.java b/src/com/aoleyun/os/compat/LauncherAppsCompatVL.java
similarity index 96%
rename from src/com/android/colorfulos/compat/LauncherAppsCompatVL.java
rename to src/com/aoleyun/os/compat/LauncherAppsCompatVL.java
index 54b5956..943f7b6 100644
--- a/src/com/android/colorfulos/compat/LauncherAppsCompatVL.java
+++ b/src/com/aoleyun/os/compat/LauncherAppsCompatVL.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.compat;
+package com.aoleyun.os.compat;
 
 import android.content.ComponentName;
 import android.content.Context;
@@ -32,8 +32,7 @@ import android.os.Process;
 import android.os.UserHandle;
 import android.util.ArrayMap;
 
-import com.android.colorfulos.compat.ShortcutConfigActivityInfo.ShortcutConfigActivityInfoVL;
-import com.android.colorfulos.util.PackageUserKey;
+import com.aoleyun.os.util.PackageUserKey;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -195,7 +194,7 @@ public class LauncherAppsCompatVL extends LauncherAppsCompat {
                 pm.queryIntentActivities(new Intent(Intent.ACTION_CREATE_SHORTCUT), 0)) {
             if (packageUser == null || packageUser.mPackageName
                     .equals(info.activityInfo.packageName)) {
-                result.add(new ShortcutConfigActivityInfoVL(info.activityInfo));
+                result.add(new ShortcutConfigActivityInfo.ShortcutConfigActivityInfoVL(info.activityInfo));
             }
         }
         return result;
diff --git a/src/com/android/colorfulos/compat/LauncherAppsCompatVO.java b/src/com/aoleyun/os/compat/LauncherAppsCompatVO.java
similarity index 91%
rename from src/com/android/colorfulos/compat/LauncherAppsCompatVO.java
rename to src/com/aoleyun/os/compat/LauncherAppsCompatVO.java
index ac9da94..e2903ee 100644
--- a/src/com/android/colorfulos/compat/LauncherAppsCompatVO.java
+++ b/src/com/aoleyun/os/compat/LauncherAppsCompatVO.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.compat;
+package com.aoleyun.os.compat;
 
 import android.annotation.TargetApi;
 import android.content.Context;
@@ -30,13 +30,12 @@ import android.os.Parcelable;
 import android.os.Process;
 import android.os.UserHandle;
 
-import com.android.colorfulos.LauncherAppState;
-import com.android.colorfulos.LauncherModel;
-import com.android.colorfulos.WorkspaceItemInfo;
-import com.android.colorfulos.compat.ShortcutConfigActivityInfo.ShortcutConfigActivityInfoVO;
-import com.android.colorfulos.icons.LauncherIcons;
-import com.android.colorfulos.util.LooperExecutor;
-import com.android.colorfulos.util.PackageUserKey;
+import com.aoleyun.os.LauncherAppState;
+import com.aoleyun.os.LauncherModel;
+import com.aoleyun.os.WorkspaceItemInfo;
+import com.aoleyun.os.icons.LauncherIcons;
+import com.aoleyun.os.util.LooperExecutor;
+import com.aoleyun.os.util.PackageUserKey;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -84,7 +83,7 @@ public class LauncherAppsCompatVO extends LauncherAppsCompatVL {
             for (LauncherActivityInfo activityInfo : activities) {
                 if (ignoreTargetSdk || activityInfo.getApplicationInfo().targetSdkVersion >=
                         Build.VERSION_CODES.O) {
-                    result.add(new ShortcutConfigActivityInfoVO(activityInfo));
+                    result.add(new ShortcutConfigActivityInfo.ShortcutConfigActivityInfoVO(activityInfo));
                 }
             }
         }
diff --git a/src/com/android/colorfulos/compat/LauncherAppsCompatVQ.java b/src/com/aoleyun/os/compat/LauncherAppsCompatVQ.java
similarity index 96%
rename from src/com/android/colorfulos/compat/LauncherAppsCompatVQ.java
rename to src/com/aoleyun/os/compat/LauncherAppsCompatVQ.java
index 769ef29..b47c5ba 100644
--- a/src/com/android/colorfulos/compat/LauncherAppsCompatVQ.java
+++ b/src/com/aoleyun/os/compat/LauncherAppsCompatVQ.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.compat;
+package com.aoleyun.os.compat;
 
 import android.annotation.TargetApi;
 import android.content.Context;
diff --git a/src/com/android/colorfulos/compat/PackageInstallerCompat.java b/src/com/aoleyun/os/compat/PackageInstallerCompat.java
similarity index 98%
rename from src/com/android/colorfulos/compat/PackageInstallerCompat.java
rename to src/com/aoleyun/os/compat/PackageInstallerCompat.java
index d08a243..f0d41b6 100644
--- a/src/com/android/colorfulos/compat/PackageInstallerCompat.java
+++ b/src/com/aoleyun/os/compat/PackageInstallerCompat.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.compat;
+package com.aoleyun.os.compat;
 
 import android.content.ComponentName;
 import android.content.Context;
diff --git a/src/com/android/colorfulos/compat/PackageInstallerCompatVL.java b/src/com/aoleyun/os/compat/PackageInstallerCompatVL.java
similarity index 95%
rename from src/com/android/colorfulos/compat/PackageInstallerCompatVL.java
rename to src/com/aoleyun/os/compat/PackageInstallerCompatVL.java
index a18dce2..5f9eafb 100644
--- a/src/com/android/colorfulos/compat/PackageInstallerCompatVL.java
+++ b/src/com/aoleyun/os/compat/PackageInstallerCompatVL.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.compat;
+package com.aoleyun.os.compat;
 
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
@@ -27,12 +27,12 @@ import android.os.UserHandle;
 import android.text.TextUtils;
 import android.util.SparseArray;
 
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.icons.IconCache;
-import com.android.colorfulos.LauncherAppState;
-import com.android.colorfulos.LauncherModel;
-import com.android.colorfulos.config.FeatureFlags;
-import com.android.colorfulos.util.Thunk;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.icons.IconCache;
+import com.aoleyun.os.LauncherAppState;
+import com.aoleyun.os.LauncherModel;
+import com.aoleyun.os.config.FeatureFlags;
+import com.aoleyun.os.util.Thunk;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/src/com/android/colorfulos/compat/ShortcutConfigActivityInfo.java b/src/com/aoleyun/os/compat/ShortcutConfigActivityInfo.java
similarity index 94%
rename from src/com/android/colorfulos/compat/ShortcutConfigActivityInfo.java
rename to src/com/aoleyun/os/compat/ShortcutConfigActivityInfo.java
index 143ab8e..9be9ca8 100644
--- a/src/com/android/colorfulos/compat/ShortcutConfigActivityInfo.java
+++ b/src/com/aoleyun/os/compat/ShortcutConfigActivityInfo.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.compat;
+package com.aoleyun.os.compat;
 
 import android.annotation.TargetApi;
 import android.app.Activity;
@@ -32,11 +32,11 @@ import android.os.UserHandle;
 import android.util.Log;
 import android.widget.Toast;
 
-import com.android.colorfulos.WorkspaceItemInfo;
-import com.android.colorfulos.icons.ComponentWithLabel;
-import com.android.colorfulos.icons.IconCache;
-import com.android.colorfulos.LauncherSettings;
-import com.android.colorfulos.R;
+import com.aoleyun.os.WorkspaceItemInfo;
+import com.aoleyun.os.icons.ComponentWithLabel;
+import com.aoleyun.os.icons.IconCache;
+import com.aoleyun.os.LauncherSettings;
+import com.aoleyun.os.R;
 
 /**
  * Wrapper class for representing a shortcut configure activity.
diff --git a/src/com/android/colorfulos/compat/UserManagerCompat.java b/src/com/aoleyun/os/compat/UserManagerCompat.java
similarity index 96%
rename from src/com/android/colorfulos/compat/UserManagerCompat.java
rename to src/com/aoleyun/os/compat/UserManagerCompat.java
index a6e92ba..364738a 100644
--- a/src/com/android/colorfulos/compat/UserManagerCompat.java
+++ b/src/com/aoleyun/os/compat/UserManagerCompat.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.compat;
+package com.aoleyun.os.compat;
 
 import android.content.Context;
 import android.os.UserHandle;
 
-import com.android.colorfulos.Utilities;
+import com.aoleyun.os.Utilities;
 
 import java.util.List;
 
diff --git a/src/com/android/colorfulos/compat/UserManagerCompatVNMr1.java b/src/com/aoleyun/os/compat/UserManagerCompatVNMr1.java
similarity index 99%
rename from src/com/android/colorfulos/compat/UserManagerCompatVNMr1.java
rename to src/com/aoleyun/os/compat/UserManagerCompatVNMr1.java
index 9895481..fa75be5 100644
--- a/src/com/android/colorfulos/compat/UserManagerCompatVNMr1.java
+++ b/src/com/aoleyun/os/compat/UserManagerCompatVNMr1.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.compat;
+package com.aoleyun.os.compat;
 
 import android.annotation.TargetApi;
 import android.content.Context;
diff --git a/src/com/android/colorfulos/compat/UserManagerCompatVP.java b/src/com/aoleyun/os/compat/UserManagerCompatVP.java
similarity index 96%
rename from src/com/android/colorfulos/compat/UserManagerCompatVP.java
rename to src/com/aoleyun/os/compat/UserManagerCompatVP.java
index 833ddf8..43951e3 100644
--- a/src/com/android/colorfulos/compat/UserManagerCompatVP.java
+++ b/src/com/aoleyun/os/compat/UserManagerCompatVP.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.compat;
+package com.aoleyun.os.compat;
 
 import android.annotation.TargetApi;
 import android.content.Context;
diff --git a/src/com/android/colorfulos/config/BaseFlags.java b/src/com/aoleyun/os/config/BaseFlags.java
similarity index 99%
rename from src/com/android/colorfulos/config/BaseFlags.java
rename to src/com/aoleyun/os/config/BaseFlags.java
index 58016b9..0a71a68 100644
--- a/src/com/android/colorfulos/config/BaseFlags.java
+++ b/src/com/aoleyun/os/config/BaseFlags.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.config;
+package com.aoleyun.os.config;
 
 import static androidx.core.util.Preconditions.checkNotNull;
 
@@ -30,7 +30,7 @@ import androidx.annotation.GuardedBy;
 import androidx.annotation.Keep;
 import androidx.annotation.VisibleForTesting;
 
-import com.android.colorfulos.Utilities;
+import com.aoleyun.os.Utilities;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com/android/colorfulos/config/FlagTogglerPrefUi.java b/src/com/aoleyun/os/config/FlagTogglerPrefUi.java
similarity index 97%
rename from src/com/android/colorfulos/config/FlagTogglerPrefUi.java
rename to src/com/aoleyun/os/config/FlagTogglerPrefUi.java
index 918d48f..6b1f325 100644
--- a/src/com/android/colorfulos/config/FlagTogglerPrefUi.java
+++ b/src/com/aoleyun/os/config/FlagTogglerPrefUi.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.config;
+package com.aoleyun.os.config;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -25,8 +25,8 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.widget.Toast;
 
-import com.android.colorfulos.R;
-import com.android.colorfulos.config.BaseFlags.TogglableFlag;
+import com.aoleyun.os.R;
+import com.aoleyun.os.config.BaseFlags.TogglableFlag;
 
 import androidx.preference.PreferenceDataStore;
 import androidx.preference.PreferenceFragment;
diff --git a/src/com/android/colorfulos/dot/DotInfo.java b/src/com/aoleyun/os/dot/DotInfo.java
similarity index 94%
rename from src/com/android/colorfulos/dot/DotInfo.java
rename to src/com/aoleyun/os/dot/DotInfo.java
index c4ba5c1..a1ac75f 100644
--- a/src/com/android/colorfulos/dot/DotInfo.java
+++ b/src/com/aoleyun/os/dot/DotInfo.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.dot;
+package com.aoleyun.os.dot;
 
-import com.android.colorfulos.notification.NotificationInfo;
-import com.android.colorfulos.notification.NotificationKeyData;
+import com.aoleyun.os.notification.NotificationInfo;
+import com.aoleyun.os.notification.NotificationKeyData;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com/android/colorfulos/dot/FolderDotInfo.java b/src/com/aoleyun/os/dot/FolderDotInfo.java
similarity index 95%
rename from src/com/android/colorfulos/dot/FolderDotInfo.java
rename to src/com/aoleyun/os/dot/FolderDotInfo.java
index 4ccb442..ec445ed 100644
--- a/src/com/android/colorfulos/dot/FolderDotInfo.java
+++ b/src/com/aoleyun/os/dot/FolderDotInfo.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.dot;
+package com.aoleyun.os.dot;
 
 import android.view.ViewDebug;
 
-import com.android.colorfulos.Utilities;
+import com.aoleyun.os.Utilities;
 
 /**
  * Subclass of DotInfo that only contains the dot count, which is
diff --git a/src/com/android/colorfulos/dragndrop/AddItemActivity.java b/src/com/aoleyun/os/dragndrop/AddItemActivity.java
similarity index 87%
rename from src/com/android/colorfulos/dragndrop/AddItemActivity.java
rename to src/com/aoleyun/os/dragndrop/AddItemActivity.java
index 8026261..4c17f3f 100644
--- a/src/com/android/colorfulos/dragndrop/AddItemActivity.java
+++ b/src/com/aoleyun/os/dragndrop/AddItemActivity.java
@@ -14,12 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.dragndrop;
+package com.aoleyun.os.dragndrop;
 
-import static com.android.colorfulos.logging.LoggerUtils.newCommandAction;
-import static com.android.colorfulos.logging.LoggerUtils.newContainerTarget;
-import static com.android.colorfulos.logging.LoggerUtils.newItemTarget;
-import static com.android.colorfulos.logging.LoggerUtils.newLauncherEvent;
+import static com.aoleyun.os.logging.LoggerUtils.newItemTarget;
 
 import android.annotation.TargetApi;
 import android.app.ActivityOptions;
@@ -41,26 +38,27 @@ import android.view.View.DragShadowBuilder;
 import android.view.View.OnLongClickListener;
 import android.view.View.OnTouchListener;
 
-import com.android.colorfulos.BaseActivity;
-import com.android.colorfulos.InstallShortcutReceiver;
-import com.android.colorfulos.InvariantDeviceProfile;
-import com.android.colorfulos.LauncherAppState;
-import com.android.colorfulos.LauncherAppWidgetHost;
-import com.android.colorfulos.LauncherAppWidgetProviderInfo;
-import com.android.colorfulos.LauncherModel;
-import com.android.colorfulos.R;
-import com.android.colorfulos.compat.AppWidgetManagerCompat;
-import com.android.colorfulos.compat.LauncherAppsCompatVO;
-import com.android.colorfulos.model.WidgetItem;
-import com.android.colorfulos.userevent.nano.LauncherLogProto.Action;
-import com.android.colorfulos.userevent.nano.LauncherLogProto.ContainerType;
-import com.android.colorfulos.util.InstantAppResolver;
-import com.android.colorfulos.util.LooperExecutor;
-import com.android.colorfulos.views.BaseDragLayer;
-import com.android.colorfulos.widget.PendingAddShortcutInfo;
-import com.android.colorfulos.widget.PendingAddWidgetInfo;
-import com.android.colorfulos.widget.WidgetHostViewLoader;
-import com.android.colorfulos.widget.WidgetImageView;
+import com.aoleyun.os.BaseActivity;
+import com.aoleyun.os.InstallShortcutReceiver;
+import com.aoleyun.os.InvariantDeviceProfile;
+import com.aoleyun.os.LauncherAppState;
+import com.aoleyun.os.LauncherAppWidgetHost;
+import com.aoleyun.os.LauncherAppWidgetProviderInfo;
+import com.aoleyun.os.LauncherModel;
+import com.aoleyun.os.R;
+import com.aoleyun.os.compat.AppWidgetManagerCompat;
+import com.aoleyun.os.compat.LauncherAppsCompatVO;
+import com.aoleyun.os.model.WidgetItem;
+import com.aoleyun.os.userevent.nano.LauncherLogProto.Action;
+import com.aoleyun.os.userevent.nano.LauncherLogProto.ContainerType;
+import com.aoleyun.os.util.InstantAppResolver;
+import com.aoleyun.os.util.LooperExecutor;
+import com.aoleyun.os.views.BaseDragLayer;
+import com.aoleyun.os.widget.PendingAddShortcutInfo;
+import com.aoleyun.os.widget.PendingAddWidgetInfo;
+import com.aoleyun.os.widget.WidgetHostViewLoader;
+import com.aoleyun.os.widget.WidgetImageView;
+import com.aoleyun.os.logging.LoggerUtils;
 
 import java.util.function.Supplier;
 
@@ -320,9 +318,9 @@ public class AddItemActivity extends BaseActivity implements OnLongClickListener
     }
 
     private void logCommand(int command) {
-        getUserEventDispatcher().dispatchUserEvent(newLauncherEvent(
-                newCommandAction(command),
+        getUserEventDispatcher().dispatchUserEvent(LoggerUtils.newLauncherEvent(
+                LoggerUtils.newCommandAction(command),
                 newItemTarget(mWidgetCell.getWidgetView(), mInstantAppResolver),
-                newContainerTarget(ContainerType.PINITEM)), null);
+                LoggerUtils.newContainerTarget(ContainerType.PINITEM)), null);
     }
 }
diff --git a/src/com/android/colorfulos/dragndrop/BaseItemDragListener.java b/src/com/aoleyun/os/dragndrop/BaseItemDragListener.java
similarity index 89%
rename from src/com/android/colorfulos/dragndrop/BaseItemDragListener.java
rename to src/com/aoleyun/os/dragndrop/BaseItemDragListener.java
index 97064a2..1dce1e9 100644
--- a/src/com/android/colorfulos/dragndrop/BaseItemDragListener.java
+++ b/src/com/aoleyun/os/dragndrop/BaseItemDragListener.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.dragndrop;
+package com.aoleyun.os.dragndrop;
 
-import static com.android.colorfulos.LauncherState.NORMAL;
-import static com.android.colorfulos.states.RotationHelper.REQUEST_LOCK;
-import static com.android.colorfulos.states.RotationHelper.REQUEST_NONE;
+import static com.aoleyun.os.LauncherState.NORMAL;
+import static com.aoleyun.os.states.RotationHelper.REQUEST_LOCK;
+import static com.aoleyun.os.states.RotationHelper.REQUEST_NONE;
 
 import android.content.ClipDescription;
 import android.content.Intent;
@@ -31,14 +31,14 @@ import android.util.Log;
 import android.view.DragEvent;
 import android.view.View;
 
-import com.android.colorfulos.AbstractFloatingView;
-import com.android.colorfulos.DragSource;
-import com.android.colorfulos.DropTarget.DragObject;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.R;
-import com.android.colorfulos.states.InternalStateHandler;
-import com.android.colorfulos.testing.TestProtocol;
-import com.android.colorfulos.widget.PendingItemDragHelper;
+import com.aoleyun.os.AbstractFloatingView;
+import com.aoleyun.os.DragSource;
+import com.aoleyun.os.DropTarget.DragObject;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.R;
+import com.aoleyun.os.states.InternalStateHandler;
+import com.aoleyun.os.testing.TestProtocol;
+import com.aoleyun.os.widget.PendingItemDragHelper;
 
 import java.util.UUID;
 
@@ -50,7 +50,7 @@ public abstract class BaseItemDragListener extends InternalStateHandler implemen
 
     private static final String TAG = "BaseItemDragListener";
 
-    private static final String MIME_TYPE_PREFIX = "com.android.colorfulos.drag_and_drop/";
+    private static final String MIME_TYPE_PREFIX = "com.aoleyun.os.drag_and_drop/";
     public static final String EXTRA_PIN_ITEM_DRAG_LISTENER = "pin_item_drag_listener";
 
     // Position of preview relative to the touch location
diff --git a/src/com/android/colorfulos/dragndrop/DragController.java b/src/com/aoleyun/os/dragndrop/DragController.java
similarity index 95%
rename from src/com/android/colorfulos/dragndrop/DragController.java
rename to src/com/aoleyun/os/dragndrop/DragController.java
index d62fd8e..7a23bf8 100644
--- a/src/com/android/colorfulos/dragndrop/DragController.java
+++ b/src/com/aoleyun/os/dragndrop/DragController.java
@@ -14,11 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.dragndrop;
+package com.aoleyun.os.dragndrop;
 
-import static com.android.colorfulos.AbstractFloatingView.TYPE_DISCOVERY_BOUNCE;
-import static com.android.colorfulos.LauncherAnimUtils.SPRING_LOADED_EXIT_DELAY;
-import static com.android.colorfulos.LauncherState.NORMAL;
+import static com.aoleyun.os.LauncherAnimUtils.SPRING_LOADED_EXIT_DELAY;
+import static com.aoleyun.os.LauncherState.NORMAL;
 
 import android.animation.ValueAnimator;
 import android.content.ComponentName;
@@ -34,22 +33,22 @@ import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
 
-import com.android.colorfulos.AbstractFloatingView;
-import com.android.colorfulos.DeleteDropTarget;
-import com.android.colorfulos.DragSource;
-import com.android.colorfulos.DropTarget;
-import com.android.colorfulos.ItemInfo;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.LauncherAppState;
-import com.android.colorfulos.LauncherSettings;
-import com.android.colorfulos.R;
-import com.android.colorfulos.WorkspaceItemInfo;
-import com.android.colorfulos.accessibility.DragViewStateAnnouncer;
-import com.android.colorfulos.testing.TestProtocol;
-import com.android.colorfulos.util.ItemInfoMatcher;
-import com.android.colorfulos.util.Thunk;
-import com.android.colorfulos.util.TouchController;
-import com.android.colorfulos.util.UiThreadHelper;
+import com.aoleyun.os.AbstractFloatingView;
+import com.aoleyun.os.DeleteDropTarget;
+import com.aoleyun.os.DragSource;
+import com.aoleyun.os.DropTarget;
+import com.aoleyun.os.ItemInfo;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.LauncherAppState;
+import com.aoleyun.os.LauncherSettings;
+import com.aoleyun.os.R;
+import com.aoleyun.os.WorkspaceItemInfo;
+import com.aoleyun.os.accessibility.DragViewStateAnnouncer;
+import com.aoleyun.os.testing.TestProtocol;
+import com.aoleyun.os.util.ItemInfoMatcher;
+import com.aoleyun.os.util.Thunk;
+import com.aoleyun.os.util.TouchController;
+import com.aoleyun.os.util.UiThreadHelper;
 
 import java.util.ArrayList;
 
@@ -59,7 +58,8 @@ import java.util.ArrayList;
 public class DragController implements DragDriver.EventListener, TouchController {
     private static final boolean PROFILE_DRAWING_DURING_DRAG = false;
 
-    @Thunk Launcher mLauncher;
+    @Thunk
+    Launcher mLauncher;
     private FlingToDeleteHelper mFlingToDeleteHelper;
 
     // temporaries to avoid gc thrash
@@ -153,7 +153,7 @@ public class DragController implements DragDriver.EventListener, TouchController
 
         // Hide soft keyboard, if visible
         UiThreadHelper.hideKeyboardAsync(mLauncher, mWindowToken);
-        AbstractFloatingView.closeOpenViews(mLauncher, false, TYPE_DISCOVERY_BOUNCE);
+        AbstractFloatingView.closeOpenViews(mLauncher, false, AbstractFloatingView.TYPE_DISCOVERY_BOUNCE);
 
         mOptions = options;
         if (mOptions.systemDndStartPoint != null) {
diff --git a/src/com/android/colorfulos/dragndrop/DragDriver.java b/src/com/aoleyun/os/dragndrop/DragDriver.java
similarity index 98%
rename from src/com/android/colorfulos/dragndrop/DragDriver.java
rename to src/com/aoleyun/os/dragndrop/DragDriver.java
index 8712311..647e924 100644
--- a/src/com/android/colorfulos/dragndrop/DragDriver.java
+++ b/src/com/aoleyun/os/dragndrop/DragDriver.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.dragndrop;
+package com.aoleyun.os.dragndrop;
 
 import android.content.Context;
 import android.view.DragEvent;
 import android.view.MotionEvent;
 
-import com.android.colorfulos.DropTarget.DragObject;
+import com.aoleyun.os.DropTarget.DragObject;
 
 /**
  * Base class for driving a drag/drop operation.
diff --git a/src/com/android/colorfulos/dragndrop/DragLayer.java b/src/com/aoleyun/os/dragndrop/DragLayer.java
similarity index 96%
rename from src/com/android/colorfulos/dragndrop/DragLayer.java
rename to src/com/aoleyun/os/dragndrop/DragLayer.java
index df300cc..97a41dc 100644
--- a/src/com/android/colorfulos/dragndrop/DragLayer.java
+++ b/src/com/aoleyun/os/dragndrop/DragLayer.java
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.dragndrop;
+package com.aoleyun.os.dragndrop;
 
 import static android.view.View.MeasureSpec.EXACTLY;
 import static android.view.View.MeasureSpec.getMode;
 import static android.view.View.MeasureSpec.getSize;
 
-import static com.android.colorfulos.compat.AccessibilityManagerCompat.sendCustomAccessibilityEvent;
+import static com.aoleyun.os.compat.AccessibilityManagerCompat.sendCustomAccessibilityEvent;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -43,23 +43,23 @@ import android.view.animation.Interpolator;
 import android.widget.FrameLayout;
 import android.widget.TextView;
 
-import com.android.colorfulos.AbstractFloatingView;
-import com.android.colorfulos.CellLayout;
-import com.android.colorfulos.DropTargetBar;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.R;
-import com.android.colorfulos.graphics.RotationMode;
-import com.android.colorfulos.ShortcutAndWidgetContainer;
-import com.android.colorfulos.Workspace;
-import com.android.colorfulos.anim.Interpolators;
-import com.android.colorfulos.folder.Folder;
-import com.android.colorfulos.folder.FolderIcon;
-import com.android.colorfulos.graphics.WorkspaceAndHotseatScrim;
-import com.android.colorfulos.keyboard.ViewGroupFocusHelper;
-import com.android.colorfulos.uioverrides.UiFactory;
-import com.android.colorfulos.util.Thunk;
-import com.android.colorfulos.views.BaseDragLayer;
-import com.android.colorfulos.views.Transposable;
+import com.aoleyun.os.AbstractFloatingView;
+import com.aoleyun.os.CellLayout;
+import com.aoleyun.os.DropTargetBar;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.R;
+import com.aoleyun.os.graphics.RotationMode;
+import com.aoleyun.os.ShortcutAndWidgetContainer;
+import com.aoleyun.os.Workspace;
+import com.aoleyun.os.anim.Interpolators;
+import com.aoleyun.os.folder.Folder;
+import com.aoleyun.os.folder.FolderIcon;
+import com.aoleyun.os.graphics.WorkspaceAndHotseatScrim;
+import com.aoleyun.os.keyboard.ViewGroupFocusHelper;
+import com.aoleyun.os.uioverrides.UiFactory;
+import com.aoleyun.os.util.Thunk;
+import com.aoleyun.os.views.BaseDragLayer;
+import com.aoleyun.os.views.Transposable;
 
 import java.util.ArrayList;
 
diff --git a/src/com/android/colorfulos/dragndrop/DragOptions.java b/src/com/aoleyun/os/dragndrop/DragOptions.java
similarity index 96%
rename from src/com/android/colorfulos/dragndrop/DragOptions.java
rename to src/com/aoleyun/os/dragndrop/DragOptions.java
index 2346300..e1cee54 100644
--- a/src/com/android/colorfulos/dragndrop/DragOptions.java
+++ b/src/com/aoleyun/os/dragndrop/DragOptions.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.dragndrop;
+package com.aoleyun.os.dragndrop;
 
 import android.graphics.Point;
 
-import com.android.colorfulos.DropTarget;
+import com.aoleyun.os.DropTarget;
 
 /**
  * Set of options to control the drag and drop behavior.
diff --git a/src/com/android/colorfulos/dragndrop/DragView.java b/src/com/aoleyun/os/dragndrop/DragView.java
similarity index 96%
rename from src/com/android/colorfulos/dragndrop/DragView.java
rename to src/com/aoleyun/os/dragndrop/DragView.java
index a340c7a..e6f0478 100644
--- a/src/com/android/colorfulos/dragndrop/DragView.java
+++ b/src/com/aoleyun/os/dragndrop/DragView.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.dragndrop;
+package com.aoleyun.os.dragndrop;
 
-import static com.android.colorfulos.Utilities.getBadge;
+import static com.aoleyun.os.Utilities.getBadge;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -41,20 +41,20 @@ import android.os.Handler;
 import android.os.Looper;
 import android.view.View;
 
-import com.android.colorfulos.FastBitmapDrawable;
-import com.android.colorfulos.ItemInfo;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.LauncherModel;
-import com.android.colorfulos.LauncherSettings;
-import com.android.colorfulos.LauncherState;
-import com.android.colorfulos.LauncherStateManager;
-import com.android.colorfulos.R;
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.FirstFrameAnimatorHelper;
-import com.android.colorfulos.anim.Interpolators;
-import com.android.colorfulos.icons.LauncherIcons;
-import com.android.colorfulos.util.Themes;
-import com.android.colorfulos.util.Thunk;
+import com.aoleyun.os.FastBitmapDrawable;
+import com.aoleyun.os.ItemInfo;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.LauncherModel;
+import com.aoleyun.os.LauncherSettings;
+import com.aoleyun.os.LauncherState;
+import com.aoleyun.os.LauncherStateManager;
+import com.aoleyun.os.R;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.FirstFrameAnimatorHelper;
+import com.aoleyun.os.anim.Interpolators;
+import com.aoleyun.os.icons.LauncherIcons;
+import com.aoleyun.os.util.Themes;
+import com.aoleyun.os.util.Thunk;
 
 import java.util.Arrays;
 
diff --git a/src/com/android/colorfulos/dragndrop/FlingToDeleteHelper.java b/src/com/aoleyun/os/dragndrop/FlingToDeleteHelper.java
similarity index 95%
rename from src/com/android/colorfulos/dragndrop/FlingToDeleteHelper.java
rename to src/com/aoleyun/os/dragndrop/FlingToDeleteHelper.java
index 36586bb..edf33d7 100644
--- a/src/com/android/colorfulos/dragndrop/FlingToDeleteHelper.java
+++ b/src/com/aoleyun/os/dragndrop/FlingToDeleteHelper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.dragndrop;
+package com.aoleyun.os.dragndrop;
 
 import android.graphics.PointF;
 import android.os.SystemClock;
@@ -23,11 +23,11 @@ import android.view.MotionEvent;
 import android.view.VelocityTracker;
 import android.view.ViewConfiguration;
 
-import com.android.colorfulos.ButtonDropTarget;
-import com.android.colorfulos.DropTarget;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.R;
-import com.android.colorfulos.util.FlingAnimation;
+import com.aoleyun.os.ButtonDropTarget;
+import com.aoleyun.os.DropTarget;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.R;
+import com.aoleyun.os.util.FlingAnimation;
 
 /**
  * Utility class to manage fling to delete action during drag and drop.
diff --git a/src/com/android/colorfulos/dragndrop/FolderAdaptiveIcon.java b/src/com/aoleyun/os/dragndrop/FolderAdaptiveIcon.java
similarity index 93%
rename from src/com/android/colorfulos/dragndrop/FolderAdaptiveIcon.java
rename to src/com/aoleyun/os/dragndrop/FolderAdaptiveIcon.java
index 08582bb..800d1cd 100644
--- a/src/com/android/colorfulos/dragndrop/FolderAdaptiveIcon.java
+++ b/src/com/aoleyun/os/dragndrop/FolderAdaptiveIcon.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.dragndrop;
+package com.aoleyun.os.dragndrop;
 
 import android.annotation.TargetApi;
 import android.graphics.Bitmap;
@@ -28,14 +28,14 @@ import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.util.Log;
 
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.MainThreadExecutor;
-import com.android.colorfulos.R;
-import com.android.colorfulos.folder.FolderIcon;
-import com.android.colorfulos.folder.PreviewBackground;
-import com.android.colorfulos.graphics.ShiftedBitmapDrawable;
-import com.android.colorfulos.icons.BitmapRenderer;
-import com.android.colorfulos.util.Preconditions;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.MainThreadExecutor;
+import com.aoleyun.os.R;
+import com.aoleyun.os.folder.FolderIcon;
+import com.aoleyun.os.folder.PreviewBackground;
+import com.aoleyun.os.graphics.ShiftedBitmapDrawable;
+import com.aoleyun.os.icons.BitmapRenderer;
+import com.aoleyun.os.util.Preconditions;
 
 /**
  * {@link AdaptiveIconDrawable} representation of a {@link FolderIcon}
diff --git a/src/com/android/colorfulos/dragndrop/LivePreviewWidgetCell.java b/src/com/aoleyun/os/dragndrop/LivePreviewWidgetCell.java
similarity index 90%
rename from src/com/android/colorfulos/dragndrop/LivePreviewWidgetCell.java
rename to src/com/aoleyun/os/dragndrop/LivePreviewWidgetCell.java
index 20c774c..2e23705 100644
--- a/src/com/android/colorfulos/dragndrop/LivePreviewWidgetCell.java
+++ b/src/com/aoleyun/os/dragndrop/LivePreviewWidgetCell.java
@@ -1,4 +1,4 @@
-package com.android.colorfulos.dragndrop;
+package com.aoleyun.os.dragndrop;
 
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -8,10 +8,11 @@ import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.RemoteViews;
 
-import com.android.colorfulos.BaseActivity;
-import com.android.colorfulos.DeviceProfile;
-import com.android.colorfulos.LauncherAppWidgetProviderInfo;
-import com.android.colorfulos.widget.WidgetCell;
+import com.aoleyun.os.BaseActivity;
+import com.aoleyun.os.DeviceProfile;
+import com.aoleyun.os.LauncherAppWidgetProviderInfo;
+import com.aoleyun.os.WidgetPreviewLoader;
+import com.aoleyun.os.widget.WidgetCell;
 
 /**
  * Extension of {@link WidgetCell} which supports generating previews from {@link RemoteViews}
@@ -51,7 +52,7 @@ public class LivePreviewWidgetCell extends WidgetCell {
 
     /**
      * Generates a bitmap by inflating {@param views}.
-     * @see com.android.colorfulos.WidgetPreviewLoader#generateWidgetPreview
+     * @see WidgetPreviewLoader#generateWidgetPreview
      *
      * TODO: Consider moving this to the background thread.
      */
diff --git a/src/com/android/colorfulos/dragndrop/PinItemDragListener.java b/src/com/aoleyun/os/dragndrop/PinItemDragListener.java
similarity index 86%
rename from src/com/android/colorfulos/dragndrop/PinItemDragListener.java
rename to src/com/aoleyun/os/dragndrop/PinItemDragListener.java
index a850d41..5dd3a8b 100644
--- a/src/com/android/colorfulos/dragndrop/PinItemDragListener.java
+++ b/src/com/aoleyun/os/dragndrop/PinItemDragListener.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.dragndrop;
+package com.aoleyun.os.dragndrop;
 
 import android.annotation.TargetApi;
 import android.appwidget.AppWidgetManager;
@@ -27,17 +27,17 @@ import android.view.DragEvent;
 import android.view.View;
 import android.widget.RemoteViews;
 
-import com.android.colorfulos.DragSource;
-import com.android.colorfulos.ItemInfo;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.LauncherAppWidgetProviderInfo;
-import com.android.colorfulos.PendingAddItemInfo;
-import com.android.colorfulos.uioverrides.UiFactory;
-import com.android.colorfulos.userevent.nano.LauncherLogProto;
-import com.android.colorfulos.widget.PendingAddShortcutInfo;
-import com.android.colorfulos.widget.PendingAddWidgetInfo;
-import com.android.colorfulos.widget.PendingItemDragHelper;
-import com.android.colorfulos.widget.WidgetAddFlowHandler;
+import com.aoleyun.os.DragSource;
+import com.aoleyun.os.ItemInfo;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.LauncherAppWidgetProviderInfo;
+import com.aoleyun.os.PendingAddItemInfo;
+import com.aoleyun.os.uioverrides.UiFactory;
+import com.aoleyun.os.userevent.nano.LauncherLogProto;
+import com.aoleyun.os.widget.PendingAddShortcutInfo;
+import com.aoleyun.os.widget.PendingAddWidgetInfo;
+import com.aoleyun.os.widget.PendingItemDragHelper;
+import com.aoleyun.os.widget.WidgetAddFlowHandler;
 
 /**
  * {@link DragSource} for handling drop from a different window. This object is initialized
diff --git a/src/com/android/colorfulos/dragndrop/PinShortcutRequestActivityInfo.java b/src/com/aoleyun/os/dragndrop/PinShortcutRequestActivityInfo.java
similarity index 87%
rename from src/com/android/colorfulos/dragndrop/PinShortcutRequestActivityInfo.java
rename to src/com/aoleyun/os/dragndrop/PinShortcutRequestActivityInfo.java
index a1b2bd3..c7de8e6 100644
--- a/src/com/android/colorfulos/dragndrop/PinShortcutRequestActivityInfo.java
+++ b/src/com/aoleyun/os/dragndrop/PinShortcutRequestActivityInfo.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.dragndrop;
+package com.aoleyun.os.dragndrop;
 
 import android.annotation.TargetApi;
 import android.app.Activity;
@@ -28,15 +28,15 @@ import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Process;
 
-import com.android.colorfulos.FastBitmapDrawable;
-import com.android.colorfulos.WorkspaceItemInfo;
-import com.android.colorfulos.icons.IconCache;
-import com.android.colorfulos.LauncherAnimUtils;
-import com.android.colorfulos.LauncherAppState;
-import com.android.colorfulos.LauncherSettings;
-import com.android.colorfulos.R;
-import com.android.colorfulos.compat.LauncherAppsCompatVO;
-import com.android.colorfulos.compat.ShortcutConfigActivityInfo;
+import com.aoleyun.os.FastBitmapDrawable;
+import com.aoleyun.os.WorkspaceItemInfo;
+import com.aoleyun.os.icons.IconCache;
+import com.aoleyun.os.LauncherAnimUtils;
+import com.aoleyun.os.LauncherAppState;
+import com.aoleyun.os.LauncherSettings;
+import com.aoleyun.os.R;
+import com.aoleyun.os.compat.LauncherAppsCompatVO;
+import com.aoleyun.os.compat.ShortcutConfigActivityInfo;
 
 /**
  * Extension of ShortcutConfigActivityInfo to be used in the confirmation prompt for pin item
diff --git a/src/com/android/colorfulos/dragndrop/PinWidgetFlowHandler.java b/src/com/aoleyun/os/dragndrop/PinWidgetFlowHandler.java
similarity index 92%
rename from src/com/android/colorfulos/dragndrop/PinWidgetFlowHandler.java
rename to src/com/aoleyun/os/dragndrop/PinWidgetFlowHandler.java
index a6d91a2..e6b7eb2 100644
--- a/src/com/android/colorfulos/dragndrop/PinWidgetFlowHandler.java
+++ b/src/com/aoleyun/os/dragndrop/PinWidgetFlowHandler.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.dragndrop;
+package com.aoleyun.os.dragndrop;
 
 import android.annotation.TargetApi;
 import android.appwidget.AppWidgetManager;
@@ -25,9 +25,9 @@ import android.os.Bundle;
 import android.os.Parcel;
 import android.os.Parcelable;
 
-import com.android.colorfulos.ItemInfo;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.widget.WidgetAddFlowHandler;
+import com.aoleyun.os.ItemInfo;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.widget.WidgetAddFlowHandler;
 
 /**
  * Extension of WidgetAddFlowHandler to handle pin item request behavior.
@@ -58,7 +58,7 @@ public class PinWidgetFlowHandler extends WidgetAddFlowHandler implements Parcel
 
     @Override
     public boolean startConfigActivity(Launcher launcher, int appWidgetId, ItemInfo info,
-            int requestCode) {
+                                       int requestCode) {
         Bundle extras = new Bundle();
         extras.putInt(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId);
         mRequest.accept(extras);
diff --git a/src/com/android/colorfulos/dragndrop/SpringLoadedDragController.java b/src/com/aoleyun/os/dragndrop/SpringLoadedDragController.java
similarity index 89%
rename from src/com/android/colorfulos/dragndrop/SpringLoadedDragController.java
rename to src/com/aoleyun/os/dragndrop/SpringLoadedDragController.java
index 2818c21..11adbce 100644
--- a/src/com/android/colorfulos/dragndrop/SpringLoadedDragController.java
+++ b/src/com/aoleyun/os/dragndrop/SpringLoadedDragController.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.dragndrop;
+package com.aoleyun.os.dragndrop;
 
-import com.android.colorfulos.Alarm;
-import com.android.colorfulos.CellLayout;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.OnAlarmListener;
-import com.android.colorfulos.Workspace;
+import com.aoleyun.os.Alarm;
+import com.aoleyun.os.CellLayout;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.OnAlarmListener;
+import com.aoleyun.os.Workspace;
 
 public class SpringLoadedDragController implements OnAlarmListener {
     // how long the user must hover over a mini-screen before it unshrinks
diff --git a/src/com/android/colorfulos/folder/ClippedFolderIconLayoutRule.java b/src/com/aoleyun/os/folder/ClippedFolderIconLayoutRule.java
similarity index 99%
rename from src/com/android/colorfulos/folder/ClippedFolderIconLayoutRule.java
rename to src/com/aoleyun/os/folder/ClippedFolderIconLayoutRule.java
index 2d90bd1..d28f3a0 100644
--- a/src/com/android/colorfulos/folder/ClippedFolderIconLayoutRule.java
+++ b/src/com/aoleyun/os/folder/ClippedFolderIconLayoutRule.java
@@ -1,4 +1,4 @@
-package com.android.colorfulos.folder;
+package com.aoleyun.os.folder;
 
 public class ClippedFolderIconLayoutRule {
 
diff --git a/src/com/android/colorfulos/folder/Folder.java b/src/com/aoleyun/os/folder/Folder.java
similarity index 96%
rename from src/com/android/colorfulos/folder/Folder.java
rename to src/com/aoleyun/os/folder/Folder.java
index a780824..639c1f7 100644
--- a/src/com/android/colorfulos/folder/Folder.java
+++ b/src/com/aoleyun/os/folder/Folder.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.folder;
+package com.aoleyun.os.folder;
 
-import static com.android.colorfulos.LauncherAnimUtils.SPRING_LOADED_EXIT_DELAY;
-import static com.android.colorfulos.LauncherState.NORMAL;
-import static com.android.colorfulos.compat.AccessibilityManagerCompat.sendCustomAccessibilityEvent;
+import static com.aoleyun.os.LauncherAnimUtils.SPRING_LOADED_EXIT_DELAY;
+import static com.aoleyun.os.LauncherState.NORMAL;
+import static com.aoleyun.os.compat.AccessibilityManagerCompat.sendCustomAccessibilityEvent;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -55,40 +55,38 @@ import android.view.animation.AnimationUtils;
 import android.view.inputmethod.EditorInfo;
 import android.widget.TextView;
 
-import com.android.colorfulos.AbstractFloatingView;
-import com.android.colorfulos.Alarm;
-import com.android.colorfulos.AppInfo;
-import com.android.colorfulos.BubbleTextView;
-import com.android.colorfulos.CellLayout;
-import com.android.colorfulos.DeviceProfile;
-import com.android.colorfulos.DragSource;
-import com.android.colorfulos.DropTarget;
-import com.android.colorfulos.ExtendedEditText;
-import com.android.colorfulos.FolderInfo;
-import com.android.colorfulos.FolderInfo.FolderListener;
-import com.android.colorfulos.ItemInfo;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.LauncherSettings;
-import com.android.colorfulos.OnAlarmListener;
-import com.android.colorfulos.PagedView;
-import com.android.colorfulos.R;
-import com.android.colorfulos.ShortcutAndWidgetContainer;
-import com.android.colorfulos.Workspace;
-import com.android.colorfulos.Workspace.ItemOperator;
-import com.android.colorfulos.WorkspaceItemInfo;
-import com.android.colorfulos.accessibility.AccessibleDragListenerAdapter;
-import com.android.colorfulos.config.FeatureFlags;
-import com.android.colorfulos.dragndrop.DragController;
-import com.android.colorfulos.dragndrop.DragController.DragListener;
-import com.android.colorfulos.dragndrop.DragLayer;
-import com.android.colorfulos.dragndrop.DragOptions;
-import com.android.colorfulos.logging.LoggerUtils;
-import com.android.colorfulos.pageindicators.PageIndicatorDots;
-import com.android.colorfulos.userevent.nano.LauncherLogProto.ContainerType;
-import com.android.colorfulos.userevent.nano.LauncherLogProto.Target;
-import com.android.colorfulos.util.Thunk;
-import com.android.colorfulos.views.ClipPathView;
-import com.android.colorfulos.widget.PendingAddShortcutInfo;
+import com.aoleyun.os.AbstractFloatingView;
+import com.aoleyun.os.Alarm;
+import com.aoleyun.os.AppInfo;
+import com.aoleyun.os.BubbleTextView;
+import com.aoleyun.os.CellLayout;
+import com.aoleyun.os.DeviceProfile;
+import com.aoleyun.os.DragSource;
+import com.aoleyun.os.DropTarget;
+import com.aoleyun.os.ExtendedEditText;
+import com.aoleyun.os.FolderInfo;
+import com.aoleyun.os.FolderInfo.FolderListener;
+import com.aoleyun.os.ItemInfo;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.LauncherSettings;
+import com.aoleyun.os.OnAlarmListener;
+import com.aoleyun.os.PagedView;
+import com.aoleyun.os.R;
+import com.aoleyun.os.ShortcutAndWidgetContainer;
+import com.aoleyun.os.Workspace;
+import com.aoleyun.os.WorkspaceItemInfo;
+import com.aoleyun.os.accessibility.AccessibleDragListenerAdapter;
+import com.aoleyun.os.config.FeatureFlags;
+import com.aoleyun.os.dragndrop.DragController;
+import com.aoleyun.os.dragndrop.DragLayer;
+import com.aoleyun.os.dragndrop.DragOptions;
+import com.aoleyun.os.logging.LoggerUtils;
+import com.aoleyun.os.pageindicators.PageIndicatorDots;
+import com.aoleyun.os.userevent.nano.LauncherLogProto.ContainerType;
+import com.aoleyun.os.userevent.nano.LauncherLogProto.Target;
+import com.aoleyun.os.util.Thunk;
+import com.aoleyun.os.views.ClipPathView;
+import com.aoleyun.os.widget.PendingAddShortcutInfo;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -100,7 +98,7 @@ import java.util.List;
  */
 public class Folder extends AbstractFloatingView implements ClipPathView, DragSource,
         View.OnLongClickListener, DropTarget, FolderListener, TextView.OnEditorActionListener,
-        View.OnFocusChangeListener, DragListener, ExtendedEditText.OnBackKeyListener {
+        View.OnFocusChangeListener, DragController.DragListener, ExtendedEditText.OnBackKeyListener {
     private static final String TAG = "Launcher.Folder";
 
     /**
@@ -1337,7 +1335,7 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
     }
 
     private View getViewForInfo(final WorkspaceItemInfo item) {
-        return mContent.iterateOverItems(new ItemOperator() {
+        return mContent.iterateOverItems(new Workspace.ItemOperator() {
 
             @Override
             public boolean evaluate(ItemInfo info, View view) {
@@ -1362,7 +1360,7 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
     public ArrayList<View> getItemsInReadingOrder() {
         if (mItemsInvalidated) {
             mItemsInReadingOrder.clear();
-            mContent.iterateOverItems(new ItemOperator() {
+            mContent.iterateOverItems(new Workspace.ItemOperator() {
 
                 @Override
                 public boolean evaluate(ItemInfo info, View view) {
diff --git a/src/com/android/colorfulos/folder/FolderAnimationManager.java b/src/com/aoleyun/os/folder/FolderAnimationManager.java
similarity index 92%
rename from src/com/android/colorfulos/folder/FolderAnimationManager.java
rename to src/com/aoleyun/os/folder/FolderAnimationManager.java
index 3062829..e170dc5 100644
--- a/src/com/android/colorfulos/folder/FolderAnimationManager.java
+++ b/src/com/aoleyun/os/folder/FolderAnimationManager.java
@@ -14,13 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.folder;
+package com.aoleyun.os.folder;
 
-import static com.android.colorfulos.BubbleTextView.TEXT_ALPHA_PROPERTY;
-import static com.android.colorfulos.LauncherAnimUtils.SCALE_PROPERTY;
-import static com.android.colorfulos.folder.ClippedFolderIconLayoutRule.MAX_NUM_ITEMS_IN_PREVIEW;
-import static com.android.colorfulos.graphics.IconShape.getShape;
-import static com.android.colorfulos.icons.GraphicsUtils.setColorAlphaBound;
+import static com.aoleyun.os.BubbleTextView.TEXT_ALPHA_PROPERTY;
+import static com.aoleyun.os.LauncherAnimUtils.SCALE_PROPERTY;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -37,16 +34,18 @@ import android.view.animation.AnimationUtils;
 
 import androidx.core.graphics.ColorUtils;
 
-import com.android.colorfulos.BubbleTextView;
-import com.android.colorfulos.CellLayout;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.R;
-import com.android.colorfulos.ResourceUtils;
-import com.android.colorfulos.ShortcutAndWidgetContainer;
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.anim.PropertyResetListener;
-import com.android.colorfulos.dragndrop.DragLayer;
-import com.android.colorfulos.util.Themes;
+import com.aoleyun.os.BubbleTextView;
+import com.aoleyun.os.CellLayout;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.R;
+import com.aoleyun.os.ResourceUtils;
+import com.aoleyun.os.ShortcutAndWidgetContainer;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.anim.PropertyResetListener;
+import com.aoleyun.os.dragndrop.DragLayer;
+import com.aoleyun.os.util.Themes;
+import com.aoleyun.os.graphics.IconShape;
+import com.aoleyun.os.icons.GraphicsUtils;
 
 import java.util.List;
 
@@ -156,7 +155,7 @@ public class FolderAnimationManager {
         // Set up the Folder background.
         final int finalColor = ColorUtils.setAlphaComponent(
                 Themes.getAttrColor(mContext, R.attr.folderFillColor), 255);
-        final int initialColor = setColorAlphaBound(
+        final int initialColor = GraphicsUtils.setColorAlphaBound(
                 finalColor, mPreviewBackground.getBackgroundAlpha());
         mFolderBackground.mutate();
         mFolderBackground.setColor(mIsOpening ? initialColor : finalColor);
@@ -191,7 +190,7 @@ public class FolderAnimationManager {
         play(a, getAnimator(mFolder, SCALE_PROPERTY, initialScale, finalScale));
         play(a, getAnimator(mFolderBackground, "color", initialColor, finalColor));
         play(a, mFolderIcon.mFolderName.createTextAlphaAnimator(!mIsOpening));
-        play(a, getShape().createRevealAnimator(
+        play(a, IconShape.getShape().createRevealAnimator(
                 mFolder, startRect, endRect, finalRadius, !mIsOpening));
 
         // Animate the elevation midway so that the shadow is not noticeable in the background.
@@ -237,7 +236,7 @@ public class FolderAnimationManager {
                 : mFolderIcon.getPreviewItemsOnPage(mFolder.mContent.getCurrentPage());
         final int numItemsInPreview = itemsInPreview.size();
         final int numItemsInFirstPagePreview = isOnFirstPage
-                ? numItemsInPreview : MAX_NUM_ITEMS_IN_PREVIEW;
+                ? numItemsInPreview : ClippedFolderIconLayoutRule.MAX_NUM_ITEMS_IN_PREVIEW;
 
         TimeInterpolator previewItemInterpolator = getPreviewItemInterpolator();
 
@@ -286,7 +285,7 @@ public class FolderAnimationManager {
             scaleAnimator.setInterpolator(previewItemInterpolator);
             play(animatorSet, scaleAnimator);
 
-            if (mFolder.getItemCount() > MAX_NUM_ITEMS_IN_PREVIEW) {
+            if (mFolder.getItemCount() > ClippedFolderIconLayoutRule.MAX_NUM_ITEMS_IN_PREVIEW) {
                 // These delays allows the preview items to move as part of the Folder's motion,
                 // and its only necessary for large folders because of differing interpolators.
                 int delay = mIsOpening ? mDelay : mDelay * 2;
@@ -336,7 +335,7 @@ public class FolderAnimationManager {
     }
 
     private TimeInterpolator getPreviewItemInterpolator() {
-        if (mFolder.getItemCount() > MAX_NUM_ITEMS_IN_PREVIEW) {
+        if (mFolder.getItemCount() > ClippedFolderIconLayoutRule.MAX_NUM_ITEMS_IN_PREVIEW) {
             // With larger folders, we want the preview items to reach their final positions faster
             // (when opening) and later (when closing) so that they appear aligned with the rest of
             // the folder items when they are both visible.
diff --git a/src/com/android/colorfulos/folder/FolderIcon.java b/src/com/aoleyun/os/folder/FolderIcon.java
similarity index 91%
rename from src/com/android/colorfulos/folder/FolderIcon.java
rename to src/com/aoleyun/os/folder/FolderIcon.java
index 22bc7a3..d799f6f 100644
--- a/src/com/android/colorfulos/folder/FolderIcon.java
+++ b/src/com/aoleyun/os/folder/FolderIcon.java
@@ -14,10 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.folder;
+package com.aoleyun.os.folder;
 
-import static com.android.colorfulos.folder.ClippedFolderIconLayoutRule.MAX_NUM_ITEMS_IN_PREVIEW;
-import static com.android.colorfulos.folder.PreviewItemManager.INITIAL_ITEM_ANIMATION_DURATION;
+import static com.aoleyun.os.folder.PreviewItemManager.INITIAL_ITEM_ANIMATION_DURATION;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -38,34 +37,34 @@ import android.widget.FrameLayout;
 
 import androidx.annotation.NonNull;
 
-import com.android.colorfulos.Alarm;
-import com.android.colorfulos.AppInfo;
-import com.android.colorfulos.BubbleTextView;
-import com.android.colorfulos.CellLayout;
-import com.android.colorfulos.CheckLongPressHelper;
-import com.android.colorfulos.DeviceProfile;
-import com.android.colorfulos.DropTarget.DragObject;
-import com.android.colorfulos.FolderInfo;
-import com.android.colorfulos.FolderInfo.FolderListener;
-import com.android.colorfulos.ItemInfo;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.LauncherSettings;
-import com.android.colorfulos.OnAlarmListener;
-import com.android.colorfulos.R;
-import com.android.colorfulos.SimpleOnStylusPressListener;
-import com.android.colorfulos.StylusEventHelper;
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.Workspace;
-import com.android.colorfulos.WorkspaceItemInfo;
-import com.android.colorfulos.anim.Interpolators;
-import com.android.colorfulos.dot.FolderDotInfo;
-import com.android.colorfulos.dragndrop.BaseItemDragListener;
-import com.android.colorfulos.dragndrop.DragLayer;
-import com.android.colorfulos.dragndrop.DragView;
-import com.android.colorfulos.icons.DotRenderer;
-import com.android.colorfulos.touch.ItemClickHandler;
-import com.android.colorfulos.util.Thunk;
-import com.android.colorfulos.widget.PendingAddShortcutInfo;
+import com.aoleyun.os.Alarm;
+import com.aoleyun.os.AppInfo;
+import com.aoleyun.os.BubbleTextView;
+import com.aoleyun.os.CellLayout;
+import com.aoleyun.os.CheckLongPressHelper;
+import com.aoleyun.os.DeviceProfile;
+import com.aoleyun.os.DropTarget.DragObject;
+import com.aoleyun.os.FolderInfo;
+import com.aoleyun.os.FolderInfo.FolderListener;
+import com.aoleyun.os.ItemInfo;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.LauncherSettings;
+import com.aoleyun.os.OnAlarmListener;
+import com.aoleyun.os.R;
+import com.aoleyun.os.SimpleOnStylusPressListener;
+import com.aoleyun.os.StylusEventHelper;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.Workspace;
+import com.aoleyun.os.WorkspaceItemInfo;
+import com.aoleyun.os.anim.Interpolators;
+import com.aoleyun.os.dot.FolderDotInfo;
+import com.aoleyun.os.dragndrop.BaseItemDragListener;
+import com.aoleyun.os.dragndrop.DragLayer;
+import com.aoleyun.os.dragndrop.DragView;
+import com.aoleyun.os.icons.DotRenderer;
+import com.aoleyun.os.touch.ItemClickHandler;
+import com.aoleyun.os.util.Thunk;
+import com.aoleyun.os.widget.PendingAddShortcutInfo;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -75,7 +74,8 @@ import java.util.List;
  */
 public class FolderIcon extends FrameLayout implements FolderListener {
 
-    @Thunk Launcher mLauncher;
+    @Thunk
+    Launcher mLauncher;
     @Thunk Folder mFolder;
     private FolderInfo mInfo;
 
@@ -268,8 +268,8 @@ public class FolderIcon extends FrameLayout implements FolderListener {
     }
 
     public void performCreateAnimation(final WorkspaceItemInfo destInfo, final View destView,
-            final WorkspaceItemInfo srcInfo, final DragView srcView, Rect dstRect,
-            float scaleRelativeToDragLayer) {
+                                       final WorkspaceItemInfo srcInfo, final DragView srcView, Rect dstRect,
+                                       float scaleRelativeToDragLayer) {
         prepareCreateAnimation(destView);
         addItem(destInfo);
         // This will animate the first item from it's position as an icon into its
@@ -323,9 +323,9 @@ public class FolderIcon extends FrameLayout implements FolderListener {
                 workspace.resetTransitionTransform();
             }
 
-            int numItemsInPreview = Math.min(MAX_NUM_ITEMS_IN_PREVIEW, index + 1);
+            int numItemsInPreview = Math.min(ClippedFolderIconLayoutRule.MAX_NUM_ITEMS_IN_PREVIEW, index + 1);
             boolean itemAdded = false;
-            if (itemReturnedOnFailedDrop || index >= MAX_NUM_ITEMS_IN_PREVIEW) {
+            if (itemReturnedOnFailedDrop || index >= ClippedFolderIconLayoutRule.MAX_NUM_ITEMS_IN_PREVIEW) {
                 List<BubbleTextView> oldPreviewItems = new ArrayList<>(mCurrentPreviewItems);
                 addItem(item, false);
                 mCurrentPreviewItems.clear();
@@ -360,7 +360,7 @@ public class FolderIcon extends FrameLayout implements FolderListener {
             to.offset(center[0] - animateView.getMeasuredWidth() / 2,
                     center[1] - animateView.getMeasuredHeight() / 2);
 
-            float finalAlpha = index < MAX_NUM_ITEMS_IN_PREVIEW ? 0.5f : 0f;
+            float finalAlpha = index < ClippedFolderIconLayoutRule.MAX_NUM_ITEMS_IN_PREVIEW ? 0.5f : 0f;
 
             float finalScale = scale * scaleRelativeToDragLayer;
             dragLayer.animateView(animateView, from, to, finalAlpha,
@@ -449,7 +449,7 @@ public class FolderIcon extends FrameLayout implements FolderListener {
 
     private float getLocalCenterForIndex(int index, int curNumItems, int[] center) {
         mTmpParams = mPreviewItemManager.computePreviewItemDrawingParams(
-                Math.min(MAX_NUM_ITEMS_IN_PREVIEW, index), curNumItems, mTmpParams);
+                Math.min(ClippedFolderIconLayoutRule.MAX_NUM_ITEMS_IN_PREVIEW, index), curNumItems, mTmpParams);
 
         mTmpParams.transX += mBackground.basePreviewOffsetX;
         mTmpParams.transY += mBackground.basePreviewOffsetY;
@@ -557,7 +557,7 @@ public class FolderIcon extends FrameLayout implements FolderListener {
                 itemsToDisplay.add(itemsOnPage.get(rank));
             }
 
-            if (itemsToDisplay.size() == MAX_NUM_ITEMS_IN_PREVIEW) {
+            if (itemsToDisplay.size() == ClippedFolderIconLayoutRule.MAX_NUM_ITEMS_IN_PREVIEW) {
                 break;
             }
         }
diff --git a/src/com/android/colorfulos/folder/FolderIconPreviewVerifier.java b/src/com/aoleyun/os/folder/FolderIconPreviewVerifier.java
similarity index 88%
rename from src/com/android/colorfulos/folder/FolderIconPreviewVerifier.java
rename to src/com/aoleyun/os/folder/FolderIconPreviewVerifier.java
index 8c42109..228f653 100644
--- a/src/com/android/colorfulos/folder/FolderIconPreviewVerifier.java
+++ b/src/com/aoleyun/os/folder/FolderIconPreviewVerifier.java
@@ -14,14 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.folder;
+package com.aoleyun.os.folder;
 
 import android.util.Log;
 
-import com.android.colorfulos.FolderInfo;
-import com.android.colorfulos.InvariantDeviceProfile;
-
-import static com.android.colorfulos.folder.ClippedFolderIconLayoutRule.MAX_NUM_ITEMS_IN_PREVIEW;
+import com.aoleyun.os.FolderInfo;
+import com.aoleyun.os.InvariantDeviceProfile;
 
 /**
  * Verifies whether an item in a Folder is displayed in the FolderIcon preview.
@@ -55,7 +53,7 @@ public class FolderIconPreviewVerifier {
                     mMaxGridCountY, mMaxItemsPerPage, mGridSize);
             mGridCountX = mGridSize[0];
 
-            mDisplayingUpperLeftQuadrant = numItemsInFolder > MAX_NUM_ITEMS_IN_PREVIEW;
+            mDisplayingUpperLeftQuadrant = numItemsInFolder > ClippedFolderIconLayoutRule.MAX_NUM_ITEMS_IN_PREVIEW;
             mNumItemsInFolder = numItemsInFolder;
         }
     }
@@ -84,6 +82,6 @@ public class FolderIconPreviewVerifier {
             int row = rank / mGridCountX;
             return col < 2 && row < 2;
         }
-        return rank < MAX_NUM_ITEMS_IN_PREVIEW;
+        return rank < ClippedFolderIconLayoutRule.MAX_NUM_ITEMS_IN_PREVIEW;
     }
 }
diff --git a/src/com/android/colorfulos/folder/FolderPagedView.java b/src/com/aoleyun/os/folder/FolderPagedView.java
similarity index 96%
rename from src/com/android/colorfulos/folder/FolderPagedView.java
rename to src/com/aoleyun/os/folder/FolderPagedView.java
index eb19374..f6dabf4 100644
--- a/src/com/android/colorfulos/folder/FolderPagedView.java
+++ b/src/com/aoleyun/os/folder/FolderPagedView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.folder;
+package com.aoleyun.os.folder;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -28,24 +28,24 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewDebug;
 
-import com.android.colorfulos.BubbleTextView;
-import com.android.colorfulos.CellLayout;
-import com.android.colorfulos.DeviceProfile;
-import com.android.colorfulos.InvariantDeviceProfile;
-import com.android.colorfulos.ItemInfo;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.LauncherAppState;
-import com.android.colorfulos.PagedView;
-import com.android.colorfulos.R;
-import com.android.colorfulos.ShortcutAndWidgetContainer;
-import com.android.colorfulos.WorkspaceItemInfo;
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.Workspace.ItemOperator;
-import com.android.colorfulos.anim.Interpolators;
-import com.android.colorfulos.keyboard.ViewGroupFocusHelper;
-import com.android.colorfulos.pageindicators.PageIndicatorDots;
-import com.android.colorfulos.touch.ItemClickHandler;
-import com.android.colorfulos.util.Thunk;
+import com.aoleyun.os.BubbleTextView;
+import com.aoleyun.os.CellLayout;
+import com.aoleyun.os.DeviceProfile;
+import com.aoleyun.os.InvariantDeviceProfile;
+import com.aoleyun.os.ItemInfo;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.LauncherAppState;
+import com.aoleyun.os.PagedView;
+import com.aoleyun.os.R;
+import com.aoleyun.os.ShortcutAndWidgetContainer;
+import com.aoleyun.os.WorkspaceItemInfo;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.anim.Interpolators;
+import com.aoleyun.os.keyboard.ViewGroupFocusHelper;
+import com.aoleyun.os.pageindicators.PageIndicatorDots;
+import com.aoleyun.os.touch.ItemClickHandler;
+import com.aoleyun.os.util.Thunk;
+import com.aoleyun.os.Workspace;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -454,7 +454,7 @@ public class FolderPagedView extends PagedView<PageIndicatorDots> {
      * Iterates over all its items in a reading order.
      * @return the view for which the operator returned true.
      */
-    public View iterateOverItems(ItemOperator op) {
+    public View iterateOverItems(Workspace.ItemOperator op) {
         for (int k = 0 ; k < getChildCount(); k++) {
             CellLayout page = getPageAt(k);
             for (int j = 0; j < page.getCountY(); j++) {
diff --git a/src/com/android/colorfulos/folder/FolderPreviewItemAnim.java b/src/com/aoleyun/os/folder/FolderPreviewItemAnim.java
similarity index 99%
rename from src/com/android/colorfulos/folder/FolderPreviewItemAnim.java
rename to src/com/aoleyun/os/folder/FolderPreviewItemAnim.java
index 03d8a47..80fa2a2 100644
--- a/src/com/android/colorfulos/folder/FolderPreviewItemAnim.java
+++ b/src/com/aoleyun/os/folder/FolderPreviewItemAnim.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.folder;
+package com.aoleyun.os.folder;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
diff --git a/src/com/android/colorfulos/folder/PreviewBackground.java b/src/com/aoleyun/os/folder/PreviewBackground.java
similarity index 95%
rename from src/com/android/colorfulos/folder/PreviewBackground.java
rename to src/com/aoleyun/os/folder/PreviewBackground.java
index a789fc0..d1586d7 100644
--- a/src/com/android/colorfulos/folder/PreviewBackground.java
+++ b/src/com/aoleyun/os/folder/PreviewBackground.java
@@ -14,10 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.folder;
-
-import static com.android.colorfulos.graphics.IconShape.getShape;
-import static com.android.colorfulos.icons.GraphicsUtils.setColorAlphaBound;
+package com.aoleyun.os.folder;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -42,10 +39,12 @@ import android.util.Log;
 import android.util.Property;
 import android.view.View;
 
-import com.android.colorfulos.CellLayout;
-import com.android.colorfulos.DeviceProfile;
-import com.android.colorfulos.R;
-import com.android.colorfulos.views.ActivityContext;
+import com.aoleyun.os.CellLayout;
+import com.aoleyun.os.DeviceProfile;
+import com.aoleyun.os.R;
+import com.aoleyun.os.views.ActivityContext;
+import com.aoleyun.os.graphics.IconShape;
+import com.aoleyun.os.icons.GraphicsUtils;
 
 /**
  * This object represents a FolderIcon preview background. It stores drawing / measurement
@@ -206,7 +205,7 @@ public class PreviewBackground {
 
     public int getBgColor() {
         int alpha = (int) Math.min(MAX_BG_OPACITY, BG_OPACITY * mColorMultiplier);
-        return setColorAlphaBound(mBgColor, alpha);
+        return GraphicsUtils.setColorAlphaBound(mBgColor, alpha);
     }
 
     public int getDotColor() {
@@ -279,7 +278,7 @@ public class PreviewBackground {
         mPaint.setShader(null);
         if (canvas.isHardwareAccelerated()) {
             mPaint.setXfermode(mShadowPorterDuffXfermode);
-            getShape().drawShape(canvas, offsetX, offsetY, radius, mPaint);
+            IconShape.getShape().drawShape(canvas, offsetX, offsetY, radius, mPaint);
             mPaint.setXfermode(null);
         }
 
@@ -319,12 +318,12 @@ public class PreviewBackground {
     }
 
     public void drawBackgroundStroke(Canvas canvas) {
-        mPaint.setColor(setColorAlphaBound(mStrokeColor, mStrokeAlpha));
+        mPaint.setColor(GraphicsUtils.setColorAlphaBound(mStrokeColor, mStrokeAlpha));
         mPaint.setStyle(Paint.Style.STROKE);
         mPaint.setStrokeWidth(mStrokeWidth);
 
         float inset = 1f;
-        getShape().drawShape(canvas,
+        IconShape.getShape().drawShape(canvas,
                 getOffsetX() + inset, getOffsetY() + inset, getScaledRadius() - inset, mPaint);
     }
 
@@ -334,14 +333,14 @@ public class PreviewBackground {
 
         mPaint.setStyle(Paint.Style.FILL);
         mPaint.setColor(Color.argb(160, 245, 245, 245));
-        getShape().drawShape(canvas, getOffsetX(), getOffsetY(), getScaledRadius(), mPaint);
+        IconShape.getShape().drawShape(canvas, getOffsetX(), getOffsetY(), getScaledRadius(), mPaint);
 
         mScale = originalScale;
     }
 
     public Path getClipPath() {
         mPath.reset();
-        getShape().addToPath(mPath, getOffsetX(), getOffsetY(), getScaledRadius());
+        IconShape.getShape().addToPath(mPath, getOffsetX(), getOffsetY(), getScaledRadius());
         return mPath;
     }
 
diff --git a/src/com/android/colorfulos/folder/PreviewItemDrawingParams.java b/src/com/aoleyun/os/folder/PreviewItemDrawingParams.java
similarity index 97%
rename from src/com/android/colorfulos/folder/PreviewItemDrawingParams.java
rename to src/com/aoleyun/os/folder/PreviewItemDrawingParams.java
index bc93c83..e4b39e5 100644
--- a/src/com/android/colorfulos/folder/PreviewItemDrawingParams.java
+++ b/src/com/aoleyun/os/folder/PreviewItemDrawingParams.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.folder;
+package com.aoleyun.os.folder;
 
 import android.graphics.drawable.Drawable;
 
diff --git a/src/com/android/colorfulos/folder/PreviewItemManager.java b/src/com/aoleyun/os/folder/PreviewItemManager.java
similarity index 93%
rename from src/com/android/colorfulos/folder/PreviewItemManager.java
rename to src/com/aoleyun/os/folder/PreviewItemManager.java
index 40ac450..fb2449d 100644
--- a/src/com/android/colorfulos/folder/PreviewItemManager.java
+++ b/src/com/aoleyun/os/folder/PreviewItemManager.java
@@ -14,12 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.folder;
-
-import static com.android.colorfulos.folder.ClippedFolderIconLayoutRule.ENTER_INDEX;
-import static com.android.colorfulos.folder.ClippedFolderIconLayoutRule.EXIT_INDEX;
-import static com.android.colorfulos.folder.ClippedFolderIconLayoutRule.MAX_NUM_ITEMS_IN_PREVIEW;
-import static com.android.colorfulos.folder.FolderIcon.DROP_IN_ANIMATION_DURATION;
+package com.aoleyun.os.folder;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -30,9 +25,9 @@ import android.graphics.drawable.Drawable;
 import android.view.View;
 import android.widget.TextView;
 
-import com.android.colorfulos.BubbleTextView;
-import com.android.colorfulos.WorkspaceItemInfo;
-import com.android.colorfulos.Utilities;
+import com.aoleyun.os.BubbleTextView;
+import com.aoleyun.os.WorkspaceItemInfo;
+import com.aoleyun.os.Utilities;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -190,7 +185,7 @@ public class PreviewItemManager {
         // If there are more params than visible in the preview, they are used for enter/exit
         // animation purposes and they were added to the front of the list.
         // To index the params properly, we need to skip these params.
-        index = index + Math.max(mFirstPageParams.size() - MAX_NUM_ITEMS_IN_PREVIEW, 0);
+        index = index + Math.max(mFirstPageParams.size() - ClippedFolderIconLayoutRule.MAX_NUM_ITEMS_IN_PREVIEW, 0);
 
         PreviewItemDrawingParams params = index < mFirstPageParams.size() ?
                 mFirstPageParams.get(index) : null;
@@ -211,7 +206,7 @@ public class PreviewItemManager {
             params.add(new PreviewItemDrawingParams(0, 0, 0, 0));
         }
 
-        int numItemsInFirstPagePreview = page == 0 ? items.size() : MAX_NUM_ITEMS_IN_PREVIEW;
+        int numItemsInFirstPagePreview = page == 0 ? items.size() : ClippedFolderIconLayoutRule.MAX_NUM_ITEMS_IN_PREVIEW;
         for (int i = 0; i < params.size(); i++) {
             PreviewItemDrawingParams p = params.get(i);
             p.drawable = items.get(i).getCompoundDrawables()[1];
@@ -229,7 +224,7 @@ public class PreviewItemManager {
                 }
             } else {
                 FolderPreviewItemAnim anim = new FolderPreviewItemAnim(this, p, i, prevNumItems, i,
-                        numItemsInFirstPagePreview, DROP_IN_ANIMATION_DURATION, null);
+                        numItemsInFirstPagePreview, FolderIcon.DROP_IN_ANIMATION_DURATION, null);
 
                 if (p.anim != null) {
                     if (p.anim.hasEqualFinalState(anim)) {
@@ -317,7 +312,7 @@ public class PreviewItemManager {
             int prevIndex = newParams.indexOf(moveIn.get(i));
             PreviewItemDrawingParams p = params.get(prevIndex);
             computePreviewItemDrawingParams(prevIndex, numItems, p);
-            updateTransitionParam(p, moveIn.get(i), ENTER_INDEX, newParams.indexOf(moveIn.get(i)),
+            updateTransitionParam(p, moveIn.get(i), ClippedFolderIconLayoutRule.ENTER_INDEX, newParams.indexOf(moveIn.get(i)),
                     numItems);
         }
 
@@ -337,7 +332,7 @@ public class PreviewItemManager {
             BubbleTextView item = moveOut.get(i);
             int oldIndex = oldParams.indexOf(item);
             PreviewItemDrawingParams p = computePreviewItemDrawingParams(oldIndex, numItems, null);
-            updateTransitionParam(p, item, oldIndex, EXIT_INDEX, numItems);
+            updateTransitionParam(p, item, oldIndex, ClippedFolderIconLayoutRule.EXIT_INDEX, numItems);
             params.add(0, p); // We want these items first so that they are on drawn last.
         }
 
@@ -358,7 +353,7 @@ public class PreviewItemManager {
         }
 
         FolderPreviewItemAnim anim = new FolderPreviewItemAnim(this, p, prevIndex, numItems,
-                newIndex, numItems, DROP_IN_ANIMATION_DURATION, null);
+                newIndex, numItems, FolderIcon.DROP_IN_ANIMATION_DURATION, null);
         if (p.anim != null && !p.anim.hasEqualFinalState(anim)) {
             p.anim.cancel();
         }
diff --git a/src/com/android/colorfulos/graphics/DragPreviewProvider.java b/src/com/aoleyun/os/graphics/DragPreviewProvider.java
similarity index 95%
rename from src/com/android/colorfulos/graphics/DragPreviewProvider.java
rename to src/com/aoleyun/os/graphics/DragPreviewProvider.java
index ef924f7..8378bc3 100644
--- a/src/com/android/colorfulos/graphics/DragPreviewProvider.java
+++ b/src/com/aoleyun/os/graphics/DragPreviewProvider.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.graphics;
+package com.aoleyun.os.graphics;
 
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -28,15 +28,15 @@ import android.graphics.drawable.Drawable;
 import android.os.Handler;
 import android.view.View;
 
-import com.android.colorfulos.BubbleTextView;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.R;
-import com.android.colorfulos.config.FeatureFlags;
-import com.android.colorfulos.folder.FolderIcon;
-import com.android.colorfulos.icons.BitmapRenderer;
-import com.android.colorfulos.util.UiThreadHelper;
-import com.android.colorfulos.widget.LauncherAppWidgetHostView;
-import com.android.colorfulos.widget.PendingAppWidgetHostView;
+import com.aoleyun.os.BubbleTextView;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.R;
+import com.aoleyun.os.config.FeatureFlags;
+import com.aoleyun.os.folder.FolderIcon;
+import com.aoleyun.os.icons.BitmapRenderer;
+import com.aoleyun.os.util.UiThreadHelper;
+import com.aoleyun.os.widget.LauncherAppWidgetHostView;
+import com.aoleyun.os.widget.PendingAppWidgetHostView;
 
 import java.nio.ByteBuffer;
 
diff --git a/src/com/android/colorfulos/graphics/DrawableFactory.java b/src/com/aoleyun/os/graphics/DrawableFactory.java
similarity index 85%
rename from src/com/android/colorfulos/graphics/DrawableFactory.java
rename to src/com/aoleyun/os/graphics/DrawableFactory.java
index 65361a2..7b237b9 100644
--- a/src/com/android/colorfulos/graphics/DrawableFactory.java
+++ b/src/com/aoleyun/os/graphics/DrawableFactory.java
@@ -14,9 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.graphics;
-
-import static com.android.colorfulos.graphics.IconShape.getShapePath;
+package com.aoleyun.os.graphics;
 
 import android.content.Context;
 import android.content.pm.ActivityInfo;
@@ -31,12 +29,12 @@ import android.os.Process;
 import android.os.UserHandle;
 import android.util.ArrayMap;
 
-import com.android.colorfulos.FastBitmapDrawable;
-import com.android.colorfulos.ItemInfoWithIcon;
-import com.android.colorfulos.R;
-import com.android.colorfulos.icons.BitmapInfo;
-import com.android.colorfulos.util.MainThreadInitializedObject;
-import com.android.colorfulos.util.ResourceBasedOverride;
+import com.aoleyun.os.FastBitmapDrawable;
+import com.aoleyun.os.ItemInfoWithIcon;
+import com.aoleyun.os.R;
+import com.aoleyun.os.icons.BitmapInfo;
+import com.aoleyun.os.util.MainThreadInitializedObject;
+import com.aoleyun.os.util.ResourceBasedOverride;
 
 import androidx.annotation.UiThread;
 
@@ -57,7 +55,7 @@ public class DrawableFactory implements ResourceBasedOverride {
      */
     public FastBitmapDrawable newIcon(Context context, ItemInfoWithIcon info) {
         FastBitmapDrawable drawable = info.usingLowResIcon()
-                ? new PlaceHolderIconDrawable(info, getShapePath(), context)
+                ? new PlaceHolderIconDrawable(info, IconShape.getShapePath(), context)
                 : new FastBitmapDrawable(info);
         drawable.setIsDisabled(info.isDisabled());
         return drawable;
@@ -65,7 +63,7 @@ public class DrawableFactory implements ResourceBasedOverride {
 
     public FastBitmapDrawable newIcon(Context context, BitmapInfo info, ActivityInfo target) {
         return info.isLowRes()
-                ? new PlaceHolderIconDrawable(info, getShapePath(), context)
+                ? new PlaceHolderIconDrawable(info, IconShape.getShapePath(), context)
                 : new FastBitmapDrawable(info);
     }
 
@@ -73,7 +71,7 @@ public class DrawableFactory implements ResourceBasedOverride {
      * Returns a FastBitmapDrawable with the icon.
      */
     public PreloadIconDrawable newPendingIcon(Context context, ItemInfoWithIcon info) {
-        return new PreloadIconDrawable(info, getShapePath(), context);
+        return new PreloadIconDrawable(info, IconShape.getShapePath(), context);
     }
 
     /**
diff --git a/src/com/android/colorfulos/graphics/FastScrollThumbDrawable.java b/src/com/aoleyun/os/graphics/FastScrollThumbDrawable.java
similarity index 98%
rename from src/com/android/colorfulos/graphics/FastScrollThumbDrawable.java
rename to src/com/aoleyun/os/graphics/FastScrollThumbDrawable.java
index 5f0ddfe..d54bf26 100644
--- a/src/com/android/colorfulos/graphics/FastScrollThumbDrawable.java
+++ b/src/com/aoleyun/os/graphics/FastScrollThumbDrawable.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.graphics;
+package com.aoleyun.os.graphics;
 
 import android.graphics.Canvas;
 import android.graphics.ColorFilter;
diff --git a/src/com/android/colorfulos/graphics/FragmentWithPreview.java b/src/com/aoleyun/os/graphics/FragmentWithPreview.java
similarity index 97%
rename from src/com/android/colorfulos/graphics/FragmentWithPreview.java
rename to src/com/aoleyun/os/graphics/FragmentWithPreview.java
index 17caac7..d0b3019 100644
--- a/src/com/android/colorfulos/graphics/FragmentWithPreview.java
+++ b/src/com/aoleyun/os/graphics/FragmentWithPreview.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.graphics;
+package com.aoleyun.os.graphics;
 
 import android.app.Fragment;
 import android.content.Context;
diff --git a/src/com/android/colorfulos/graphics/GridOptionsProvider.java b/src/com/aoleyun/os/graphics/GridOptionsProvider.java
similarity index 95%
rename from src/com/android/colorfulos/graphics/GridOptionsProvider.java
rename to src/com/aoleyun/os/graphics/GridOptionsProvider.java
index 148babd..d88b30b 100644
--- a/src/com/android/colorfulos/graphics/GridOptionsProvider.java
+++ b/src/com/aoleyun/os/graphics/GridOptionsProvider.java
@@ -1,4 +1,4 @@
-package com.android.colorfulos.graphics;
+package com.aoleyun.os.graphics;
 
 import android.content.ContentProvider;
 import android.content.ContentValues;
@@ -14,11 +14,11 @@ import android.text.TextUtils;
 import android.util.Log;
 import android.util.Xml;
 
-import com.android.colorfulos.InvariantDeviceProfile;
-import com.android.colorfulos.InvariantDeviceProfile.GridOption;
-import com.android.colorfulos.R;
-import com.android.colorfulos.util.LooperExecutor;
-import com.android.colorfulos.util.UiThreadHelper;
+import com.aoleyun.os.InvariantDeviceProfile;
+import com.aoleyun.os.InvariantDeviceProfile.GridOption;
+import com.aoleyun.os.R;
+import com.aoleyun.os.util.LooperExecutor;
+import com.aoleyun.os.util.UiThreadHelper;
 
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
diff --git a/src/com/android/colorfulos/graphics/IconPalette.java b/src/com/aoleyun/os/graphics/IconPalette.java
similarity index 95%
rename from src/com/android/colorfulos/graphics/IconPalette.java
rename to src/com/aoleyun/os/graphics/IconPalette.java
index 1e7c2db..cbf1daa 100644
--- a/src/com/android/colorfulos/graphics/IconPalette.java
+++ b/src/com/aoleyun/os/graphics/IconPalette.java
@@ -14,17 +14,16 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.graphics;
-
-import static com.android.colorfulos.icons.GraphicsUtils.setColorAlphaBound;
+package com.aoleyun.os.graphics;
 
 import android.app.Notification;
 import android.content.Context;
 import android.graphics.Color;
 import android.util.Log;
 
-import com.android.colorfulos.R;
-import com.android.colorfulos.util.Themes;
+import com.aoleyun.os.R;
+import com.aoleyun.os.util.Themes;
+import com.aoleyun.os.icons.GraphicsUtils;
 
 import androidx.core.graphics.ColorUtils;
 
@@ -149,7 +148,7 @@ public class IconPalette {
     }
 
     public static int getMutedColor(int color, float whiteScrimAlpha) {
-        int whiteScrim = setColorAlphaBound(Color.WHITE, (int) (255 * whiteScrimAlpha));
+        int whiteScrim = GraphicsUtils.setColorAlphaBound(Color.WHITE, (int) (255 * whiteScrimAlpha));
         return ColorUtils.compositeColors(whiteScrim, color);
     }
 }
diff --git a/src/com/android/colorfulos/graphics/IconShape.java b/src/com/aoleyun/os/graphics/IconShape.java
similarity index 96%
rename from src/com/android/colorfulos/graphics/IconShape.java
rename to src/com/aoleyun/os/graphics/IconShape.java
index 8bc0cea..9115278 100644
--- a/src/com/android/colorfulos/graphics/IconShape.java
+++ b/src/com/aoleyun/os/graphics/IconShape.java
@@ -13,9 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.graphics;
-
-import static com.android.colorfulos.icons.IconNormalizer.ICON_VISIBLE_AREA_FACTOR;
+package com.aoleyun.os.graphics;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -43,14 +41,14 @@ import android.util.Xml;
 import android.view.View;
 import android.view.ViewOutlineProvider;
 
-import com.android.colorfulos.R;
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.anim.RoundedRectRevealOutlineProvider;
-import com.android.colorfulos.icons.GraphicsUtils;
-import com.android.colorfulos.icons.IconNormalizer;
-import com.android.colorfulos.util.IntArray;
-import com.android.colorfulos.util.Themes;
-import com.android.colorfulos.views.ClipPathView;
+import com.aoleyun.os.R;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.anim.RoundedRectRevealOutlineProvider;
+import com.aoleyun.os.icons.GraphicsUtils;
+import com.aoleyun.os.icons.IconNormalizer;
+import com.aoleyun.os.util.IntArray;
+import com.aoleyun.os.util.Themes;
+import com.aoleyun.os.views.ClipPathView;
 
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
@@ -68,7 +66,7 @@ public abstract class IconShape {
 
     private static IconShape sInstance = new Circle();
     private static Path sShapePath;
-    private static float sNormalizationScale = ICON_VISIBLE_AREA_FACTOR;
+    private static float sNormalizationScale = IconNormalizer.ICON_VISIBLE_AREA_FACTOR;
 
     public static final int DEFAULT_PATH_SIZE = 100;
 
diff --git a/src/com/android/colorfulos/graphics/LauncherPreviewRenderer.java b/src/com/aoleyun/os/graphics/LauncherPreviewRenderer.java
similarity index 92%
rename from src/com/android/colorfulos/graphics/LauncherPreviewRenderer.java
rename to src/com/aoleyun/os/graphics/LauncherPreviewRenderer.java
index 1d18afd..cada0a9 100644
--- a/src/com/android/colorfulos/graphics/LauncherPreviewRenderer.java
+++ b/src/com/aoleyun/os/graphics/LauncherPreviewRenderer.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.graphics;
+package com.aoleyun.os.graphics;
 
 import static android.view.View.MeasureSpec.EXACTLY;
 import static android.view.View.MeasureSpec.makeMeasureSpec;
@@ -42,24 +42,24 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextClock;
 
-import com.android.colorfulos.BubbleTextView;
-import com.android.colorfulos.CellLayout;
-import com.android.colorfulos.DeviceProfile;
-import com.android.colorfulos.Hotseat;
-import com.android.colorfulos.InsettableFrameLayout;
-import com.android.colorfulos.InvariantDeviceProfile;
-import com.android.colorfulos.LauncherSettings.Favorites;
-import com.android.colorfulos.R;
-import com.android.colorfulos.WorkspaceItemInfo;
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.WorkspaceLayoutManager;
-import com.android.colorfulos.allapps.SearchUiManager;
-import com.android.colorfulos.config.FeatureFlags;
-import com.android.colorfulos.icons.BaseIconFactory;
-import com.android.colorfulos.icons.BitmapInfo;
-import com.android.colorfulos.icons.BitmapRenderer;
-import com.android.colorfulos.views.ActivityContext;
-import com.android.colorfulos.views.BaseDragLayer;
+import com.aoleyun.os.BubbleTextView;
+import com.aoleyun.os.CellLayout;
+import com.aoleyun.os.DeviceProfile;
+import com.aoleyun.os.Hotseat;
+import com.aoleyun.os.InsettableFrameLayout;
+import com.aoleyun.os.InvariantDeviceProfile;
+import com.aoleyun.os.LauncherSettings.Favorites;
+import com.aoleyun.os.R;
+import com.aoleyun.os.WorkspaceItemInfo;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.WorkspaceLayoutManager;
+import com.aoleyun.os.allapps.SearchUiManager;
+import com.aoleyun.os.config.FeatureFlags;
+import com.aoleyun.os.icons.BaseIconFactory;
+import com.aoleyun.os.icons.BitmapInfo;
+import com.aoleyun.os.icons.BitmapRenderer;
+import com.aoleyun.os.views.ActivityContext;
+import com.aoleyun.os.views.BaseDragLayer;
 
 import java.util.concurrent.Callable;
 import java.util.concurrent.CountDownLatch;
diff --git a/src/com/android/colorfulos/graphics/NinePatchDrawHelper.java b/src/com/aoleyun/os/graphics/NinePatchDrawHelper.java
similarity index 98%
rename from src/com/android/colorfulos/graphics/NinePatchDrawHelper.java
rename to src/com/aoleyun/os/graphics/NinePatchDrawHelper.java
index 2ef9c21..89bbd8c 100644
--- a/src/com/android/colorfulos/graphics/NinePatchDrawHelper.java
+++ b/src/com/aoleyun/os/graphics/NinePatchDrawHelper.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.graphics;
+package com.aoleyun.os.graphics;
 
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
diff --git a/src/com/android/colorfulos/graphics/PlaceHolderIconDrawable.java b/src/com/aoleyun/os/graphics/PlaceHolderIconDrawable.java
similarity index 88%
rename from src/com/android/colorfulos/graphics/PlaceHolderIconDrawable.java
rename to src/com/aoleyun/os/graphics/PlaceHolderIconDrawable.java
index 5a4d869..d32e1c7 100644
--- a/src/com/android/colorfulos/graphics/PlaceHolderIconDrawable.java
+++ b/src/com/aoleyun/os/graphics/PlaceHolderIconDrawable.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.graphics;
+package com.aoleyun.os.graphics;
 
 import static androidx.core.graphics.ColorUtils.compositeColors;
 
@@ -23,11 +23,11 @@ import android.graphics.Canvas;
 import android.graphics.Path;
 import android.graphics.Rect;
 
-import com.android.colorfulos.FastBitmapDrawable;
-import com.android.colorfulos.ItemInfoWithIcon;
-import com.android.colorfulos.R;
-import com.android.colorfulos.icons.BitmapInfo;
-import com.android.colorfulos.util.Themes;
+import com.aoleyun.os.FastBitmapDrawable;
+import com.aoleyun.os.ItemInfoWithIcon;
+import com.aoleyun.os.R;
+import com.aoleyun.os.icons.BitmapInfo;
+import com.aoleyun.os.util.Themes;
 
 /**
  * Subclass which draws a placeholder icon when the actual icon is not yet loaded
diff --git a/src/com/android/colorfulos/graphics/PreloadIconDrawable.java b/src/com/aoleyun/os/graphics/PreloadIconDrawable.java
similarity index 97%
rename from src/com/android/colorfulos/graphics/PreloadIconDrawable.java
rename to src/com/aoleyun/os/graphics/PreloadIconDrawable.java
index 1420962..bd9ac28 100644
--- a/src/com/android/colorfulos/graphics/PreloadIconDrawable.java
+++ b/src/com/aoleyun/os/graphics/PreloadIconDrawable.java
@@ -15,9 +15,9 @@
  */
 
 
-package com.android.colorfulos.graphics;
+package com.aoleyun.os.graphics;
 
-import static com.android.colorfulos.graphics.IconShape.DEFAULT_PATH_SIZE;
+import static com.aoleyun.os.graphics.IconShape.DEFAULT_PATH_SIZE;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -33,9 +33,9 @@ import android.graphics.Rect;
 import android.util.Property;
 import android.util.SparseArray;
 
-import com.android.colorfulos.FastBitmapDrawable;
-import com.android.colorfulos.ItemInfoWithIcon;
-import com.android.colorfulos.anim.Interpolators;
+import com.aoleyun.os.FastBitmapDrawable;
+import com.aoleyun.os.ItemInfoWithIcon;
+import com.aoleyun.os.anim.Interpolators;
 
 import java.lang.ref.WeakReference;
 
diff --git a/src/com/android/colorfulos/graphics/RotationMode.java b/src/com/aoleyun/os/graphics/RotationMode.java
similarity index 97%
rename from src/com/android/colorfulos/graphics/RotationMode.java
rename to src/com/aoleyun/os/graphics/RotationMode.java
index aeee423..5a2e973 100644
--- a/src/com/android/colorfulos/graphics/RotationMode.java
+++ b/src/com/aoleyun/os/graphics/RotationMode.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.graphics;
+package com.aoleyun.os.graphics;
 
 import android.content.Context;
 import android.graphics.Rect;
diff --git a/src/com/android/colorfulos/graphics/ShadowDrawable.java b/src/com/aoleyun/os/graphics/ShadowDrawable.java
similarity index 98%
rename from src/com/android/colorfulos/graphics/ShadowDrawable.java
rename to src/com/aoleyun/os/graphics/ShadowDrawable.java
index 66de0e4..accc924 100644
--- a/src/com/android/colorfulos/graphics/ShadowDrawable.java
+++ b/src/com/aoleyun/os/graphics/ShadowDrawable.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.graphics;
+package com.aoleyun.os.graphics;
 
 import android.annotation.TargetApi;
 import android.content.res.Resources;
@@ -31,8 +31,8 @@ import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.util.AttributeSet;
 
-import com.android.colorfulos.R;
-import com.android.colorfulos.icons.BitmapRenderer;
+import com.aoleyun.os.R;
+import com.aoleyun.os.icons.BitmapRenderer;
 
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
diff --git a/src/com/android/colorfulos/graphics/ShiftedBitmapDrawable.java b/src/com/aoleyun/os/graphics/ShiftedBitmapDrawable.java
similarity index 98%
rename from src/com/android/colorfulos/graphics/ShiftedBitmapDrawable.java
rename to src/com/aoleyun/os/graphics/ShiftedBitmapDrawable.java
index 7ffbc11..ec11e18 100644
--- a/src/com/android/colorfulos/graphics/ShiftedBitmapDrawable.java
+++ b/src/com/aoleyun/os/graphics/ShiftedBitmapDrawable.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.graphics;
+package com.aoleyun.os.graphics;
 
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
diff --git a/src/com/android/colorfulos/graphics/TintedDrawableSpan.java b/src/com/aoleyun/os/graphics/TintedDrawableSpan.java
similarity index 98%
rename from src/com/android/colorfulos/graphics/TintedDrawableSpan.java
rename to src/com/aoleyun/os/graphics/TintedDrawableSpan.java
index 8323e05..a4a5042 100644
--- a/src/com/android/colorfulos/graphics/TintedDrawableSpan.java
+++ b/src/com/aoleyun/os/graphics/TintedDrawableSpan.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.graphics;
+package com.aoleyun.os.graphics;
 
 import android.content.Context;
 import android.graphics.Canvas;
diff --git a/src/com/android/colorfulos/graphics/TriangleShape.java b/src/com/aoleyun/os/graphics/TriangleShape.java
similarity index 97%
rename from src/com/android/colorfulos/graphics/TriangleShape.java
rename to src/com/aoleyun/os/graphics/TriangleShape.java
index 0b4d8bc..8b4ef4e 100644
--- a/src/com/android/colorfulos/graphics/TriangleShape.java
+++ b/src/com/aoleyun/os/graphics/TriangleShape.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.graphics;
+package com.aoleyun.os.graphics;
 
 import android.graphics.Outline;
 import android.graphics.Path;
diff --git a/src/com/android/colorfulos/graphics/WorkspaceAndHotseatScrim.java b/src/com/aoleyun/os/graphics/WorkspaceAndHotseatScrim.java
similarity index 94%
rename from src/com/android/colorfulos/graphics/WorkspaceAndHotseatScrim.java
rename to src/com/aoleyun/os/graphics/WorkspaceAndHotseatScrim.java
index 69dca3f..defb4db 100644
--- a/src/com/android/colorfulos/graphics/WorkspaceAndHotseatScrim.java
+++ b/src/com/aoleyun/os/graphics/WorkspaceAndHotseatScrim.java
@@ -14,13 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.graphics;
+package com.aoleyun.os.graphics;
 
 import static android.content.Intent.ACTION_SCREEN_OFF;
 import static android.content.Intent.ACTION_USER_PRESENT;
 
-import static com.android.colorfulos.icons.GraphicsUtils.setColorAlphaBound;
-
 import android.animation.ObjectAnimator;
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -40,13 +38,14 @@ import android.util.DisplayMetrics;
 import android.util.Property;
 import android.view.View;
 
-import com.android.colorfulos.CellLayout;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.R;
-import com.android.colorfulos.ResourceUtils;
-import com.android.colorfulos.Workspace;
-import com.android.colorfulos.uioverrides.WallpaperColorInfo;
-import com.android.colorfulos.util.Themes;
+import com.aoleyun.os.CellLayout;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.R;
+import com.aoleyun.os.ResourceUtils;
+import com.aoleyun.os.Workspace;
+import com.aoleyun.os.uioverrides.WallpaperColorInfo;
+import com.aoleyun.os.util.Themes;
+import com.aoleyun.os.icons.GraphicsUtils;
 
 import androidx.core.graphics.ColorUtils;
 
@@ -176,7 +175,7 @@ public class WorkspaceAndHotseatScrim implements
                 canvas.clipRect(mHighlightRect, Region.Op.DIFFERENCE);
             }
 
-            canvas.drawColor(setColorAlphaBound(mFullScrimColor, mScrimAlpha));
+            canvas.drawColor(GraphicsUtils.setColorAlphaBound(mFullScrimColor, mScrimAlpha));
             canvas.restore();
         }
 
@@ -305,7 +304,7 @@ public class WorkspaceAndHotseatScrim implements
         LinearGradient lg = new LinearGradient(0, 0, 0, gradientHeight,
                 new int[]{
                         0x00FFFFFF,
-                        setColorAlphaBound(Color.WHITE, (int) (0xFF * 0.95)),
+                        GraphicsUtils.setColorAlphaBound(Color.WHITE, (int) (0xFF * 0.95)),
                         0xFFFFFFFF},
                 new float[]{0f, 0.8f, 1f},
                 Shader.TileMode.CLAMP);
diff --git a/src/com/android/colorfulos/icons/ComponentWithLabel.java b/src/com/aoleyun/os/icons/ComponentWithLabel.java
similarity index 95%
rename from src/com/android/colorfulos/icons/ComponentWithLabel.java
rename to src/com/aoleyun/os/icons/ComponentWithLabel.java
index f46961b..582fb1c 100644
--- a/src/com/android/colorfulos/icons/ComponentWithLabel.java
+++ b/src/com/aoleyun/os/icons/ComponentWithLabel.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.icons;
+package com.aoleyun.os.icons;
 
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.os.UserHandle;
 
-import com.android.colorfulos.icons.cache.CachingLogic;
+import com.aoleyun.os.icons.cache.CachingLogic;
 
 public interface ComponentWithLabel {
 
diff --git a/src/com/android/colorfulos/icons/IconCache.java b/src/com/aoleyun/os/icons/IconCache.java
similarity index 90%
rename from src/com/android/colorfulos/icons/IconCache.java
rename to src/com/aoleyun/os/icons/IconCache.java
index 481c9bc..900a3f8 100644
--- a/src/com/android/colorfulos/icons/IconCache.java
+++ b/src/com/aoleyun/os/icons/IconCache.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.icons;
+package com.aoleyun.os.icons;
 
 import android.content.Context;
 import android.content.Intent;
@@ -29,26 +29,25 @@ import android.os.Process;
 import android.os.UserHandle;
 import android.util.Log;
 
-import com.android.colorfulos.AppInfo;
-import com.android.colorfulos.IconProvider;
-import com.android.colorfulos.InvariantDeviceProfile;
-import com.android.colorfulos.ItemInfoWithIcon;
-import com.android.colorfulos.LauncherFiles;
-import com.android.colorfulos.LauncherModel;
-import com.android.colorfulos.MainThreadExecutor;
-import com.android.colorfulos.R;
-import com.android.colorfulos.TTUtils.BitmapUtils;
-import com.android.colorfulos.WorkspaceItemInfo;
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.compat.LauncherAppsCompat;
-import com.android.colorfulos.compat.UserManagerCompat;
-import com.android.colorfulos.icons.ComponentWithLabel.ComponentCachingLogic;
-import com.android.colorfulos.icons.cache.BaseIconCache;
-import com.android.colorfulos.icons.cache.CachingLogic;
-import com.android.colorfulos.icons.cache.HandlerRunnable;
-import com.android.colorfulos.model.PackageItemInfo;
-import com.android.colorfulos.util.InstantAppResolver;
-import com.android.colorfulos.util.Preconditions;
+import com.aoleyun.os.AppInfo;
+import com.aoleyun.os.IconProvider;
+import com.aoleyun.os.InvariantDeviceProfile;
+import com.aoleyun.os.ItemInfoWithIcon;
+import com.aoleyun.os.LauncherFiles;
+import com.aoleyun.os.LauncherModel;
+import com.aoleyun.os.MainThreadExecutor;
+import com.aoleyun.os.R;
+import com.aoleyun.os.TTUtils.BitmapUtils;
+import com.aoleyun.os.WorkspaceItemInfo;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.compat.LauncherAppsCompat;
+import com.aoleyun.os.compat.UserManagerCompat;
+import com.aoleyun.os.icons.cache.BaseIconCache;
+import com.aoleyun.os.icons.cache.CachingLogic;
+import com.aoleyun.os.icons.cache.HandlerRunnable;
+import com.aoleyun.os.model.PackageItemInfo;
+import com.aoleyun.os.util.InstantAppResolver;
+import com.aoleyun.os.util.Preconditions;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -78,7 +77,7 @@ public class IconCache extends BaseIconCache {
     public IconCache(Context context, InvariantDeviceProfile inv) {
         super(context, LauncherFiles.APP_ICONS_DB, LauncherModel.getWorkerLooper(),
                 inv.fillResIconDpi, inv.iconBitmapSize, true /* inMemoryCache */);
-        mComponentWithLabelCachingLogic = new ComponentCachingLogic(context);
+        mComponentWithLabelCachingLogic = new ComponentWithLabel.ComponentCachingLogic(context);
         mLauncherActivityInfoCachingLogic = new LauncherActivtiyCachingLogic(this);
         mLauncherApps = LauncherAppsCompat.getInstance(mContext);
         mUserManager = UserManagerCompat.getInstance(mContext);
@@ -242,15 +241,15 @@ public class IconCache extends BaseIconCache {
             this.add("com.android.deskclock.DeskClock");//时钟
             this.add("com.android.dialer.DialtactsActivity");//电话
             this.add("com.android.dialer.main.impl.MainActivity");//电话
-            this.add("com.android.gallery3d.app.GalleryActivity");//图库
-            this.add("com.android.mms.ui.BootActivity");//信息
+            this.add("com.android.gallery3d.v2.app.GalleryActivity2");//图库
+            this.add("com.android.messaging.ui.conversationlist.ConversationListActivity");//信息
             this.add("com.android.music.MusicBrowserActivity");//音乐
             this.add("com.android.providers.downloads.ui.DownloadList");//下载
             this.add("com.android.quicksearchbox.SearchActivity");//搜索
             this.add("com.android.settings.Settings");//设置
-            this.add("com.android.soundrecorder.SoundRecorder");//录音机
+            this.add("com.sprd.soundrecorder.RecorderActivity");//录音机
             this.add("com.android.stk.StkMain");//sim卡
-            this.add("com.android.vdieo");//视频
+            this.add("com.sprd.gallery3d.app.NewVideoActivity");//视频
             this.add("com.mediatek.filemanager.FileManagerOperationActivity");//文件管理
             this.add("com.android.documentsui.LauncherActivity");//下载
             this.add("com.mediatek.fmradio.FmRadioActivity");//收音机
@@ -306,7 +305,7 @@ public class IconCache extends BaseIconCache {
                 } else {
                     int i = appClassNameList.indexOf(name);
                     String val = appIconList.get(i);
-                    int resID = mContext.getResources().getIdentifier(val, "drawable", "com.android.colorfulos");
+                    int resID = mContext.getResources().getIdentifier(val, "drawable", "com.aoleyun.os");
                     if (resID == 0) {
                         icon = mIconProvider.getIcon(info, mIconDpi, flattenDrawable);
                     } else {
diff --git a/src/com/android/colorfulos/icons/LauncherActivtiyCachingLogic.java b/src/com/aoleyun/os/icons/LauncherActivtiyCachingLogic.java
similarity index 94%
rename from src/com/android/colorfulos/icons/LauncherActivtiyCachingLogic.java
rename to src/com/aoleyun/os/icons/LauncherActivtiyCachingLogic.java
index 67bc77b..e81bc7b 100644
--- a/src/com/android/colorfulos/icons/LauncherActivtiyCachingLogic.java
+++ b/src/com/aoleyun/os/icons/LauncherActivtiyCachingLogic.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.icons;
+package com.aoleyun.os.icons;
 
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.pm.LauncherActivityInfo;
 import android.os.UserHandle;
 
-import com.android.colorfulos.icons.cache.CachingLogic;
+import com.aoleyun.os.icons.cache.CachingLogic;
 
 public class LauncherActivtiyCachingLogic implements CachingLogic<LauncherActivityInfo> {
 
diff --git a/src/com/android/colorfulos/icons/LauncherIcons.java b/src/com/aoleyun/os/icons/LauncherIcons.java
similarity index 92%
rename from src/com/android/colorfulos/icons/LauncherIcons.java
rename to src/com/aoleyun/os/icons/LauncherIcons.java
index bdbb590..ad9ebce 100644
--- a/src/com/android/colorfulos/icons/LauncherIcons.java
+++ b/src/com/aoleyun/os/icons/LauncherIcons.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.icons;
+package com.aoleyun.os.icons;
 
 import android.content.ComponentName;
 import android.content.Context;
@@ -24,16 +24,16 @@ import android.graphics.Bitmap;
 import android.graphics.drawable.Drawable;
 import android.os.Process;
 
-import com.android.colorfulos.AppInfo;
-import com.android.colorfulos.FastBitmapDrawable;
-import com.android.colorfulos.InvariantDeviceProfile;
-import com.android.colorfulos.ItemInfoWithIcon;
-import com.android.colorfulos.LauncherAppState;
-import com.android.colorfulos.R;
-import com.android.colorfulos.graphics.IconShape;
-import com.android.colorfulos.model.PackageItemInfo;
-import com.android.colorfulos.shortcuts.DeepShortcutManager;
-import com.android.colorfulos.util.Themes;
+import com.aoleyun.os.AppInfo;
+import com.aoleyun.os.FastBitmapDrawable;
+import com.aoleyun.os.InvariantDeviceProfile;
+import com.aoleyun.os.ItemInfoWithIcon;
+import com.aoleyun.os.LauncherAppState;
+import com.aoleyun.os.R;
+import com.aoleyun.os.graphics.IconShape;
+import com.aoleyun.os.model.PackageItemInfo;
+import com.aoleyun.os.shortcuts.DeepShortcutManager;
+import com.aoleyun.os.util.Themes;
 
 import java.util.function.Supplier;
 
diff --git a/src/com/android/colorfulos/jpush/ExampleApplication.java b/src/com/aoleyun/os/jpush/ExampleApplication.java
similarity index 94%
rename from src/com/android/colorfulos/jpush/ExampleApplication.java
rename to src/com/aoleyun/os/jpush/ExampleApplication.java
index 0f74e86..353e5c6 100644
--- a/src/com/android/colorfulos/jpush/ExampleApplication.java
+++ b/src/com/aoleyun/os/jpush/ExampleApplication.java
@@ -1,4 +1,4 @@
-package com.android.colorfulos.jpush;
+package com.aoleyun.os.jpush;
 
 import android.app.Application;
 import cn.jpush.android.api.JPushInterface;
diff --git a/src/com/android/colorfulos/jpush/ExampleUtil.java b/src/com/aoleyun/os/jpush/ExampleUtil.java
similarity index 95%
rename from src/com/android/colorfulos/jpush/ExampleUtil.java
rename to src/com/aoleyun/os/jpush/ExampleUtil.java
index 50f1f1a..a0d152c 100644
--- a/src/com/android/colorfulos/jpush/ExampleUtil.java
+++ b/src/com/aoleyun/os/jpush/ExampleUtil.java
@@ -1,4 +1,4 @@
-package com.android.colorfulos.jpush;
+package com.aoleyun.os.jpush;
 
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
@@ -8,6 +8,7 @@ import android.content.pm.PackageManager.NameNotFoundException;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.os.Bundle;
+import android.os.Looper;
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 
@@ -83,15 +84,15 @@ public class ExampleUtil {
 
     public static void showToast(final String toast, final Context context)
     {
-//    	new Thread(new Runnable() {
-//
-//			@Override
-//			public void run() {
-//				Looper.prepare();
+    	new Thread(new Runnable() {
+			
+			@Override
+			public void run() {
+				Looper.prepare();
 //				Toast.makeText(context, toast, Toast.LENGTH_SHORT).show();
-//				Looper.loop();
-//			}
-//		}).start();
+				Looper.loop();
+			}
+		}).start();
     }
     
     public static boolean isConnected(Context context) {
diff --git a/src/com/android/colorfulos/jpush/LocalBroadcastManager.java b/src/com/aoleyun/os/jpush/LocalBroadcastManager.java
similarity index 98%
rename from src/com/android/colorfulos/jpush/LocalBroadcastManager.java
rename to src/com/aoleyun/os/jpush/LocalBroadcastManager.java
index 7333527..ae2ef04 100644
--- a/src/com/android/colorfulos/jpush/LocalBroadcastManager.java
+++ b/src/com/aoleyun/os/jpush/LocalBroadcastManager.java
@@ -1,4 +1,4 @@
-package com.android.colorfulos.jpush;
+package com.aoleyun.os.jpush;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -21,7 +21,7 @@ public final class LocalBroadcastManager {
     private static final boolean DEBUG = false;
     private final Context mAppContext;
     private final HashMap<BroadcastReceiver, ArrayList<IntentFilter>> mReceivers = new HashMap<BroadcastReceiver, ArrayList<IntentFilter>>();
-    private final HashMap<String, ArrayList<ReceiverRecord>> mActions = new HashMap<String, ArrayList<ReceiverRecord>> ();
+    private final HashMap<String, ArrayList<ReceiverRecord>> mActions = new HashMap<String, ArrayList<ReceiverRecord>>();
     private final ArrayList<BroadcastRecord> mPendingBroadcasts = new ArrayList<BroadcastRecord>();
     static final int MSG_EXEC_PENDING_BROADCASTS = 1;
     private final Handler mHandler;
diff --git a/src/com/android/colorfulos/jpush/Logger.java b/src/com/aoleyun/os/jpush/Logger.java
similarity index 91%
rename from src/com/android/colorfulos/jpush/Logger.java
rename to src/com/aoleyun/os/jpush/Logger.java
index 4c4c112..a9dfe7f 100644
--- a/src/com/android/colorfulos/jpush/Logger.java
+++ b/src/com/aoleyun/os/jpush/Logger.java
@@ -1,4 +1,4 @@
-package com.android.colorfulos.jpush;
+package com.aoleyun.os.jpush;
 
 import android.util.Log;
 
@@ -23,7 +23,7 @@ public class Logger {
     }
     public static void d(String tag, String msg){
         if (LOG_ENABLE){
-            Log.e(tag, msg);
+            Log.d(tag, msg);
         }
     }
     public static void w(String tag, String msg){
diff --git a/src/com/aoleyun/os/jpush/MyJPushMessageReceiver.java b/src/com/aoleyun/os/jpush/MyJPushMessageReceiver.java
new file mode 100644
index 0000000..02b4a16
--- /dev/null
+++ b/src/com/aoleyun/os/jpush/MyJPushMessageReceiver.java
@@ -0,0 +1,46 @@
+package com.aoleyun.os.jpush;
+
+import android.content.Context;
+
+import com.aoleyun.os.base.MyApplication;
+
+import cn.jpush.android.api.CustomMessage;
+import cn.jpush.android.api.JPushMessage;
+import cn.jpush.android.service.JPushMessageReceiver;
+
+/**
+ * 自定义JPush message 接收器,包括操作tag/alias的结果返回(仅仅包含tag/alias新接口部分)
+ * */
+public class MyJPushMessageReceiver extends JPushMessageReceiver {
+
+    @Override
+    public void onTagOperatorResult(Context context, JPushMessage jPushMessage) {
+        TagAliasOperatorHelper.getInstance().onTagOperatorResult(context,jPushMessage);
+        super.onTagOperatorResult(context, jPushMessage);
+        MyApplication.getInstance().onTagOperatorResult(jPushMessage);
+    }
+    @Override
+    public void onCheckTagOperatorResult(Context context, JPushMessage jPushMessage){
+        TagAliasOperatorHelper.getInstance().onCheckTagOperatorResult(context,jPushMessage);
+        super.onCheckTagOperatorResult(context, jPushMessage);
+    }
+    @Override
+    public void onAliasOperatorResult(Context context, JPushMessage jPushMessage) {
+        TagAliasOperatorHelper.getInstance().onAliasOperatorResult(context,jPushMessage);
+        super.onAliasOperatorResult(context, jPushMessage);
+        MyApplication.getInstance().onAliasOperatorResult(jPushMessage);
+    }
+
+    @Override
+    public void onMobileNumberOperatorResult(Context context, JPushMessage jPushMessage) {
+        TagAliasOperatorHelper.getInstance().onMobileNumberOperatorResult(context,jPushMessage);
+        super.onMobileNumberOperatorResult(context, jPushMessage);
+    }
+
+    @Override
+    public void onMessage(Context context, CustomMessage customMessage) {
+        super.onMessage(context, customMessage);
+    }
+
+
+}
diff --git a/src/com/android/colorfulos/jpush/MyReceiver.java b/src/com/aoleyun/os/jpush/MyReceiver.java
similarity index 92%
rename from src/com/android/colorfulos/jpush/MyReceiver.java
rename to src/com/aoleyun/os/jpush/MyReceiver.java
index 9c4b636..ae12993 100644
--- a/src/com/android/colorfulos/jpush/MyReceiver.java
+++ b/src/com/aoleyun/os/jpush/MyReceiver.java
@@ -1,4 +1,4 @@
-package com.android.colorfulos.jpush;
+package com.aoleyun.os.jpush;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -7,16 +7,22 @@ import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.android.colorfulos.base.MyApplication;
-import com.android.colorfulos.TTUtils.APKUtils;
-import com.android.colorfulos.network.BaseResponse;
-import com.android.colorfulos.network.NetWorkManager;
+import com.aoleyun.os.base.MyApplication;
+import com.aoleyun.os.TTUtils.APKUtils;
+import com.aoleyun.os.network.AppPasswdBean;
+import com.aoleyun.os.network.BaseResponse;
+import com.aoleyun.os.network.HTTPInterface;
+import com.aoleyun.os.network.NetWorkManager;
+import com.google.gson.Gson;
 import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import com.tencent.mmkv.MMKV;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.util.Iterator;
+import java.util.List;
 
 import cn.jpush.android.api.JPushInterface;
 import io.reactivex.Observer;
@@ -109,6 +115,9 @@ public class MyReceiver extends BroadcastReceiver {
     }
 
     private static final String SEND_RUNNING_APP = "2";
+    //应用锁
+    private static final String UPDATE_APP_LOCK = "39";
+
 
     //send msg to MainActivity
     private void processCustomMessage(Context context, Bundle bundle) {
@@ -140,6 +149,9 @@ public class MyReceiver extends BroadcastReceiver {
             case SEND_RUNNING_APP:
                 sendRunningApp(context);
                 break;
+            case UPDATE_APP_LOCK:
+                HTTPInterface.getAppPasswd();
+                break;
             default:
                 break;
         }
diff --git a/src/com/android/colorfulos/jpush/PushService.java b/src/com/aoleyun/os/jpush/PushService.java
similarity index 72%
rename from src/com/android/colorfulos/jpush/PushService.java
rename to src/com/aoleyun/os/jpush/PushService.java
index dc5c4ed..249cc39 100644
--- a/src/com/android/colorfulos/jpush/PushService.java
+++ b/src/com/aoleyun/os/jpush/PushService.java
@@ -1,5 +1,4 @@
-package com.android.colorfulos.jpush;
-
+package com.aoleyun.os.jpush;
 
 import cn.jpush.android.service.JCommonService;
 
diff --git a/src/com/android/colorfulos/jpush/TagAliasOperatorHelper.java b/src/com/aoleyun/os/jpush/TagAliasOperatorHelper.java
similarity index 94%
rename from src/com/android/colorfulos/jpush/TagAliasOperatorHelper.java
rename to src/com/aoleyun/os/jpush/TagAliasOperatorHelper.java
index 5435664..0e8adf7 100644
--- a/src/com/android/colorfulos/jpush/TagAliasOperatorHelper.java
+++ b/src/com/aoleyun/os/jpush/TagAliasOperatorHelper.java
@@ -1,10 +1,13 @@
-package com.android.colorfulos.jpush;
+package com.aoleyun.os.jpush;
 
 import android.content.Context;
 import android.os.Handler;
 import android.os.Message;
+import android.util.Log;
 import android.util.SparseArray;
 
+import com.aoleyun.os.TTUtils.ToastUtil;
+
 import java.util.Locale;
 import java.util.Set;
 
@@ -62,7 +65,7 @@ public class TagAliasOperatorHelper {
     public Object remove(int sequence){
         return setActionCache.get(sequence);
     }
-    public void put(int sequence,Object tagAliasBean){
+    public void put(int sequence, Object tagAliasBean){
         setActionCache.put(sequence,tagAliasBean);
     }
     private Handler delaySendHandler = new Handler(){
@@ -85,7 +88,7 @@ public class TagAliasOperatorHelper {
                     }
                     break;
                 case DELAY_SET_MOBILE_NUMBER_ACTION:
-                    if(msg.obj !=null && msg.obj instanceof  String) {
+                    if(msg.obj !=null && msg.obj instanceof String) {
                         Logger.i(TAG, "retry set mobile number");
                         sequence++;
                         String mobileNumber = (String) msg.obj;
@@ -102,7 +105,7 @@ public class TagAliasOperatorHelper {
             }
         }
     };
-    public void handleAction(Context context,int sequence,String mobileNumber){
+    public void handleAction(Context context, int sequence, String mobileNumber){
         put(sequence,mobileNumber);
         Logger.d(TAG,"sequence:"+sequence+",mobileNumber:"+mobileNumber);
         JPushInterface.setMobileNumber(context,sequence,mobileNumber);
@@ -110,7 +113,7 @@ public class TagAliasOperatorHelper {
     /**
      * 处理设置tag
      * */
-    public void handleAction(Context context,int sequence, TagAliasBean tagAliasBean){
+    public void handleAction(Context context, int sequence, TagAliasBean tagAliasBean){
         init(context);
         if(tagAliasBean == null){
             Logger.w(TAG,"tagAliasBean was null");
@@ -180,7 +183,7 @@ public class TagAliasOperatorHelper {
         }
         return false;
     }
-    private boolean RetrySetMObileNumberActionIfNeeded(int errorCode,String mobileNumber){
+    private boolean RetrySetMObileNumberActionIfNeeded(int errorCode, String mobileNumber){
         if(!ExampleUtil.isConnected(context)){
             Logger.w(TAG,"no network");
             return false;
@@ -200,7 +203,7 @@ public class TagAliasOperatorHelper {
         return false;
 
     }
-    private String getRetryStr(boolean isAliasAction,int actionType,int errorCode){
+    private String getRetryStr(boolean isAliasAction, int actionType, int errorCode){
         String str = "Failed to %s %s due to %s. Try again after 60s.";
         str = String.format(Locale.ENGLISH,str,getActionStr(actionType),(isAliasAction? "alias" : " tags") ,(errorCode == 6002 ? "timeout" : "server too busy"));
         return str;
@@ -239,6 +242,8 @@ public class TagAliasOperatorHelper {
             setActionCache.remove(sequence);
             String logs = getActionStr(tagAliasBean.action)+" tags success";
             Logger.i(TAG,logs);
+            Log.e(TAG,"Tag绑定成功: " + jPushMessage.getTags());
+            ToastUtil.betaShow("Tag绑定成功: " + jPushMessage.getTags());
             ExampleUtil.showToast(logs, context);
         }else{
             String logs = "Failed to " + getActionStr(tagAliasBean.action)+" tags";
@@ -292,6 +297,8 @@ public class TagAliasOperatorHelper {
             setActionCache.remove(sequence);
             String logs = getActionStr(tagAliasBean.action)+" alias success";
             Logger.i(TAG,logs);
+            Log.e(TAG,"Alias绑定成功: "+jPushMessage.getAlias());
+            ToastUtil.betaShow("Alias绑定成功: "+jPushMessage.getAlias());
             ExampleUtil.showToast(logs, context);
         }else{
             String logs = "Failed to " + getActionStr(tagAliasBean.action)+" alias, errorCode:" + jPushMessage.getErrorCode();
@@ -319,7 +326,7 @@ public class TagAliasOperatorHelper {
     }
     public static class TagAliasBean{
         public int action;
-        Set<String> tags;
+        public Set<String> tags;
         public String alias;
         public boolean isAliasAction;
 
diff --git a/src/com/android/colorfulos/jpush/TestActivity.java b/src/com/aoleyun/os/jpush/TestActivity.java
similarity index 96%
rename from src/com/android/colorfulos/jpush/TestActivity.java
rename to src/com/aoleyun/os/jpush/TestActivity.java
index 1c3cdd3..ac04156 100644
--- a/src/com/android/colorfulos/jpush/TestActivity.java
+++ b/src/com/aoleyun/os/jpush/TestActivity.java
@@ -1,4 +1,4 @@
-package com.android.colorfulos.jpush;
+package com.aoleyun.os.jpush;
 
 import android.app.Activity;
 import android.content.Intent;
diff --git a/src/com/android/colorfulos/keyboard/CustomActionsPopup.java b/src/com/aoleyun/os/keyboard/CustomActionsPopup.java
similarity index 92%
rename from src/com/android/colorfulos/keyboard/CustomActionsPopup.java
rename to src/com/aoleyun/os/keyboard/CustomActionsPopup.java
index 346889e..70b9648 100644
--- a/src/com/android/colorfulos/keyboard/CustomActionsPopup.java
+++ b/src/com/aoleyun/os/keyboard/CustomActionsPopup.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.keyboard;
+package com.aoleyun.os.keyboard;
 
 import android.view.Menu;
 import android.view.MenuItem;
@@ -24,10 +24,10 @@ import android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction;
 import android.widget.PopupMenu;
 import android.widget.PopupMenu.OnMenuItemClickListener;
 
-import com.android.colorfulos.ItemInfo;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.accessibility.LauncherAccessibilityDelegate;
-import com.android.colorfulos.popup.PopupContainerWithArrow;
+import com.aoleyun.os.ItemInfo;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.accessibility.LauncherAccessibilityDelegate;
+import com.aoleyun.os.popup.PopupContainerWithArrow;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/src/com/android/colorfulos/keyboard/FocusIndicatorHelper.java b/src/com/aoleyun/os/keyboard/FocusIndicatorHelper.java
similarity index 99%
rename from src/com/android/colorfulos/keyboard/FocusIndicatorHelper.java
rename to src/com/aoleyun/os/keyboard/FocusIndicatorHelper.java
index fa31ee0..d70d1da 100644
--- a/src/com/android/colorfulos/keyboard/FocusIndicatorHelper.java
+++ b/src/com/aoleyun/os/keyboard/FocusIndicatorHelper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.keyboard;
+package com.aoleyun.os.keyboard;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -31,7 +31,7 @@ import android.util.Property;
 import android.view.View;
 import android.view.View.OnFocusChangeListener;
 
-import com.android.colorfulos.R;
+import com.aoleyun.os.R;
 
 /**
  * A helper class to draw background of a focused view.
diff --git a/src/com/android/colorfulos/keyboard/FocusedItemDecorator.java b/src/com/aoleyun/os/keyboard/FocusedItemDecorator.java
similarity index 87%
rename from src/com/android/colorfulos/keyboard/FocusedItemDecorator.java
rename to src/com/aoleyun/os/keyboard/FocusedItemDecorator.java
index d394f76..51be3ed 100644
--- a/src/com/android/colorfulos/keyboard/FocusedItemDecorator.java
+++ b/src/com/aoleyun/os/keyboard/FocusedItemDecorator.java
@@ -14,14 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.keyboard;
+package com.aoleyun.os.keyboard;
 
 import android.graphics.Canvas;
 import android.view.View;
 import android.view.View.OnFocusChangeListener;
 
-import com.android.colorfulos.keyboard.FocusIndicatorHelper.SimpleFocusIndicatorHelper;
-
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.RecyclerView.ItemDecoration;
 import androidx.recyclerview.widget.RecyclerView.State;
@@ -34,7 +32,7 @@ public class FocusedItemDecorator extends ItemDecoration {
     private FocusIndicatorHelper mHelper;
 
     public FocusedItemDecorator(View container) {
-        mHelper = new SimpleFocusIndicatorHelper(container);
+        mHelper = new FocusIndicatorHelper.SimpleFocusIndicatorHelper(container);
     }
 
     public OnFocusChangeListener getFocusListener() {
diff --git a/src/com/android/colorfulos/keyboard/ViewGroupFocusHelper.java b/src/com/aoleyun/os/keyboard/ViewGroupFocusHelper.java
similarity index 96%
rename from src/com/android/colorfulos/keyboard/ViewGroupFocusHelper.java
rename to src/com/aoleyun/os/keyboard/ViewGroupFocusHelper.java
index 67509ff..2824597 100644
--- a/src/com/android/colorfulos/keyboard/ViewGroupFocusHelper.java
+++ b/src/com/aoleyun/os/keyboard/ViewGroupFocusHelper.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.keyboard;
+package com.aoleyun.os.keyboard;
 
 import android.graphics.Rect;
 import android.view.View;
 
-import com.android.colorfulos.PagedView;
+import com.aoleyun.os.PagedView;
 
 /**
  * {@link FocusIndicatorHelper} for a generic view group.
diff --git a/src/com/android/colorfulos/logging/DumpTargetWrapper.java b/src/com/aoleyun/os/logging/DumpTargetWrapper.java
similarity index 90%
rename from src/com/android/colorfulos/logging/DumpTargetWrapper.java
rename to src/com/aoleyun/os/logging/DumpTargetWrapper.java
index f103e0a..28e454b 100644
--- a/src/com/android/colorfulos/logging/DumpTargetWrapper.java
+++ b/src/com/aoleyun/os/logging/DumpTargetWrapper.java
@@ -13,19 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.logging;
+package com.aoleyun.os.logging;
 
 import android.os.Process;
 import android.text.TextUtils;
 
-import com.android.colorfulos.ItemInfo;
-import com.android.colorfulos.LauncherAppWidgetInfo;
-import com.android.colorfulos.LauncherSettings;
-import com.android.colorfulos.model.nano.LauncherDumpProto;
-import com.android.colorfulos.model.nano.LauncherDumpProto.ContainerType;
-import com.android.colorfulos.model.nano.LauncherDumpProto.DumpTarget;
-import com.android.colorfulos.model.nano.LauncherDumpProto.ItemType;
-import com.android.colorfulos.model.nano.LauncherDumpProto.UserType;
+import com.aoleyun.os.ItemInfo;
+import com.aoleyun.os.LauncherAppWidgetInfo;
+import com.aoleyun.os.LauncherSettings;
+import com.aoleyun.os.model.nano.LauncherDumpProto;
+import com.aoleyun.os.model.nano.LauncherDumpProto.ContainerType;
+import com.aoleyun.os.model.nano.LauncherDumpProto.DumpTarget;
+import com.aoleyun.os.model.nano.LauncherDumpProto.ItemType;
+import com.aoleyun.os.model.nano.LauncherDumpProto.UserType;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com/android/colorfulos/logging/EventLogArray.java b/src/com/aoleyun/os/logging/EventLogArray.java
similarity index 99%
rename from src/com/android/colorfulos/logging/EventLogArray.java
rename to src/com/aoleyun/os/logging/EventLogArray.java
index 6a177dc..fd7ce16 100644
--- a/src/com/android/colorfulos/logging/EventLogArray.java
+++ b/src/com/aoleyun/os/logging/EventLogArray.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.logging;
+package com.aoleyun.os.logging;
 
 
 import java.io.PrintWriter;
diff --git a/src/com/android/colorfulos/logging/FileLog.java b/src/com/aoleyun/os/logging/FileLog.java
similarity index 98%
rename from src/com/android/colorfulos/logging/FileLog.java
rename to src/com/aoleyun/os/logging/FileLog.java
index 6e4443b..3c5fee7 100644
--- a/src/com/android/colorfulos/logging/FileLog.java
+++ b/src/com/aoleyun/os/logging/FileLog.java
@@ -1,4 +1,4 @@
-package com.android.colorfulos.logging;
+package com.aoleyun.os.logging;
 
 import android.os.Handler;
 import android.os.HandlerThread;
@@ -6,8 +6,8 @@ import android.os.Message;
 import android.util.Log;
 import android.util.Pair;
 
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.config.FeatureFlags;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.config.FeatureFlags;
 
 import java.io.BufferedReader;
 import java.io.File;
diff --git a/src/com/android/colorfulos/logging/LoggerUtils.java b/src/com/aoleyun/os/logging/LoggerUtils.java
similarity index 89%
rename from src/com/android/colorfulos/logging/LoggerUtils.java
rename to src/com/aoleyun/os/logging/LoggerUtils.java
index 6f2a5c6..fb7bd7a 100644
--- a/src/com/android/colorfulos/logging/LoggerUtils.java
+++ b/src/com/aoleyun/os/logging/LoggerUtils.java
@@ -13,27 +13,27 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.logging;
+package com.aoleyun.os.logging;
 
-import static com.android.colorfulos.userevent.nano.LauncherLogProto.ContainerType.NAVBAR;
+import static com.aoleyun.os.userevent.nano.LauncherLogProto.ContainerType.NAVBAR;
 
 import android.util.ArrayMap;
 import android.util.SparseArray;
 import android.view.View;
 
-import com.android.colorfulos.AppInfo;
-import com.android.colorfulos.ButtonDropTarget;
-import com.android.colorfulos.ItemInfo;
-import com.android.colorfulos.LauncherSettings;
-import com.android.colorfulos.userevent.nano.LauncherLogExtensions.TargetExtension;
-import com.android.colorfulos.userevent.nano.LauncherLogProto.Action;
-import com.android.colorfulos.userevent.nano.LauncherLogProto.ContainerType;
-import com.android.colorfulos.userevent.nano.LauncherLogProto.ControlType;
-import com.android.colorfulos.userevent.nano.LauncherLogProto.ItemType;
-import com.android.colorfulos.userevent.nano.LauncherLogProto.LauncherEvent;
-import com.android.colorfulos.userevent.nano.LauncherLogProto.Target;
-import com.android.colorfulos.userevent.nano.LauncherLogProto.TipType;
-import com.android.colorfulos.util.InstantAppResolver;
+import com.aoleyun.os.AppInfo;
+import com.aoleyun.os.ButtonDropTarget;
+import com.aoleyun.os.ItemInfo;
+import com.aoleyun.os.LauncherSettings;
+import com.aoleyun.os.userevent.nano.LauncherLogExtensions.TargetExtension;
+import com.aoleyun.os.userevent.nano.LauncherLogProto.Action;
+import com.aoleyun.os.userevent.nano.LauncherLogProto.ContainerType;
+import com.aoleyun.os.userevent.nano.LauncherLogProto.ControlType;
+import com.aoleyun.os.userevent.nano.LauncherLogProto.ItemType;
+import com.aoleyun.os.userevent.nano.LauncherLogProto.LauncherEvent;
+import com.aoleyun.os.userevent.nano.LauncherLogProto.Target;
+import com.aoleyun.os.userevent.nano.LauncherLogProto.TipType;
+import com.aoleyun.os.util.InstantAppResolver;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
diff --git a/src/com/android/colorfulos/logging/StatsLogManager.java b/src/com/aoleyun/os/logging/StatsLogManager.java
similarity index 76%
rename from src/com/android/colorfulos/logging/StatsLogManager.java
rename to src/com/aoleyun/os/logging/StatsLogManager.java
index b651ab5..efff5f2 100644
--- a/src/com/android/colorfulos/logging/StatsLogManager.java
+++ b/src/com/aoleyun/os/logging/StatsLogManager.java
@@ -13,24 +13,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.logging;
+package com.aoleyun.os.logging;
 
 import android.content.Context;
 import android.content.Intent;
 import android.view.View;
 
-import com.android.colorfulos.R;
-import com.android.colorfulos.util.ComponentKey;
-import com.android.colorfulos.util.ResourceBasedOverride;
-import com.android.colorfulos.logging.StatsLogUtils.LogStateProvider;
+import com.aoleyun.os.R;
+import com.aoleyun.os.util.ComponentKey;
+import com.aoleyun.os.util.ResourceBasedOverride;
 
 /**
  * Handles the user event logging in Q.
  */
 public class StatsLogManager implements ResourceBasedOverride {
 
-    protected LogStateProvider mStateProvider;
-    public static StatsLogManager newInstance(Context context, LogStateProvider stateProvider) {
+    protected StatsLogUtils.LogStateProvider mStateProvider;
+    public static StatsLogManager newInstance(Context context, StatsLogUtils.LogStateProvider stateProvider) {
         StatsLogManager mgr = Overrides.getObject(StatsLogManager.class,
                 context.getApplicationContext(), R.string.stats_log_manager_class);
         mgr.mStateProvider = stateProvider;
diff --git a/src/com/android/colorfulos/logging/StatsLogUtils.java b/src/com/aoleyun/os/logging/StatsLogUtils.java
similarity index 92%
rename from src/com/android/colorfulos/logging/StatsLogUtils.java
rename to src/com/aoleyun/os/logging/StatsLogUtils.java
index f9db38f..8f3dd50 100644
--- a/src/com/android/colorfulos/logging/StatsLogUtils.java
+++ b/src/com/aoleyun/os/logging/StatsLogUtils.java
@@ -1,10 +1,10 @@
-package com.android.colorfulos.logging;
+package com.aoleyun.os.logging;
 
 import android.view.View;
 import android.view.ViewParent;
 
-import com.android.colorfulos.ItemInfo;
-import com.android.colorfulos.userevent.nano.LauncherLogProto.Target;
+import com.aoleyun.os.ItemInfo;
+import com.aoleyun.os.userevent.nano.LauncherLogProto.Target;
 
 import androidx.annotation.Nullable;
 
diff --git a/src/com/android/colorfulos/logging/UserEventDispatcher.java b/src/com/aoleyun/os/logging/UserEventDispatcher.java
similarity index 76%
rename from src/com/android/colorfulos/logging/UserEventDispatcher.java
rename to src/com/aoleyun/os/logging/UserEventDispatcher.java
index 1b26ec8..267d1dd 100644
--- a/src/com/android/colorfulos/logging/UserEventDispatcher.java
+++ b/src/com/aoleyun/os/logging/UserEventDispatcher.java
@@ -14,17 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.logging;
+package com.aoleyun.os.logging;
 
-import static com.android.colorfulos.logging.LoggerUtils.newAction;
-import static com.android.colorfulos.logging.LoggerUtils.newCommandAction;
-import static com.android.colorfulos.logging.LoggerUtils.newContainerTarget;
-import static com.android.colorfulos.logging.LoggerUtils.newControlTarget;
-import static com.android.colorfulos.logging.LoggerUtils.newDropTarget;
-import static com.android.colorfulos.logging.LoggerUtils.newItemTarget;
-import static com.android.colorfulos.logging.LoggerUtils.newLauncherEvent;
-import static com.android.colorfulos.logging.LoggerUtils.newTarget;
-import static com.android.colorfulos.logging.LoggerUtils.newTouchAction;
+import static com.aoleyun.os.logging.LoggerUtils.newItemTarget;
+import static com.aoleyun.os.logging.LoggerUtils.newTarget;
 
 import android.app.PendingIntent;
 import android.content.ComponentName;
@@ -37,20 +30,20 @@ import android.view.View;
 
 import androidx.annotation.Nullable;
 
-import com.android.colorfulos.DropTarget;
-import com.android.colorfulos.ItemInfo;
-import com.android.colorfulos.R;
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.config.FeatureFlags;
-import com.android.colorfulos.logging.StatsLogUtils.LogContainerProvider;
-import com.android.colorfulos.userevent.nano.LauncherLogProto;
-import com.android.colorfulos.userevent.nano.LauncherLogProto.Action;
-import com.android.colorfulos.userevent.nano.LauncherLogProto.LauncherEvent;
-import com.android.colorfulos.userevent.nano.LauncherLogProto.Target;
-import com.android.colorfulos.util.ComponentKey;
-import com.android.colorfulos.util.InstantAppResolver;
-import com.android.colorfulos.util.LogConfig;
-import com.android.colorfulos.util.ResourceBasedOverride;
+import com.aoleyun.os.DropTarget;
+import com.aoleyun.os.ItemInfo;
+import com.aoleyun.os.R;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.config.FeatureFlags;
+import com.aoleyun.os.logging.StatsLogUtils.LogContainerProvider;
+import com.aoleyun.os.userevent.nano.LauncherLogProto;
+import com.aoleyun.os.userevent.nano.LauncherLogProto.Action;
+import com.aoleyun.os.userevent.nano.LauncherLogProto.LauncherEvent;
+import com.aoleyun.os.userevent.nano.LauncherLogProto.Target;
+import com.aoleyun.os.util.ComponentKey;
+import com.aoleyun.os.util.InstantAppResolver;
+import com.aoleyun.os.util.LogConfig;
+import com.aoleyun.os.util.ResourceBasedOverride;
 
 import java.util.Locale;
 import java.util.UUID;
@@ -125,8 +118,8 @@ public class UserEventDispatcher implements ResourceBasedOverride {
 
     @Deprecated
     public void logAppLaunch(View v, Intent intent) {
-        LauncherEvent event = newLauncherEvent(newTouchAction(Action.Touch.TAP),
-                newItemTarget(v, mInstantAppResolver), newTarget(Target.Type.CONTAINER));
+        LauncherEvent event = LoggerUtils.newLauncherEvent(LoggerUtils.newTouchAction(Action.Touch.TAP),
+                LoggerUtils.newItemTarget(v, mInstantAppResolver), LoggerUtils.newTarget(Target.Type.CONTAINER));
 
         if (fillInLogContainerData(event, v)) {
             if (mDelegate != null) {
@@ -143,8 +136,8 @@ public class UserEventDispatcher implements ResourceBasedOverride {
     @Deprecated
     public void logTaskLaunchOrDismiss(int action, int direction, int taskIndex,
             ComponentKey componentKey) {
-        LauncherEvent event = newLauncherEvent(newTouchAction(action), // TAP or SWIPE or FLING
-                newTarget(Target.Type.ITEM));
+        LauncherEvent event = LoggerUtils.newLauncherEvent(LoggerUtils.newTouchAction(action), // TAP or SWIPE or FLING
+                LoggerUtils.newTarget(Target.Type.ITEM));
         if (action == Action.Touch.SWIPE || action == Action.Touch.FLING) {
             // Direction DOWN means the task was launched, UP means it was dismissed.
             event.action.dir = direction;
@@ -169,8 +162,8 @@ public class UserEventDispatcher implements ResourceBasedOverride {
     }
 
     public void logNotificationLaunch(View v, PendingIntent intent) {
-        LauncherEvent event = newLauncherEvent(newTouchAction(Action.Touch.TAP),
-                newItemTarget(v, mInstantAppResolver), newTarget(Target.Type.CONTAINER));
+        LauncherEvent event = LoggerUtils.newLauncherEvent(LoggerUtils.newTouchAction(Action.Touch.TAP),
+                LoggerUtils.newItemTarget(v, mInstantAppResolver), LoggerUtils.newTarget(Target.Type.CONTAINER));
         if (fillInLogContainerData(event, v)) {
             event.srcTarget[0].packageNameHash = (mUuidStr + intent.getCreatorPackage()).hashCode();
         }
@@ -182,12 +175,12 @@ public class UserEventDispatcher implements ResourceBasedOverride {
     }
 
     public void logActionCommand(int command, int srcContainerType, int dstContainerType) {
-        logActionCommand(command, newContainerTarget(srcContainerType),
-                dstContainerType >=0 ? newContainerTarget(dstContainerType) : null);
+        logActionCommand(command, LoggerUtils.newContainerTarget(srcContainerType),
+                dstContainerType >=0 ? LoggerUtils.newContainerTarget(dstContainerType) : null);
     }
 
     public void logActionCommand(int command, Target srcTarget, Target dstTarget) {
-        LauncherEvent event = newLauncherEvent(newCommandAction(command), srcTarget);
+        LauncherEvent event = LoggerUtils.newLauncherEvent(LoggerUtils.newCommandAction(command), srcTarget);
         if (command == Action.Command.STOP) {
             if (mAppOrTaskLaunch || !mSessionStarted) {
                 mSessionStarted = false;
@@ -207,8 +200,8 @@ public class UserEventDispatcher implements ResourceBasedOverride {
      * TODO: Make this function work when a container view is passed as the 2nd param.
      */
     public void logActionCommand(int command, View itemView, int srcContainerType) {
-        LauncherEvent event = newLauncherEvent(newCommandAction(command),
-                newItemTarget(itemView, mInstantAppResolver), newTarget(Target.Type.CONTAINER));
+        LauncherEvent event = LoggerUtils.newLauncherEvent(LoggerUtils.newCommandAction(command),
+                LoggerUtils.newItemTarget(itemView, mInstantAppResolver), LoggerUtils.newTarget(Target.Type.CONTAINER));
 
         if (fillInLogContainerData(event, itemView)) {
             // TODO: Remove the following two lines once fillInLogContainerData can take in a
@@ -233,19 +226,19 @@ public class UserEventDispatcher implements ResourceBasedOverride {
 
     public void logActionOnControl(int action, int controlType, int parentContainer,
                                    int grandParentContainer){
-        LauncherEvent event = newLauncherEvent(newTouchAction(action),
-                newControlTarget(controlType),
-                newContainerTarget(parentContainer),
-                newContainerTarget(grandParentContainer));
+        LauncherEvent event = LoggerUtils.newLauncherEvent(LoggerUtils.newTouchAction(action),
+                LoggerUtils.newControlTarget(controlType),
+                LoggerUtils.newContainerTarget(parentContainer),
+                LoggerUtils.newContainerTarget(grandParentContainer));
         dispatchUserEvent(event, null);
     }
 
     public void logActionOnControl(int action, int controlType, @Nullable View controlInContainer,
                                    int parentContainerType) {
         final LauncherEvent event = (controlInContainer == null && parentContainerType < 0)
-                ? newLauncherEvent(newTouchAction(action), newTarget(Target.Type.CONTROL))
-                : newLauncherEvent(newTouchAction(action), newTarget(Target.Type.CONTROL),
-                        newTarget(Target.Type.CONTAINER));
+                ? LoggerUtils.newLauncherEvent(LoggerUtils.newTouchAction(action), LoggerUtils.newTarget(Target.Type.CONTROL))
+                : LoggerUtils.newLauncherEvent(LoggerUtils.newTouchAction(action), LoggerUtils.newTarget(Target.Type.CONTROL),
+                        LoggerUtils.newTarget(Target.Type.CONTAINER));
         event.srcTarget[0].controlType = controlType;
         if (controlInContainer != null) {
             fillInLogContainerData(event, controlInContainer);
@@ -260,15 +253,15 @@ public class UserEventDispatcher implements ResourceBasedOverride {
     }
 
     public void logActionTapOutside(Target target) {
-        LauncherEvent event = newLauncherEvent(newTouchAction(Action.Type.TOUCH),
+        LauncherEvent event = LoggerUtils.newLauncherEvent(LoggerUtils.newTouchAction(Action.Type.TOUCH),
                 target);
         event.action.isOutside = true;
         dispatchUserEvent(event, null);
     }
 
     public void logActionBounceTip(int containerType) {
-        LauncherEvent event = newLauncherEvent(newAction(Action.Type.TIP),
-                newContainerTarget(containerType));
+        LauncherEvent event = LoggerUtils.newLauncherEvent(LoggerUtils.newAction(Action.Type.TIP),
+                LoggerUtils.newContainerTarget(containerType));
         event.srcTarget[0].tipType = LauncherLogProto.TipType.BOUNCE;
         dispatchUserEvent(event, null);
     }
@@ -278,8 +271,8 @@ public class UserEventDispatcher implements ResourceBasedOverride {
     }
 
     public void logActionOnContainer(int action, int dir, int containerType, int pageIndex) {
-        LauncherEvent event = newLauncherEvent(newTouchAction(action),
-                newContainerTarget(containerType));
+        LauncherEvent event = LoggerUtils.newLauncherEvent(LoggerUtils.newTouchAction(action),
+                LoggerUtils.newContainerTarget(containerType));
         event.action.dir = dir;
         event.srcTarget[0].pageIndex = pageIndex;
         dispatchUserEvent(event, null);
@@ -297,16 +290,16 @@ public class UserEventDispatcher implements ResourceBasedOverride {
                                      int pageIndex) {
         LauncherEvent event;
         if (srcChildTargetType == LauncherLogProto.ItemType.TASK) {
-            event = newLauncherEvent(newTouchAction(action),
-                    newItemTarget(srcChildTargetType),
-                    newContainerTarget(srcParentContainerType));
+            event = LoggerUtils.newLauncherEvent(LoggerUtils.newTouchAction(action),
+                    LoggerUtils.newItemTarget(srcChildTargetType),
+                    LoggerUtils.newContainerTarget(srcParentContainerType));
         } else {
-            event = newLauncherEvent(newTouchAction(action),
-                    newContainerTarget(srcChildTargetType),
-                    newContainerTarget(srcParentContainerType));
+            event = LoggerUtils.newLauncherEvent(LoggerUtils.newTouchAction(action),
+                    LoggerUtils.newContainerTarget(srcChildTargetType),
+                    LoggerUtils.newContainerTarget(srcParentContainerType));
         }
         event.destTarget = new Target[1];
-        event.destTarget[0] = newContainerTarget(dstContainerType);
+        event.destTarget[0] = LoggerUtils.newContainerTarget(dstContainerType);
         event.action.dir = dir;
         event.action.isStateChange = true;
         event.srcTarget[0].pageIndex = pageIndex;
@@ -317,9 +310,9 @@ public class UserEventDispatcher implements ResourceBasedOverride {
     }
 
     public void logActionOnItem(int action, int dir, int itemType) {
-        Target itemTarget = newTarget(Target.Type.ITEM);
+        Target itemTarget = LoggerUtils.newTarget(Target.Type.ITEM);
         itemTarget.itemType = itemType;
-        LauncherEvent event = newLauncherEvent(newTouchAction(action), itemTarget);
+        LauncherEvent event = LoggerUtils.newLauncherEvent(LoggerUtils.newTouchAction(action), itemTarget);
         event.action.dir = dir;
         dispatchUserEvent(event, null);
     }
@@ -330,8 +323,8 @@ public class UserEventDispatcher implements ResourceBasedOverride {
             return;
         }
         ItemInfo info = (ItemInfo) icon.getTag();
-        LauncherEvent event = newLauncherEvent(newTouchAction(Action.Touch.LONGPRESS),
-                newItemTarget(info, mInstantAppResolver), newTarget(Target.Type.CONTAINER));
+        LauncherEvent event = LoggerUtils.newLauncherEvent(LoggerUtils.newTouchAction(Action.Touch.LONGPRESS),
+                LoggerUtils.newItemTarget(info, mInstantAppResolver), LoggerUtils.newTarget(Target.Type.CONTAINER));
         provider.fillInLogContainerData(icon, info, event.srcTarget[0], event.srcTarget[1]);
         dispatchUserEvent(event, null);
 
@@ -339,12 +332,12 @@ public class UserEventDispatcher implements ResourceBasedOverride {
     }
 
     public void logDragNDrop(DropTarget.DragObject dragObj, View dropTargetAsView) {
-        LauncherEvent event = newLauncherEvent(newTouchAction(Action.Touch.DRAGDROP),
+        LauncherEvent event = LoggerUtils.newLauncherEvent(LoggerUtils.newTouchAction(Action.Touch.DRAGDROP),
                 newItemTarget(dragObj.originalDragInfo, mInstantAppResolver),
-                newTarget(Target.Type.CONTAINER));
+                LoggerUtils.newTarget(Target.Type.CONTAINER));
         event.destTarget = new Target[] {
                 newItemTarget(dragObj.originalDragInfo, mInstantAppResolver),
-                newDropTarget(dropTargetAsView)
+                LoggerUtils.newDropTarget(dropTargetAsView)
         };
 
         dragObj.dragSource.fillInLogContainerData(null, dragObj.originalDragInfo,
@@ -362,20 +355,20 @@ public class UserEventDispatcher implements ResourceBasedOverride {
     public void logActionBack(boolean completed, int downX, int downY, boolean isButton,
             boolean gestureSwipeLeft, int containerType) {
         int actionTouch = isButton ? Action.Touch.TAP : Action.Touch.SWIPE;
-        Action action = newCommandAction(actionTouch);
+        Action action = LoggerUtils.newCommandAction(actionTouch);
         action.command = Action.Command.BACK;
         action.dir = isButton
                 ? Action.Direction.NONE
                 : gestureSwipeLeft
                         ? Action.Direction.LEFT
                         : Action.Direction.RIGHT;
-        Target target = newControlTarget(isButton
+        Target target = LoggerUtils.newControlTarget(isButton
                 ? LauncherLogProto.ControlType.BACK_BUTTON
                 : LauncherLogProto.ControlType.BACK_GESTURE);
         target.spanX = downX;
         target.spanY = downY;
         target.cardinality = completed ? 1 : 0;
-        LauncherEvent event = newLauncherEvent(action, target, newContainerTarget(containerType));
+        LauncherEvent event = LoggerUtils.newLauncherEvent(action, target, LoggerUtils.newContainerTarget(containerType));
 
         dispatchUserEvent(event, null);
     }
diff --git a/src/com/android/colorfulos/model/AddWorkspaceItemsTask.java b/src/com/aoleyun/os/model/AddWorkspaceItemsTask.java
similarity index 93%
rename from src/com/android/colorfulos/model/AddWorkspaceItemsTask.java
rename to src/com/aoleyun/os/model/AddWorkspaceItemsTask.java
index b1ef5f0..dbcf9bd 100644
--- a/src/com/android/colorfulos/model/AddWorkspaceItemsTask.java
+++ b/src/com/aoleyun/os/model/AddWorkspaceItemsTask.java
@@ -13,27 +13,27 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.model;
+package com.aoleyun.os.model;
 
 import android.content.Intent;
 import android.os.UserHandle;
 import android.util.LongSparseArray;
 import android.util.Pair;
 
-import com.android.colorfulos.AllAppsList;
-import com.android.colorfulos.AppInfo;
-import com.android.colorfulos.FolderInfo;
-import com.android.colorfulos.InvariantDeviceProfile;
-import com.android.colorfulos.ItemInfo;
-import com.android.colorfulos.LauncherAppState;
-import com.android.colorfulos.LauncherAppWidgetInfo;
-import com.android.colorfulos.LauncherModel.CallbackTask;
-import com.android.colorfulos.LauncherModel.Callbacks;
-import com.android.colorfulos.LauncherSettings;
-import com.android.colorfulos.WorkspaceItemInfo;
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.util.GridOccupancy;
-import com.android.colorfulos.util.IntArray;
+import com.aoleyun.os.AllAppsList;
+import com.aoleyun.os.AppInfo;
+import com.aoleyun.os.FolderInfo;
+import com.aoleyun.os.InvariantDeviceProfile;
+import com.aoleyun.os.ItemInfo;
+import com.aoleyun.os.LauncherAppState;
+import com.aoleyun.os.LauncherAppWidgetInfo;
+import com.aoleyun.os.LauncherModel.CallbackTask;
+import com.aoleyun.os.LauncherModel.Callbacks;
+import com.aoleyun.os.LauncherSettings;
+import com.aoleyun.os.WorkspaceItemInfo;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.util.GridOccupancy;
+import com.aoleyun.os.util.IntArray;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com/android/colorfulos/model/AppLaunchTracker.java b/src/com/aoleyun/os/model/AppLaunchTracker.java
similarity index 83%
rename from src/com/android/colorfulos/model/AppLaunchTracker.java
rename to src/com/aoleyun/os/model/AppLaunchTracker.java
index 3507277..009b433 100644
--- a/src/com/android/colorfulos/model/AppLaunchTracker.java
+++ b/src/com/aoleyun/os/model/AppLaunchTracker.java
@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.model;
+package com.aoleyun.os.model;
 
-import static com.android.colorfulos.util.ResourceBasedOverride.Overrides.getObject;
+import static com.aoleyun.os.util.ResourceBasedOverride.Overrides.getObject;
 
 import android.content.ComponentName;
 import android.os.UserHandle;
 
-import com.android.colorfulos.R;
-import com.android.colorfulos.userevent.nano.LauncherLogProto.ContainerType;
-import com.android.colorfulos.util.MainThreadInitializedObject;
-import com.android.colorfulos.util.ResourceBasedOverride;
+import com.aoleyun.os.R;
+import com.aoleyun.os.userevent.nano.LauncherLogProto.ContainerType;
+import com.aoleyun.os.util.MainThreadInitializedObject;
+import com.aoleyun.os.util.ResourceBasedOverride;
 
 import androidx.annotation.Nullable;
 
diff --git a/src/com/android/colorfulos/model/BaseLoaderResults.java b/src/com/aoleyun/os/model/BaseLoaderResults.java
similarity index 93%
rename from src/com/android/colorfulos/model/BaseLoaderResults.java
rename to src/com/aoleyun/os/model/BaseLoaderResults.java
index 2440ab3..65e44b7 100644
--- a/src/com/android/colorfulos/model/BaseLoaderResults.java
+++ b/src/com/aoleyun/os/model/BaseLoaderResults.java
@@ -14,27 +14,27 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.model;
+package com.aoleyun.os.model;
 
 import android.os.Looper;
 import android.util.Log;
 
-import com.android.colorfulos.AllAppsList;
-import com.android.colorfulos.AppInfo;
-import com.android.colorfulos.InvariantDeviceProfile;
-import com.android.colorfulos.ItemInfo;
-import com.android.colorfulos.LauncherAppState;
-import com.android.colorfulos.LauncherAppWidgetInfo;
-import com.android.colorfulos.LauncherModel.CallbackTask;
-import com.android.colorfulos.LauncherModel.Callbacks;
-import com.android.colorfulos.LauncherSettings;
-import com.android.colorfulos.MainThreadExecutor;
-import com.android.colorfulos.PagedView;
-import com.android.colorfulos.config.FeatureFlags;
-import com.android.colorfulos.util.IntArray;
-import com.android.colorfulos.util.IntSet;
-import com.android.colorfulos.util.LooperIdleLock;
-import com.android.colorfulos.util.ViewOnDrawExecutor;
+import com.aoleyun.os.AllAppsList;
+import com.aoleyun.os.AppInfo;
+import com.aoleyun.os.InvariantDeviceProfile;
+import com.aoleyun.os.ItemInfo;
+import com.aoleyun.os.LauncherAppState;
+import com.aoleyun.os.LauncherAppWidgetInfo;
+import com.aoleyun.os.LauncherModel.CallbackTask;
+import com.aoleyun.os.LauncherModel.Callbacks;
+import com.aoleyun.os.LauncherSettings;
+import com.aoleyun.os.MainThreadExecutor;
+import com.aoleyun.os.PagedView;
+import com.aoleyun.os.config.FeatureFlags;
+import com.aoleyun.os.util.IntArray;
+import com.aoleyun.os.util.IntSet;
+import com.aoleyun.os.util.LooperIdleLock;
+import com.aoleyun.os.util.ViewOnDrawExecutor;
 
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
@@ -44,7 +44,7 @@ import java.util.Iterator;
 import java.util.concurrent.Executor;
 
 /**
- * Base Helper class to handle results of {@link com.android.colorfulos.model.LoaderTask}.
+ * Base Helper class to handle results of {@link LoaderTask}.
  */
 public abstract class BaseLoaderResults {
 
diff --git a/src/com/android/colorfulos/model/BaseModelUpdateTask.java b/src/com/aoleyun/os/model/BaseModelUpdateTask.java
similarity index 88%
rename from src/com/android/colorfulos/model/BaseModelUpdateTask.java
rename to src/com/aoleyun/os/model/BaseModelUpdateTask.java
index 074aa5f..81525f6 100644
--- a/src/com/android/colorfulos/model/BaseModelUpdateTask.java
+++ b/src/com/aoleyun/os/model/BaseModelUpdateTask.java
@@ -13,20 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.model;
+package com.aoleyun.os.model;
 
 import android.util.Log;
 
-import com.android.colorfulos.AllAppsList;
-import com.android.colorfulos.LauncherAppState;
-import com.android.colorfulos.LauncherModel;
-import com.android.colorfulos.LauncherModel.ModelUpdateTask;
-import com.android.colorfulos.LauncherModel.CallbackTask;
-import com.android.colorfulos.LauncherModel.Callbacks;
-import com.android.colorfulos.WorkspaceItemInfo;
-import com.android.colorfulos.util.ComponentKey;
-import com.android.colorfulos.util.ItemInfoMatcher;
-import com.android.colorfulos.widget.WidgetListRowEntry;
+import com.aoleyun.os.AllAppsList;
+import com.aoleyun.os.LauncherAppState;
+import com.aoleyun.os.LauncherModel;
+import com.aoleyun.os.LauncherModel.ModelUpdateTask;
+import com.aoleyun.os.LauncherModel.CallbackTask;
+import com.aoleyun.os.LauncherModel.Callbacks;
+import com.aoleyun.os.WorkspaceItemInfo;
+import com.aoleyun.os.util.ComponentKey;
+import com.aoleyun.os.util.ItemInfoMatcher;
+import com.aoleyun.os.widget.WidgetListRowEntry;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/src/com/android/colorfulos/model/BgDataModel.java b/src/com/aoleyun/os/model/BgDataModel.java
similarity index 93%
rename from src/com/android/colorfulos/model/BgDataModel.java
rename to src/com/aoleyun/os/model/BgDataModel.java
index 36033e7..1015a2d 100644
--- a/src/com/android/colorfulos/model/BgDataModel.java
+++ b/src/com/aoleyun/os/model/BgDataModel.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.model;
+package com.aoleyun.os.model;
 
 import android.content.Context;
 import android.content.pm.ShortcutInfo;
@@ -22,24 +22,24 @@ import android.text.TextUtils;
 import android.util.Log;
 import android.util.MutableInt;
 
-import com.android.colorfulos.FolderInfo;
-import com.android.colorfulos.InstallShortcutReceiver;
-import com.android.colorfulos.ItemInfo;
-import com.android.colorfulos.LauncherAppWidgetInfo;
-import com.android.colorfulos.LauncherSettings;
-import com.android.colorfulos.WorkspaceItemInfo;
-import com.android.colorfulos.Workspace;
-import com.android.colorfulos.config.FeatureFlags;
-import com.android.colorfulos.logging.DumpTargetWrapper;
-import com.android.colorfulos.model.nano.LauncherDumpProto;
-import com.android.colorfulos.model.nano.LauncherDumpProto.ContainerType;
-import com.android.colorfulos.model.nano.LauncherDumpProto.DumpTarget;
-import com.android.colorfulos.shortcuts.DeepShortcutManager;
-import com.android.colorfulos.shortcuts.ShortcutKey;
-import com.android.colorfulos.util.ComponentKey;
-import com.android.colorfulos.util.IntArray;
-import com.android.colorfulos.util.IntSet;
-import com.android.colorfulos.util.IntSparseArrayMap;
+import com.aoleyun.os.FolderInfo;
+import com.aoleyun.os.InstallShortcutReceiver;
+import com.aoleyun.os.ItemInfo;
+import com.aoleyun.os.LauncherAppWidgetInfo;
+import com.aoleyun.os.LauncherSettings;
+import com.aoleyun.os.WorkspaceItemInfo;
+import com.aoleyun.os.Workspace;
+import com.aoleyun.os.config.FeatureFlags;
+import com.aoleyun.os.logging.DumpTargetWrapper;
+import com.aoleyun.os.model.nano.LauncherDumpProto;
+import com.aoleyun.os.model.nano.LauncherDumpProto.ContainerType;
+import com.aoleyun.os.model.nano.LauncherDumpProto.DumpTarget;
+import com.aoleyun.os.shortcuts.DeepShortcutManager;
+import com.aoleyun.os.shortcuts.ShortcutKey;
+import com.aoleyun.os.util.ComponentKey;
+import com.aoleyun.os.util.IntArray;
+import com.aoleyun.os.util.IntSet;
+import com.aoleyun.os.util.IntSparseArrayMap;
 import com.google.protobuf.nano.MessageNano;
 
 import java.io.FileDescriptor;
diff --git a/src/com/android/colorfulos/model/CacheDataUpdatedTask.java b/src/com/aoleyun/os/model/CacheDataUpdatedTask.java
similarity index 86%
rename from src/com/android/colorfulos/model/CacheDataUpdatedTask.java
rename to src/com/aoleyun/os/model/CacheDataUpdatedTask.java
index e955669..1f9c9e0 100644
--- a/src/com/android/colorfulos/model/CacheDataUpdatedTask.java
+++ b/src/com/aoleyun/os/model/CacheDataUpdatedTask.java
@@ -13,20 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.model;
+package com.aoleyun.os.model;
 
 import android.content.ComponentName;
 import android.os.UserHandle;
 
-import com.android.colorfulos.AllAppsList;
-import com.android.colorfulos.AppInfo;
-import com.android.colorfulos.WorkspaceItemInfo;
-import com.android.colorfulos.icons.IconCache;
-import com.android.colorfulos.ItemInfo;
-import com.android.colorfulos.LauncherAppState;
-import com.android.colorfulos.LauncherModel.CallbackTask;
-import com.android.colorfulos.LauncherModel.Callbacks;
-import com.android.colorfulos.LauncherSettings;
+import com.aoleyun.os.AllAppsList;
+import com.aoleyun.os.AppInfo;
+import com.aoleyun.os.WorkspaceItemInfo;
+import com.aoleyun.os.icons.IconCache;
+import com.aoleyun.os.ItemInfo;
+import com.aoleyun.os.LauncherAppState;
+import com.aoleyun.os.LauncherModel.CallbackTask;
+import com.aoleyun.os.LauncherModel.Callbacks;
+import com.aoleyun.os.LauncherSettings;
 
 import java.util.ArrayList;
 import java.util.HashSet;
diff --git a/src/com/android/colorfulos/model/DbDowngradeHelper.java b/src/com/aoleyun/os/model/DbDowngradeHelper.java
similarity index 93%
rename from src/com/android/colorfulos/model/DbDowngradeHelper.java
rename to src/com/aoleyun/os/model/DbDowngradeHelper.java
index 611a2d7..d9984a7 100644
--- a/src/com/android/colorfulos/model/DbDowngradeHelper.java
+++ b/src/com/aoleyun/os/model/DbDowngradeHelper.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.model;
+package com.aoleyun.os.model;
 
 import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
@@ -21,9 +21,9 @@ import android.database.sqlite.SQLiteException;
 import android.util.Log;
 import android.util.SparseArray;
 
-import com.android.colorfulos.R;
-import com.android.colorfulos.provider.LauncherDbUtils.SQLiteTransaction;
-import com.android.colorfulos.util.IOUtils;
+import com.aoleyun.os.R;
+import com.aoleyun.os.util.IOUtils;
+import com.aoleyun.os.provider.LauncherDbUtils;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -64,7 +64,7 @@ public class DbDowngradeHelper {
             Collections.addAll(allCommands, commands);
         }
 
-        try (SQLiteTransaction t = new SQLiteTransaction(db)) {
+        try (LauncherDbUtils.SQLiteTransaction t = new LauncherDbUtils.SQLiteTransaction(db)) {
             for (String sql : allCommands) {
                 db.execSQL(sql);
             }
diff --git a/src/com/android/colorfulos/model/FirstScreenBroadcast.java b/src/com/aoleyun/os/model/FirstScreenBroadcast.java
similarity index 95%
rename from src/com/android/colorfulos/model/FirstScreenBroadcast.java
rename to src/com/aoleyun/os/model/FirstScreenBroadcast.java
index 57d3536..f7f18e8 100644
--- a/src/com/android/colorfulos/model/FirstScreenBroadcast.java
+++ b/src/com/aoleyun/os/model/FirstScreenBroadcast.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.model;
+package com.aoleyun.os.model;
 
 import android.app.PendingIntent;
 import android.content.Context;
@@ -21,11 +21,11 @@ import android.content.Intent;
 import android.content.pm.PackageInstaller.SessionInfo;
 import android.util.Log;
 
-import com.android.colorfulos.FolderInfo;
-import com.android.colorfulos.ItemInfo;
-import com.android.colorfulos.LauncherAppWidgetInfo;
-import com.android.colorfulos.LauncherSettings;
-import com.android.colorfulos.util.MultiHashMap;
+import com.aoleyun.os.FolderInfo;
+import com.aoleyun.os.ItemInfo;
+import com.aoleyun.os.LauncherAppWidgetInfo;
+import com.aoleyun.os.LauncherSettings;
+import com.aoleyun.os.util.MultiHashMap;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -49,7 +49,7 @@ public class FirstScreenBroadcast {
     private static final boolean DEBUG = false;
 
     private static final String ACTION_FIRST_SCREEN_ACTIVE_INSTALLS
-            = "com.android.colorfulos.action.FIRST_SCREEN_ACTIVE_INSTALLS";
+            = "com.aoleyun.os.action.FIRST_SCREEN_ACTIVE_INSTALLS";
 
     private static final String FOLDER_ITEM_EXTRA = "folderItem";
     private static final String WORKSPACE_ITEM_EXTRA = "workspaceItem";
diff --git a/src/com/android/colorfulos/model/GridBackupTable.java b/src/com/aoleyun/os/model/GridBackupTable.java
similarity index 89%
rename from src/com/android/colorfulos/model/GridBackupTable.java
rename to src/com/aoleyun/os/model/GridBackupTable.java
index c8b9329..3806fbc 100644
--- a/src/com/android/colorfulos/model/GridBackupTable.java
+++ b/src/com/aoleyun/os/model/GridBackupTable.java
@@ -13,11 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.model;
+package com.aoleyun.os.model;
 
-import static com.android.colorfulos.LauncherSettings.Favorites.BACKUP_TABLE_NAME;
-import static com.android.colorfulos.provider.LauncherDbUtils.dropTable;
-import static com.android.colorfulos.provider.LauncherDbUtils.tableExists;
+import static com.aoleyun.os.LauncherSettings.Favorites.BACKUP_TABLE_NAME;
 
 import android.content.ContentValues;
 import android.content.Context;
@@ -27,9 +25,10 @@ import android.graphics.Point;
 import android.os.Process;
 import android.util.Log;
 
-import com.android.colorfulos.LauncherSettings.Favorites;
-import com.android.colorfulos.LauncherSettings.Settings;
-import com.android.colorfulos.compat.UserManagerCompat;
+import com.aoleyun.os.LauncherSettings.Favorites;
+import com.aoleyun.os.LauncherSettings.Settings;
+import com.aoleyun.os.compat.UserManagerCompat;
+import com.aoleyun.os.provider.LauncherDbUtils;
 
 /**
  * Helper class to backup and restore Favorites table into a separate table
@@ -68,7 +67,7 @@ public class GridBackupTable {
 
     public boolean backupOrRestoreAsNeeded() {
         // Check if backup table exists
-        if (!tableExists(mDb, BACKUP_TABLE_NAME)) {
+        if (!LauncherDbUtils.tableExists(mDb, BACKUP_TABLE_NAME)) {
             if (Settings.call(mContext.getContentResolver(), Settings.METHOD_WAS_EMPTY_DB_CREATED)
                     .getBoolean(Settings.EXTRA_VALUE, false)) {
                 // No need to copy if empty DB was created.
@@ -96,7 +95,7 @@ public class GridBackupTable {
     private void copyTable(String from, String to) {
         long userSerial = UserManagerCompat.getInstance(mContext).getSerialNumberForUser(
                 Process.myUserHandle());
-        dropTable(mDb, to);
+        LauncherDbUtils.dropTable(mDb, to);
         Favorites.addTableToDb(mDb, userSerial, false, to);
         mDb.execSQL("INSERT INTO " + to + " SELECT * FROM " + from + " where _id > " + ID_PROPERTY);
     }
diff --git a/src/com/android/colorfulos/model/GridSizeMigrationTask.java b/src/com/aoleyun/os/model/GridSizeMigrationTask.java
similarity index 97%
rename from src/com/android/colorfulos/model/GridSizeMigrationTask.java
rename to src/com/aoleyun/os/model/GridSizeMigrationTask.java
index faee9c1..e17effe 100644
--- a/src/com/android/colorfulos/model/GridSizeMigrationTask.java
+++ b/src/com/aoleyun/os/model/GridSizeMigrationTask.java
@@ -1,8 +1,8 @@
-package com.android.colorfulos.model;
+package com.aoleyun.os.model;
 
-import static com.android.colorfulos.LauncherSettings.Settings.EXTRA_VALUE;
-import static com.android.colorfulos.Utilities.getPointString;
-import static com.android.colorfulos.Utilities.parsePoint;
+import static com.aoleyun.os.LauncherSettings.Settings.EXTRA_VALUE;
+import static com.aoleyun.os.Utilities.getPointString;
+import static com.aoleyun.os.Utilities.parsePoint;
 
 import android.content.ComponentName;
 import android.content.ContentValues;
@@ -17,23 +17,22 @@ import android.graphics.Point;
 import android.util.Log;
 import android.util.SparseArray;
 
-import com.android.colorfulos.InvariantDeviceProfile;
-import com.android.colorfulos.ItemInfo;
-import com.android.colorfulos.LauncherAppState;
-import com.android.colorfulos.LauncherAppWidgetProviderInfo;
-import com.android.colorfulos.LauncherSettings;
-import com.android.colorfulos.LauncherSettings.Favorites;
-import com.android.colorfulos.LauncherSettings.Settings;
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.Workspace;
-import com.android.colorfulos.compat.AppWidgetManagerCompat;
-import com.android.colorfulos.compat.PackageInstallerCompat;
-import com.android.colorfulos.config.FeatureFlags;
-import com.android.colorfulos.provider.LauncherDbUtils;
-import com.android.colorfulos.provider.LauncherDbUtils.SQLiteTransaction;
-import com.android.colorfulos.util.GridOccupancy;
-import com.android.colorfulos.util.IntArray;
-import com.android.colorfulos.util.IntSparseArrayMap;
+import com.aoleyun.os.InvariantDeviceProfile;
+import com.aoleyun.os.ItemInfo;
+import com.aoleyun.os.LauncherAppState;
+import com.aoleyun.os.LauncherAppWidgetProviderInfo;
+import com.aoleyun.os.LauncherSettings;
+import com.aoleyun.os.LauncherSettings.Favorites;
+import com.aoleyun.os.LauncherSettings.Settings;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.Workspace;
+import com.aoleyun.os.compat.AppWidgetManagerCompat;
+import com.aoleyun.os.compat.PackageInstallerCompat;
+import com.aoleyun.os.config.FeatureFlags;
+import com.aoleyun.os.provider.LauncherDbUtils;
+import com.aoleyun.os.util.GridOccupancy;
+import com.aoleyun.os.util.IntArray;
+import com.aoleyun.os.util.IntSparseArrayMap;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -896,7 +895,7 @@ public class GridSizeMigrationTask {
         }
 
         long migrationStartTime = System.currentTimeMillis();
-        try (SQLiteTransaction transaction = (SQLiteTransaction) Settings.call(
+        try (LauncherDbUtils.SQLiteTransaction transaction = (LauncherDbUtils.SQLiteTransaction) Settings.call(
                 context.getContentResolver(), Settings.METHOD_NEW_TRANSACTION)
                 .getBinder(Settings.EXTRA_VALUE)) {
 
@@ -982,7 +981,7 @@ public class GridSizeMigrationTask {
      */
     public static IntSparseArrayMap<Object> removeBrokenHotseatItems(Context context)
             throws Exception {
-        try (SQLiteTransaction transaction = (SQLiteTransaction) Settings.call(
+        try (LauncherDbUtils.SQLiteTransaction transaction = (LauncherDbUtils.SQLiteTransaction) Settings.call(
                 context.getContentResolver(), Settings.METHOD_NEW_TRANSACTION)
                 .getBinder(Settings.EXTRA_VALUE)) {
             GridSizeMigrationTask task = new GridSizeMigrationTask(
diff --git a/src/com/android/colorfulos/model/LoaderCursor.java b/src/com/aoleyun/os/model/LoaderCursor.java
similarity index 94%
rename from src/com/android/colorfulos/model/LoaderCursor.java
rename to src/com/aoleyun/os/model/LoaderCursor.java
index d0c2b84..b0b93b8 100644
--- a/src/com/android/colorfulos/model/LoaderCursor.java
+++ b/src/com/aoleyun/os/model/LoaderCursor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.model;
+package com.aoleyun.os.model;
 
 import android.content.ComponentName;
 import android.content.ContentValues;
@@ -32,24 +32,24 @@ import android.text.TextUtils;
 import android.util.Log;
 import android.util.LongSparseArray;
 
-import com.android.colorfulos.AppInfo;
-import com.android.colorfulos.WorkspaceItemInfo;
-import com.android.colorfulos.icons.IconCache;
-import com.android.colorfulos.InvariantDeviceProfile;
-import com.android.colorfulos.ItemInfo;
-import com.android.colorfulos.LauncherAppState;
-import com.android.colorfulos.LauncherSettings;
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.Workspace;
-import com.android.colorfulos.compat.LauncherAppsCompat;
-import com.android.colorfulos.config.FeatureFlags;
-import com.android.colorfulos.icons.BitmapInfo;
-import com.android.colorfulos.icons.LauncherIcons;
-import com.android.colorfulos.logging.FileLog;
-import com.android.colorfulos.util.ContentWriter;
-import com.android.colorfulos.util.GridOccupancy;
-import com.android.colorfulos.util.IntArray;
-import com.android.colorfulos.util.IntSparseArrayMap;
+import com.aoleyun.os.AppInfo;
+import com.aoleyun.os.WorkspaceItemInfo;
+import com.aoleyun.os.icons.IconCache;
+import com.aoleyun.os.InvariantDeviceProfile;
+import com.aoleyun.os.ItemInfo;
+import com.aoleyun.os.LauncherAppState;
+import com.aoleyun.os.LauncherSettings;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.Workspace;
+import com.aoleyun.os.compat.LauncherAppsCompat;
+import com.aoleyun.os.config.FeatureFlags;
+import com.aoleyun.os.icons.BitmapInfo;
+import com.aoleyun.os.icons.LauncherIcons;
+import com.aoleyun.os.logging.FileLog;
+import com.aoleyun.os.util.ContentWriter;
+import com.aoleyun.os.util.GridOccupancy;
+import com.aoleyun.os.util.IntArray;
+import com.aoleyun.os.util.IntSparseArrayMap;
 
 import java.net.URISyntaxException;
 import java.security.InvalidParameterException;
diff --git a/src/com/android/colorfulos/model/LoaderTask.java b/src/com/aoleyun/os/model/LoaderTask.java
similarity index 95%
rename from src/com/android/colorfulos/model/LoaderTask.java
rename to src/com/aoleyun/os/model/LoaderTask.java
index 10edef3..c5d21cb 100644
--- a/src/com/android/colorfulos/model/LoaderTask.java
+++ b/src/com/aoleyun/os/model/LoaderTask.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.model;
+package com.aoleyun.os.model;
 
-import static com.android.colorfulos.ItemInfoWithIcon.FLAG_DISABLED_LOCKED_USER;
-import static com.android.colorfulos.ItemInfoWithIcon.FLAG_DISABLED_SAFEMODE;
-import static com.android.colorfulos.ItemInfoWithIcon.FLAG_DISABLED_SUSPENDED;
-import static com.android.colorfulos.model.LoaderResults.filterCurrentWorkspaceItems;
+import static com.aoleyun.os.ItemInfoWithIcon.FLAG_DISABLED_LOCKED_USER;
+import static com.aoleyun.os.ItemInfoWithIcon.FLAG_DISABLED_SAFEMODE;
+import static com.aoleyun.os.ItemInfoWithIcon.FLAG_DISABLED_SUSPENDED;
+import static com.aoleyun.os.model.LoaderResults.filterCurrentWorkspaceItems;
 
 import android.appwidget.AppWidgetProviderInfo;
 import android.content.ComponentName;
@@ -40,41 +40,41 @@ import android.util.LongSparseArray;
 import android.util.MutableInt;
 import android.util.Pair;
 
-import com.android.colorfulos.AllAppsList;
-import com.android.colorfulos.AppInfo;
-import com.android.colorfulos.BuildConfig;
-import com.android.colorfulos.FolderInfo;
-import com.android.colorfulos.InstallShortcutReceiver;
-import com.android.colorfulos.ItemInfo;
-import com.android.colorfulos.ItemInfoWithIcon;
-import com.android.colorfulos.LauncherAppState;
-import com.android.colorfulos.LauncherAppWidgetInfo;
-import com.android.colorfulos.LauncherModel;
-import com.android.colorfulos.LauncherSettings;
-import com.android.colorfulos.WorkspaceItemInfo;
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.compat.AppWidgetManagerCompat;
-import com.android.colorfulos.compat.LauncherAppsCompat;
-import com.android.colorfulos.compat.PackageInstallerCompat;
-import com.android.colorfulos.compat.UserManagerCompat;
-import com.android.colorfulos.config.FeatureFlags;
-import com.android.colorfulos.folder.Folder;
-import com.android.colorfulos.folder.FolderIconPreviewVerifier;
-import com.android.colorfulos.icons.ComponentWithLabel;
-import com.android.colorfulos.icons.ComponentWithLabel.ComponentCachingLogic;
-import com.android.colorfulos.icons.IconCache;
-import com.android.colorfulos.icons.LauncherActivtiyCachingLogic;
-import com.android.colorfulos.icons.LauncherIcons;
-import com.android.colorfulos.icons.cache.IconCacheUpdateHandler;
-import com.android.colorfulos.logging.FileLog;
-import com.android.colorfulos.provider.ImportDataTask;
-import com.android.colorfulos.shortcuts.DeepShortcutManager;
-import com.android.colorfulos.shortcuts.ShortcutKey;
-import com.android.colorfulos.util.ComponentKey;
-import com.android.colorfulos.util.LooperIdleLock;
-import com.android.colorfulos.util.MultiHashMap;
-import com.android.colorfulos.util.PackageManagerHelper;
-import com.android.colorfulos.util.TraceHelper;
+import com.aoleyun.os.AllAppsList;
+import com.aoleyun.os.AppInfo;
+import com.aoleyun.os.BuildConfig;
+import com.aoleyun.os.FolderInfo;
+import com.aoleyun.os.InstallShortcutReceiver;
+import com.aoleyun.os.ItemInfo;
+import com.aoleyun.os.ItemInfoWithIcon;
+import com.aoleyun.os.LauncherAppState;
+import com.aoleyun.os.LauncherAppWidgetInfo;
+import com.aoleyun.os.LauncherModel;
+import com.aoleyun.os.LauncherSettings;
+import com.aoleyun.os.WorkspaceItemInfo;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.compat.AppWidgetManagerCompat;
+import com.aoleyun.os.compat.LauncherAppsCompat;
+import com.aoleyun.os.compat.PackageInstallerCompat;
+import com.aoleyun.os.compat.UserManagerCompat;
+import com.aoleyun.os.config.FeatureFlags;
+import com.aoleyun.os.folder.Folder;
+import com.aoleyun.os.folder.FolderIconPreviewVerifier;
+import com.aoleyun.os.icons.ComponentWithLabel;
+import com.aoleyun.os.icons.ComponentWithLabel.ComponentCachingLogic;
+import com.aoleyun.os.icons.IconCache;
+import com.aoleyun.os.icons.LauncherActivtiyCachingLogic;
+import com.aoleyun.os.icons.LauncherIcons;
+import com.aoleyun.os.icons.cache.IconCacheUpdateHandler;
+import com.aoleyun.os.logging.FileLog;
+import com.aoleyun.os.provider.ImportDataTask;
+import com.aoleyun.os.shortcuts.DeepShortcutManager;
+import com.aoleyun.os.shortcuts.ShortcutKey;
+import com.aoleyun.os.util.ComponentKey;
+import com.aoleyun.os.util.LooperIdleLock;
+import com.aoleyun.os.util.MultiHashMap;
+import com.aoleyun.os.util.PackageManagerHelper;
+import com.aoleyun.os.util.TraceHelper;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -256,6 +256,8 @@ public class LoaderTask implements Runnable {
         this.add("com.st.nfc.dta.mobile");
         this.add("com.mediatek.ygps");
         this.add("com.mediatek.factorymode");
+        this.add("org.chromium.browser");
+        this.add("com.android.email");
     }};
 
     //add for load all app on workspace
diff --git a/src/com/android/colorfulos/model/ModelPreload.java b/src/com/aoleyun/os/model/ModelPreload.java
similarity index 89%
rename from src/com/android/colorfulos/model/ModelPreload.java
rename to src/com/aoleyun/os/model/ModelPreload.java
index 846c414..48d62b5 100644
--- a/src/com/android/colorfulos/model/ModelPreload.java
+++ b/src/com/aoleyun/os/model/ModelPreload.java
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.model;
+package com.aoleyun.os.model;
 
 import android.content.Context;
 import android.util.Log;
 
-import com.android.colorfulos.AllAppsList;
-import com.android.colorfulos.LauncherAppState;
-import com.android.colorfulos.LauncherModel;
-import com.android.colorfulos.LauncherModel.ModelUpdateTask;
+import com.aoleyun.os.AllAppsList;
+import com.aoleyun.os.LauncherAppState;
+import com.aoleyun.os.LauncherModel;
+import com.aoleyun.os.LauncherModel.ModelUpdateTask;
 
 import java.util.concurrent.Executor;
 
diff --git a/src/com/android/colorfulos/model/ModelWriter.java b/src/com/aoleyun/os/model/ModelWriter.java
similarity index 95%
rename from src/com/android/colorfulos/model/ModelWriter.java
rename to src/com/aoleyun/os/model/ModelWriter.java
index 5455029..3948e74 100644
--- a/src/com/android/colorfulos/model/ModelWriter.java
+++ b/src/com/aoleyun/os/model/ModelWriter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.model;
+package com.aoleyun.os.model;
 
 import android.content.ContentProviderOperation;
 import android.content.ContentResolver;
@@ -25,23 +25,23 @@ import android.os.Handler;
 import android.os.Looper;
 import android.util.Log;
 
-import com.android.colorfulos.FolderInfo;
-import com.android.colorfulos.ItemInfo;
-import com.android.colorfulos.LauncherAppState;
-import com.android.colorfulos.LauncherAppWidgetHost;
-import com.android.colorfulos.LauncherAppWidgetInfo;
-import com.android.colorfulos.LauncherModel;
-import com.android.colorfulos.LauncherModel.Callbacks;
-import com.android.colorfulos.LauncherProvider;
-import com.android.colorfulos.LauncherSettings;
-import com.android.colorfulos.LauncherSettings.Favorites;
-import com.android.colorfulos.LauncherSettings.Settings;
-import com.android.colorfulos.WorkspaceItemInfo;
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.config.FeatureFlags;
-import com.android.colorfulos.util.ContentWriter;
-import com.android.colorfulos.util.ItemInfoMatcher;
-import com.android.colorfulos.util.LooperExecutor;
+import com.aoleyun.os.FolderInfo;
+import com.aoleyun.os.ItemInfo;
+import com.aoleyun.os.LauncherAppState;
+import com.aoleyun.os.LauncherAppWidgetHost;
+import com.aoleyun.os.LauncherAppWidgetInfo;
+import com.aoleyun.os.LauncherModel;
+import com.aoleyun.os.LauncherModel.Callbacks;
+import com.aoleyun.os.LauncherProvider;
+import com.aoleyun.os.LauncherSettings;
+import com.aoleyun.os.LauncherSettings.Favorites;
+import com.aoleyun.os.LauncherSettings.Settings;
+import com.aoleyun.os.WorkspaceItemInfo;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.config.FeatureFlags;
+import com.aoleyun.os.util.ContentWriter;
+import com.aoleyun.os.util.ItemInfoMatcher;
+import com.aoleyun.os.util.LooperExecutor;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/src/com/android/colorfulos/model/PackageInstallStateChangedTask.java b/src/com/aoleyun/os/model/PackageInstallStateChangedTask.java
similarity index 86%
rename from src/com/android/colorfulos/model/PackageInstallStateChangedTask.java
rename to src/com/aoleyun/os/model/PackageInstallStateChangedTask.java
index 3ae5a18..72f54c7 100644
--- a/src/com/android/colorfulos/model/PackageInstallStateChangedTask.java
+++ b/src/com/aoleyun/os/model/PackageInstallStateChangedTask.java
@@ -13,25 +13,24 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.model;
+package com.aoleyun.os.model;
 
 import android.content.ComponentName;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.os.Process;
 
-import com.android.colorfulos.AllAppsList;
-import com.android.colorfulos.AppInfo;
-import com.android.colorfulos.ItemInfo;
-import com.android.colorfulos.LauncherAppState;
-import com.android.colorfulos.LauncherAppWidgetInfo;
-import com.android.colorfulos.LauncherModel.CallbackTask;
-import com.android.colorfulos.LauncherModel.Callbacks;
-import com.android.colorfulos.PromiseAppInfo;
-import com.android.colorfulos.WorkspaceItemInfo;
-import com.android.colorfulos.compat.PackageInstallerCompat;
-import com.android.colorfulos.compat.PackageInstallerCompat.PackageInstallInfo;
-import com.android.colorfulos.util.InstantAppResolver;
+import com.aoleyun.os.AllAppsList;
+import com.aoleyun.os.AppInfo;
+import com.aoleyun.os.ItemInfo;
+import com.aoleyun.os.LauncherAppState;
+import com.aoleyun.os.LauncherAppWidgetInfo;
+import com.aoleyun.os.LauncherModel.CallbackTask;
+import com.aoleyun.os.LauncherModel.Callbacks;
+import com.aoleyun.os.PromiseAppInfo;
+import com.aoleyun.os.WorkspaceItemInfo;
+import com.aoleyun.os.compat.PackageInstallerCompat;
+import com.aoleyun.os.util.InstantAppResolver;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -41,9 +40,9 @@ import java.util.HashSet;
  */
 public class PackageInstallStateChangedTask extends BaseModelUpdateTask {
 
-    private final PackageInstallInfo mInstallInfo;
+    private final PackageInstallerCompat.PackageInstallInfo mInstallInfo;
 
-    public PackageInstallStateChangedTask(PackageInstallInfo installInfo) {
+    public PackageInstallStateChangedTask(PackageInstallerCompat.PackageInstallInfo installInfo) {
         mInstallInfo = installInfo;
     }
 
diff --git a/src/com/android/colorfulos/model/PackageItemInfo.java b/src/com/aoleyun/os/model/PackageItemInfo.java
similarity index 92%
rename from src/com/android/colorfulos/model/PackageItemInfo.java
rename to src/com/aoleyun/os/model/PackageItemInfo.java
index 87de960..677266b 100644
--- a/src/com/android/colorfulos/model/PackageItemInfo.java
+++ b/src/com/aoleyun/os/model/PackageItemInfo.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.model;
+package com.aoleyun.os.model;
 
-import com.android.colorfulos.ItemInfoWithIcon;
+import com.aoleyun.os.ItemInfoWithIcon;
 
 /**
  * Represents a {@link Package} in the widget tray section.
diff --git a/src/com/android/colorfulos/model/PackageUpdatedTask.java b/src/com/aoleyun/os/model/PackageUpdatedTask.java
similarity index 93%
rename from src/com/android/colorfulos/model/PackageUpdatedTask.java
rename to src/com/aoleyun/os/model/PackageUpdatedTask.java
index 4288201..0eab45f 100644
--- a/src/com/android/colorfulos/model/PackageUpdatedTask.java
+++ b/src/com/aoleyun/os/model/PackageUpdatedTask.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.model;
+package com.aoleyun.os.model;
 
 import android.content.ComponentName;
 import android.content.Context;
@@ -25,31 +25,31 @@ import android.os.UserHandle;
 import android.util.Log;
 import android.util.Pair;
 
-import com.android.colorfulos.AllAppsList;
-import com.android.colorfulos.AppInfo;
-import com.android.colorfulos.WorkspaceItemInfo;
-import com.android.colorfulos.icons.IconCache;
-import com.android.colorfulos.InstallShortcutReceiver;
-import com.android.colorfulos.ItemInfo;
-import com.android.colorfulos.LauncherAppState;
-import com.android.colorfulos.LauncherAppWidgetInfo;
-import com.android.colorfulos.LauncherModel.CallbackTask;
-import com.android.colorfulos.LauncherModel.Callbacks;
-import com.android.colorfulos.LauncherSettings.Favorites;
-import com.android.colorfulos.SessionCommitReceiver;
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.compat.LauncherAppsCompat;
-import com.android.colorfulos.compat.UserManagerCompat;
-import com.android.colorfulos.config.FeatureFlags;
-import com.android.colorfulos.icons.BitmapInfo;
-import com.android.colorfulos.icons.LauncherIcons;
-import com.android.colorfulos.logging.FileLog;
-import com.android.colorfulos.shortcuts.DeepShortcutManager;
-import com.android.colorfulos.util.FlagOp;
-import com.android.colorfulos.util.IntSparseArrayMap;
-import com.android.colorfulos.util.ItemInfoMatcher;
-import com.android.colorfulos.util.PackageManagerHelper;
-import com.android.colorfulos.util.PackageUserKey;
+import com.aoleyun.os.AllAppsList;
+import com.aoleyun.os.AppInfo;
+import com.aoleyun.os.WorkspaceItemInfo;
+import com.aoleyun.os.icons.IconCache;
+import com.aoleyun.os.InstallShortcutReceiver;
+import com.aoleyun.os.ItemInfo;
+import com.aoleyun.os.LauncherAppState;
+import com.aoleyun.os.LauncherAppWidgetInfo;
+import com.aoleyun.os.LauncherModel.CallbackTask;
+import com.aoleyun.os.LauncherModel.Callbacks;
+import com.aoleyun.os.LauncherSettings.Favorites;
+import com.aoleyun.os.SessionCommitReceiver;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.compat.LauncherAppsCompat;
+import com.aoleyun.os.compat.UserManagerCompat;
+import com.aoleyun.os.config.FeatureFlags;
+import com.aoleyun.os.icons.BitmapInfo;
+import com.aoleyun.os.icons.LauncherIcons;
+import com.aoleyun.os.logging.FileLog;
+import com.aoleyun.os.shortcuts.DeepShortcutManager;
+import com.aoleyun.os.util.FlagOp;
+import com.aoleyun.os.util.IntSparseArrayMap;
+import com.aoleyun.os.util.ItemInfoMatcher;
+import com.aoleyun.os.util.PackageManagerHelper;
+import com.aoleyun.os.util.PackageUserKey;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/src/com/android/colorfulos/model/SdCardAvailableReceiver.java b/src/com/aoleyun/os/model/SdCardAvailableReceiver.java
similarity index 91%
rename from src/com/android/colorfulos/model/SdCardAvailableReceiver.java
rename to src/com/aoleyun/os/model/SdCardAvailableReceiver.java
index e20a65e..1be61ec 100644
--- a/src/com/android/colorfulos/model/SdCardAvailableReceiver.java
+++ b/src/com/aoleyun/os/model/SdCardAvailableReceiver.java
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.model;
+package com.aoleyun.os.model;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.os.UserHandle;
 
-import com.android.colorfulos.LauncherAppState;
-import com.android.colorfulos.LauncherModel;
-import com.android.colorfulos.compat.LauncherAppsCompat;
-import com.android.colorfulos.util.MultiHashMap;
-import com.android.colorfulos.util.PackageManagerHelper;
+import com.aoleyun.os.LauncherAppState;
+import com.aoleyun.os.LauncherModel;
+import com.aoleyun.os.compat.LauncherAppsCompat;
+import com.aoleyun.os.util.MultiHashMap;
+import com.aoleyun.os.util.PackageManagerHelper;
 
 import java.util.ArrayList;
 import java.util.HashSet;
diff --git a/src/com/android/colorfulos/model/ShortcutsChangedTask.java b/src/com/aoleyun/os/model/ShortcutsChangedTask.java
similarity index 90%
rename from src/com/android/colorfulos/model/ShortcutsChangedTask.java
rename to src/com/aoleyun/os/model/ShortcutsChangedTask.java
index 8ab5783..e947ada 100644
--- a/src/com/android/colorfulos/model/ShortcutsChangedTask.java
+++ b/src/com/aoleyun/os/model/ShortcutsChangedTask.java
@@ -13,22 +13,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.model;
+package com.aoleyun.os.model;
 
 import android.content.Context;
 import android.content.pm.ShortcutInfo;
 import android.os.UserHandle;
 
-import com.android.colorfulos.AllAppsList;
-import com.android.colorfulos.ItemInfo;
-import com.android.colorfulos.LauncherAppState;
-import com.android.colorfulos.LauncherSettings;
-import com.android.colorfulos.WorkspaceItemInfo;
-import com.android.colorfulos.icons.LauncherIcons;
-import com.android.colorfulos.shortcuts.DeepShortcutManager;
-import com.android.colorfulos.shortcuts.ShortcutKey;
-import com.android.colorfulos.util.ItemInfoMatcher;
-import com.android.colorfulos.util.MultiHashMap;
+import com.aoleyun.os.AllAppsList;
+import com.aoleyun.os.ItemInfo;
+import com.aoleyun.os.LauncherAppState;
+import com.aoleyun.os.LauncherSettings;
+import com.aoleyun.os.WorkspaceItemInfo;
+import com.aoleyun.os.icons.LauncherIcons;
+import com.aoleyun.os.shortcuts.DeepShortcutManager;
+import com.aoleyun.os.shortcuts.ShortcutKey;
+import com.aoleyun.os.util.ItemInfoMatcher;
+import com.aoleyun.os.util.MultiHashMap;
 
 import java.util.ArrayList;
 import java.util.HashSet;
diff --git a/src/com/android/colorfulos/model/UserLockStateChangedTask.java b/src/com/aoleyun/os/model/UserLockStateChangedTask.java
similarity index 87%
rename from src/com/android/colorfulos/model/UserLockStateChangedTask.java
rename to src/com/aoleyun/os/model/UserLockStateChangedTask.java
index ae7a06a..16a57fc 100644
--- a/src/com/android/colorfulos/model/UserLockStateChangedTask.java
+++ b/src/com/aoleyun/os/model/UserLockStateChangedTask.java
@@ -13,25 +13,25 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.model;
+package com.aoleyun.os.model;
 
-import static com.android.colorfulos.ItemInfoWithIcon.FLAG_DISABLED_LOCKED_USER;
+import static com.aoleyun.os.ItemInfoWithIcon.FLAG_DISABLED_LOCKED_USER;
 
 import android.content.Context;
 import android.content.pm.ShortcutInfo;
 import android.os.UserHandle;
 
-import com.android.colorfulos.AllAppsList;
-import com.android.colorfulos.ItemInfo;
-import com.android.colorfulos.LauncherAppState;
-import com.android.colorfulos.LauncherSettings;
-import com.android.colorfulos.WorkspaceItemInfo;
-import com.android.colorfulos.compat.UserManagerCompat;
-import com.android.colorfulos.icons.LauncherIcons;
-import com.android.colorfulos.shortcuts.DeepShortcutManager;
-import com.android.colorfulos.shortcuts.ShortcutKey;
-import com.android.colorfulos.util.ComponentKey;
-import com.android.colorfulos.util.ItemInfoMatcher;
+import com.aoleyun.os.AllAppsList;
+import com.aoleyun.os.ItemInfo;
+import com.aoleyun.os.LauncherAppState;
+import com.aoleyun.os.LauncherSettings;
+import com.aoleyun.os.WorkspaceItemInfo;
+import com.aoleyun.os.compat.UserManagerCompat;
+import com.aoleyun.os.icons.LauncherIcons;
+import com.aoleyun.os.shortcuts.DeepShortcutManager;
+import com.aoleyun.os.shortcuts.ShortcutKey;
+import com.aoleyun.os.util.ComponentKey;
+import com.aoleyun.os.util.ItemInfoMatcher;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/src/com/android/colorfulos/model/WidgetItem.java b/src/com/aoleyun/os/model/WidgetItem.java
similarity index 88%
rename from src/com/android/colorfulos/model/WidgetItem.java
rename to src/com/aoleyun/os/model/WidgetItem.java
index ce1cc27..abfd423 100644
--- a/src/com/android/colorfulos/model/WidgetItem.java
+++ b/src/com/aoleyun/os/model/WidgetItem.java
@@ -1,16 +1,16 @@
-package com.android.colorfulos.model;
+package com.aoleyun.os.model;
 
 import android.content.pm.ActivityInfo;
 import android.content.pm.PackageManager;
 import android.os.Process;
 import android.os.UserHandle;
 
-import com.android.colorfulos.InvariantDeviceProfile;
-import com.android.colorfulos.LauncherAppWidgetProviderInfo;
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.compat.ShortcutConfigActivityInfo;
-import com.android.colorfulos.icons.IconCache;
-import com.android.colorfulos.util.ComponentKey;
+import com.aoleyun.os.InvariantDeviceProfile;
+import com.aoleyun.os.LauncherAppWidgetProviderInfo;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.compat.ShortcutConfigActivityInfo;
+import com.aoleyun.os.icons.IconCache;
+import com.aoleyun.os.util.ComponentKey;
 
 import java.text.Collator;
 
diff --git a/src/com/aoleyun/os/network/AppPasswdBean.java b/src/com/aoleyun/os/network/AppPasswdBean.java
new file mode 100644
index 0000000..a6fbf07
--- /dev/null
+++ b/src/com/aoleyun/os/network/AppPasswdBean.java
@@ -0,0 +1,33 @@
+package com.aoleyun.os.network;
+
+import java.io.Serializable;
+
+/**
+ * @author : fanhuitong
+ * e-mail :
+ * @date : 2021/10/22 18:09
+ * desc   :
+ * version: 1.0
+ */
+public class AppPasswdBean implements Serializable {
+    private static final long serialVersionUID = 777139872907974502L;
+
+    String app_package;
+    String password;
+
+    public String getApp_package() {
+        return app_package;
+    }
+
+    public void setApp_package(String app_package) {
+        this.app_package = app_package;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+}
diff --git a/src/com/android/colorfulos/network/BaseResponse.java b/src/com/aoleyun/os/network/BaseResponse.java
similarity index 67%
rename from src/com/android/colorfulos/network/BaseResponse.java
rename to src/com/aoleyun/os/network/BaseResponse.java
index de7860d..59439e6 100644
--- a/src/com/android/colorfulos/network/BaseResponse.java
+++ b/src/com/aoleyun/os/network/BaseResponse.java
@@ -1,4 +1,4 @@
-package com.android.colorfulos.network;
+package com.aoleyun.os.network;
 
 import androidx.annotation.NonNull;
 
@@ -21,8 +21,6 @@ public class BaseResponse<T> implements Serializable {
     @NonNull
     @Override
     public String toString() {
-        Gson gson = new Gson();
-        JsonObject jsonObject = JsonParser.parseString(gson.toJson(this)).getAsJsonObject();
-        return jsonObject.toString();
+        return JsonParser.parseString(new Gson().toJson(this)).getAsJsonObject().toString();
     }
 }
\ No newline at end of file
diff --git a/src/com/aoleyun/os/network/HTTPInterface.java b/src/com/aoleyun/os/network/HTTPInterface.java
new file mode 100644
index 0000000..a12f6ba
--- /dev/null
+++ b/src/com/aoleyun/os/network/HTTPInterface.java
@@ -0,0 +1,127 @@
+package com.aoleyun.os.network;
+
+import android.content.Context;
+import android.text.TextUtils;
+import android.util.Log;
+
+import com.aoleyun.os.jpush.TagAliasOperatorHelper;
+import com.aoleyun.os.uiuiutils.JGYUtils;
+import com.google.gson.Gson;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import com.tencent.mmkv.MMKV;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import io.reactivex.Observer;
+import io.reactivex.annotations.NonNull;
+import io.reactivex.disposables.Disposable;
+
+import static com.aoleyun.os.jpush.TagAliasOperatorHelper.ACTION_SET;
+import static com.aoleyun.os.jpush.TagAliasOperatorHelper.sequence;
+
+/**
+ * @author : fanhuitong
+ * e-mail :
+ * @date : 2021/10/27 15:31
+ * desc   :
+ * version: 1.0
+ */
+public class HTTPInterface {
+    private static final String TAG = HTTPInterface.class.getSimpleName();
+
+    public static void getAppPasswd() {
+        NetWorkManager.getInstance().getAppPasswordObservable()
+                .subscribe(new Observer<BaseResponse<List<AppPasswdBean>>>() {
+                    @Override
+                    public void onSubscribe(Disposable d) {
+                        Log.e("getAppPasswd", "onSubscribe: ");
+                    }
+
+                    @Override
+                    public void onNext(BaseResponse<List<AppPasswdBean>> listBaseResponse) {
+                        Log.e("getAppPasswd", "onNext: " + listBaseResponse);
+                        if (listBaseResponse.code == 200) {
+                            List<AppPasswdBean> beanList = listBaseResponse.data;
+                            String jsonString = JsonParser.parseString(new Gson().toJson(beanList)).getAsJsonArray().toString();
+                            MMKV.defaultMMKV().encode("ApplicationLock", jsonString);
+                            Log.e("getAppPasswd", "onNext: " + jsonString);
+                        } else {
+                            MMKV.defaultMMKV().encode("ApplicationLock", "");
+                        }
+                    }
+
+                    @Override
+                    public void onError(Throwable e) {
+                        Log.e("getAppPasswd", "onError: " + e.getMessage());
+                    }
+
+                    @Override
+                    public void onComplete() {
+                        Log.e("getAppPasswd", "onComplete: ");
+                    }
+                });
+    }
+
+    synchronized public static void setJpushTags(final Context context) {
+        NetWorkManager.getInstance()
+                .getJpushTagsObservable()
+                .subscribe(new Observer<BaseResponse>() {
+                    @Override
+                    public void onSubscribe(@NonNull Disposable d) {
+                        Log.e(TAG + ":" + "setJpushTags", "onSubscribe: ");
+                    }
+
+                    @Override
+                    public void onNext(@NonNull BaseResponse response) {
+                        if (response.code == 200) {
+                            JsonObject jsonObject = JsonParser.parseString(new Gson().toJson(response.data)).getAsJsonObject();
+                            String batch = jsonObject.get("batch").getAsString();
+                            Log.e(TAG + ":" + "setJpushTags", "onNext: " + batch);
+                            if (!TextUtils.isEmpty(batch)) {
+                                Set set = new HashSet();
+                                set.add(batch);
+                                JGYUtils.getInstance().getAppPlatform(new JGYUtils.GetAppPlatformCallback() {
+                                    @Override
+                                    public void AppPlatform(int platform) {
+                                        if (platform == JGYUtils.MTKPlatform) {
+                                            set.add(JGYUtils.MTKTag);
+                                        } else if (platform == JGYUtils.ZhanruiPlatform) {
+                                            set.add(JGYUtils.ZhanruiTag);
+                                        }
+                                    }
+                                });
+                                setTag(context, set);
+                            } else {
+                                Log.e(TAG + ":" + "setJpushTags", "onNext: " + "batch empty");
+                            }
+                        } else {
+                            Log.e(TAG + ":" + "setJpushTags", "onNext: " + response.toString());
+                        }
+                    }
+
+                    @Override
+                    public void onError(@NonNull Throwable e) {
+                        Log.e(TAG + ":" + "setJpushTags", "onError: " + e.getMessage());
+                        onComplete();
+                    }
+
+                    @Override
+                    public void onComplete() {
+                        Log.e(TAG + ":" + "setJpushTags", "onComplete: ");
+                    }
+                });
+    }
+
+    private static void setTag(Context context, Set set) {
+        TagAliasOperatorHelper.TagAliasBean tagAliasBean = new TagAliasOperatorHelper.TagAliasBean();
+        tagAliasBean.action = ACTION_SET;
+        sequence++;
+        tagAliasBean.tags = set;
+        tagAliasBean.isAliasAction = false;
+        TagAliasOperatorHelper.getInstance().handleAction(context, sequence, tagAliasBean);
+    }
+
+}
diff --git a/src/com/android/colorfulos/network/NetWorkManager.java b/src/com/aoleyun/os/network/NetWorkManager.java
similarity index 74%
rename from src/com/android/colorfulos/network/NetWorkManager.java
rename to src/com/aoleyun/os/network/NetWorkManager.java
index af7efcb..6ba4e2a 100644
--- a/src/com/android/colorfulos/network/NetWorkManager.java
+++ b/src/com/aoleyun/os/network/NetWorkManager.java
@@ -1,14 +1,17 @@
-package com.android.colorfulos.network;
+package com.aoleyun.os.network;
 
 import android.content.Context;
 import android.os.Environment;
 
-import com.android.colorfulos.TTUtils.Utils;
-import com.android.colorfulos.network.api.AddAppLog;
-import com.android.colorfulos.network.api.CheckUpdate;
-import com.android.colorfulos.network.api.RunningApp;
+import com.aoleyun.os.TTUtils.Utils;
+import com.aoleyun.os.network.api.AddAppLog;
+import com.aoleyun.os.network.api.CheckUpdate;
+import com.aoleyun.os.network.api.GetAppPassword;
+import com.aoleyun.os.network.api.GetJpushTagsApi;
+import com.aoleyun.os.network.api.RunningApp;
 
 import java.io.File;
+import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 import io.reactivex.Observable;
@@ -75,18 +78,36 @@ public class NetWorkManager {
     private static CallAdapter.Factory rxJavaCallAdapterFactory = RxJava2CallAdapterFactory.create();
     private static Converter.Factory gsonConverterFactory = GsonConverterFactory.create();
 
-
-    public   AddAppLog getapplogControl() {
-        return mRetrofit.create(AddAppLog.class);
-    }
-
     public Observable<BaseResponse> getRunningAppObservable(String json) {
         return mRetrofit.create(RunningApp.class)
-                .sendAppInfo(Utils.getSerial(),json)
+                .sendAppInfo(Utils.getSerial(), json)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread());
     }
 
+    public Observable<BaseResponse<List<AppPasswdBean>>> getAppPasswordObservable() {
+        return mRetrofit.create(GetAppPassword.class)
+                .getAppPasswd(Utils.getSerial())
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread());
+    }
+
+    /**
+     * 获取极光推送的tag
+     *
+     * @return
+     */
+    public Observable<BaseResponse> getJpushTagsObservable() {
+        return mRetrofit.create(GetJpushTagsApi.class)
+                .getJpushTags(Utils.getSerial())
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread());
+    }
+
+    public AddAppLog getapplogControl() {
+        return mRetrofit.create(AddAppLog.class);
+    }
+
     public CheckUpdate getCheckUpdateObservable() {
         return mRetrofit.create(CheckUpdate.class);
     }
diff --git a/src/com/aoleyun/os/network/NewestAppUpdateResult.java b/src/com/aoleyun/os/network/NewestAppUpdateResult.java
new file mode 100644
index 0000000..d8e2f3b
--- /dev/null
+++ b/src/com/aoleyun/os/network/NewestAppUpdateResult.java
@@ -0,0 +1,75 @@
+package com.aoleyun.os.network;
+
+import androidx.annotation.NonNull;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonParser;
+import com.google.gson.annotations.SerializedName;
+
+import java.io.Serializable;
+
+public class NewestAppUpdateResult implements Serializable {
+    private static final long serialVersionUID = -934484906663584753L;
+
+    long id ;
+    String url;
+    int version_code;
+    String app_name;
+    @SerializedName("package")
+    String app_package;
+    String app_md5;
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public String getApp_name() {
+        return app_name;
+    }
+
+    public void setApp_name(String app_name) {
+        this.app_name = app_name;
+    }
+
+    public String getApp_package() {
+        return app_package;
+    }
+
+    public void setApp_package(String app_package) {
+        this.app_package = app_package;
+    }
+
+    public int getVersion_code() {
+        return version_code;
+    }
+
+    public void setVersion_code(int version_code) {
+        this.version_code = version_code;
+    }
+
+    public String getApp_md5() {
+        return app_md5;
+    }
+
+    public void setApp_md5(String app_md5) {
+        this.app_md5 = app_md5;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    @NonNull
+    @Override
+    public String toString() {
+        return JsonParser.parseString(new Gson().toJson(this)).getAsJsonObject().toString();
+    }
+}
diff --git a/src/com/aoleyun/os/network/URLPath.java b/src/com/aoleyun/os/network/URLPath.java
new file mode 100644
index 0000000..7230eca
--- /dev/null
+++ b/src/com/aoleyun/os/network/URLPath.java
@@ -0,0 +1,23 @@
+package com.aoleyun.os.network;
+
+public class URLPath {
+    public static final String ROOT_URL = "https://led.aoleyun.cn/api/";
+    public static final String APP_LOG = "app/addAppLog";
+    public static final String RUN_NEW_APP = "app/runNewApp";
+    //更新
+    public final static String GET_NEWESTAPPUPDATE = "Silent/silent";
+    //是否有应用密码锁
+    public final static String GET_APP_ISLOCKED = "And/isApplicationLock";
+    //验证应用密码锁
+    public final static String CHECK_APP_PASSWD = "And/checkApplicationLock";
+    //获取所有应用密码
+    public final static String GET_APP_PASSWD = "And/getApplicationLock";
+    //获取设备标签
+    public static final String GET_DEVICES_TAGS = "Sn/getSnTag";
+
+
+    //删除alias
+    public static final String DELETE_JPUSH_ALIAS = "https://device.jpush.cn/v3/aliases/";
+    //删除tags
+    public static final String DELETE_JPUSH_TAG = "https://device.jpush.cn/v3/tags/";
+}
diff --git a/src/com/android/colorfulos/network/api/AddAppLog.java b/src/com/aoleyun/os/network/api/AddAppLog.java
similarity index 77%
rename from src/com/android/colorfulos/network/api/AddAppLog.java
rename to src/com/aoleyun/os/network/api/AddAppLog.java
index b32b948..59115d6 100644
--- a/src/com/android/colorfulos/network/api/AddAppLog.java
+++ b/src/com/aoleyun/os/network/api/AddAppLog.java
@@ -1,7 +1,7 @@
-package com.android.colorfulos.network.api;
+package com.aoleyun.os.network.api;
 
-import com.android.colorfulos.network.BaseResponse;
-import com.android.colorfulos.network.URLPath;
+import com.aoleyun.os.network.BaseResponse;
+import com.aoleyun.os.network.URLPath;
 
 import io.reactivex.Observable;
 import retrofit2.http.Field;
diff --git a/src/com/android/colorfulos/network/api/CheckUpdate.java b/src/com/aoleyun/os/network/api/CheckUpdate.java
similarity index 62%
rename from src/com/android/colorfulos/network/api/CheckUpdate.java
rename to src/com/aoleyun/os/network/api/CheckUpdate.java
index a8fac9c..17867dc 100644
--- a/src/com/android/colorfulos/network/api/CheckUpdate.java
+++ b/src/com/aoleyun/os/network/api/CheckUpdate.java
@@ -1,15 +1,13 @@
-package com.android.colorfulos.network.api;
+package com.aoleyun.os.network.api;
 
-import com.android.colorfulos.network.BaseResponse;
-import com.android.colorfulos.network.NewestAppUpdateResult;
-import com.android.colorfulos.network.URLPath;
+import com.aoleyun.os.network.BaseResponse;
+import com.aoleyun.os.network.NewestAppUpdateResult;
+import com.aoleyun.os.network.URLPath;
 
 import io.reactivex.Observable;
 import retrofit2.http.Field;
 import retrofit2.http.FormUrlEncoded;
-import retrofit2.http.GET;
 import retrofit2.http.POST;
-import retrofit2.http.Query;
 
 public interface CheckUpdate {
     @FormUrlEncoded
diff --git a/src/com/aoleyun/os/network/api/GetAppPassword.java b/src/com/aoleyun/os/network/api/GetAppPassword.java
new file mode 100644
index 0000000..877a7b6
--- /dev/null
+++ b/src/com/aoleyun/os/network/api/GetAppPassword.java
@@ -0,0 +1,25 @@
+package com.aoleyun.os.network.api;
+
+import com.aoleyun.os.network.AppPasswdBean;
+import com.aoleyun.os.network.BaseResponse;
+import com.aoleyun.os.network.URLPath;
+
+import java.util.List;
+
+import io.reactivex.Observable;
+import retrofit2.http.GET;
+import retrofit2.http.Query;
+
+/**
+ * @author : fanhuitong
+ * e-mail :
+ * @date : 2021/10/22 18:06
+ * desc   :
+ * version: 1.0
+ */
+public interface GetAppPassword {
+    @GET(URLPath.GET_APP_PASSWD)
+    Observable<BaseResponse<List<AppPasswdBean>>> getAppPasswd(
+            @Query("sn") String sn
+    );
+}
diff --git a/src/com/aoleyun/os/network/api/GetJpushTagsApi.java b/src/com/aoleyun/os/network/api/GetJpushTagsApi.java
new file mode 100644
index 0000000..c87ef6b
--- /dev/null
+++ b/src/com/aoleyun/os/network/api/GetJpushTagsApi.java
@@ -0,0 +1,16 @@
+package com.aoleyun.os.network.api;
+
+
+import com.aoleyun.os.network.BaseResponse;
+import com.aoleyun.os.network.URLPath;
+
+import io.reactivex.Observable;
+import retrofit2.http.GET;
+import retrofit2.http.Query;
+
+public interface GetJpushTagsApi {
+    @GET(URLPath.GET_DEVICES_TAGS)
+    Observable<BaseResponse> getJpushTags(
+            @Query("sn") String sn
+    );
+}
diff --git a/src/com/android/colorfulos/network/api/RunningApp.java b/src/com/aoleyun/os/network/api/RunningApp.java
similarity index 70%
rename from src/com/android/colorfulos/network/api/RunningApp.java
rename to src/com/aoleyun/os/network/api/RunningApp.java
index b7c83d3..0c38757 100644
--- a/src/com/android/colorfulos/network/api/RunningApp.java
+++ b/src/com/aoleyun/os/network/api/RunningApp.java
@@ -1,7 +1,7 @@
-package com.android.colorfulos.network.api;
+package com.aoleyun.os.network.api;
 
-import com.android.colorfulos.network.BaseResponse;
-import com.android.colorfulos.network.URLPath;
+import com.aoleyun.os.network.BaseResponse;
+import com.aoleyun.os.network.URLPath;
 
 import io.reactivex.Observable;
 import retrofit2.http.Field;
diff --git a/src/com/android/colorfulos/notification/NotificationFooterLayout.java b/src/com/aoleyun/os/notification/NotificationFooterLayout.java
similarity index 96%
rename from src/com/android/colorfulos/notification/NotificationFooterLayout.java
rename to src/com/aoleyun/os/notification/NotificationFooterLayout.java
index 950992c..ee5fd49 100644
--- a/src/com/android/colorfulos/notification/NotificationFooterLayout.java
+++ b/src/com/aoleyun/os/notification/NotificationFooterLayout.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.notification;
+package com.aoleyun.os.notification;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -29,11 +29,11 @@ import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 
-import com.android.colorfulos.R;
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.anim.PropertyListBuilder;
-import com.android.colorfulos.anim.PropertyResetListener;
-import com.android.colorfulos.util.Themes;
+import com.aoleyun.os.R;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.anim.PropertyListBuilder;
+import com.aoleyun.os.anim.PropertyResetListener;
+import com.aoleyun.os.util.Themes;
 
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/src/com/android/colorfulos/notification/NotificationGroup.java b/src/com/aoleyun/os/notification/NotificationGroup.java
similarity index 96%
rename from src/com/android/colorfulos/notification/NotificationGroup.java
rename to src/com/aoleyun/os/notification/NotificationGroup.java
index c0e6305..53d4f72 100644
--- a/src/com/android/colorfulos/notification/NotificationGroup.java
+++ b/src/com/aoleyun/os/notification/NotificationGroup.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.notification;
+package com.aoleyun.os.notification;
 
 import java.util.HashSet;
 import java.util.Set;
diff --git a/src/com/android/colorfulos/notification/NotificationInfo.java b/src/com/aoleyun/os/notification/NotificationInfo.java
similarity index 93%
rename from src/com/android/colorfulos/notification/NotificationInfo.java
rename to src/com/aoleyun/os/notification/NotificationInfo.java
index 656a9dd..e29072c 100644
--- a/src/com/android/colorfulos/notification/NotificationInfo.java
+++ b/src/com/aoleyun/os/notification/NotificationInfo.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.notification;
+package com.aoleyun.os.notification;
 
 import android.app.ActivityOptions;
 import android.app.Notification;
@@ -27,12 +27,12 @@ import android.os.Bundle;
 import android.service.notification.StatusBarNotification;
 import android.view.View;
 
-import com.android.colorfulos.AbstractFloatingView;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.LauncherAppState;
-import com.android.colorfulos.dot.DotInfo;
-import com.android.colorfulos.graphics.IconPalette;
-import com.android.colorfulos.util.PackageUserKey;
+import com.aoleyun.os.AbstractFloatingView;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.LauncherAppState;
+import com.aoleyun.os.dot.DotInfo;
+import com.aoleyun.os.graphics.IconPalette;
+import com.aoleyun.os.util.PackageUserKey;
 
 /**
  * An object that contains relevant information from a {@link StatusBarNotification}. This should
diff --git a/src/com/android/colorfulos/notification/NotificationItemView.java b/src/com/aoleyun/os/notification/NotificationItemView.java
similarity index 95%
rename from src/com/android/colorfulos/notification/NotificationItemView.java
rename to src/com/aoleyun/os/notification/NotificationItemView.java
index 0a0c4fa..a60e0a4 100644
--- a/src/com/android/colorfulos/notification/NotificationItemView.java
+++ b/src/com/aoleyun/os/notification/NotificationItemView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.notification;
+package com.aoleyun.os.notification;
 
 import android.app.Notification;
 import android.content.Context;
@@ -25,15 +25,15 @@ import android.view.View;
 import android.view.ViewGroup.MarginLayoutParams;
 import android.widget.TextView;
 
-import com.android.colorfulos.R;
-import com.android.colorfulos.graphics.IconPalette;
-import com.android.colorfulos.popup.PopupContainerWithArrow;
-import com.android.colorfulos.touch.SwipeDetector;
-import com.android.colorfulos.util.Themes;
+import com.aoleyun.os.R;
+import com.aoleyun.os.graphics.IconPalette;
+import com.aoleyun.os.popup.PopupContainerWithArrow;
+import com.aoleyun.os.touch.SwipeDetector;
+import com.aoleyun.os.util.Themes;
 
 import java.util.List;
 
-import static com.android.colorfulos.touch.SwipeDetector.HORIZONTAL;
+import static com.aoleyun.os.touch.SwipeDetector.HORIZONTAL;
 
 /**
  * Utility class to manage notification UI
diff --git a/src/com/android/colorfulos/notification/NotificationKeyData.java b/src/com/aoleyun/os/notification/NotificationKeyData.java
similarity index 98%
rename from src/com/android/colorfulos/notification/NotificationKeyData.java
rename to src/com/aoleyun/os/notification/NotificationKeyData.java
index 0a1d577..a6328b0 100644
--- a/src/com/android/colorfulos/notification/NotificationKeyData.java
+++ b/src/com/aoleyun/os/notification/NotificationKeyData.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.notification;
+package com.aoleyun.os.notification;
 
 import android.app.Notification;
 import android.service.notification.StatusBarNotification;
diff --git a/src/com/android/colorfulos/notification/NotificationListener.java b/src/com/aoleyun/os/notification/NotificationListener.java
similarity index 97%
rename from src/com/android/colorfulos/notification/NotificationListener.java
rename to src/com/aoleyun/os/notification/NotificationListener.java
index 9839636..55a2969 100644
--- a/src/com/android/colorfulos/notification/NotificationListener.java
+++ b/src/com/aoleyun/os/notification/NotificationListener.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.notification;
+package com.aoleyun.os.notification;
 
-import static com.android.colorfulos.util.SecureSettingsObserver.newNotificationSettingsObserver;
+import static com.aoleyun.os.util.SecureSettingsObserver.newNotificationSettingsObserver;
 
 import android.annotation.TargetApi;
 import android.app.Notification;
@@ -31,10 +31,10 @@ import android.text.TextUtils;
 import android.util.Log;
 import android.util.Pair;
 
-import com.android.colorfulos.LauncherModel;
-import com.android.colorfulos.util.IntSet;
-import com.android.colorfulos.util.PackageUserKey;
-import com.android.colorfulos.util.SecureSettingsObserver;
+import com.aoleyun.os.LauncherModel;
+import com.aoleyun.os.util.IntSet;
+import com.aoleyun.os.util.PackageUserKey;
+import com.aoleyun.os.util.SecureSettingsObserver;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/src/com/android/colorfulos/notification/NotificationMainView.java b/src/com/aoleyun/os/notification/NotificationMainView.java
similarity index 94%
rename from src/com/android/colorfulos/notification/NotificationMainView.java
rename to src/com/aoleyun/os/notification/NotificationMainView.java
index a644a8a..3889b53 100644
--- a/src/com/android/colorfulos/notification/NotificationMainView.java
+++ b/src/com/aoleyun/os/notification/NotificationMainView.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.notification;
+package com.aoleyun.os.notification;
 
-import static com.android.colorfulos.anim.Interpolators.scrollInterpolatorForVelocity;
+import static com.aoleyun.os.anim.Interpolators.scrollInterpolatorForVelocity;
 
 import android.animation.Animator;
 import android.animation.ObjectAnimator;
@@ -34,14 +34,14 @@ import android.view.ViewGroup;
 import android.widget.FrameLayout;
 import android.widget.TextView;
 
-import com.android.colorfulos.ItemInfo;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.R;
-import com.android.colorfulos.anim.AnimationSuccessListener;
-import com.android.colorfulos.touch.OverScroll;
-import com.android.colorfulos.touch.SwipeDetector;
-import com.android.colorfulos.userevent.nano.LauncherLogProto;
-import com.android.colorfulos.util.Themes;
+import com.aoleyun.os.ItemInfo;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.R;
+import com.aoleyun.os.anim.AnimationSuccessListener;
+import com.aoleyun.os.touch.OverScroll;
+import com.aoleyun.os.touch.SwipeDetector;
+import com.aoleyun.os.userevent.nano.LauncherLogProto;
+import com.aoleyun.os.util.Themes;
 
 /**
  * A {@link android.widget.FrameLayout} that contains a single notification,
diff --git a/src/com/android/colorfulos/pageindicators/PageIndicator.java b/src/com/aoleyun/os/pageindicators/PageIndicator.java
similarity index 94%
rename from src/com/android/colorfulos/pageindicators/PageIndicator.java
rename to src/com/aoleyun/os/pageindicators/PageIndicator.java
index a5574e4..da22781 100644
--- a/src/com/android/colorfulos/pageindicators/PageIndicator.java
+++ b/src/com/aoleyun/os/pageindicators/PageIndicator.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.pageindicators;
+package com.aoleyun.os.pageindicators;
 
 /**
  * Base class for a page indicator.
diff --git a/src/com/android/colorfulos/pageindicators/PageIndicatorDots.java b/src/com/aoleyun/os/pageindicators/PageIndicatorDots.java
similarity index 98%
rename from src/com/android/colorfulos/pageindicators/PageIndicatorDots.java
rename to src/com/aoleyun/os/pageindicators/PageIndicatorDots.java
index f62db67..2b45e45 100644
--- a/src/com/android/colorfulos/pageindicators/PageIndicatorDots.java
+++ b/src/com/aoleyun/os/pageindicators/PageIndicatorDots.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.pageindicators;
+package com.aoleyun.os.pageindicators;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -39,11 +39,11 @@ import android.view.animation.Interpolator;
 import android.view.animation.OvershootInterpolator;
 import android.widget.FrameLayout;
 
-import com.android.colorfulos.DeviceProfile;
-import com.android.colorfulos.Insettable;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.R;
-import com.android.colorfulos.Utilities;
+import com.aoleyun.os.DeviceProfile;
+import com.aoleyun.os.Insettable;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.R;
+import com.aoleyun.os.Utilities;
 
 /**
  * {@link PageIndicator} which shows dots per page. The active page is shown with the current
diff --git a/src/com/android/colorfulos/pageindicators/WorkspacePageIndicator.java b/src/com/aoleyun/os/pageindicators/WorkspacePageIndicator.java
similarity index 96%
rename from src/com/android/colorfulos/pageindicators/WorkspacePageIndicator.java
rename to src/com/aoleyun/os/pageindicators/WorkspacePageIndicator.java
index a81364c..60f63be 100644
--- a/src/com/android/colorfulos/pageindicators/WorkspacePageIndicator.java
+++ b/src/com/aoleyun/os/pageindicators/WorkspacePageIndicator.java
@@ -1,4 +1,4 @@
-package com.android.colorfulos.pageindicators;
+package com.aoleyun.os.pageindicators;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -19,12 +19,12 @@ import android.view.View;
 import android.view.ViewConfiguration;
 import android.widget.FrameLayout;
 
-import com.android.colorfulos.DeviceProfile;
-import com.android.colorfulos.Insettable;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.R;
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.uioverrides.WallpaperColorInfo;
+import com.aoleyun.os.DeviceProfile;
+import com.aoleyun.os.Insettable;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.R;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.uioverrides.WallpaperColorInfo;
 
 /**
  * A PageIndicator that briefly shows a fraction of a line when moving between pages
diff --git a/src/com/android/colorfulos/popup/ArrowPopup.java b/src/com/aoleyun/os/popup/ArrowPopup.java
similarity index 96%
rename from src/com/android/colorfulos/popup/ArrowPopup.java
rename to src/com/aoleyun/os/popup/ArrowPopup.java
index 2829b51..0a4bc0c 100644
--- a/src/com/android/colorfulos/popup/ArrowPopup.java
+++ b/src/com/aoleyun/os/popup/ArrowPopup.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.popup;
+package com.aoleyun.os.popup;
 
-import static com.android.colorfulos.anim.Interpolators.ACCEL_DEACCEL;
+import static com.aoleyun.os.anim.Interpolators.ACCEL_DEACCEL;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -39,18 +39,18 @@ import android.view.ViewGroup;
 import android.view.ViewOutlineProvider;
 import android.widget.FrameLayout;
 
-import com.android.colorfulos.AbstractFloatingView;
-import com.android.colorfulos.InsettableFrameLayout;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.LauncherAnimUtils;
-import com.android.colorfulos.R;
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.anim.RevealOutlineAnimation;
-import com.android.colorfulos.anim.RoundedRectRevealOutlineProvider;
-import com.android.colorfulos.dragndrop.DragLayer;
-import com.android.colorfulos.graphics.TriangleShape;
-import com.android.colorfulos.util.Themes;
-import com.android.colorfulos.views.BaseDragLayer;
+import com.aoleyun.os.AbstractFloatingView;
+import com.aoleyun.os.InsettableFrameLayout;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.LauncherAnimUtils;
+import com.aoleyun.os.R;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.anim.RevealOutlineAnimation;
+import com.aoleyun.os.anim.RoundedRectRevealOutlineProvider;
+import com.aoleyun.os.dragndrop.DragLayer;
+import com.aoleyun.os.graphics.TriangleShape;
+import com.aoleyun.os.util.Themes;
+import com.aoleyun.os.views.BaseDragLayer;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/src/com/android/colorfulos/popup/PopupContainerWithArrow.java b/src/com/aoleyun/os/popup/PopupContainerWithArrow.java
similarity index 89%
rename from src/com/android/colorfulos/popup/PopupContainerWithArrow.java
rename to src/com/aoleyun/os/popup/PopupContainerWithArrow.java
index 45f46dd..678a10f 100644
--- a/src/com/android/colorfulos/popup/PopupContainerWithArrow.java
+++ b/src/com/aoleyun/os/popup/PopupContainerWithArrow.java
@@ -14,16 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.popup;
+package com.aoleyun.os.popup;
 
-import static com.android.colorfulos.Utilities.squaredHypot;
-import static com.android.colorfulos.Utilities.squaredTouchSlop;
-import static com.android.colorfulos.notification.NotificationMainView.NOTIFICATION_ITEM_INFO;
-import static com.android.colorfulos.popup.PopupPopulator.MAX_SHORTCUTS;
-import static com.android.colorfulos.popup.PopupPopulator.MAX_SHORTCUTS_IF_NOTIFICATIONS;
-import static com.android.colorfulos.userevent.nano.LauncherLogProto.ContainerType;
-import static com.android.colorfulos.userevent.nano.LauncherLogProto.ItemType;
-import static com.android.colorfulos.userevent.nano.LauncherLogProto.Target;
+import static com.aoleyun.os.Utilities.squaredHypot;
+import static com.aoleyun.os.Utilities.squaredTouchSlop;
+import static com.aoleyun.os.userevent.nano.LauncherLogProto.ContainerType;
+import static com.aoleyun.os.userevent.nano.LauncherLogProto.ItemType;
+import static com.aoleyun.os.userevent.nano.LauncherLogProto.Target;
 
 import android.animation.AnimatorSet;
 import android.animation.LayoutTransition;
@@ -43,35 +40,36 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 
-import com.android.colorfulos.AbstractFloatingView;
-import com.android.colorfulos.BubbleTextView;
-import com.android.colorfulos.DragSource;
-import com.android.colorfulos.DropTarget;
-import com.android.colorfulos.DropTarget.DragObject;
-import com.android.colorfulos.ItemInfo;
-import com.android.colorfulos.ItemInfoWithIcon;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.LauncherModel;
-import com.android.colorfulos.R;
-import com.android.colorfulos.accessibility.LauncherAccessibilityDelegate;
-import com.android.colorfulos.accessibility.ShortcutMenuAccessibilityDelegate;
-import com.android.colorfulos.dot.DotInfo;
-import com.android.colorfulos.dragndrop.DragController;
-import com.android.colorfulos.dragndrop.DragOptions;
-import com.android.colorfulos.dragndrop.DragView;
-import com.android.colorfulos.logging.LoggerUtils;
-import com.android.colorfulos.notification.NotificationInfo;
-import com.android.colorfulos.notification.NotificationItemView;
-import com.android.colorfulos.notification.NotificationKeyData;
-import com.android.colorfulos.popup.PopupDataProvider.PopupDataChangeListener;
-import com.android.colorfulos.shortcuts.DeepShortcutManager;
-import com.android.colorfulos.shortcuts.DeepShortcutView;
-import com.android.colorfulos.shortcuts.ShortcutDragPreviewProvider;
-import com.android.colorfulos.testing.TestProtocol;
-import com.android.colorfulos.touch.ItemClickHandler;
-import com.android.colorfulos.touch.ItemLongClickListener;
-import com.android.colorfulos.util.PackageUserKey;
-import com.android.colorfulos.views.BaseDragLayer;
+import com.aoleyun.os.AbstractFloatingView;
+import com.aoleyun.os.BubbleTextView;
+import com.aoleyun.os.DragSource;
+import com.aoleyun.os.DropTarget;
+import com.aoleyun.os.DropTarget.DragObject;
+import com.aoleyun.os.ItemInfo;
+import com.aoleyun.os.ItemInfoWithIcon;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.LauncherModel;
+import com.aoleyun.os.R;
+import com.aoleyun.os.accessibility.LauncherAccessibilityDelegate;
+import com.aoleyun.os.accessibility.ShortcutMenuAccessibilityDelegate;
+import com.aoleyun.os.dot.DotInfo;
+import com.aoleyun.os.dragndrop.DragController;
+import com.aoleyun.os.dragndrop.DragOptions;
+import com.aoleyun.os.dragndrop.DragView;
+import com.aoleyun.os.logging.LoggerUtils;
+import com.aoleyun.os.notification.NotificationInfo;
+import com.aoleyun.os.notification.NotificationItemView;
+import com.aoleyun.os.notification.NotificationKeyData;
+import com.aoleyun.os.popup.PopupDataProvider.PopupDataChangeListener;
+import com.aoleyun.os.shortcuts.DeepShortcutManager;
+import com.aoleyun.os.shortcuts.DeepShortcutView;
+import com.aoleyun.os.shortcuts.ShortcutDragPreviewProvider;
+import com.aoleyun.os.testing.TestProtocol;
+import com.aoleyun.os.touch.ItemClickHandler;
+import com.aoleyun.os.touch.ItemLongClickListener;
+import com.aoleyun.os.util.PackageUserKey;
+import com.aoleyun.os.views.BaseDragLayer;
+import com.aoleyun.os.notification.NotificationMainView;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -247,14 +245,14 @@ public class PopupContainerWithArrow extends ArrowPopup implements DragSource,
 
     @TargetApi(Build.VERSION_CODES.P)
     protected void populateAndShow(final BubbleTextView originalIcon, int shortcutCount,
-            final List<NotificationKeyData> notificationKeys, List<SystemShortcut> systemShortcuts) {
+                                   final List<NotificationKeyData> notificationKeys, List<SystemShortcut> systemShortcuts) {
         mNumNotifications = notificationKeys.size();
         mOriginalIcon = originalIcon;
 
         // Add views
         if (mNumNotifications > 0) {
             // Add notification entries
-            View.inflate(getContext(), R.layout.notification_content, this);
+            inflate(getContext(), R.layout.notification_content, this);
             mNotificationItemView = new NotificationItemView(this);
             if (mNumNotifications == 1) {
                 mNotificationItemView.removeFooter();
@@ -339,7 +337,7 @@ public class PopupContainerWithArrow extends ArrowPopup implements DragSource,
 
     private void updateHiddenShortcuts() {
         int allowedCount = mNotificationItemView != null
-                ? MAX_SHORTCUTS_IF_NOTIFICATIONS : MAX_SHORTCUTS;
+                ? PopupPopulator.MAX_SHORTCUTS_IF_NOTIFICATIONS : PopupPopulator.MAX_SHORTCUTS;
         int originalHeight = getResources().getDimensionPixelSize(R.dimen.bg_popup_item_height);
         int itemHeight = mNotificationItemView != null ?
                 getResources().getDimensionPixelSize(R.dimen.bg_popup_item_condensed_height)
@@ -554,7 +552,7 @@ public class PopupContainerWithArrow extends ArrowPopup implements DragSource,
 
     @Override
     public void fillInLogContainerData(View v, ItemInfo info, Target target, Target targetParent) {
-        if (info == NOTIFICATION_ITEM_INFO) {
+        if (info == NotificationMainView.NOTIFICATION_ITEM_INFO) {
             target.itemType = ItemType.NOTIFICATION;
         } else {
             target.itemType = ItemType.DEEPSHORTCUT;
@@ -610,7 +608,7 @@ public class PopupContainerWithArrow extends ArrowPopup implements DragSource,
         dv.animateShift(-iconShift.x, -iconShift.y);
 
         // TODO: support dragging from within folder without having to close it
-        AbstractFloatingView.closeOpenContainer(mLauncher, AbstractFloatingView.TYPE_FOLDER);
+        AbstractFloatingView.closeOpenContainer(mLauncher, TYPE_FOLDER);
         return false;
     }
 
diff --git a/src/com/android/colorfulos/popup/PopupDataProvider.java b/src/com/aoleyun/os/popup/PopupDataProvider.java
similarity index 93%
rename from src/com/android/colorfulos/popup/PopupDataProvider.java
rename to src/com/aoleyun/os/popup/PopupDataProvider.java
index cba11b1..730b152 100644
--- a/src/com/android/colorfulos/popup/PopupDataProvider.java
+++ b/src/com/aoleyun/os/popup/PopupDataProvider.java
@@ -14,22 +14,22 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.popup;
+package com.aoleyun.os.popup;
 
 import android.content.ComponentName;
 import android.service.notification.StatusBarNotification;
 import android.util.Log;
 
-import com.android.colorfulos.ItemInfo;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.dot.DotInfo;
-import com.android.colorfulos.model.WidgetItem;
-import com.android.colorfulos.notification.NotificationKeyData;
-import com.android.colorfulos.notification.NotificationListener;
-import com.android.colorfulos.shortcuts.DeepShortcutManager;
-import com.android.colorfulos.util.ComponentKey;
-import com.android.colorfulos.util.PackageUserKey;
-import com.android.colorfulos.widget.WidgetListRowEntry;
+import com.aoleyun.os.ItemInfo;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.dot.DotInfo;
+import com.aoleyun.os.model.WidgetItem;
+import com.aoleyun.os.notification.NotificationKeyData;
+import com.aoleyun.os.notification.NotificationListener;
+import com.aoleyun.os.shortcuts.DeepShortcutManager;
+import com.aoleyun.os.util.ComponentKey;
+import com.aoleyun.os.util.PackageUserKey;
+import com.aoleyun.os.widget.WidgetListRowEntry;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -71,7 +71,7 @@ public class PopupDataProvider implements NotificationListener.NotificationsChan
 
     @Override
     public void onNotificationPosted(PackageUserKey postedPackageUserKey,
-            NotificationKeyData notificationKey, boolean shouldBeFilteredOut) {
+                                     NotificationKeyData notificationKey, boolean shouldBeFilteredOut) {
         DotInfo dotInfo = mPackageUserToDotInfos.get(postedPackageUserKey);
         boolean dotShouldBeRefreshed;
         if (dotInfo == null) {
diff --git a/src/com/android/colorfulos/popup/PopupPopulator.java b/src/com/aoleyun/os/popup/PopupPopulator.java
similarity index 90%
rename from src/com/android/colorfulos/popup/PopupPopulator.java
rename to src/com/aoleyun/os/popup/PopupPopulator.java
index 4abf717..a3a439e 100644
--- a/src/com/android/colorfulos/popup/PopupPopulator.java
+++ b/src/com/aoleyun/os/popup/PopupPopulator.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.popup;
+package com.aoleyun.os.popup;
 
 import android.content.ComponentName;
 import android.content.pm.ShortcutInfo;
@@ -22,15 +22,15 @@ import android.os.Handler;
 import android.os.UserHandle;
 import android.service.notification.StatusBarNotification;
 
-import com.android.colorfulos.ItemInfo;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.WorkspaceItemInfo;
-import com.android.colorfulos.icons.LauncherIcons;
-import com.android.colorfulos.notification.NotificationInfo;
-import com.android.colorfulos.notification.NotificationKeyData;
-import com.android.colorfulos.shortcuts.DeepShortcutManager;
-import com.android.colorfulos.shortcuts.DeepShortcutView;
-import com.android.colorfulos.util.PackageUserKey;
+import com.aoleyun.os.ItemInfo;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.WorkspaceItemInfo;
+import com.aoleyun.os.icons.LauncherIcons;
+import com.aoleyun.os.notification.NotificationInfo;
+import com.aoleyun.os.notification.NotificationKeyData;
+import com.aoleyun.os.shortcuts.DeepShortcutManager;
+import com.aoleyun.os.shortcuts.DeepShortcutView;
+import com.aoleyun.os.util.PackageUserKey;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -123,9 +123,9 @@ public class PopupPopulator {
     }
 
     public static Runnable createUpdateRunnable(final Launcher launcher, final ItemInfo originalInfo,
-            final Handler uiHandler, final PopupContainerWithArrow container,
-            final List<DeepShortcutView> shortcutViews,
-            final List<NotificationKeyData> notificationKeys) {
+                                                final Handler uiHandler, final PopupContainerWithArrow container,
+                                                final List<DeepShortcutView> shortcutViews,
+                                                final List<NotificationKeyData> notificationKeys) {
         final ComponentName activity = originalInfo.getTargetComponent();
         final UserHandle user = originalInfo.user;
         return () -> {
diff --git a/src/com/android/colorfulos/popup/RemoteActionShortcut.java b/src/com/aoleyun/os/popup/RemoteActionShortcut.java
similarity index 92%
rename from src/com/android/colorfulos/popup/RemoteActionShortcut.java
rename to src/com/aoleyun/os/popup/RemoteActionShortcut.java
index 905e3a5..55496de 100644
--- a/src/com/android/colorfulos/popup/RemoteActionShortcut.java
+++ b/src/com/aoleyun/os/popup/RemoteActionShortcut.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.popup;
+package com.aoleyun.os.popup;
 
 import android.app.PendingIntent;
 import android.app.RemoteAction;
@@ -25,11 +25,11 @@ import android.util.Log;
 import android.view.View;
 import android.widget.Toast;
 
-import com.android.colorfulos.AbstractFloatingView;
-import com.android.colorfulos.BaseDraggingActivity;
-import com.android.colorfulos.ItemInfo;
-import com.android.colorfulos.R;
-import com.android.colorfulos.userevent.nano.LauncherLogProto;
+import com.aoleyun.os.AbstractFloatingView;
+import com.aoleyun.os.BaseDraggingActivity;
+import com.aoleyun.os.ItemInfo;
+import com.aoleyun.os.R;
+import com.aoleyun.os.userevent.nano.LauncherLogProto;
 
 public class RemoteActionShortcut extends SystemShortcut<BaseDraggingActivity> {
     private static final String TAG = "RemoteActionShortcut";
diff --git a/src/com/android/colorfulos/popup/SystemShortcut.java b/src/com/aoleyun/os/popup/SystemShortcut.java
similarity index 88%
rename from src/com/android/colorfulos/popup/SystemShortcut.java
rename to src/com/aoleyun/os/popup/SystemShortcut.java
index 4d1392e..263d444 100644
--- a/src/com/android/colorfulos/popup/SystemShortcut.java
+++ b/src/com/aoleyun/os/popup/SystemShortcut.java
@@ -1,7 +1,7 @@
-package com.android.colorfulos.popup;
+package com.aoleyun.os.popup;
 
-import static com.android.colorfulos.userevent.nano.LauncherLogProto.Action;
-import static com.android.colorfulos.userevent.nano.LauncherLogProto.ControlType;
+import static com.aoleyun.os.userevent.nano.LauncherLogProto.Action;
+import static com.aoleyun.os.userevent.nano.LauncherLogProto.ControlType;
 
 import android.app.ActivityOptions;
 import android.content.Context;
@@ -15,17 +15,17 @@ import android.view.accessibility.AccessibilityNodeInfo;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.android.colorfulos.AbstractFloatingView;
-import com.android.colorfulos.BaseDraggingActivity;
-import com.android.colorfulos.ItemInfo;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.R;
-import com.android.colorfulos.WorkspaceItemInfo;
-import com.android.colorfulos.model.WidgetItem;
-import com.android.colorfulos.util.InstantAppResolver;
-import com.android.colorfulos.util.PackageManagerHelper;
-import com.android.colorfulos.util.PackageUserKey;
-import com.android.colorfulos.widget.WidgetsBottomSheet;
+import com.aoleyun.os.AbstractFloatingView;
+import com.aoleyun.os.BaseDraggingActivity;
+import com.aoleyun.os.ItemInfo;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.R;
+import com.aoleyun.os.WorkspaceItemInfo;
+import com.aoleyun.os.model.WidgetItem;
+import com.aoleyun.os.util.InstantAppResolver;
+import com.aoleyun.os.util.PackageManagerHelper;
+import com.aoleyun.os.util.PackageUserKey;
+import com.aoleyun.os.widget.WidgetsBottomSheet;
 
 import java.util.List;
 
@@ -178,8 +178,8 @@ public abstract class SystemShortcut<T extends BaseDraggingActivity> extends Ite
             boolean supportsWebUI = (itemInfo instanceof WorkspaceItemInfo) &&
                     ((WorkspaceItemInfo) itemInfo).hasStatusFlag(WorkspaceItemInfo.FLAG_SUPPORTS_WEB_UI);
             boolean isInstantApp = false;
-            if (itemInfo instanceof com.android.colorfulos.AppInfo) {
-                com.android.colorfulos.AppInfo appInfo = (com.android.colorfulos.AppInfo) itemInfo;
+            if (itemInfo instanceof com.aoleyun.os.AppInfo) {
+                com.aoleyun.os.AppInfo appInfo = (com.aoleyun.os.AppInfo) itemInfo;
                 isInstantApp = InstantAppResolver.newInstance(activity).isInstantApp(appInfo);
             }
             boolean enabled = supportsWebUI || isInstantApp;
diff --git a/src/com/android/colorfulos/popup/SystemShortcutFactory.java b/src/com/aoleyun/os/popup/SystemShortcutFactory.java
similarity index 87%
rename from src/com/android/colorfulos/popup/SystemShortcutFactory.java
rename to src/com/aoleyun/os/popup/SystemShortcutFactory.java
index 39a74f3..d2219c3 100644
--- a/src/com/android/colorfulos/popup/SystemShortcutFactory.java
+++ b/src/com/aoleyun/os/popup/SystemShortcutFactory.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.popup;
+package com.aoleyun.os.popup;
 
-import com.android.colorfulos.ItemInfo;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.R;
-import com.android.colorfulos.util.MainThreadInitializedObject;
-import com.android.colorfulos.util.ResourceBasedOverride;
+import com.aoleyun.os.ItemInfo;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.R;
+import com.aoleyun.os.util.MainThreadInitializedObject;
+import com.aoleyun.os.util.ResourceBasedOverride;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com/android/colorfulos/provider/ImportDataTask.java b/src/com/aoleyun/os/provider/ImportDataTask.java
similarity index 95%
rename from src/com/android/colorfulos/provider/ImportDataTask.java
rename to src/com/aoleyun/os/provider/ImportDataTask.java
index 3550111..f419b49 100644
--- a/src/com/android/colorfulos/provider/ImportDataTask.java
+++ b/src/com/aoleyun/os/provider/ImportDataTask.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.provider;
+package com.aoleyun.os.provider;
 
-import static com.android.colorfulos.Utilities.getDevicePrefs;
+import static com.aoleyun.os.Utilities.getDevicePrefs;
 
 import android.content.ContentProviderOperation;
 import android.content.ContentValues;
@@ -34,22 +34,22 @@ import android.text.TextUtils;
 import android.util.ArrayMap;
 import android.util.SparseBooleanArray;
 
-import com.android.colorfulos.AutoInstallsLayout.LayoutParserCallback;
-import com.android.colorfulos.DefaultLayoutParser;
-import com.android.colorfulos.LauncherAppState;
-import com.android.colorfulos.LauncherAppWidgetInfo;
-import com.android.colorfulos.LauncherProvider;
-import com.android.colorfulos.LauncherSettings;
-import com.android.colorfulos.LauncherSettings.Favorites;
-import com.android.colorfulos.LauncherSettings.Settings;
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.Workspace;
-import com.android.colorfulos.compat.UserManagerCompat;
-import com.android.colorfulos.config.FeatureFlags;
-import com.android.colorfulos.logging.FileLog;
-import com.android.colorfulos.model.GridSizeMigrationTask;
-import com.android.colorfulos.util.IntArray;
-import com.android.colorfulos.util.IntSparseArrayMap;
+import com.aoleyun.os.AutoInstallsLayout.LayoutParserCallback;
+import com.aoleyun.os.DefaultLayoutParser;
+import com.aoleyun.os.LauncherAppState;
+import com.aoleyun.os.LauncherAppWidgetInfo;
+import com.aoleyun.os.LauncherProvider;
+import com.aoleyun.os.LauncherSettings;
+import com.aoleyun.os.LauncherSettings.Favorites;
+import com.aoleyun.os.LauncherSettings.Settings;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.Workspace;
+import com.aoleyun.os.compat.UserManagerCompat;
+import com.aoleyun.os.config.FeatureFlags;
+import com.aoleyun.os.logging.FileLog;
+import com.aoleyun.os.model.GridSizeMigrationTask;
+import com.aoleyun.os.util.IntArray;
+import com.aoleyun.os.util.IntSparseArrayMap;
 
 import java.net.URISyntaxException;
 import java.util.ArrayList;
diff --git a/src/com/android/colorfulos/provider/LauncherDbUtils.java b/src/com/aoleyun/os/provider/LauncherDbUtils.java
similarity index 96%
rename from src/com/android/colorfulos/provider/LauncherDbUtils.java
rename to src/com/aoleyun/os/provider/LauncherDbUtils.java
index d1f81ce..c85e229 100644
--- a/src/com/android/colorfulos/provider/LauncherDbUtils.java
+++ b/src/com/aoleyun/os/provider/LauncherDbUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.provider;
+package com.aoleyun.os.provider;
 
 import android.content.ContentValues;
 import android.content.Context;
@@ -24,9 +24,9 @@ import android.database.sqlite.SQLiteDatabase;
 import android.os.Binder;
 import android.util.Log;
 
-import com.android.colorfulos.LauncherAppState;
-import com.android.colorfulos.LauncherSettings.Favorites;
-import com.android.colorfulos.util.IntArray;
+import com.aoleyun.os.LauncherAppState;
+import com.aoleyun.os.LauncherSettings.Favorites;
+import com.aoleyun.os.util.IntArray;
 
 import java.util.Locale;
 
diff --git a/src/com/android/colorfulos/provider/LossyScreenMigrationTask.java b/src/com/aoleyun/os/provider/LossyScreenMigrationTask.java
similarity index 89%
rename from src/com/android/colorfulos/provider/LossyScreenMigrationTask.java
rename to src/com/aoleyun/os/provider/LossyScreenMigrationTask.java
index c1d8eaa..1dadf5f 100644
--- a/src/com/android/colorfulos/provider/LossyScreenMigrationTask.java
+++ b/src/com/aoleyun/os/provider/LossyScreenMigrationTask.java
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.provider;
+package com.aoleyun.os.provider;
 
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
 import android.graphics.Point;
 
-import com.android.colorfulos.InvariantDeviceProfile;
-import com.android.colorfulos.LauncherSettings.Favorites;
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.Workspace;
-import com.android.colorfulos.model.GridSizeMigrationTask;
-import com.android.colorfulos.util.IntSparseArrayMap;
+import com.aoleyun.os.InvariantDeviceProfile;
+import com.aoleyun.os.LauncherSettings.Favorites;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.Workspace;
+import com.aoleyun.os.model.GridSizeMigrationTask;
+import com.aoleyun.os.util.IntSparseArrayMap;
 
 import java.util.ArrayList;
 
diff --git a/src/com/android/colorfulos/provider/RestoreDbTask.java b/src/com/aoleyun/os/provider/RestoreDbTask.java
similarity index 92%
rename from src/com/android/colorfulos/provider/RestoreDbTask.java
rename to src/com/aoleyun/os/provider/RestoreDbTask.java
index 961807d..43edbbf 100644
--- a/src/com/android/colorfulos/provider/RestoreDbTask.java
+++ b/src/com/aoleyun/os/provider/RestoreDbTask.java
@@ -14,11 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.provider;
+package com.aoleyun.os.provider;
 
-import static com.android.colorfulos.Utilities.getIntArrayFromString;
-import static com.android.colorfulos.Utilities.getStringFromIntArray;
-import static com.android.colorfulos.provider.LauncherDbUtils.dropTable;
+import static com.aoleyun.os.Utilities.getIntArrayFromString;
+import static com.aoleyun.os.Utilities.getStringFromIntArray;
 
 import android.app.backup.BackupManager;
 import android.content.ContentValues;
@@ -32,15 +31,14 @@ import android.util.SparseLongArray;
 
 import androidx.annotation.NonNull;
 
-import com.android.colorfulos.AppWidgetsRestoredReceiver;
-import com.android.colorfulos.LauncherAppWidgetInfo;
-import com.android.colorfulos.LauncherProvider.DatabaseHelper;
-import com.android.colorfulos.LauncherSettings.Favorites;
-import com.android.colorfulos.WorkspaceItemInfo;
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.logging.FileLog;
-import com.android.colorfulos.provider.LauncherDbUtils.SQLiteTransaction;
-import com.android.colorfulos.util.LogConfig;
+import com.aoleyun.os.AppWidgetsRestoredReceiver;
+import com.aoleyun.os.LauncherAppWidgetInfo;
+import com.aoleyun.os.LauncherProvider.DatabaseHelper;
+import com.aoleyun.os.LauncherSettings.Favorites;
+import com.aoleyun.os.WorkspaceItemInfo;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.logging.FileLog;
+import com.aoleyun.os.util.LogConfig;
 
 import java.io.InvalidObjectException;
 
@@ -64,7 +62,7 @@ public class RestoreDbTask {
     public static boolean performRestore(Context context, DatabaseHelper helper,
             BackupManager backupManager) {
         SQLiteDatabase db = helper.getWritableDatabase();
-        try (SQLiteTransaction t = new SQLiteTransaction(db)) {
+        try (LauncherDbUtils.SQLiteTransaction t = new LauncherDbUtils.SQLiteTransaction(db)) {
             RestoreDbTask task = new RestoreDbTask();
             task.sanitizeDB(helper, db, backupManager);
             task.restoreAppWidgetIdsIfExists(context);
@@ -178,7 +176,7 @@ public class RestoreDbTask {
         db.execSQL("ALTER TABLE favorites RENAME TO favorites_old;");
         Favorites.addTableToDb(db, newProfileId, false);
         db.execSQL("INSERT INTO favorites SELECT * FROM favorites_old;");
-        dropTable(db, "favorites_old");
+        LauncherDbUtils.dropTable(db, "favorites_old");
     }
 
 
@@ -189,7 +187,7 @@ public class RestoreDbTask {
         db.execSQL("ALTER TABLE favorites RENAME TO favorites_old;");
         Favorites.addTableToDb(db, newProfileId, false);
         db.execSQL("INSERT INTO favorites SELECT * FROM favorites_old;");
-        dropTable(db, "favorites_old");
+        LauncherDbUtils.dropTable(db, "favorites_old");
     }
 
     /**
diff --git a/src/com/android/colorfulos/qsb/QsbContainerView.java b/src/com/aoleyun/os/qsb/QsbContainerView.java
similarity index 96%
rename from src/com/android/colorfulos/qsb/QsbContainerView.java
rename to src/com/aoleyun/os/qsb/QsbContainerView.java
index 314f394..c6188d4 100644
--- a/src/com/android/colorfulos/qsb/QsbContainerView.java
+++ b/src/com/aoleyun/os/qsb/QsbContainerView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.qsb;
+package com.aoleyun.os.qsb;
 
 import static android.appwidget.AppWidgetManager.ACTION_APPWIDGET_BIND;
 import static android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_ID;
@@ -38,13 +38,13 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
-import com.android.colorfulos.AppWidgetResizeFrame;
-import com.android.colorfulos.InvariantDeviceProfile;
-import com.android.colorfulos.LauncherAppState;
-import com.android.colorfulos.R;
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.config.FeatureFlags;
-import com.android.colorfulos.graphics.FragmentWithPreview;
+import com.aoleyun.os.AppWidgetResizeFrame;
+import com.aoleyun.os.InvariantDeviceProfile;
+import com.aoleyun.os.LauncherAppState;
+import com.aoleyun.os.R;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.config.FeatureFlags;
+import com.aoleyun.os.graphics.FragmentWithPreview;
 
 /**
  * A frame layout which contains a QSB. This internally uses fragment to bind the view, which
diff --git a/src/com/android/colorfulos/qsb/QsbWidgetHostView.java b/src/com/aoleyun/os/qsb/QsbWidgetHostView.java
similarity index 94%
rename from src/com/android/colorfulos/qsb/QsbWidgetHostView.java
rename to src/com/aoleyun/os/qsb/QsbWidgetHostView.java
index ef7d7e2..b0f7b71 100644
--- a/src/com/android/colorfulos/qsb/QsbWidgetHostView.java
+++ b/src/com/aoleyun/os/qsb/QsbWidgetHostView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.qsb;
+package com.aoleyun.os.qsb;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -23,9 +23,9 @@ import android.view.ViewDebug;
 import android.view.ViewGroup;
 import android.widget.RemoteViews;
 
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.R;
-import com.android.colorfulos.widget.NavigableAppWidgetHostView;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.R;
+import com.aoleyun.os.widget.NavigableAppWidgetHostView;
 
 /**
  * Appwidget host view with QSB specific logic.
diff --git a/src/com/android/colorfulos/receiver/InstallResultReceiver.java b/src/com/aoleyun/os/receiver/InstallResultReceiver.java
similarity index 98%
rename from src/com/android/colorfulos/receiver/InstallResultReceiver.java
rename to src/com/aoleyun/os/receiver/InstallResultReceiver.java
index ffb2c8d..730c6be 100644
--- a/src/com/android/colorfulos/receiver/InstallResultReceiver.java
+++ b/src/com/aoleyun/os/receiver/InstallResultReceiver.java
@@ -1,4 +1,4 @@
-package com.android.colorfulos.receiver;
+package com.aoleyun.os.receiver;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
diff --git a/src/com/android/colorfulos/service/MainService.java b/src/com/aoleyun/os/service/MainService.java
similarity index 93%
rename from src/com/android/colorfulos/service/MainService.java
rename to src/com/aoleyun/os/service/MainService.java
index f06ab15..f6b9582 100644
--- a/src/com/android/colorfulos/service/MainService.java
+++ b/src/com/aoleyun/os/service/MainService.java
@@ -1,11 +1,11 @@
-package com.android.colorfulos.service;
+package com.aoleyun.os.service;
 
 import android.app.Service;
 import android.content.Intent;
 import android.os.IBinder;
 import android.util.Log;
 
-import com.android.colorfulos.TTUtils.APKUtils;
+import com.aoleyun.os.TTUtils.APKUtils;
 import com.arialyy.annotations.Download;
 import com.arialyy.aria.core.Aria;
 import com.arialyy.aria.core.task.DownloadTask;
diff --git a/src/com/android/colorfulos/settings/DeveloperOptionsFragment.java b/src/com/aoleyun/os/settings/DeveloperOptionsFragment.java
similarity index 95%
rename from src/com/android/colorfulos/settings/DeveloperOptionsFragment.java
rename to src/com/aoleyun/os/settings/DeveloperOptionsFragment.java
index f144a17..d8274f1 100644
--- a/src/com/android/colorfulos/settings/DeveloperOptionsFragment.java
+++ b/src/com/aoleyun/os/settings/DeveloperOptionsFragment.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.settings;
+package com.aoleyun.os.settings;
 
-import static com.android.colorfulos.uioverrides.plugins.PluginManagerWrapper.PLUGIN_CHANGED;
-import static com.android.colorfulos.uioverrides.plugins.PluginManagerWrapper.pluginEnabledKey;
+import static com.aoleyun.os.uioverrides.plugins.PluginManagerWrapper.PLUGIN_CHANGED;
+import static com.aoleyun.os.uioverrides.plugins.PluginManagerWrapper.pluginEnabledKey;
 
 import android.annotation.TargetApi;
 import android.content.BroadcastReceiver;
@@ -38,10 +38,10 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 
-import com.android.colorfulos.R;
-import com.android.colorfulos.config.FeatureFlags;
-import com.android.colorfulos.config.FlagTogglerPrefUi;
-import com.android.colorfulos.uioverrides.plugins.PluginManagerWrapper;
+import com.aoleyun.os.R;
+import com.aoleyun.os.config.FeatureFlags;
+import com.aoleyun.os.config.FlagTogglerPrefUi;
+import com.aoleyun.os.uioverrides.plugins.PluginManagerWrapper;
 
 import java.util.List;
 import java.util.Set;
diff --git a/src/com/android/colorfulos/settings/NotificationDotsPreference.java b/src/com/aoleyun/os/settings/NotificationDotsPreference.java
similarity index 89%
rename from src/com/android/colorfulos/settings/NotificationDotsPreference.java
rename to src/com/aoleyun/os/settings/NotificationDotsPreference.java
index b89d429..cab7de0 100644
--- a/src/com/android/colorfulos/settings/NotificationDotsPreference.java
+++ b/src/com/aoleyun/os/settings/NotificationDotsPreference.java
@@ -13,10 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.settings;
-
-import static com.android.colorfulos.settings.SettingsActivity.EXTRA_FRAGMENT_ARG_KEY;
-import static com.android.colorfulos.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGS;
+package com.aoleyun.os.settings;
 
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -30,9 +27,9 @@ import android.provider.Settings;
 import android.util.AttributeSet;
 import android.view.View;
 
-import com.android.colorfulos.R;
-import com.android.colorfulos.notification.NotificationListener;
-import com.android.colorfulos.util.SecureSettingsObserver;
+import com.aoleyun.os.R;
+import com.aoleyun.os.notification.NotificationListener;
+import com.aoleyun.os.util.SecureSettingsObserver;
 
 import androidx.preference.Preference;
 import androidx.preference.PreferenceViewHolder;
@@ -128,12 +125,12 @@ public class NotificationDotsPreference extends Preference
         public void onClick(DialogInterface dialogInterface, int i) {
             ComponentName cn = new ComponentName(getActivity(), NotificationListener.class);
             Bundle showFragmentArgs = new Bundle();
-            showFragmentArgs.putString(EXTRA_FRAGMENT_ARG_KEY, cn.flattenToString());
+            showFragmentArgs.putString(SettingsActivity.EXTRA_FRAGMENT_ARG_KEY, cn.flattenToString());
 
             Intent intent = new Intent(Settings.ACTION_NOTIFICATION_LISTENER_SETTINGS)
                     .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                    .putExtra(EXTRA_FRAGMENT_ARG_KEY, cn.flattenToString())
-                    .putExtra(EXTRA_SHOW_FRAGMENT_ARGS, showFragmentArgs);
+                    .putExtra(SettingsActivity.EXTRA_FRAGMENT_ARG_KEY, cn.flattenToString())
+                    .putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGS, showFragmentArgs);
             getActivity().startActivity(intent);
         }
     }
diff --git a/src/com/android/colorfulos/settings/PreferenceHighlighter.java b/src/com/aoleyun/os/settings/PreferenceHighlighter.java
similarity index 92%
rename from src/com/android/colorfulos/settings/PreferenceHighlighter.java
rename to src/com/aoleyun/os/settings/PreferenceHighlighter.java
index 4d40b7c..67d7109 100644
--- a/src/com/android/colorfulos/settings/PreferenceHighlighter.java
+++ b/src/com/aoleyun/os/settings/PreferenceHighlighter.java
@@ -13,9 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.settings;
-
-import static com.android.colorfulos.icons.GraphicsUtils.setColorAlphaBound;
+package com.aoleyun.os.settings;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -27,7 +25,8 @@ import android.graphics.Paint;
 import android.util.Property;
 import android.view.View;
 
-import com.android.colorfulos.util.Themes;
+import com.aoleyun.os.util.Themes;
+import com.aoleyun.os.icons.GraphicsUtils;
 
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.RecyclerView.ItemDecoration;
@@ -57,7 +56,7 @@ public class PreferenceHighlighter extends ItemDecoration implements Runnable {
     private static final long HIGHLIGHT_DURATION = 15000L;
     private static final long HIGHLIGHT_FADE_OUT_DURATION = 500L;
     private static final long HIGHLIGHT_FADE_IN_DURATION = 200L;
-    private static final int END_COLOR = setColorAlphaBound(Color.WHITE, 0);
+    private static final int END_COLOR = GraphicsUtils.setColorAlphaBound(Color.WHITE, 0);
 
     private final Paint mPaint = new Paint();
     private final RecyclerView mRv;
@@ -91,7 +90,7 @@ public class PreferenceHighlighter extends ItemDecoration implements Runnable {
 
         if (!mHighLightStarted) {
             // Start highlight
-            int colorTo = setColorAlphaBound(Themes.getColorAccent(mRv.getContext()), 66);
+            int colorTo = GraphicsUtils.setColorAlphaBound(Themes.getColorAccent(mRv.getContext()), 66);
             ObjectAnimator anim = ObjectAnimator.ofArgb(this, HIGHLIGHT_COLOR, END_COLOR, colorTo);
             anim.setDuration(HIGHLIGHT_FADE_IN_DURATION);
             anim.setRepeatMode(ValueAnimator.REVERSE);
diff --git a/src/com/android/colorfulos/settings/SettingsActivity.java b/src/com/aoleyun/os/settings/SettingsActivity.java
similarity index 93%
rename from src/com/android/colorfulos/settings/SettingsActivity.java
rename to src/com/aoleyun/os/settings/SettingsActivity.java
index d42c081..91699a2 100644
--- a/src/com/android/colorfulos/settings/SettingsActivity.java
+++ b/src/com/aoleyun/os/settings/SettingsActivity.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.settings;
+package com.aoleyun.os.settings;
 
-import static com.android.colorfulos.SessionCommitReceiver.ADD_ICON_PREFERENCE_KEY;
-import static com.android.colorfulos.states.RotationHelper.ALLOW_ROTATION_PREFERENCE_KEY;
-import static com.android.colorfulos.states.RotationHelper.getAllowRotationDefaultValue;
-import static com.android.colorfulos.util.SecureSettingsObserver.newNotificationSettingsObserver;
+import static com.aoleyun.os.SessionCommitReceiver.ADD_ICON_PREFERENCE_KEY;
+import static com.aoleyun.os.states.RotationHelper.ALLOW_ROTATION_PREFERENCE_KEY;
+import static com.aoleyun.os.states.RotationHelper.getAllowRotationDefaultValue;
+import static com.aoleyun.os.util.SecureSettingsObserver.newNotificationSettingsObserver;
 
 import android.app.Activity;
 import android.app.DialogFragment;
@@ -32,13 +32,13 @@ import android.os.Bundle;
 import android.provider.Settings;
 import android.text.TextUtils;
 
-import com.android.colorfulos.LauncherFiles;
-import com.android.colorfulos.R;
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.config.FeatureFlags;
-import com.android.colorfulos.graphics.GridOptionsProvider;
-import com.android.colorfulos.uioverrides.plugins.PluginManagerWrapper;
-import com.android.colorfulos.util.SecureSettingsObserver;
+import com.aoleyun.os.LauncherFiles;
+import com.aoleyun.os.R;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.config.FeatureFlags;
+import com.aoleyun.os.graphics.GridOptionsProvider;
+import com.aoleyun.os.uioverrides.plugins.PluginManagerWrapper;
+import com.aoleyun.os.util.SecureSettingsObserver;
 
 import androidx.preference.Preference;
 import androidx.preference.PreferenceFragment;
diff --git a/src/com/android/colorfulos/shortcuts/DeepShortcutTextView.java b/src/com/aoleyun/os/shortcuts/DeepShortcutTextView.java
similarity index 96%
rename from src/com/android/colorfulos/shortcuts/DeepShortcutTextView.java
rename to src/com/aoleyun/os/shortcuts/DeepShortcutTextView.java
index f1d007b..64ac3f4 100644
--- a/src/com/android/colorfulos/shortcuts/DeepShortcutTextView.java
+++ b/src/com/aoleyun/os/shortcuts/DeepShortcutTextView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.shortcuts;
+package com.aoleyun.os.shortcuts;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -26,9 +26,9 @@ import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.widget.Toast;
 
-import com.android.colorfulos.BubbleTextView;
-import com.android.colorfulos.R;
-import com.android.colorfulos.Utilities;
+import com.aoleyun.os.BubbleTextView;
+import com.aoleyun.os.R;
+import com.aoleyun.os.Utilities;
 
 /**
  * A {@link BubbleTextView} that has the shortcut icon on the left and drag handle on the right.
diff --git a/src/com/android/colorfulos/shortcuts/DeepShortcutView.java b/src/com/aoleyun/os/shortcuts/DeepShortcutView.java
similarity index 93%
rename from src/com/android/colorfulos/shortcuts/DeepShortcutView.java
rename to src/com/aoleyun/os/shortcuts/DeepShortcutView.java
index 3d47ee6..9f0c0c8 100644
--- a/src/com/android/colorfulos/shortcuts/DeepShortcutView.java
+++ b/src/com/aoleyun/os/shortcuts/DeepShortcutView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.shortcuts;
+package com.aoleyun.os.shortcuts;
 
 import android.content.Context;
 import android.content.pm.ShortcutInfo;
@@ -24,12 +24,12 @@ import android.util.AttributeSet;
 import android.view.View;
 import android.widget.FrameLayout;
 
-import com.android.colorfulos.BubbleTextView;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.R;
-import com.android.colorfulos.WorkspaceItemInfo;
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.popup.PopupContainerWithArrow;
+import com.aoleyun.os.BubbleTextView;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.R;
+import com.aoleyun.os.WorkspaceItemInfo;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.popup.PopupContainerWithArrow;
 
 /**
  * A {@link android.widget.FrameLayout} that contains a {@link DeepShortcutView}.
diff --git a/src/com/android/colorfulos/shortcuts/ShortcutDragPreviewProvider.java b/src/com/aoleyun/os/shortcuts/ShortcutDragPreviewProvider.java
similarity index 93%
rename from src/com/android/colorfulos/shortcuts/ShortcutDragPreviewProvider.java
rename to src/com/aoleyun/os/shortcuts/ShortcutDragPreviewProvider.java
index 76ef186..af9df5f 100644
--- a/src/com/android/colorfulos/shortcuts/ShortcutDragPreviewProvider.java
+++ b/src/com/aoleyun/os/shortcuts/ShortcutDragPreviewProvider.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.shortcuts;
+package com.aoleyun.os.shortcuts;
 
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
@@ -23,9 +23,9 @@ import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.view.View;
 
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.graphics.DragPreviewProvider;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.graphics.DragPreviewProvider;
 
 /**
  * Extension of {@link DragPreviewProvider} which generates bitmaps scaled to the default icon size.
diff --git a/src/com/android/colorfulos/shortcuts/ShortcutKey.java b/src/com/aoleyun/os/shortcuts/ShortcutKey.java
similarity index 88%
rename from src/com/android/colorfulos/shortcuts/ShortcutKey.java
rename to src/com/aoleyun/os/shortcuts/ShortcutKey.java
index 9bd4fcb..8568fa0 100644
--- a/src/com/android/colorfulos/shortcuts/ShortcutKey.java
+++ b/src/com/aoleyun/os/shortcuts/ShortcutKey.java
@@ -1,12 +1,12 @@
-package com.android.colorfulos.shortcuts;
+package com.aoleyun.os.shortcuts;
 
 import android.content.ComponentName;
 import android.content.Intent;
 import android.content.pm.ShortcutInfo;
 import android.os.UserHandle;
 
-import com.android.colorfulos.ItemInfo;
-import com.android.colorfulos.util.ComponentKey;
+import com.aoleyun.os.ItemInfo;
+import com.aoleyun.os.util.ComponentKey;
 
 /**
  * A key that uniquely identifies a shortcut using its package, id, and user handle.
@@ -14,7 +14,7 @@ import com.android.colorfulos.util.ComponentKey;
 public class ShortcutKey extends ComponentKey {
 
     public static final String EXTRA_SHORTCUT_ID = "shortcut_id";
-    private static final String INTENT_CATEGORY = "com.android.colorfulos.DEEP_SHORTCUT";
+    private static final String INTENT_CATEGORY = "com.aoleyun.os.DEEP_SHORTCUT";
 
     public ShortcutKey(String packageName, UserHandle user, String id) {
         // Use the id as the class name.
diff --git a/src/com/android/colorfulos/states/InternalStateHandler.java b/src/com/aoleyun/os/states/InternalStateHandler.java
similarity index 95%
rename from src/com/android/colorfulos/states/InternalStateHandler.java
rename to src/com/aoleyun/os/states/InternalStateHandler.java
index 5a86a1a..7ce6ac2 100644
--- a/src/com/android/colorfulos/states/InternalStateHandler.java
+++ b/src/com/aoleyun/os/states/InternalStateHandler.java
@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.states;
+package com.aoleyun.os.states;
 
 import android.content.Intent;
 import android.os.Binder;
 import android.os.Bundle;
 import android.os.IBinder;
 
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.LauncherAppState;
-import com.android.colorfulos.LauncherModel.Callbacks;
-import com.android.colorfulos.MainThreadExecutor;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.LauncherAppState;
+import com.aoleyun.os.LauncherModel.Callbacks;
+import com.aoleyun.os.MainThreadExecutor;
 
 import java.lang.ref.WeakReference;
 
diff --git a/src/com/android/colorfulos/states/RotationHelper.java b/src/com/aoleyun/os/states/RotationHelper.java
similarity index 96%
rename from src/com/android/colorfulos/states/RotationHelper.java
rename to src/com/aoleyun/os/states/RotationHelper.java
index 462cda6..ec75fcf 100644
--- a/src/com/android/colorfulos/states/RotationHelper.java
+++ b/src/com/aoleyun/os/states/RotationHelper.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.states;
+package com.aoleyun.os.states;
 
 import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_LOCKED;
 import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_NOSENSOR;
@@ -25,11 +25,11 @@ import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
 import android.content.res.Resources;
 import android.view.WindowManager;
 
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.R;
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.config.FeatureFlags;
-import com.android.colorfulos.util.UiThreadHelper;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.R;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.config.FeatureFlags;
+import com.aoleyun.os.util.UiThreadHelper;
 
 /**
  * Utility class to manage launcher rotation
diff --git a/src/com/android/colorfulos/states/SpringLoadedState.java b/src/com/aoleyun/os/states/SpringLoadedState.java
similarity index 86%
rename from src/com/android/colorfulos/states/SpringLoadedState.java
rename to src/com/aoleyun/os/states/SpringLoadedState.java
index 619686e..b35682a 100644
--- a/src/com/android/colorfulos/states/SpringLoadedState.java
+++ b/src/com/aoleyun/os/states/SpringLoadedState.java
@@ -13,19 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.states;
+package com.aoleyun.os.states;
 
-import static com.android.colorfulos.LauncherAnimUtils.SPRING_LOADED_TRANSITION_MS;
-import static com.android.colorfulos.states.RotationHelper.REQUEST_LOCK;
+import static com.aoleyun.os.LauncherAnimUtils.SPRING_LOADED_TRANSITION_MS;
 
 import android.graphics.Rect;
 
-import com.android.colorfulos.DeviceProfile;
-import com.android.colorfulos.InstallShortcutReceiver;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.LauncherState;
-import com.android.colorfulos.Workspace;
-import com.android.colorfulos.userevent.nano.LauncherLogProto.ContainerType;
+import com.aoleyun.os.DeviceProfile;
+import com.aoleyun.os.InstallShortcutReceiver;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.LauncherState;
+import com.aoleyun.os.Workspace;
+import com.aoleyun.os.userevent.nano.LauncherLogProto.ContainerType;
 
 /**
  * Definition for spring loaded state used during drag and drop.
@@ -86,7 +85,7 @@ public class SpringLoadedState extends LauncherState {
         // Prevent any Un/InstallShortcutReceivers from updating the db while we are
         // in spring loaded mode
         InstallShortcutReceiver.enableInstallQueue(InstallShortcutReceiver.FLAG_DRAG_AND_DROP);
-        launcher.getRotationHelper().setCurrentStateRequest(REQUEST_LOCK);
+        launcher.getRotationHelper().setCurrentStateRequest(RotationHelper.REQUEST_LOCK);
     }
 
     @Override
diff --git a/src/com/android/colorfulos/testing/TestInformationHandler.java b/src/com/aoleyun/os/testing/TestInformationHandler.java
similarity index 90%
rename from src/com/android/colorfulos/testing/TestInformationHandler.java
rename to src/com/aoleyun/os/testing/TestInformationHandler.java
index e6d664b..9191dff 100644
--- a/src/com/android/colorfulos/testing/TestInformationHandler.java
+++ b/src/com/aoleyun/os/testing/TestInformationHandler.java
@@ -13,20 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.testing;
+package com.aoleyun.os.testing;
 
 import android.content.Context;
 import android.os.Bundle;
 
-import com.android.colorfulos.DeviceProfile;
-import com.android.colorfulos.InvariantDeviceProfile;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.LauncherAppState;
-import com.android.colorfulos.LauncherState;
-import com.android.colorfulos.MainThreadExecutor;
-import com.android.colorfulos.R;
-import com.android.colorfulos.allapps.AllAppsStore;
-import com.android.colorfulos.util.ResourceBasedOverride;
+import com.aoleyun.os.DeviceProfile;
+import com.aoleyun.os.InvariantDeviceProfile;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.LauncherAppState;
+import com.aoleyun.os.LauncherState;
+import com.aoleyun.os.MainThreadExecutor;
+import com.aoleyun.os.R;
+import com.aoleyun.os.allapps.AllAppsStore;
+import com.aoleyun.os.util.ResourceBasedOverride;
 
 import java.util.concurrent.ExecutionException;
 
diff --git a/src/com/android/colorfulos/testing/TestInformationProvider.java b/src/com/aoleyun/os/testing/TestInformationProvider.java
similarity index 95%
rename from src/com/android/colorfulos/testing/TestInformationProvider.java
rename to src/com/aoleyun/os/testing/TestInformationProvider.java
index d17de97..f9945b6 100644
--- a/src/com/android/colorfulos/testing/TestInformationProvider.java
+++ b/src/com/aoleyun/os/testing/TestInformationProvider.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.testing;
+package com.aoleyun.os.testing;
 
 import android.content.ContentProvider;
 import android.content.ContentValues;
@@ -22,7 +22,7 @@ import android.database.Cursor;
 import android.net.Uri;
 import android.os.Bundle;
 
-import com.android.colorfulos.Utilities;
+import com.aoleyun.os.Utilities;
 
 public class TestInformationProvider extends ContentProvider {
     @Override
diff --git a/src/com/android/colorfulos/testing/TestProtocol.java b/src/com/aoleyun/os/testing/TestProtocol.java
similarity index 98%
rename from src/com/android/colorfulos/testing/TestProtocol.java
rename to src/com/aoleyun/os/testing/TestProtocol.java
index 4484055..6bac4ff 100644
--- a/src/com/android/colorfulos/testing/TestProtocol.java
+++ b/src/com/aoleyun/os/testing/TestProtocol.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.testing;
+package com.aoleyun.os.testing;
 
 /**
  * Protocol for custom accessibility events for communication with UI Automation tests.
diff --git a/src/com/android/colorfulos/touch/AbstractStateChangeTouchController.java b/src/com/aoleyun/os/touch/AbstractStateChangeTouchController.java
similarity index 92%
rename from src/com/android/colorfulos/touch/AbstractStateChangeTouchController.java
rename to src/com/aoleyun/os/touch/AbstractStateChangeTouchController.java
index 1731962..52e23ee 100644
--- a/src/com/android/colorfulos/touch/AbstractStateChangeTouchController.java
+++ b/src/com/aoleyun/os/touch/AbstractStateChangeTouchController.java
@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.touch;
+package com.aoleyun.os.touch;
 
-import static com.android.colorfulos.LauncherAnimUtils.MIN_PROGRESS_TO_ALL_APPS;
-import static com.android.colorfulos.LauncherState.ALL_APPS;
-import static com.android.colorfulos.LauncherState.NORMAL;
-import static com.android.colorfulos.LauncherState.OVERVIEW;
-import static com.android.colorfulos.LauncherStateManager.ANIM_ALL;
-import static com.android.colorfulos.LauncherStateManager.ATOMIC_OVERVIEW_SCALE_COMPONENT;
-import static com.android.colorfulos.LauncherStateManager.NON_ATOMIC_COMPONENT;
-import static com.android.colorfulos.Utilities.SINGLE_FRAME_MS;
-import static com.android.colorfulos.anim.Interpolators.scrollInterpolatorForVelocity;
-import static com.android.colorfulos.config.FeatureFlags.QUICKSTEP_SPRINGS;
+import static com.aoleyun.os.LauncherAnimUtils.MIN_PROGRESS_TO_ALL_APPS;
+import static com.aoleyun.os.LauncherState.ALL_APPS;
+import static com.aoleyun.os.LauncherState.NORMAL;
+import static com.aoleyun.os.LauncherState.OVERVIEW;
+import static com.aoleyun.os.LauncherStateManager.ANIM_ALL;
+import static com.aoleyun.os.LauncherStateManager.ATOMIC_OVERVIEW_SCALE_COMPONENT;
+import static com.aoleyun.os.LauncherStateManager.NON_ATOMIC_COMPONENT;
+import static com.aoleyun.os.Utilities.SINGLE_FRAME_MS;
+import static com.aoleyun.os.anim.Interpolators.scrollInterpolatorForVelocity;
+import static com.aoleyun.os.config.FeatureFlags.QUICKSTEP_SPRINGS;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -35,21 +35,21 @@ import android.util.Log;
 import android.view.HapticFeedbackConstants;
 import android.view.MotionEvent;
 
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.LauncherAnimUtils;
-import com.android.colorfulos.LauncherState;
-import com.android.colorfulos.LauncherStateManager.AnimationComponents;
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.anim.AnimationSuccessListener;
-import com.android.colorfulos.anim.AnimatorPlaybackController;
-import com.android.colorfulos.anim.AnimatorSetBuilder;
-import com.android.colorfulos.testing.TestProtocol;
-import com.android.colorfulos.userevent.nano.LauncherLogProto;
-import com.android.colorfulos.userevent.nano.LauncherLogProto.Action.Direction;
-import com.android.colorfulos.userevent.nano.LauncherLogProto.Action.Touch;
-import com.android.colorfulos.util.FlingBlockCheck;
-import com.android.colorfulos.util.PendingAnimation;
-import com.android.colorfulos.util.TouchController;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.LauncherAnimUtils;
+import com.aoleyun.os.LauncherState;
+import com.aoleyun.os.LauncherStateManager.AnimationComponents;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.anim.AnimationSuccessListener;
+import com.aoleyun.os.anim.AnimatorPlaybackController;
+import com.aoleyun.os.anim.AnimatorSetBuilder;
+import com.aoleyun.os.testing.TestProtocol;
+import com.aoleyun.os.userevent.nano.LauncherLogProto;
+import com.aoleyun.os.userevent.nano.LauncherLogProto.Action.Direction;
+import com.aoleyun.os.userevent.nano.LauncherLogProto.Action.Touch;
+import com.aoleyun.os.util.FlingBlockCheck;
+import com.aoleyun.os.util.PendingAnimation;
+import com.aoleyun.os.util.TouchController;
 
 /**
  * TouchController for handling state changes
@@ -376,7 +376,7 @@ public abstract class AbstractStateChangeTouchController
 
     @Override
     public void onDragEnd(float velocity, boolean fling) {
-        if (com.android.colorfulos.testing.TestProtocol.sDebugTracing) {
+        if (TestProtocol.sDebugTracing) {
             android.util.Log.e(TestProtocol.NO_ALLAPPS_EVENT_TAG, "onDragEnd");
         }
         final int logAction = fling ? Touch.FLING : Touch.SWIPE;
@@ -515,7 +515,7 @@ public abstract class AbstractStateChangeTouchController
     }
 
     protected void onSwipeInteractionCompleted(LauncherState targetState, int logAction) {
-        if (com.android.colorfulos.testing.TestProtocol.sDebugTracing) {
+        if (TestProtocol.sDebugTracing) {
             android.util.Log.e(TestProtocol.NO_ALLAPPS_EVENT_TAG, "onSwipeInteractionCompleted 1");
         }
         if (mAtomicComponentsController != null) {
@@ -536,7 +536,7 @@ public abstract class AbstractStateChangeTouchController
             }
             mLauncher.getStateManager().goToState(targetState, false /* animated */);
 
-            if (com.android.colorfulos.testing.TestProtocol.sDebugTracing) {
+            if (TestProtocol.sDebugTracing) {
                 android.util.Log.e(
                         TestProtocol.NO_ALLAPPS_EVENT_TAG, "onSwipeInteractionCompleted 2");
             }
diff --git a/src/com/android/colorfulos/touch/ItemClickHandler.java b/src/com/aoleyun/os/touch/ItemClickHandler.java
similarity index 71%
rename from src/com/android/colorfulos/touch/ItemClickHandler.java
rename to src/com/aoleyun/os/touch/ItemClickHandler.java
index d0cfb3f..418fd7c 100644
--- a/src/com/android/colorfulos/touch/ItemClickHandler.java
+++ b/src/com/aoleyun/os/touch/ItemClickHandler.java
@@ -13,16 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.touch;
+package com.aoleyun.os.touch;
 
-import static com.android.colorfulos.ItemInfoWithIcon.FLAG_DISABLED_BY_PUBLISHER;
-import static com.android.colorfulos.ItemInfoWithIcon.FLAG_DISABLED_LOCKED_USER;
-import static com.android.colorfulos.ItemInfoWithIcon.FLAG_DISABLED_QUIET_USER;
-import static com.android.colorfulos.ItemInfoWithIcon.FLAG_DISABLED_SAFEMODE;
-import static com.android.colorfulos.ItemInfoWithIcon.FLAG_DISABLED_SUSPENDED;
-import static com.android.colorfulos.Launcher.REQUEST_BIND_PENDING_APPWIDGET;
-import static com.android.colorfulos.Launcher.REQUEST_RECONFIGURE_APPWIDGET;
-import static com.android.colorfulos.model.AppLaunchTracker.CONTAINER_ALL_APPS;
+import static com.aoleyun.os.ItemInfoWithIcon.FLAG_DISABLED_BY_PUBLISHER;
+import static com.aoleyun.os.ItemInfoWithIcon.FLAG_DISABLED_LOCKED_USER;
+import static com.aoleyun.os.ItemInfoWithIcon.FLAG_DISABLED_QUIET_USER;
+import static com.aoleyun.os.ItemInfoWithIcon.FLAG_DISABLED_SAFEMODE;
+import static com.aoleyun.os.ItemInfoWithIcon.FLAG_DISABLED_SUSPENDED;
+import static com.aoleyun.os.model.AppLaunchTracker.CONTAINER_ALL_APPS;
 
 import android.app.AlertDialog;
 import android.content.Context;
@@ -35,40 +33,52 @@ import android.provider.Settings;
 import android.text.TextUtils;
 import android.text.format.DateUtils;
 import android.util.Log;
+import android.view.Gravity;
 import android.view.View;
 import android.view.View.OnClickListener;
+import android.view.WindowManager;
 import android.widget.Toast;
 
 import androidx.annotation.Nullable;
 
-import com.android.colorfulos.AppInfo;
-import com.android.colorfulos.BubbleTextView;
-import com.android.colorfulos.FolderInfo;
-import com.android.colorfulos.ItemInfo;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.LauncherAppWidgetInfo;
-import com.android.colorfulos.LauncherAppWidgetProviderInfo;
-import com.android.colorfulos.base.MyApplication;
-import com.android.colorfulos.PromiseAppInfo;
-import com.android.colorfulos.R;
-import com.android.colorfulos.Statistics.AppInformation;
-import com.android.colorfulos.Statistics.StatisticsInfo;
-import com.android.colorfulos.TTUtils.APKUtils;
-import com.android.colorfulos.TTUtils.Utils;
-import com.android.colorfulos.WorkspaceItemInfo;
-import com.android.colorfulos.compat.AppWidgetManagerCompat;
-import com.android.colorfulos.folder.Folder;
-import com.android.colorfulos.folder.FolderIcon;
-import com.android.colorfulos.network.BaseResponse;
-import com.android.colorfulos.network.NetWorkManager;
-import com.android.colorfulos.network.api.AddAppLog;
-import com.android.colorfulos.testing.TestProtocol;
-import com.android.colorfulos.util.PackageManagerHelper;
-import com.android.colorfulos.views.FloatingIconView;
-import com.android.colorfulos.widget.PendingAppWidgetHostView;
-import com.android.colorfulos.widget.WidgetAddFlowHandler;
+import com.aoleyun.os.AppInfo;
+import com.aoleyun.os.BubbleTextView;
+import com.aoleyun.os.FolderInfo;
+import com.aoleyun.os.ItemInfo;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.LauncherAppWidgetInfo;
+import com.aoleyun.os.LauncherAppWidgetProviderInfo;
+import com.aoleyun.os.TTUtils.CustomDialog;
+import com.aoleyun.os.TTUtils.ToastUtil;
+import com.aoleyun.os.base.MyApplication;
+import com.aoleyun.os.PromiseAppInfo;
+import com.aoleyun.os.R;
+import com.aoleyun.os.Statistics.AppInformation;
+import com.aoleyun.os.Statistics.StatisticsInfo;
+import com.aoleyun.os.TTUtils.APKUtils;
+import com.aoleyun.os.TTUtils.Utils;
+import com.aoleyun.os.WorkspaceItemInfo;
+import com.aoleyun.os.compat.AppWidgetManagerCompat;
+import com.aoleyun.os.folder.Folder;
+import com.aoleyun.os.folder.FolderIcon;
+import com.aoleyun.os.network.AppPasswdBean;
+import com.aoleyun.os.network.BaseResponse;
+import com.aoleyun.os.network.NetWorkManager;
+import com.aoleyun.os.network.api.AddAppLog;
+import com.aoleyun.os.testing.TestProtocol;
+import com.aoleyun.os.util.PackageManagerHelper;
+import com.aoleyun.os.views.FloatingIconView;
+import com.aoleyun.os.widget.PendingAppWidgetHostView;
+import com.aoleyun.os.widget.WidgetAddFlowHandler;
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+import com.tencent.mmkv.MMKV;
 
+import org.json.JSONArray;
+
+import java.lang.reflect.Type;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 
 import io.reactivex.Observer;
@@ -116,36 +126,79 @@ public class ItemClickHandler {
 
         Object tag = v.getTag();
         if (tag instanceof WorkspaceItemInfo) {
+            String ApplicationLock = MMKV.defaultMMKV().decodeString("ApplicationLock");
+            Log.e("onClick", "onClick: " + ApplicationLock);
+            Type type = new TypeToken<List<AppPasswdBean>>() {
+            }.getType();
+            Gson gson = new Gson();
+            List<AppPasswdBean> appPasswdBeans = gson.fromJson(ApplicationLock, type);
             String packageName = ((WorkspaceItemInfo) tag).getTargetComponent().getPackageName();
             Log.e("ItemClickHandler", "onClick: " + packageName);
-            Context context = MyApplication.getInstance().getApplicationContext();
-            if (cameraClosed(context,packageName)){
-                return;
-            }
-            onClickAppShortcut(v, (WorkspaceItemInfo) tag, launcher, sourceContainer);
-            AppInformation app = null;
-            try {
-                app = getInfoFromPackageName(packageName);
-            } catch (Exception e) {
-                Log.e("onClick", e.getMessage());
-            }
-            if (app != null) {
-                Log.e("fht", "运行时间: " + DateUtils.formatElapsedTime(app.getUsedTimebyDay() / 1000));
-                Log.e("fht", "运行时间: " + app.getUsedTimebyDay() / 1000);
-                MyApplication.getInstance().setTime(app.getUsedTimebyDay() / 1000);
-
+            if (appPasswdBeans == null) {
+                onClickAppShortcut(v, (WorkspaceItemInfo) tag, launcher, sourceContainer);
             } else {
-                Log.e("fht", "首次运行:" + "包名:" + packageName);
-                MyApplication.getInstance().setTime(0);
+                HashMap<String, String> hashMap = new HashMap<>();
+                for (AppPasswdBean bean : appPasswdBeans) {
+                    hashMap.put(bean.getApp_package(), bean.getPassword());
+                }
 
+                if (hashMap.get(packageName) != null) {
+                    CustomDialog dialog = new CustomDialog(v.getContext());
+                    dialog.setTitle("请输入密码");
+//                    dialog.getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_ALERT);
+                    dialog.setOnClickBottomListener(new CustomDialog.OnClickBottomListener() {
+                        @Override
+                        public void onPositiveClick() {
+                            if (hashMap.get(packageName).equals(dialog.messageTv.getText().toString())) {
+                                onClickAppShortcut(v, (WorkspaceItemInfo) tag, launcher, sourceContainer);
+                                dialog.dismiss();
+                            }else {
+                                ToastUtil.showCenter("密码错误");
+                            }
+                        }
+
+                        @Override
+                        public void onNegtiveClick() {
+                            dialog.dismiss();
+                        }
+                    });
+                    dialog.show();
+                    dialog.getWindow().setGravity(Gravity.CENTER);
+                    dialog.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE | WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM);
+                    dialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
+                } else {
+                    onClickAppShortcut(v, (WorkspaceItemInfo) tag, launcher, sourceContainer);
+                }
             }
-            if (!APKUtils.isSystemApp(context, packageName) && !Arrays.asList(packages).contains(packageName)) {
-//                HTTPInterface.sendTimeLog(handler, userInfo, ((ShortcutInfo) tag).title.toString(), 1, 0);
-                SendOpenApp(packageName);
-            }
-            //写入正在运行的app的包名和时间
-            MyApplication.getInstance().setAppPackageName(packageName);
-            MyApplication.getInstance().setOnClickTime(System.currentTimeMillis());
+
+//            Log.e("ItemClickHandler", "onClick: " + packageName);
+//            if (cameraClosed(v.getContext(), packageName)) {
+//                return;
+//            }
+//            onClickAppShortcut(v, (WorkspaceItemInfo) tag, launcher, sourceContainer);
+//            AppInformation app = null;
+//            try {
+//                app = getInfoFromPackageName(packageName);
+//            } catch (Exception e) {
+//                Log.e("onClick", e.getMessage());
+//            }
+//            if (app != null) {
+//                Log.e("fht", "运行时间: " + DateUtils.formatElapsedTime(app.getUsedTimebyDay() / 1000));
+//                Log.e("fht", "运行时间: " + app.getUsedTimebyDay() / 1000);
+//                MyApplication.getInstance().setTime(app.getUsedTimebyDay() / 1000);
+//
+//            } else {
+//                Log.e("fht", "首次运行:" + "包名:" + packageName);
+//                MyApplication.getInstance().setTime(0);
+//
+//            }
+//            if (!APKUtils.isSystemApp(v.getContext(), packageName) && !Arrays.asList(packages).contains(packageName)) {
+////                HTTPInterface.sendTimeLog(handler, userInfo, ((ShortcutInfo) tag).title.toString(), 1, 0);
+//                SendOpenApp(packageName);
+//            }
+//            //写入正在运行的app的包名和时间
+//            MyApplication.getInstance().setAppPackageName(packageName);
+//            MyApplication.getInstance().setOnClickTime(System.currentTimeMillis());
         } else if (tag instanceof FolderInfo) {
             if (v instanceof FolderIcon) {
                 onClickFolderIcon(v);
@@ -218,7 +271,7 @@ public class ItemClickHandler {
             }
             AddAppLog appLog = NetWorkManager.getInstance().getapplogControl();
             String sn = Utils.getSerial();
-            appLog.addLog(sn, packageName, appVersionCode, System.currentTimeMillis()/1000, 1)
+            appLog.addLog(sn, packageName, appVersionCode, System.currentTimeMillis() / 1000, 1)
                     .subscribeOn(Schedulers.io())
                     .observeOn(AndroidSchedulers.mainThread())
                     .subscribe(new Observer<BaseResponse>() {
@@ -289,9 +342,9 @@ public class ItemClickHandler {
                     return;
                 }
                 addFlowHandler.startBindFlow(launcher, info.appWidgetId, info,
-                        REQUEST_BIND_PENDING_APPWIDGET);
+                        Launcher.REQUEST_BIND_PENDING_APPWIDGET);
             } else {
-                addFlowHandler.startConfigActivity(launcher, info, REQUEST_RECONFIGURE_APPWIDGET);
+                addFlowHandler.startConfigActivity(launcher, info, Launcher.REQUEST_RECONFIGURE_APPWIDGET);
             }
         } else {
             final String packageName = info.providerName.getPackageName();
diff --git a/src/com/android/colorfulos/touch/ItemLongClickListener.java b/src/com/aoleyun/os/touch/ItemLongClickListener.java
similarity index 87%
rename from src/com/android/colorfulos/touch/ItemLongClickListener.java
rename to src/com/aoleyun/os/touch/ItemLongClickListener.java
index de6f58f..07462a4 100644
--- a/src/com/android/colorfulos/touch/ItemLongClickListener.java
+++ b/src/com/aoleyun/os/touch/ItemLongClickListener.java
@@ -13,25 +13,25 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.touch;
+package com.aoleyun.os.touch;
 
 import static android.view.View.INVISIBLE;
 import static android.view.View.VISIBLE;
-import static com.android.colorfulos.LauncherState.ALL_APPS;
-import static com.android.colorfulos.LauncherState.NORMAL;
-import static com.android.colorfulos.LauncherState.OVERVIEW;
+import static com.aoleyun.os.LauncherState.ALL_APPS;
+import static com.aoleyun.os.LauncherState.NORMAL;
+import static com.aoleyun.os.LauncherState.OVERVIEW;
 
 import android.view.View;
 import android.view.View.OnLongClickListener;
 
-import com.android.colorfulos.CellLayout;
-import com.android.colorfulos.DeviceProfile;
-import com.android.colorfulos.DropTarget;
-import com.android.colorfulos.ItemInfo;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.dragndrop.DragController;
-import com.android.colorfulos.dragndrop.DragOptions;
-import com.android.colorfulos.folder.Folder;
+import com.aoleyun.os.CellLayout;
+import com.aoleyun.os.DeviceProfile;
+import com.aoleyun.os.DropTarget;
+import com.aoleyun.os.ItemInfo;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.dragndrop.DragController;
+import com.aoleyun.os.dragndrop.DragOptions;
+import com.aoleyun.os.folder.Folder;
 
 /**
  * Class to handle long-clicks on workspace items and start drag as a result.
diff --git a/src/com/android/colorfulos/touch/OverScroll.java b/src/com/aoleyun/os/touch/OverScroll.java
similarity index 97%
rename from src/com/android/colorfulos/touch/OverScroll.java
rename to src/com/aoleyun/os/touch/OverScroll.java
index b2a8a38..1e2a654 100644
--- a/src/com/android/colorfulos/touch/OverScroll.java
+++ b/src/com/aoleyun/os/touch/OverScroll.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.touch;
+package com.aoleyun.os.touch;
 
 /**
  * Utility methods for overscroll damping and related effect.
diff --git a/src/com/android/colorfulos/touch/SwipeDetector.java b/src/com/aoleyun/os/touch/SwipeDetector.java
similarity index 98%
rename from src/com/android/colorfulos/touch/SwipeDetector.java
rename to src/com/aoleyun/os/touch/SwipeDetector.java
index 20e40ce..a01fdcd 100644
--- a/src/com/android/colorfulos/touch/SwipeDetector.java
+++ b/src/com/aoleyun/os/touch/SwipeDetector.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.touch;
+package com.aoleyun.os.touch;
 
 import static android.view.MotionEvent.INVALID_POINTER_ID;
 
@@ -24,8 +24,8 @@ import android.view.MotionEvent;
 import android.view.VelocityTracker;
 import android.view.ViewConfiguration;
 
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.testing.TestProtocol;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.testing.TestProtocol;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
@@ -181,7 +181,7 @@ public class SwipeDetector {
         }
 
         mState = newState;
-        if (com.android.colorfulos.testing.TestProtocol.sDebugTracing) {
+        if (TestProtocol.sDebugTracing) {
             android.util.Log.e(TestProtocol.NO_ALLAPPS_EVENT_TAG,
                     "setState: " + newState + " @ " + android.util.Log.getStackTraceString(
                             new Throwable()));
diff --git a/src/com/android/colorfulos/touch/TouchEventTranslator.java b/src/com/aoleyun/os/touch/TouchEventTranslator.java
similarity index 99%
rename from src/com/android/colorfulos/touch/TouchEventTranslator.java
rename to src/com/aoleyun/os/touch/TouchEventTranslator.java
index 0ac0886..e59c34e 100644
--- a/src/com/android/colorfulos/touch/TouchEventTranslator.java
+++ b/src/com/aoleyun/os/touch/TouchEventTranslator.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.touch;
+package com.aoleyun.os.touch;
 
 import android.graphics.PointF;
 import android.util.Log;
diff --git a/src/com/android/colorfulos/touch/WorkspaceTouchListener.java b/src/com/aoleyun/os/touch/WorkspaceTouchListener.java
similarity index 92%
rename from src/com/android/colorfulos/touch/WorkspaceTouchListener.java
rename to src/com/aoleyun/os/touch/WorkspaceTouchListener.java
index b4f35d6..2b1e040 100644
--- a/src/com/android/colorfulos/touch/WorkspaceTouchListener.java
+++ b/src/com/aoleyun/os/touch/WorkspaceTouchListener.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.touch;
+package com.aoleyun.os.touch;
 
 import static android.view.MotionEvent.ACTION_CANCEL;
 import static android.view.MotionEvent.ACTION_DOWN;
@@ -21,7 +21,7 @@ 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.colorfulos.LauncherState.NORMAL;
+import static com.aoleyun.os.LauncherState.NORMAL;
 
 import android.graphics.PointF;
 import android.graphics.Rect;
@@ -32,14 +32,14 @@ import android.view.View;
 import android.view.View.OnTouchListener;
 import android.view.ViewConfiguration;
 
-import com.android.colorfulos.AbstractFloatingView;
-import com.android.colorfulos.CellLayout;
-import com.android.colorfulos.DeviceProfile;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.Workspace;
-import com.android.colorfulos.dragndrop.DragLayer;
-import com.android.colorfulos.userevent.nano.LauncherLogProto.Action;
-import com.android.colorfulos.userevent.nano.LauncherLogProto.ContainerType;
+import com.aoleyun.os.AbstractFloatingView;
+import com.aoleyun.os.CellLayout;
+import com.aoleyun.os.DeviceProfile;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.Workspace;
+import com.aoleyun.os.dragndrop.DragLayer;
+import com.aoleyun.os.userevent.nano.LauncherLogProto.Action;
+import com.aoleyun.os.userevent.nano.LauncherLogProto.ContainerType;
 
 /**
  * Helper class to handle touch on empty space in workspace and show options popup on long press
diff --git a/src/com/android/colorfulos/uiuiutils/JGYUtils.java b/src/com/aoleyun/os/uiuiutils/JGYUtils.java
similarity index 98%
rename from src/com/android/colorfulos/uiuiutils/JGYUtils.java
rename to src/com/aoleyun/os/uiuiutils/JGYUtils.java
index 0a7adb3..e8e701e 100644
--- a/src/com/android/colorfulos/uiuiutils/JGYUtils.java
+++ b/src/com/aoleyun/os/uiuiutils/JGYUtils.java
@@ -1,4 +1,4 @@
-package com.android.colorfulos.uiuiutils;
+package com.aoleyun.os.uiuiutils;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -6,7 +6,7 @@ import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.util.Log;
 
-import com.android.colorfulos.BuildConfig;
+import com.aoleyun.os.BuildConfig;
 
 import java.lang.reflect.Method;
 
diff --git a/src/com/android/colorfulos/util/ActivityResultInfo.java b/src/com/aoleyun/os/util/ActivityResultInfo.java
similarity index 98%
rename from src/com/android/colorfulos/util/ActivityResultInfo.java
rename to src/com/aoleyun/os/util/ActivityResultInfo.java
index 3be37ce..01af21e 100644
--- a/src/com/android/colorfulos/util/ActivityResultInfo.java
+++ b/src/com/aoleyun/os/util/ActivityResultInfo.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.util;
+package com.aoleyun.os.util;
 
 import android.content.Intent;
 import android.os.Parcel;
diff --git a/src/com/android/colorfulos/util/CellAndSpan.java b/src/com/aoleyun/os/util/CellAndSpan.java
similarity index 96%
rename from src/com/android/colorfulos/util/CellAndSpan.java
rename to src/com/aoleyun/os/util/CellAndSpan.java
index 5038d28..186fc1b 100644
--- a/src/com/android/colorfulos/util/CellAndSpan.java
+++ b/src/com/aoleyun/os/util/CellAndSpan.java
@@ -1,4 +1,4 @@
-package com.android.colorfulos.util;
+package com.aoleyun.os.util;
 
 /**
  * Base class which represents an area on the grid.
diff --git a/src/com/android/colorfulos/util/ConfigMonitor.java b/src/com/aoleyun/os/util/ConfigMonitor.java
similarity index 98%
rename from src/com/android/colorfulos/util/ConfigMonitor.java
rename to src/com/aoleyun/os/util/ConfigMonitor.java
index ba234b1..1339b2b 100644
--- a/src/com/android/colorfulos/util/ConfigMonitor.java
+++ b/src/com/aoleyun/os/util/ConfigMonitor.java
@@ -1,4 +1,4 @@
-package com.android.colorfulos.util;
+package com.aoleyun.os.util;
 
 /**
  * Copyright (C) 2015 The Android Open Source Project
@@ -29,7 +29,7 @@ import android.util.Log;
 import android.view.Display;
 import android.view.WindowManager;
 
-import com.android.colorfulos.MainThreadExecutor;
+import com.aoleyun.os.MainThreadExecutor;
 
 import java.util.function.Consumer;
 
diff --git a/src/com/android/colorfulos/util/ContentWriter.java b/src/com/aoleyun/os/util/ContentWriter.java
similarity index 93%
rename from src/com/android/colorfulos/util/ContentWriter.java
rename to src/com/aoleyun/os/util/ContentWriter.java
index 2d474a9..9e75338 100644
--- a/src/com/android/colorfulos/util/ContentWriter.java
+++ b/src/com/aoleyun/os/util/ContentWriter.java
@@ -1,4 +1,4 @@
-package com.android.colorfulos.util;
+package com.aoleyun.os.util;
 
 /**
  * Copyright (C) 2016 The Android Open Source Project
@@ -23,10 +23,10 @@ import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.UserHandle;
 
-import com.android.colorfulos.LauncherAppState;
-import com.android.colorfulos.LauncherSettings;
-import com.android.colorfulos.compat.UserManagerCompat;
-import com.android.colorfulos.icons.GraphicsUtils;
+import com.aoleyun.os.LauncherAppState;
+import com.aoleyun.os.LauncherSettings;
+import com.aoleyun.os.compat.UserManagerCompat;
+import com.aoleyun.os.icons.GraphicsUtils;
 
 /**
  * A wrapper around {@link ContentValues} with some utility methods.
diff --git a/src/com/android/colorfulos/util/FlagOp.java b/src/com/aoleyun/os/util/FlagOp.java
similarity index 86%
rename from src/com/android/colorfulos/util/FlagOp.java
rename to src/com/aoleyun/os/util/FlagOp.java
index a753589..ba51394 100644
--- a/src/com/android/colorfulos/util/FlagOp.java
+++ b/src/com/aoleyun/os/util/FlagOp.java
@@ -1,4 +1,4 @@
-package com.android.colorfulos.util;
+package com.aoleyun.os.util;
 
 public interface FlagOp {
 
diff --git a/src/com/android/colorfulos/util/FlingAnimation.java b/src/com/aoleyun/os/util/FlingAnimation.java
similarity index 94%
rename from src/com/android/colorfulos/util/FlingAnimation.java
rename to src/com/aoleyun/os/util/FlingAnimation.java
index 51c9334..036d7fb 100644
--- a/src/com/android/colorfulos/util/FlingAnimation.java
+++ b/src/com/aoleyun/os/util/FlingAnimation.java
@@ -1,6 +1,6 @@
-package com.android.colorfulos.util;
+package com.aoleyun.os.util;
 
-import static com.android.colorfulos.LauncherState.NORMAL;
+import static com.aoleyun.os.LauncherState.NORMAL;
 
 import android.animation.TimeInterpolator;
 import android.animation.ValueAnimator;
@@ -10,12 +10,12 @@ import android.graphics.Rect;
 import android.view.animation.AnimationUtils;
 import android.view.animation.DecelerateInterpolator;
 
-import com.android.colorfulos.ButtonDropTarget;
-import com.android.colorfulos.DropTarget.DragObject;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.dragndrop.DragLayer;
-import com.android.colorfulos.dragndrop.DragOptions;
-import com.android.colorfulos.dragndrop.DragView;
+import com.aoleyun.os.ButtonDropTarget;
+import com.aoleyun.os.DropTarget.DragObject;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.dragndrop.DragLayer;
+import com.aoleyun.os.dragndrop.DragOptions;
+import com.aoleyun.os.dragndrop.DragView;
 
 public class FlingAnimation implements AnimatorUpdateListener, Runnable {
 
diff --git a/src/com/android/colorfulos/util/FlingBlockCheck.java b/src/com/aoleyun/os/util/FlingBlockCheck.java
similarity index 97%
rename from src/com/android/colorfulos/util/FlingBlockCheck.java
rename to src/com/aoleyun/os/util/FlingBlockCheck.java
index e68011f..c18ddeb 100644
--- a/src/com/android/colorfulos/util/FlingBlockCheck.java
+++ b/src/com/aoleyun/os/util/FlingBlockCheck.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.util;
+package com.aoleyun.os.util;
 
 import android.os.SystemClock;
 
diff --git a/src/com/android/colorfulos/util/FocusLogic.java b/src/com/aoleyun/os/util/FocusLogic.java
similarity index 99%
rename from src/com/android/colorfulos/util/FocusLogic.java
rename to src/com/aoleyun/os/util/FocusLogic.java
index b349d86..1e0f294 100644
--- a/src/com/android/colorfulos/util/FocusLogic.java
+++ b/src/com/aoleyun/os/util/FocusLogic.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.util;
+package com.aoleyun.os.util;
 
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.android.colorfulos.CellLayout;
-import com.android.colorfulos.DeviceProfile;
-import com.android.colorfulos.ShortcutAndWidgetContainer;
+import com.aoleyun.os.CellLayout;
+import com.aoleyun.os.DeviceProfile;
+import com.aoleyun.os.ShortcutAndWidgetContainer;
 
 import java.util.Arrays;
 
diff --git a/src/com/android/colorfulos/util/GridOccupancy.java b/src/com/aoleyun/os/util/GridOccupancy.java
similarity index 97%
rename from src/com/android/colorfulos/util/GridOccupancy.java
rename to src/com/aoleyun/os/util/GridOccupancy.java
index a7219cd..9edd026 100644
--- a/src/com/android/colorfulos/util/GridOccupancy.java
+++ b/src/com/aoleyun/os/util/GridOccupancy.java
@@ -1,8 +1,8 @@
-package com.android.colorfulos.util;
+package com.aoleyun.os.util;
 
 import android.graphics.Rect;
 
-import com.android.colorfulos.ItemInfo;
+import com.aoleyun.os.ItemInfo;
 
 /**
  * Utility object to manage the occupancy in a grid.
diff --git a/src/com/android/colorfulos/util/IOUtils.java b/src/com/aoleyun/os/util/IOUtils.java
similarity index 96%
rename from src/com/android/colorfulos/util/IOUtils.java
rename to src/com/aoleyun/os/util/IOUtils.java
index 5fc4e32..3f15fb0 100644
--- a/src/com/android/colorfulos/util/IOUtils.java
+++ b/src/com/aoleyun/os/util/IOUtils.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.util;
+package com.aoleyun.os.util;
 
 import android.content.Context;
 
-import com.android.colorfulos.config.FeatureFlags;
+import com.aoleyun.os.config.FeatureFlags;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
diff --git a/src/com/android/colorfulos/util/InstantAppResolver.java b/src/com/aoleyun/os/util/InstantAppResolver.java
similarity index 94%
rename from src/com/android/colorfulos/util/InstantAppResolver.java
rename to src/com/aoleyun/os/util/InstantAppResolver.java
index 9b7452e..645565e 100644
--- a/src/com/android/colorfulos/util/InstantAppResolver.java
+++ b/src/com/aoleyun/os/util/InstantAppResolver.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.util;
+package com.aoleyun.os.util;
 
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.util.Log;
 
-import com.android.colorfulos.AppInfo;
-import com.android.colorfulos.R;
+import com.aoleyun.os.AppInfo;
+import com.aoleyun.os.R;
 
 /**
  * A wrapper class to access instant app related APIs.
diff --git a/src/com/android/colorfulos/util/IntArray.java b/src/com/aoleyun/os/util/IntArray.java
similarity index 99%
rename from src/com/android/colorfulos/util/IntArray.java
rename to src/com/aoleyun/os/util/IntArray.java
index 7aaf4ee..7b69973 100644
--- a/src/com/android/colorfulos/util/IntArray.java
+++ b/src/com/aoleyun/os/util/IntArray.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.util;
+package com.aoleyun.os.util;
 
 import java.util.Arrays;
 
diff --git a/src/com/android/colorfulos/util/IntSet.java b/src/com/aoleyun/os/util/IntSet.java
similarity index 98%
rename from src/com/android/colorfulos/util/IntSet.java
rename to src/com/aoleyun/os/util/IntSet.java
index 935b0cd..c0f6cd5 100644
--- a/src/com/android/colorfulos/util/IntSet.java
+++ b/src/com/aoleyun/os/util/IntSet.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.util;
+package com.aoleyun.os.util;
 
 import java.util.Arrays;
 
diff --git a/src/com/android/colorfulos/util/IntSparseArrayMap.java b/src/com/aoleyun/os/util/IntSparseArrayMap.java
similarity index 97%
rename from src/com/android/colorfulos/util/IntSparseArrayMap.java
rename to src/com/aoleyun/os/util/IntSparseArrayMap.java
index 1016107..3b47179 100644
--- a/src/com/android/colorfulos/util/IntSparseArrayMap.java
+++ b/src/com/aoleyun/os/util/IntSparseArrayMap.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.util;
+package com.aoleyun.os.util;
 
 import android.util.SparseArray;
 
diff --git a/src/com/android/colorfulos/util/ItemInfoMatcher.java b/src/com/aoleyun/os/util/ItemInfoMatcher.java
similarity index 91%
rename from src/com/android/colorfulos/util/ItemInfoMatcher.java
rename to src/com/aoleyun/os/util/ItemInfoMatcher.java
index a9a7692..d751a5c 100644
--- a/src/com/android/colorfulos/util/ItemInfoMatcher.java
+++ b/src/com/aoleyun/os/util/ItemInfoMatcher.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.util;
+package com.aoleyun.os.util;
 
 import android.content.ComponentName;
 import android.os.UserHandle;
 
-import com.android.colorfulos.FolderInfo;
-import com.android.colorfulos.ItemInfo;
-import com.android.colorfulos.LauncherAppWidgetInfo;
-import com.android.colorfulos.LauncherSettings.Favorites;
-import com.android.colorfulos.WorkspaceItemInfo;
-import com.android.colorfulos.shortcuts.ShortcutKey;
+import com.aoleyun.os.FolderInfo;
+import com.aoleyun.os.ItemInfo;
+import com.aoleyun.os.LauncherAppWidgetInfo;
+import com.aoleyun.os.LauncherSettings.Favorites;
+import com.aoleyun.os.WorkspaceItemInfo;
+import com.aoleyun.os.shortcuts.ShortcutKey;
 
 import java.util.HashSet;
 
diff --git a/src/com/android/colorfulos/util/LabelComparator.java b/src/com/aoleyun/os/util/LabelComparator.java
similarity index 97%
rename from src/com/android/colorfulos/util/LabelComparator.java
rename to src/com/aoleyun/os/util/LabelComparator.java
index 3eaccba..e8f43f6 100644
--- a/src/com/android/colorfulos/util/LabelComparator.java
+++ b/src/com/aoleyun/os/util/LabelComparator.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.util;
+package com.aoleyun.os.util;
 
 import java.text.Collator;
 import java.util.Comparator;
diff --git a/src/com/android/colorfulos/util/LogConfig.java b/src/com/aoleyun/os/util/LogConfig.java
similarity index 96%
rename from src/com/android/colorfulos/util/LogConfig.java
rename to src/com/aoleyun/os/util/LogConfig.java
index 765bde9..9816649 100644
--- a/src/com/android/colorfulos/util/LogConfig.java
+++ b/src/com/aoleyun/os/util/LogConfig.java
@@ -1,4 +1,4 @@
-package com.android.colorfulos.util;
+package com.aoleyun.os.util;
 
 /**
  * This is a utility class that keeps track of all the tag that can be enabled to debug
diff --git a/src/com/android/colorfulos/util/LooperExecutor.java b/src/com/aoleyun/os/util/LooperExecutor.java
similarity index 98%
rename from src/com/android/colorfulos/util/LooperExecutor.java
rename to src/com/aoleyun/os/util/LooperExecutor.java
index c3ccb01..84e6ddc 100644
--- a/src/com/android/colorfulos/util/LooperExecutor.java
+++ b/src/com/aoleyun/os/util/LooperExecutor.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License
  */
-package com.android.colorfulos.util;
+package com.aoleyun.os.util;
 
 import android.os.Handler;
 import android.os.Looper;
diff --git a/src/com/android/colorfulos/util/LooperIdleLock.java b/src/com/aoleyun/os/util/LooperIdleLock.java
similarity index 97%
rename from src/com/android/colorfulos/util/LooperIdleLock.java
rename to src/com/aoleyun/os/util/LooperIdleLock.java
index ec7a55d..1a7b27d 100644
--- a/src/com/android/colorfulos/util/LooperIdleLock.java
+++ b/src/com/aoleyun/os/util/LooperIdleLock.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.util;
+package com.aoleyun.os.util;
 
 import android.os.Looper;
 import android.os.MessageQueue;
diff --git a/src/com/android/colorfulos/util/MainThreadInitializedObject.java b/src/com/aoleyun/os/util/MainThreadInitializedObject.java
similarity index 95%
rename from src/com/android/colorfulos/util/MainThreadInitializedObject.java
rename to src/com/aoleyun/os/util/MainThreadInitializedObject.java
index 30bb519..534e660 100644
--- a/src/com/android/colorfulos/util/MainThreadInitializedObject.java
+++ b/src/com/aoleyun/os/util/MainThreadInitializedObject.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.util;
+package com.aoleyun.os.util;
 
 import android.content.Context;
 import android.os.Looper;
 
-import com.android.colorfulos.MainThreadExecutor;
+import com.aoleyun.os.MainThreadExecutor;
 
 import java.util.concurrent.ExecutionException;
 
diff --git a/src/com/android/colorfulos/util/MultiHashMap.java b/src/com/aoleyun/os/util/MultiHashMap.java
similarity index 97%
rename from src/com/android/colorfulos/util/MultiHashMap.java
rename to src/com/aoleyun/os/util/MultiHashMap.java
index a3930e2..0901d8b 100644
--- a/src/com/android/colorfulos/util/MultiHashMap.java
+++ b/src/com/aoleyun/os/util/MultiHashMap.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.util;
+package com.aoleyun.os.util;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/src/com/android/colorfulos/util/MultiValueAlpha.java b/src/com/aoleyun/os/util/MultiValueAlpha.java
similarity index 98%
rename from src/com/android/colorfulos/util/MultiValueAlpha.java
rename to src/com/aoleyun/os/util/MultiValueAlpha.java
index 22fdd82..89564bc 100644
--- a/src/com/android/colorfulos/util/MultiValueAlpha.java
+++ b/src/com/aoleyun/os/util/MultiValueAlpha.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.util;
+package com.aoleyun.os.util;
 
 import android.util.Property;
 import android.view.View;
diff --git a/src/com/android/colorfulos/util/OverScroller.java b/src/com/aoleyun/os/util/OverScroller.java
similarity index 99%
rename from src/com/android/colorfulos/util/OverScroller.java
rename to src/com/aoleyun/os/util/OverScroller.java
index e8db46b..88fd786 100644
--- a/src/com/android/colorfulos/util/OverScroller.java
+++ b/src/com/aoleyun/os/util/OverScroller.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.util;
+package com.aoleyun.os.util;
 
-import static com.android.colorfulos.anim.Interpolators.SCROLL;
+import static com.aoleyun.os.anim.Interpolators.SCROLL;
 
 import android.animation.TimeInterpolator;
 import android.content.Context;
diff --git a/src/com/android/colorfulos/util/PackageManagerHelper.java b/src/com/aoleyun/os/util/PackageManagerHelper.java
similarity index 95%
rename from src/com/android/colorfulos/util/PackageManagerHelper.java
rename to src/com/aoleyun/os/util/PackageManagerHelper.java
index ee8dc6c..cf214e1 100644
--- a/src/com/android/colorfulos/util/PackageManagerHelper.java
+++ b/src/com/aoleyun/os/util/PackageManagerHelper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.util;
+package com.aoleyun.os.util;
 
 import android.app.AppOpsManager;
 import android.content.ActivityNotFoundException;
@@ -37,14 +37,14 @@ import android.text.TextUtils;
 import android.util.Log;
 import android.widget.Toast;
 
-import com.android.colorfulos.AppInfo;
-import com.android.colorfulos.ItemInfo;
-import com.android.colorfulos.LauncherAppWidgetInfo;
-import com.android.colorfulos.PendingAddItemInfo;
-import com.android.colorfulos.PromiseAppInfo;
-import com.android.colorfulos.R;
-import com.android.colorfulos.WorkspaceItemInfo;
-import com.android.colorfulos.compat.LauncherAppsCompat;
+import com.aoleyun.os.AppInfo;
+import com.aoleyun.os.ItemInfo;
+import com.aoleyun.os.LauncherAppWidgetInfo;
+import com.aoleyun.os.PendingAddItemInfo;
+import com.aoleyun.os.PromiseAppInfo;
+import com.aoleyun.os.R;
+import com.aoleyun.os.WorkspaceItemInfo;
+import com.aoleyun.os.compat.LauncherAppsCompat;
 
 import java.net.URISyntaxException;
 import java.util.List;
diff --git a/src/com/android/colorfulos/util/PackageUserKey.java b/src/com/aoleyun/os/util/PackageUserKey.java
similarity index 92%
rename from src/com/android/colorfulos/util/PackageUserKey.java
rename to src/com/aoleyun/os/util/PackageUserKey.java
index 515ddc9..0f460a1 100644
--- a/src/com/android/colorfulos/util/PackageUserKey.java
+++ b/src/com/aoleyun/os/util/PackageUserKey.java
@@ -1,10 +1,10 @@
-package com.android.colorfulos.util;
+package com.aoleyun.os.util;
 
 import android.os.UserHandle;
 import android.service.notification.StatusBarNotification;
 
-import com.android.colorfulos.ItemInfo;
-import com.android.colorfulos.shortcuts.DeepShortcutManager;
+import com.aoleyun.os.ItemInfo;
+import com.aoleyun.os.shortcuts.DeepShortcutManager;
 
 import java.util.Arrays;
 
diff --git a/src/com/android/colorfulos/util/ParcelableSparseArray.java b/src/com/aoleyun/os/util/ParcelableSparseArray.java
similarity index 98%
rename from src/com/android/colorfulos/util/ParcelableSparseArray.java
rename to src/com/aoleyun/os/util/ParcelableSparseArray.java
index 44ab786..583799c 100644
--- a/src/com/android/colorfulos/util/ParcelableSparseArray.java
+++ b/src/com/aoleyun/os/util/ParcelableSparseArray.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.util;
+package com.aoleyun.os.util;
 
 import android.os.Parcel;
 import android.os.Parcelable;
diff --git a/src/com/android/colorfulos/util/PendingAnimation.java b/src/com/aoleyun/os/util/PendingAnimation.java
similarity index 92%
rename from src/com/android/colorfulos/util/PendingAnimation.java
rename to src/com/aoleyun/os/util/PendingAnimation.java
index 6c2ea3f..4c8b619 100644
--- a/src/com/android/colorfulos/util/PendingAnimation.java
+++ b/src/com/aoleyun/os/util/PendingAnimation.java
@@ -13,12 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.util;
+package com.aoleyun.os.util;
 
 import android.animation.AnimatorSet;
 import android.annotation.TargetApi;
 import android.os.Build;
 
+import com.aoleyun.os.anim.AnimatorPlaybackController;
+
 import java.util.ArrayList;
 import java.util.function.Consumer;
 
@@ -26,7 +28,7 @@ import java.util.function.Consumer;
  * Utility class to keep track of a running animation.
  *
  * This class allows attaching end callbacks to an animation is intended to be used with
- * {@link com.android.colorfulos.anim.AnimatorPlaybackController}, since in that case
+ * {@link AnimatorPlaybackController}, since in that case
  * AnimationListeners are not properly dispatched.
  */
 @TargetApi(Build.VERSION_CODES.O)
diff --git a/src/com/android/colorfulos/util/PendingRequestArgs.java b/src/com/aoleyun/os/util/PendingRequestArgs.java
similarity index 96%
rename from src/com/android/colorfulos/util/PendingRequestArgs.java
rename to src/com/aoleyun/os/util/PendingRequestArgs.java
index cee804a..1323904 100644
--- a/src/com/android/colorfulos/util/PendingRequestArgs.java
+++ b/src/com/aoleyun/os/util/PendingRequestArgs.java
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.util;
+package com.aoleyun.os.util;
 
 import android.content.ContentValues;
 import android.content.Intent;
 import android.os.Parcel;
 import android.os.Parcelable;
 
-import com.android.colorfulos.ItemInfo;
-import com.android.colorfulos.widget.WidgetAddFlowHandler;
+import com.aoleyun.os.ItemInfo;
+import com.aoleyun.os.widget.WidgetAddFlowHandler;
 
 /**
  * Utility class to store information regarding a pending request made by launcher. This information
diff --git a/src/com/android/colorfulos/util/Preconditions.java b/src/com/aoleyun/os/util/Preconditions.java
similarity index 92%
rename from src/com/android/colorfulos/util/Preconditions.java
rename to src/com/aoleyun/os/util/Preconditions.java
index 437a832..5231363 100644
--- a/src/com/android/colorfulos/util/Preconditions.java
+++ b/src/com/aoleyun/os/util/Preconditions.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.util;
+package com.aoleyun.os.util;
 
 import android.os.Looper;
 
-import com.android.colorfulos.LauncherModel;
-import com.android.colorfulos.config.FeatureFlags;
+import com.aoleyun.os.LauncherModel;
+import com.aoleyun.os.config.FeatureFlags;
 
 /**
  * A set of utility methods for thread verification.
diff --git a/src/com/android/colorfulos/util/RaceConditionTracker.java b/src/com/aoleyun/os/util/RaceConditionTracker.java
similarity index 98%
rename from src/com/android/colorfulos/util/RaceConditionTracker.java
rename to src/com/aoleyun/os/util/RaceConditionTracker.java
index 20a8b13..015cb01 100644
--- a/src/com/android/colorfulos/util/RaceConditionTracker.java
+++ b/src/com/aoleyun/os/util/RaceConditionTracker.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.util;
+package com.aoleyun.os.util;
 
 /**
  * Event tracker for reliably reproducing race conditions in tests.
diff --git a/src/com/android/colorfulos/util/ResourceBasedOverride.java b/src/com/aoleyun/os/util/ResourceBasedOverride.java
similarity index 98%
rename from src/com/android/colorfulos/util/ResourceBasedOverride.java
rename to src/com/aoleyun/os/util/ResourceBasedOverride.java
index e5e785b..18b9030 100644
--- a/src/com/android/colorfulos/util/ResourceBasedOverride.java
+++ b/src/com/aoleyun/os/util/ResourceBasedOverride.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.util;
+package com.aoleyun.os.util;
 
 import android.content.Context;
 import android.text.TextUtils;
diff --git a/src/com/android/colorfulos/util/SecureSettingsObserver.java b/src/com/aoleyun/os/util/SecureSettingsObserver.java
similarity index 98%
rename from src/com/android/colorfulos/util/SecureSettingsObserver.java
rename to src/com/aoleyun/os/util/SecureSettingsObserver.java
index 18d147a..df230dc 100644
--- a/src/com/android/colorfulos/util/SecureSettingsObserver.java
+++ b/src/com/aoleyun/os/util/SecureSettingsObserver.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.util;
+package com.aoleyun.os.util;
 
 import android.content.ContentResolver;
 import android.content.Context;
diff --git a/src/com/android/colorfulos/util/SystemUiController.java b/src/com/aoleyun/os/util/SystemUiController.java
similarity index 97%
rename from src/com/android/colorfulos/util/SystemUiController.java
rename to src/com/aoleyun/os/util/SystemUiController.java
index 2b7a6a7..56dc8b2 100644
--- a/src/com/android/colorfulos/util/SystemUiController.java
+++ b/src/com/aoleyun/os/util/SystemUiController.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.util;
+package com.aoleyun.os.util;
 
 import android.view.View;
 import android.view.Window;
 
-import com.android.colorfulos.Utilities;
+import com.aoleyun.os.Utilities;
 
 import java.util.Arrays;
 
diff --git a/src/com/android/colorfulos/util/Themes.java b/src/com/aoleyun/os/util/Themes.java
similarity index 97%
rename from src/com/android/colorfulos/util/Themes.java
rename to src/com/aoleyun/os/util/Themes.java
index 539b7a7..59c6ef2 100644
--- a/src/com/android/colorfulos/util/Themes.java
+++ b/src/com/aoleyun/os/util/Themes.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.util;
+package com.aoleyun.os.util;
 
 import android.content.Context;
 import android.content.res.Configuration;
@@ -26,9 +26,9 @@ import android.util.AttributeSet;
 import android.util.SparseArray;
 import android.util.TypedValue;
 
-import com.android.colorfulos.R;
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.uioverrides.WallpaperColorInfo;
+import com.aoleyun.os.R;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.uioverrides.WallpaperColorInfo;
 
 /**
  * Various utility methods associated with theming.
diff --git a/src/com/android/colorfulos/util/Thunk.java b/src/com/aoleyun/os/util/Thunk.java
similarity index 97%
rename from src/com/android/colorfulos/util/Thunk.java
rename to src/com/aoleyun/os/util/Thunk.java
index 729891a..b6f6125 100644
--- a/src/com/android/colorfulos/util/Thunk.java
+++ b/src/com/aoleyun/os/util/Thunk.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.util;
+package com.aoleyun.os.util;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/com/android/colorfulos/util/TouchController.java b/src/com/aoleyun/os/util/TouchController.java
similarity index 96%
rename from src/com/android/colorfulos/util/TouchController.java
rename to src/com/aoleyun/os/util/TouchController.java
index 904adcf..4d3f16c 100644
--- a/src/com/android/colorfulos/util/TouchController.java
+++ b/src/com/aoleyun/os/util/TouchController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.util;
+package com.aoleyun.os.util;
 
 import android.view.MotionEvent;
 
diff --git a/src/com/android/colorfulos/util/TraceHelper.java b/src/com/aoleyun/os/util/TraceHelper.java
similarity index 98%
rename from src/com/android/colorfulos/util/TraceHelper.java
rename to src/com/aoleyun/os/util/TraceHelper.java
index b22dc7b..3ed2704 100644
--- a/src/com/android/colorfulos/util/TraceHelper.java
+++ b/src/com/aoleyun/os/util/TraceHelper.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.util;
+package com.aoleyun.os.util;
 
 import static android.util.Log.VERBOSE;
 import static android.util.Log.isLoggable;
diff --git a/src/com/android/colorfulos/util/TransformingTouchDelegate.java b/src/com/aoleyun/os/util/TransformingTouchDelegate.java
similarity index 99%
rename from src/com/android/colorfulos/util/TransformingTouchDelegate.java
rename to src/com/aoleyun/os/util/TransformingTouchDelegate.java
index b9df566..c25bd47 100644
--- a/src/com/android/colorfulos/util/TransformingTouchDelegate.java
+++ b/src/com/aoleyun/os/util/TransformingTouchDelegate.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.util;
+package com.aoleyun.os.util;
 
 import android.graphics.Rect;
 import android.graphics.RectF;
diff --git a/src/com/android/colorfulos/util/UiThreadHelper.java b/src/com/aoleyun/os/util/UiThreadHelper.java
similarity index 98%
rename from src/com/android/colorfulos/util/UiThreadHelper.java
rename to src/com/aoleyun/os/util/UiThreadHelper.java
index 577ee9d..5232e65 100644
--- a/src/com/android/colorfulos/util/UiThreadHelper.java
+++ b/src/com/aoleyun/os/util/UiThreadHelper.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.util;
+package com.aoleyun.os.util;
 
 import android.app.Activity;
 import android.content.Context;
diff --git a/src/com/android/colorfulos/util/ViewCache.java b/src/com/aoleyun/os/util/ViewCache.java
similarity index 98%
rename from src/com/android/colorfulos/util/ViewCache.java
rename to src/com/aoleyun/os/util/ViewCache.java
index db48c08..1eed419 100644
--- a/src/com/android/colorfulos/util/ViewCache.java
+++ b/src/com/aoleyun/os/util/ViewCache.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.util;
+package com.aoleyun.os.util;
 
 import android.content.Context;
 import android.util.SparseArray;
diff --git a/src/com/android/colorfulos/util/ViewOnDrawExecutor.java b/src/com/aoleyun/os/util/ViewOnDrawExecutor.java
similarity index 96%
rename from src/com/android/colorfulos/util/ViewOnDrawExecutor.java
rename to src/com/aoleyun/os/util/ViewOnDrawExecutor.java
index 29701c6..fa86062 100644
--- a/src/com/android/colorfulos/util/ViewOnDrawExecutor.java
+++ b/src/com/aoleyun/os/util/ViewOnDrawExecutor.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.util;
+package com.aoleyun.os.util;
 
 import android.os.Process;
 import android.view.View;
 import android.view.View.OnAttachStateChangeListener;
 import android.view.ViewTreeObserver.OnDrawListener;
 
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.LauncherModel;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.LauncherModel;
 
 import java.util.ArrayList;
 import java.util.concurrent.Executor;
diff --git a/src/com/android/colorfulos/util/ViewPool.java b/src/com/aoleyun/os/util/ViewPool.java
similarity index 97%
rename from src/com/android/colorfulos/util/ViewPool.java
rename to src/com/aoleyun/os/util/ViewPool.java
index b70dc78..11273c6 100644
--- a/src/com/android/colorfulos/util/ViewPool.java
+++ b/src/com/aoleyun/os/util/ViewPool.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.util;
+package com.aoleyun.os.util;
 
 import android.content.Context;
 import android.os.Handler;
@@ -21,7 +21,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.android.colorfulos.util.ViewPool.Reusable;
+import com.aoleyun.os.util.ViewPool.Reusable;
 
 import androidx.annotation.AnyThread;
 import androidx.annotation.Nullable;
diff --git a/src/com/android/colorfulos/util/WallpaperOffsetInterpolator.java b/src/com/aoleyun/os/util/WallpaperOffsetInterpolator.java
similarity index 98%
rename from src/com/android/colorfulos/util/WallpaperOffsetInterpolator.java
rename to src/com/aoleyun/os/util/WallpaperOffsetInterpolator.java
index 712e8e6..c496038 100644
--- a/src/com/android/colorfulos/util/WallpaperOffsetInterpolator.java
+++ b/src/com/aoleyun/os/util/WallpaperOffsetInterpolator.java
@@ -1,4 +1,4 @@
-package com.android.colorfulos.util;
+package com.aoleyun.os.util;
 
 import android.app.WallpaperManager;
 import android.content.BroadcastReceiver;
@@ -12,9 +12,9 @@ import android.os.SystemClock;
 import android.util.Log;
 import android.view.animation.Interpolator;
 
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.Workspace;
-import com.android.colorfulos.anim.Interpolators;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.Workspace;
+import com.aoleyun.os.anim.Interpolators;
 
 /**
  * Utility class to handle wallpaper scrolling along with workspace.
diff --git a/src/com/android/colorfulos/views/AbstractSlideInView.java b/src/com/aoleyun/os/views/AbstractSlideInView.java
similarity index 94%
rename from src/com/android/colorfulos/views/AbstractSlideInView.java
rename to src/com/aoleyun/os/views/AbstractSlideInView.java
index 7089143..9bbf5a8 100644
--- a/src/com/android/colorfulos/views/AbstractSlideInView.java
+++ b/src/com/aoleyun/os/views/AbstractSlideInView.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.views;
+package com.aoleyun.os.views;
 
-import static com.android.colorfulos.anim.Interpolators.scrollInterpolatorForVelocity;
+import static com.aoleyun.os.anim.Interpolators.scrollInterpolatorForVelocity;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -28,11 +28,11 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.view.animation.Interpolator;
 
-import com.android.colorfulos.AbstractFloatingView;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.anim.Interpolators;
-import com.android.colorfulos.touch.SwipeDetector;
+import com.aoleyun.os.AbstractFloatingView;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.anim.Interpolators;
+import com.aoleyun.os.touch.SwipeDetector;
 
 /**
  * Extension of AbstractFloatingView with common methods for sliding in from bottom
diff --git a/src/com/android/colorfulos/views/ActivityContext.java b/src/com/aoleyun/os/views/ActivityContext.java
similarity index 91%
rename from src/com/android/colorfulos/views/ActivityContext.java
rename to src/com/aoleyun/os/views/ActivityContext.java
index 4dbcbde..e99c129 100644
--- a/src/com/android/colorfulos/views/ActivityContext.java
+++ b/src/com/aoleyun/os/views/ActivityContext.java
@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.views;
+package com.aoleyun.os.views;
 
 import android.content.Context;
 import android.content.ContextWrapper;
 import android.view.ContextThemeWrapper;
 import android.view.View.AccessibilityDelegate;
 
-import com.android.colorfulos.DeviceProfile;
-import com.android.colorfulos.ItemInfo;
-import com.android.colorfulos.graphics.RotationMode;
-import com.android.colorfulos.dot.DotInfo;
+import com.aoleyun.os.DeviceProfile;
+import com.aoleyun.os.ItemInfo;
+import com.aoleyun.os.graphics.RotationMode;
+import com.aoleyun.os.dot.DotInfo;
 
 /**
  * An interface to be used along with a context for various activities in Launcher. This allows a
diff --git a/src/com/android/colorfulos/views/BaseDragLayer.java b/src/com/aoleyun/os/views/BaseDragLayer.java
similarity index 97%
rename from src/com/android/colorfulos/views/BaseDragLayer.java
rename to src/com/aoleyun/os/views/BaseDragLayer.java
index 4887ffd..9d44dcf 100644
--- a/src/com/android/colorfulos/views/BaseDragLayer.java
+++ b/src/com/aoleyun/os/views/BaseDragLayer.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.views;
+package com.aoleyun.os.views;
 
 import static android.view.MotionEvent.ACTION_CANCEL;
 import static android.view.MotionEvent.ACTION_DOWN;
 import static android.view.MotionEvent.ACTION_UP;
 
-import static com.android.colorfulos.Utilities.SINGLE_FRAME_MS;
-import static com.android.colorfulos.Utilities.shouldDisableGestures;
+import static com.aoleyun.os.Utilities.SINGLE_FRAME_MS;
+import static com.aoleyun.os.Utilities.shouldDisableGestures;
 
 import android.annotation.TargetApi;
 import android.content.Context;
@@ -40,13 +40,13 @@ import android.view.WindowInsets;
 import android.view.accessibility.AccessibilityEvent;
 import android.widget.FrameLayout;
 
-import com.android.colorfulos.AbstractFloatingView;
-import com.android.colorfulos.InsettableFrameLayout;
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.testing.TestProtocol;
-import com.android.colorfulos.util.MultiValueAlpha;
-import com.android.colorfulos.util.MultiValueAlpha.AlphaProperty;
-import com.android.colorfulos.util.TouchController;
+import com.aoleyun.os.AbstractFloatingView;
+import com.aoleyun.os.InsettableFrameLayout;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.testing.TestProtocol;
+import com.aoleyun.os.util.MultiValueAlpha;
+import com.aoleyun.os.util.MultiValueAlpha.AlphaProperty;
+import com.aoleyun.os.util.TouchController;
 
 import java.io.PrintWriter;
 import java.util.ArrayList;
diff --git a/src/com/android/colorfulos/views/BottomUserEducationView.java b/src/com/aoleyun/os/views/BottomUserEducationView.java
similarity index 92%
rename from src/com/android/colorfulos/views/BottomUserEducationView.java
rename to src/com/aoleyun/os/views/BottomUserEducationView.java
index 8d4fe19..547d948 100644
--- a/src/com/android/colorfulos/views/BottomUserEducationView.java
+++ b/src/com/aoleyun/os/views/BottomUserEducationView.java
@@ -13,9 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.views;
-
-import static com.android.colorfulos.compat.AccessibilityManagerCompat.sendCustomAccessibilityEvent;
+package com.aoleyun.os.views;
 
 import android.animation.PropertyValuesHolder;
 import android.content.Context;
@@ -26,11 +24,12 @@ import android.view.TouchDelegate;
 import android.view.View;
 import android.view.accessibility.AccessibilityEvent;
 
-import com.android.colorfulos.Insettable;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.R;
-import com.android.colorfulos.anim.Interpolators;
-import com.android.colorfulos.userevent.nano.LauncherLogProto.ContainerType;
+import com.aoleyun.os.Insettable;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.R;
+import com.aoleyun.os.anim.Interpolators;
+import com.aoleyun.os.userevent.nano.LauncherLogProto.ContainerType;
+import com.aoleyun.os.compat.AccessibilityManagerCompat;
 
 public class BottomUserEducationView extends AbstractSlideInView implements Insettable {
 
@@ -100,7 +99,7 @@ public class BottomUserEducationView extends AbstractSlideInView implements Inse
             // close action.
             mLauncher.getSharedPrefs().edit()
                     .putBoolean(KEY_SHOWED_BOTTOM_USER_EDUCATION, true).apply();
-            sendCustomAccessibilityEvent(
+            AccessibilityManagerCompat.sendCustomAccessibilityEvent(
                     BottomUserEducationView.this,
                     AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED,
                     getContext().getString(R.string.bottom_work_tab_user_education_closed));
diff --git a/src/com/android/colorfulos/views/ClipPathView.java b/src/com/aoleyun/os/views/ClipPathView.java
similarity index 95%
rename from src/com/android/colorfulos/views/ClipPathView.java
rename to src/com/aoleyun/os/views/ClipPathView.java
index 7d6b8fa..7f069a6 100644
--- a/src/com/android/colorfulos/views/ClipPathView.java
+++ b/src/com/aoleyun/os/views/ClipPathView.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.views;
+package com.aoleyun.os.views;
 
 import android.graphics.Path;
 import android.view.View;
diff --git a/src/com/android/colorfulos/views/DoubleShadowBubbleTextView.java b/src/com/aoleyun/os/views/DoubleShadowBubbleTextView.java
similarity index 89%
rename from src/com/android/colorfulos/views/DoubleShadowBubbleTextView.java
rename to src/com/aoleyun/os/views/DoubleShadowBubbleTextView.java
index 547d8e5..bc6405a 100644
--- a/src/com/android/colorfulos/views/DoubleShadowBubbleTextView.java
+++ b/src/com/aoleyun/os/views/DoubleShadowBubbleTextView.java
@@ -14,9 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.views;
-
-import static com.android.colorfulos.icons.GraphicsUtils.setColorAlphaBound;
+package com.aoleyun.os.views;
 
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -25,8 +23,9 @@ import android.graphics.Color;
 import android.util.AttributeSet;
 import android.widget.TextView;
 
-import com.android.colorfulos.BubbleTextView;
-import com.android.colorfulos.R;
+import com.aoleyun.os.BubbleTextView;
+import com.aoleyun.os.R;
+import com.aoleyun.os.icons.GraphicsUtils;
 
 /**
  * Extension of {@link BubbleTextView} which draws two shadows on the text (ambient and key shadows}
@@ -60,7 +59,7 @@ public class DoubleShadowBubbleTextView extends BubbleTextView {
 
         // We enhance the shadow by drawing the shadow twice
         getPaint().setShadowLayer(mShadowInfo.ambientShadowBlur, 0, 0,
-                setColorAlphaBound(mShadowInfo.ambientShadowColor, alpha));
+                GraphicsUtils.setColorAlphaBound(mShadowInfo.ambientShadowColor, alpha));
 
         drawWithoutDot(canvas);
         canvas.save();
@@ -69,7 +68,7 @@ public class DoubleShadowBubbleTextView extends BubbleTextView {
                 getScrollY() + getHeight());
 
         getPaint().setShadowLayer(mShadowInfo.keyShadowBlur, 0.0f, mShadowInfo.keyShadowOffset,
-                setColorAlphaBound(mShadowInfo.keyShadowColor, alpha));
+                GraphicsUtils.setColorAlphaBound(mShadowInfo.keyShadowColor, alpha));
         drawWithoutDot(canvas);
         canvas.restore();
 
@@ -107,11 +106,11 @@ public class DoubleShadowBubbleTextView extends BubbleTextView {
                 return true;
             } else if (ambientShadowAlpha > 0) {
                 textView.getPaint().setShadowLayer(ambientShadowBlur, 0, 0,
-                        setColorAlphaBound(ambientShadowColor, textAlpha));
+                        GraphicsUtils.setColorAlphaBound(ambientShadowColor, textAlpha));
                 return true;
             } else if (keyShadowAlpha > 0) {
                 textView.getPaint().setShadowLayer(keyShadowBlur, 0.0f, keyShadowOffset,
-                        setColorAlphaBound(keyShadowColor, textAlpha));
+                        GraphicsUtils.setColorAlphaBound(keyShadowColor, textAlpha));
                 return true;
             } else {
                 return false;
diff --git a/src/com/android/colorfulos/views/FloatingIconView.java b/src/com/aoleyun/os/views/FloatingIconView.java
similarity index 96%
rename from src/com/android/colorfulos/views/FloatingIconView.java
rename to src/com/aoleyun/os/views/FloatingIconView.java
index 6c9e79a..c807076 100644
--- a/src/com/android/colorfulos/views/FloatingIconView.java
+++ b/src/com/aoleyun/os/views/FloatingIconView.java
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.views;
+package com.aoleyun.os.views;
 
-import static com.android.colorfulos.LauncherAnimUtils.DRAWABLE_ALPHA;
-import static com.android.colorfulos.Utilities.getBadge;
-import static com.android.colorfulos.Utilities.getFullDrawable;
-import static com.android.colorfulos.Utilities.mapToRange;
-import static com.android.colorfulos.anim.Interpolators.LINEAR;
-import static com.android.colorfulos.config.FeatureFlags.ADAPTIVE_ICON_WINDOW_ANIM;
-import static com.android.colorfulos.states.RotationHelper.REQUEST_LOCK;
+import static com.aoleyun.os.LauncherAnimUtils.DRAWABLE_ALPHA;
+import static com.aoleyun.os.Utilities.getBadge;
+import static com.aoleyun.os.Utilities.getFullDrawable;
+import static com.aoleyun.os.Utilities.mapToRange;
+import static com.aoleyun.os.anim.Interpolators.LINEAR;
+import static com.aoleyun.os.config.FeatureFlags.ADAPTIVE_ICON_WINDOW_ANIM;
+import static com.aoleyun.os.states.RotationHelper.REQUEST_LOCK;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -50,21 +50,21 @@ import android.view.ViewOutlineProvider;
 import android.view.ViewTreeObserver.OnGlobalLayoutListener;
 import android.widget.ImageView;
 
-import com.android.colorfulos.BubbleTextView;
-import com.android.colorfulos.InsettableFrameLayout.LayoutParams;
-import com.android.colorfulos.ItemInfo;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.LauncherModel;
-import com.android.colorfulos.R;
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.dragndrop.DragLayer;
-import com.android.colorfulos.dragndrop.FolderAdaptiveIcon;
-import com.android.colorfulos.folder.FolderIcon;
-import com.android.colorfulos.graphics.IconShape;
-import com.android.colorfulos.graphics.ShiftedBitmapDrawable;
-import com.android.colorfulos.icons.LauncherIcons;
-import com.android.colorfulos.popup.SystemShortcut;
-import com.android.colorfulos.shortcuts.DeepShortcutView;
+import com.aoleyun.os.BubbleTextView;
+import com.aoleyun.os.InsettableFrameLayout.LayoutParams;
+import com.aoleyun.os.ItemInfo;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.LauncherModel;
+import com.aoleyun.os.R;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.dragndrop.DragLayer;
+import com.aoleyun.os.dragndrop.FolderAdaptiveIcon;
+import com.aoleyun.os.folder.FolderIcon;
+import com.aoleyun.os.graphics.IconShape;
+import com.aoleyun.os.graphics.ShiftedBitmapDrawable;
+import com.aoleyun.os.icons.LauncherIcons;
+import com.aoleyun.os.popup.SystemShortcut;
+import com.aoleyun.os.shortcuts.DeepShortcutView;
 
 import androidx.annotation.Nullable;
 import androidx.annotation.UiThread;
diff --git a/src/com/android/colorfulos/views/ListenerView.java b/src/com/aoleyun/os/views/ListenerView.java
similarity index 96%
rename from src/com/android/colorfulos/views/ListenerView.java
rename to src/com/aoleyun/os/views/ListenerView.java
index 597c9d1..60b0c8c 100644
--- a/src/com/android/colorfulos/views/ListenerView.java
+++ b/src/com/aoleyun/os/views/ListenerView.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.views;
+package com.aoleyun.os.views;
 
 import android.content.Context;
 import android.util.AttributeSet;
@@ -21,7 +21,7 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.android.colorfulos.AbstractFloatingView;
+import com.aoleyun.os.AbstractFloatingView;
 
 /**
  * An invisible AbstractFloatingView that can run a callback when it is being closed.
diff --git a/src/com/android/colorfulos/views/OptionsPopupView.java b/src/com/aoleyun/os/views/OptionsPopupView.java
similarity index 92%
rename from src/com/android/colorfulos/views/OptionsPopupView.java
rename to src/com/aoleyun/os/views/OptionsPopupView.java
index fde5f7f..46a48a6 100644
--- a/src/com/android/colorfulos/views/OptionsPopupView.java
+++ b/src/com/aoleyun/os/views/OptionsPopupView.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.views;
+package com.aoleyun.os.views;
 
-import static com.android.colorfulos.Utilities.EXTRA_WALLPAPER_FLAVOR;
-import static com.android.colorfulos.Utilities.EXTRA_WALLPAPER_OFFSET;
+import static com.aoleyun.os.Utilities.EXTRA_WALLPAPER_FLAVOR;
+import static com.aoleyun.os.Utilities.EXTRA_WALLPAPER_OFFSET;
 
 import android.content.Context;
 import android.content.Intent;
@@ -31,15 +31,15 @@ import android.view.View.OnClickListener;
 import android.view.View.OnLongClickListener;
 import android.widget.Toast;
 
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.R;
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.config.FeatureFlags;
-import com.android.colorfulos.popup.ArrowPopup;
-import com.android.colorfulos.shortcuts.DeepShortcutView;
-import com.android.colorfulos.userevent.nano.LauncherLogProto.Action;
-import com.android.colorfulos.userevent.nano.LauncherLogProto.ControlType;
-import com.android.colorfulos.widget.WidgetsFullSheet;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.R;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.config.FeatureFlags;
+import com.aoleyun.os.popup.ArrowPopup;
+import com.aoleyun.os.shortcuts.DeepShortcutView;
+import com.aoleyun.os.userevent.nano.LauncherLogProto.Action;
+import com.aoleyun.os.userevent.nano.LauncherLogProto.ControlType;
+import com.aoleyun.os.widget.WidgetsFullSheet;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com/android/colorfulos/views/RecyclerViewFastScroller.java b/src/com/aoleyun/os/views/RecyclerViewFastScroller.java
similarity index 98%
rename from src/com/android/colorfulos/views/RecyclerViewFastScroller.java
rename to src/com/aoleyun/os/views/RecyclerViewFastScroller.java
index 40f1c3e..257e0f9 100644
--- a/src/com/android/colorfulos/views/RecyclerViewFastScroller.java
+++ b/src/com/aoleyun/os/views/RecyclerViewFastScroller.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.views;
+package com.aoleyun.os.views;
 
 import android.animation.ObjectAnimator;
 import android.content.Context;
@@ -34,11 +34,11 @@ import android.widget.TextView;
 
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.android.colorfulos.BaseRecyclerView;
-import com.android.colorfulos.R;
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.graphics.FastScrollThumbDrawable;
-import com.android.colorfulos.util.Themes;
+import com.aoleyun.os.BaseRecyclerView;
+import com.aoleyun.os.R;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.graphics.FastScrollThumbDrawable;
+import com.aoleyun.os.util.Themes;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/src/com/android/colorfulos/views/ScrimView.java b/src/com/aoleyun/os/views/ScrimView.java
similarity index 91%
rename from src/com/android/colorfulos/views/ScrimView.java
rename to src/com/aoleyun/os/views/ScrimView.java
index 78f071e..5fe4959 100644
--- a/src/com/android/colorfulos/views/ScrimView.java
+++ b/src/com/aoleyun/os/views/ScrimView.java
@@ -13,16 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.views;
+package com.aoleyun.os.views;
 
 import static android.content.Context.ACCESSIBILITY_SERVICE;
 import static android.view.MotionEvent.ACTION_DOWN;
 
-import static com.android.colorfulos.LauncherState.ALL_APPS;
-import static com.android.colorfulos.LauncherState.NORMAL;
-import static com.android.colorfulos.anim.Interpolators.ACCEL;
-import static com.android.colorfulos.anim.Interpolators.DEACCEL;
-import static com.android.colorfulos.icons.GraphicsUtils.setColorAlphaBound;
+import static com.aoleyun.os.LauncherState.ALL_APPS;
+import static com.aoleyun.os.LauncherState.NORMAL;
+import static com.aoleyun.os.anim.Interpolators.ACCEL;
+import static com.aoleyun.os.anim.Interpolators.DEACCEL;
 
 import static androidx.core.graphics.ColorUtils.compositeColors;
 
@@ -47,26 +46,27 @@ import android.view.View;
 import android.view.accessibility.AccessibilityManager;
 import android.view.accessibility.AccessibilityManager.AccessibilityStateChangeListener;
 
-import com.android.colorfulos.DeviceProfile;
-import com.android.colorfulos.Insettable;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.LauncherState;
-import com.android.colorfulos.LauncherStateManager;
-import com.android.colorfulos.LauncherStateManager.StateListener;
-import com.android.colorfulos.R;
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.uioverrides.WallpaperColorInfo;
-import com.android.colorfulos.uioverrides.WallpaperColorInfo.OnChangeListener;
-import com.android.colorfulos.userevent.nano.LauncherLogProto.Action;
-import com.android.colorfulos.userevent.nano.LauncherLogProto.ControlType;
-import com.android.colorfulos.util.MultiValueAlpha;
-import com.android.colorfulos.util.MultiValueAlpha.AlphaProperty;
-import com.android.colorfulos.util.Themes;
+import com.aoleyun.os.DeviceProfile;
+import com.aoleyun.os.Insettable;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.LauncherState;
+import com.aoleyun.os.LauncherStateManager;
+import com.aoleyun.os.LauncherStateManager.StateListener;
+import com.aoleyun.os.R;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.uioverrides.WallpaperColorInfo;
+import com.aoleyun.os.userevent.nano.LauncherLogProto.Action;
+import com.aoleyun.os.userevent.nano.LauncherLogProto.ControlType;
+import com.aoleyun.os.util.MultiValueAlpha;
+import com.aoleyun.os.util.MultiValueAlpha.AlphaProperty;
+import com.aoleyun.os.util.Themes;
+import com.aoleyun.os.icons.GraphicsUtils;
 
 import java.util.List;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.graphics.ColorUtils;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
 import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat;
@@ -75,7 +75,7 @@ import androidx.customview.widget.ExploreByTouchHelper;
 /**
  * Simple scrim which draws a flat color
  */
-public class ScrimView extends View implements Insettable, OnChangeListener,
+public class ScrimView extends View implements Insettable, WallpaperColorInfo.OnChangeListener,
         AccessibilityStateChangeListener, StateListener {
 
     public static final Property<ScrimView, Integer> DRAG_HANDLE_ALPHA =
@@ -192,7 +192,7 @@ public class ScrimView extends View implements Insettable, OnChangeListener,
     @Override
     public void onExtractedColorsChanged(WallpaperColorInfo wallpaperColorInfo) {
         mScrimColor = wallpaperColorInfo.getMainColor();
-        mEndFlatColor = compositeColors(mEndScrim, setColorAlphaBound(
+        mEndFlatColor = ColorUtils.compositeColors(mEndScrim, GraphicsUtils.setColorAlphaBound(
                 mScrimColor, Math.round(mMaxScrimAlpha * 255)));
         mEndFlatColorAlpha = Color.alpha(mEndFlatColor);
         updateColors();
@@ -211,7 +211,7 @@ public class ScrimView extends View implements Insettable, OnChangeListener,
     public void reInitUi() { }
 
     protected void updateColors() {
-        mCurrentFlatColor = mProgress >= 1 ? 0 : setColorAlphaBound(
+        mCurrentFlatColor = mProgress >= 1 ? 0 : GraphicsUtils.setColorAlphaBound(
                 mEndFlatColor, Math.round((1 - mProgress) * mEndFlatColorAlpha));
     }
 
diff --git a/src/com/android/colorfulos/views/Snackbar.java b/src/com/aoleyun/os/views/Snackbar.java
similarity index 95%
rename from src/com/android/colorfulos/views/Snackbar.java
rename to src/com/aoleyun/os/views/Snackbar.java
index e7f9079..828404c 100644
--- a/src/com/android/colorfulos/views/Snackbar.java
+++ b/src/com/aoleyun/os/views/Snackbar.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.views;
+package com.aoleyun.os.views;
 
 import static android.view.accessibility.AccessibilityManager.FLAG_CONTENT_CONTROLS;
 import static android.view.accessibility.AccessibilityManager.FLAG_CONTENT_TEXT;
@@ -28,12 +28,12 @@ import android.view.Gravity;
 import android.view.MotionEvent;
 import android.widget.TextView;
 
-import com.android.colorfulos.AbstractFloatingView;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.R;
-import com.android.colorfulos.anim.Interpolators;
-import com.android.colorfulos.compat.AccessibilityManagerCompat;
-import com.android.colorfulos.dragndrop.DragLayer;
+import com.aoleyun.os.AbstractFloatingView;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.R;
+import com.aoleyun.os.anim.Interpolators;
+import com.aoleyun.os.compat.AccessibilityManagerCompat;
+import com.aoleyun.os.dragndrop.DragLayer;
 
 /**
  * A toast-like UI at the bottom of the screen with a label, button action, and dismiss action.
diff --git a/src/com/android/colorfulos/views/SpringRelativeLayout.java b/src/com/aoleyun/os/views/SpringRelativeLayout.java
similarity index 99%
rename from src/com/android/colorfulos/views/SpringRelativeLayout.java
rename to src/com/aoleyun/os/views/SpringRelativeLayout.java
index 6f0714e..2657f71 100644
--- a/src/com/android/colorfulos/views/SpringRelativeLayout.java
+++ b/src/com/aoleyun/os/views/SpringRelativeLayout.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.views;
+package com.aoleyun.os.views;
 
 import static androidx.dynamicanimation.animation.SpringForce.DAMPING_RATIO_MEDIUM_BOUNCY;
 import static androidx.dynamicanimation.animation.SpringForce.STIFFNESS_LOW;
diff --git a/src/com/android/colorfulos/views/TopRoundedCornerView.java b/src/com/aoleyun/os/views/TopRoundedCornerView.java
similarity index 95%
rename from src/com/android/colorfulos/views/TopRoundedCornerView.java
rename to src/com/aoleyun/os/views/TopRoundedCornerView.java
index 9140a78..822249f 100644
--- a/src/com/android/colorfulos/views/TopRoundedCornerView.java
+++ b/src/com/aoleyun/os/views/TopRoundedCornerView.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.views;
+package com.aoleyun.os.views;
 
 import android.content.Context;
 import android.graphics.Canvas;
@@ -22,8 +22,8 @@ import android.graphics.Path;
 import android.graphics.RectF;
 import android.util.AttributeSet;
 
-import com.android.colorfulos.R;
-import com.android.colorfulos.util.Themes;
+import com.aoleyun.os.R;
+import com.aoleyun.os.util.Themes;
 
 /**
  * View with top rounded corners.
diff --git a/src/com/android/colorfulos/views/Transposable.java b/src/com/aoleyun/os/views/Transposable.java
similarity index 89%
rename from src/com/android/colorfulos/views/Transposable.java
rename to src/com/aoleyun/os/views/Transposable.java
index 370820f..80ae2d0 100644
--- a/src/com/android/colorfulos/views/Transposable.java
+++ b/src/com/aoleyun/os/views/Transposable.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.views;
+package com.aoleyun.os.views;
 
-import com.android.colorfulos.graphics.RotationMode;
+import com.aoleyun.os.graphics.RotationMode;
 
 /**
  * Indicates that a view can be transposed.
diff --git a/src/com/android/colorfulos/views/WorkFooterContainer.java b/src/com/aoleyun/os/views/WorkFooterContainer.java
similarity index 97%
rename from src/com/android/colorfulos/views/WorkFooterContainer.java
rename to src/com/aoleyun/os/views/WorkFooterContainer.java
index f841167..a17d0bd 100644
--- a/src/com/android/colorfulos/views/WorkFooterContainer.java
+++ b/src/com/aoleyun/os/views/WorkFooterContainer.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.views;
+package com.aoleyun.os.views;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/src/com/android/colorfulos/widget/BaseWidgetSheet.java b/src/com/aoleyun/os/widget/BaseWidgetSheet.java
similarity index 83%
rename from src/com/android/colorfulos/widget/BaseWidgetSheet.java
rename to src/com/aoleyun/os/widget/BaseWidgetSheet.java
index ec2cb20..eff0d43 100644
--- a/src/com/android/colorfulos/widget/BaseWidgetSheet.java
+++ b/src/com/aoleyun/os/widget/BaseWidgetSheet.java
@@ -13,13 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.widget;
+package com.aoleyun.os.widget;
 
 import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
 
-import static com.android.colorfulos.icons.GraphicsUtils.setColorAlphaBound;
-import static com.android.colorfulos.logging.LoggerUtils.newContainerTarget;
-
 import android.content.Context;
 import android.graphics.Point;
 import android.util.AttributeSet;
@@ -28,21 +25,23 @@ import android.view.View.OnClickListener;
 import android.view.View.OnLongClickListener;
 import android.widget.Toast;
 
-import com.android.colorfulos.DragSource;
-import com.android.colorfulos.DropTarget.DragObject;
-import com.android.colorfulos.ItemInfo;
-import com.android.colorfulos.R;
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.dragndrop.DragOptions;
-import com.android.colorfulos.popup.PopupDataProvider;
-import com.android.colorfulos.touch.ItemLongClickListener;
-import com.android.colorfulos.uioverrides.WallpaperColorInfo;
-import com.android.colorfulos.userevent.nano.LauncherLogProto.ContainerType;
-import com.android.colorfulos.userevent.nano.LauncherLogProto.Target;
-import com.android.colorfulos.util.SystemUiController;
-import com.android.colorfulos.util.Themes;
-import com.android.colorfulos.views.AbstractSlideInView;
-import com.android.colorfulos.views.BaseDragLayer;
+import com.aoleyun.os.DragSource;
+import com.aoleyun.os.DropTarget.DragObject;
+import com.aoleyun.os.ItemInfo;
+import com.aoleyun.os.R;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.dragndrop.DragOptions;
+import com.aoleyun.os.popup.PopupDataProvider;
+import com.aoleyun.os.touch.ItemLongClickListener;
+import com.aoleyun.os.uioverrides.WallpaperColorInfo;
+import com.aoleyun.os.userevent.nano.LauncherLogProto.ContainerType;
+import com.aoleyun.os.userevent.nano.LauncherLogProto.Target;
+import com.aoleyun.os.util.SystemUiController;
+import com.aoleyun.os.util.Themes;
+import com.aoleyun.os.views.AbstractSlideInView;
+import com.aoleyun.os.views.BaseDragLayer;
+import com.aoleyun.os.icons.GraphicsUtils;
+import com.aoleyun.os.logging.LoggerUtils;
 
 /**
  * Base class for various widgets popup
@@ -162,7 +161,7 @@ abstract class BaseWidgetSheet extends AbstractSlideInView
 
     @Override
     public final void logActionCommand(int command) {
-        Target target = newContainerTarget(getLogContainerType());
+        Target target = LoggerUtils.newContainerTarget(getLogContainerType());
         target.cardinality = getElementsRowCount();
         mLauncher.getUserEventDispatcher().logActionCommand(command, target);
     }
@@ -184,7 +183,7 @@ abstract class BaseWidgetSheet extends AbstractSlideInView
 
         WallpaperColorInfo colors = WallpaperColorInfo.getInstance(context);
         int alpha = context.getResources().getInteger(R.integer.extracted_color_gradient_alpha);
-        view.setBackgroundColor(setColorAlphaBound(colors.getSecondaryColor(), alpha));
+        view.setBackgroundColor(GraphicsUtils.setColorAlphaBound(colors.getSecondaryColor(), alpha));
 
         BaseDragLayer.LayoutParams lp = new BaseDragLayer.LayoutParams(MATCH_PARENT, MATCH_PARENT);
         lp.ignoreInsets = true;
diff --git a/src/com/android/colorfulos/widget/DeferredAppWidgetHostView.java b/src/com/aoleyun/os/widget/DeferredAppWidgetHostView.java
similarity index 97%
rename from src/com/android/colorfulos/widget/DeferredAppWidgetHostView.java
rename to src/com/aoleyun/os/widget/DeferredAppWidgetHostView.java
index baa2f1d..c58a468 100644
--- a/src/com/android/colorfulos/widget/DeferredAppWidgetHostView.java
+++ b/src/com/aoleyun/os/widget/DeferredAppWidgetHostView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.widget;
+package com.aoleyun.os.widget;
 
 import android.appwidget.AppWidgetProviderInfo;
 import android.content.Context;
@@ -27,7 +27,7 @@ import android.text.TextUtils;
 import android.util.TypedValue;
 import android.widget.RemoteViews;
 
-import com.android.colorfulos.R;
+import com.aoleyun.os.R;
 
 /**
  * A widget host views created while the host has not bind to the system service.
diff --git a/src/com/android/colorfulos/widget/LauncherAppWidgetHostView.java b/src/com/aoleyun/os/widget/LauncherAppWidgetHostView.java
similarity index 95%
rename from src/com/android/colorfulos/widget/LauncherAppWidgetHostView.java
rename to src/com/aoleyun/os/widget/LauncherAppWidgetHostView.java
index f1c9863..6a62c17 100644
--- a/src/com/android/colorfulos/widget/LauncherAppWidgetHostView.java
+++ b/src/com/aoleyun/os/widget/LauncherAppWidgetHostView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.widget;
+package com.aoleyun.os.widget;
 
 import android.appwidget.AppWidgetProviderInfo;
 import android.content.Context;
@@ -34,18 +34,18 @@ import android.widget.AdapterView;
 import android.widget.Advanceable;
 import android.widget.RemoteViews;
 
-import com.android.colorfulos.CheckLongPressHelper;
-import com.android.colorfulos.ItemInfo;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.LauncherAppWidgetInfo;
-import com.android.colorfulos.LauncherAppWidgetProviderInfo;
-import com.android.colorfulos.R;
-import com.android.colorfulos.SimpleOnStylusPressListener;
-import com.android.colorfulos.StylusEventHelper;
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.dragndrop.DragLayer;
-import com.android.colorfulos.util.Themes;
-import com.android.colorfulos.views.BaseDragLayer.TouchCompleteListener;
+import com.aoleyun.os.CheckLongPressHelper;
+import com.aoleyun.os.ItemInfo;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.LauncherAppWidgetInfo;
+import com.aoleyun.os.LauncherAppWidgetProviderInfo;
+import com.aoleyun.os.R;
+import com.aoleyun.os.SimpleOnStylusPressListener;
+import com.aoleyun.os.StylusEventHelper;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.dragndrop.DragLayer;
+import com.aoleyun.os.util.Themes;
+import com.aoleyun.os.views.BaseDragLayer.TouchCompleteListener;
 
 /**
  * {@inheritDoc}
diff --git a/src/com/android/colorfulos/widget/NavigableAppWidgetHostView.java b/src/com/aoleyun/os/widget/NavigableAppWidgetHostView.java
similarity index 99%
rename from src/com/android/colorfulos/widget/NavigableAppWidgetHostView.java
rename to src/com/aoleyun/os/widget/NavigableAppWidgetHostView.java
index c9318f8..b6af39d 100644
--- a/src/com/android/colorfulos/widget/NavigableAppWidgetHostView.java
+++ b/src/com/aoleyun/os/widget/NavigableAppWidgetHostView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.widget;
+package com.aoleyun.os.widget;
 
 import android.appwidget.AppWidgetHostView;
 import android.content.Context;
diff --git a/src/com/android/colorfulos/widget/PendingAddShortcutInfo.java b/src/com/aoleyun/os/widget/PendingAddShortcutInfo.java
similarity index 87%
rename from src/com/android/colorfulos/widget/PendingAddShortcutInfo.java
rename to src/com/aoleyun/os/widget/PendingAddShortcutInfo.java
index e5044f2..8144681 100644
--- a/src/com/android/colorfulos/widget/PendingAddShortcutInfo.java
+++ b/src/com/aoleyun/os/widget/PendingAddShortcutInfo.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.widget;
+package com.aoleyun.os.widget;
 
-import com.android.colorfulos.PendingAddItemInfo;
-import com.android.colorfulos.compat.ShortcutConfigActivityInfo;
+import com.aoleyun.os.PendingAddItemInfo;
+import com.aoleyun.os.compat.ShortcutConfigActivityInfo;
 
 /**
  * Meta data used for late binding of the short cuts.
diff --git a/src/com/android/colorfulos/widget/PendingAddWidgetInfo.java b/src/com/aoleyun/os/widget/PendingAddWidgetInfo.java
similarity index 89%
rename from src/com/android/colorfulos/widget/PendingAddWidgetInfo.java
rename to src/com/aoleyun/os/widget/PendingAddWidgetInfo.java
index d5e8ae9..c3791c6 100644
--- a/src/com/android/colorfulos/widget/PendingAddWidgetInfo.java
+++ b/src/com/aoleyun/os/widget/PendingAddWidgetInfo.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.widget;
+package com.aoleyun.os.widget;
 
 import android.appwidget.AppWidgetHostView;
 import android.os.Bundle;
 
-import com.android.colorfulos.LauncherAppWidgetProviderInfo;
-import com.android.colorfulos.LauncherSettings;
-import com.android.colorfulos.PendingAddItemInfo;
+import com.aoleyun.os.LauncherAppWidgetProviderInfo;
+import com.aoleyun.os.LauncherSettings;
+import com.aoleyun.os.PendingAddItemInfo;
 
 /**
  * Meta data used for late binding of {@link LauncherAppWidgetProviderInfo}.
diff --git a/src/com/android/colorfulos/widget/PendingAppWidgetHostView.java b/src/com/aoleyun/os/widget/PendingAppWidgetHostView.java
similarity index 95%
rename from src/com/android/colorfulos/widget/PendingAppWidgetHostView.java
rename to src/com/aoleyun/os/widget/PendingAppWidgetHostView.java
index a892d76..d93eb79 100644
--- a/src/com/android/colorfulos/widget/PendingAppWidgetHostView.java
+++ b/src/com/aoleyun/os/widget/PendingAppWidgetHostView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.widget;
+package com.aoleyun.os.widget;
 
 import android.content.Context;
 import android.graphics.Canvas;
@@ -31,17 +31,17 @@ import android.view.ContextThemeWrapper;
 import android.view.View;
 import android.view.View.OnClickListener;
 
-import com.android.colorfulos.DeviceProfile;
-import com.android.colorfulos.FastBitmapDrawable;
-import com.android.colorfulos.icons.IconCache;
-import com.android.colorfulos.icons.IconCache.ItemInfoUpdateReceiver;
-import com.android.colorfulos.ItemInfoWithIcon;
-import com.android.colorfulos.LauncherAppWidgetInfo;
-import com.android.colorfulos.R;
-import com.android.colorfulos.graphics.DrawableFactory;
-import com.android.colorfulos.model.PackageItemInfo;
-import com.android.colorfulos.touch.ItemClickHandler;
-import com.android.colorfulos.util.Themes;
+import com.aoleyun.os.DeviceProfile;
+import com.aoleyun.os.FastBitmapDrawable;
+import com.aoleyun.os.icons.IconCache;
+import com.aoleyun.os.icons.IconCache.ItemInfoUpdateReceiver;
+import com.aoleyun.os.ItemInfoWithIcon;
+import com.aoleyun.os.LauncherAppWidgetInfo;
+import com.aoleyun.os.R;
+import com.aoleyun.os.graphics.DrawableFactory;
+import com.aoleyun.os.model.PackageItemInfo;
+import com.aoleyun.os.touch.ItemClickHandler;
+import com.aoleyun.os.util.Themes;
 
 public class PendingAppWidgetHostView extends LauncherAppWidgetHostView
         implements OnClickListener, ItemInfoUpdateReceiver {
diff --git a/src/com/android/colorfulos/widget/PendingItemDragHelper.java b/src/com/aoleyun/os/widget/PendingItemDragHelper.java
similarity index 93%
rename from src/com/android/colorfulos/widget/PendingItemDragHelper.java
rename to src/com/aoleyun/os/widget/PendingItemDragHelper.java
index be405a6..b2b3ac9 100644
--- a/src/com/android/colorfulos/widget/PendingItemDragHelper.java
+++ b/src/com/aoleyun/os/widget/PendingItemDragHelper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.widget;
+package com.aoleyun.os.widget;
 
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
@@ -25,16 +25,16 @@ import android.graphics.drawable.Drawable;
 import android.view.View;
 import android.widget.RemoteViews;
 
-import com.android.colorfulos.DeviceProfile;
-import com.android.colorfulos.DragSource;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.LauncherAppState;
-import com.android.colorfulos.PendingAddItemInfo;
-import com.android.colorfulos.R;
-import com.android.colorfulos.dragndrop.DragOptions;
-import com.android.colorfulos.dragndrop.LivePreviewWidgetCell;
-import com.android.colorfulos.graphics.DragPreviewProvider;
-import com.android.colorfulos.icons.LauncherIcons;
+import com.aoleyun.os.DeviceProfile;
+import com.aoleyun.os.DragSource;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.LauncherAppState;
+import com.aoleyun.os.PendingAddItemInfo;
+import com.aoleyun.os.R;
+import com.aoleyun.os.dragndrop.DragOptions;
+import com.aoleyun.os.dragndrop.LivePreviewWidgetCell;
+import com.aoleyun.os.graphics.DragPreviewProvider;
+import com.aoleyun.os.icons.LauncherIcons;
 
 /**
  * Extension of {@link DragPreviewProvider} with logic specific to pending widgets/shortcuts
diff --git a/src/com/android/colorfulos/widget/WidgetAddFlowHandler.java b/src/com/aoleyun/os/widget/WidgetAddFlowHandler.java
similarity index 91%
rename from src/com/android/colorfulos/widget/WidgetAddFlowHandler.java
rename to src/com/aoleyun/os/widget/WidgetAddFlowHandler.java
index 2136268..158f13b 100644
--- a/src/com/android/colorfulos/widget/WidgetAddFlowHandler.java
+++ b/src/com/aoleyun/os/widget/WidgetAddFlowHandler.java
@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.widget;
+package com.aoleyun.os.widget;
 
 import android.appwidget.AppWidgetProviderInfo;
 import android.content.Context;
 import android.os.Parcel;
 import android.os.Parcelable;
 
-import com.android.colorfulos.ItemInfo;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.LauncherAppWidgetInfo;
-import com.android.colorfulos.LauncherAppWidgetProviderInfo;
-import com.android.colorfulos.util.PendingRequestArgs;
+import com.aoleyun.os.ItemInfo;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.LauncherAppWidgetInfo;
+import com.aoleyun.os.LauncherAppWidgetProviderInfo;
+import com.aoleyun.os.util.PendingRequestArgs;
 
 /**
  * Utility class to handle app widget add flow.
diff --git a/src/com/android/colorfulos/widget/WidgetCell.java b/src/com/aoleyun/os/widget/WidgetCell.java
similarity index 94%
rename from src/com/android/colorfulos/widget/WidgetCell.java
rename to src/com/aoleyun/os/widget/WidgetCell.java
index 3a41124..62364b5 100644
--- a/src/com/android/colorfulos/widget/WidgetCell.java
+++ b/src/com/aoleyun/os/widget/WidgetCell.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.widget;
+package com.aoleyun.os.widget;
 
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -30,14 +30,14 @@ import android.view.accessibility.AccessibilityNodeInfo;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.android.colorfulos.BaseActivity;
-import com.android.colorfulos.DeviceProfile;
-import com.android.colorfulos.R;
-import com.android.colorfulos.SimpleOnStylusPressListener;
-import com.android.colorfulos.StylusEventHelper;
-import com.android.colorfulos.WidgetPreviewLoader;
-import com.android.colorfulos.graphics.DrawableFactory;
-import com.android.colorfulos.model.WidgetItem;
+import com.aoleyun.os.BaseActivity;
+import com.aoleyun.os.DeviceProfile;
+import com.aoleyun.os.R;
+import com.aoleyun.os.SimpleOnStylusPressListener;
+import com.aoleyun.os.StylusEventHelper;
+import com.aoleyun.os.WidgetPreviewLoader;
+import com.aoleyun.os.graphics.DrawableFactory;
+import com.aoleyun.os.model.WidgetItem;
 
 /**
  * Represents the individual cell of the widget inside the widget tray. The preview is drawn
diff --git a/src/com/android/colorfulos/widget/WidgetHostViewLoader.java b/src/com/aoleyun/os/widget/WidgetHostViewLoader.java
similarity index 92%
rename from src/com/android/colorfulos/widget/WidgetHostViewLoader.java
rename to src/com/aoleyun/os/widget/WidgetHostViewLoader.java
index 9e8ad4d..02c1a10 100644
--- a/src/com/android/colorfulos/widget/WidgetHostViewLoader.java
+++ b/src/com/aoleyun/os/widget/WidgetHostViewLoader.java
@@ -1,4 +1,4 @@
-package com.android.colorfulos.widget;
+package com.aoleyun.os.widget;
 
 import android.appwidget.AppWidgetHostView;
 import android.appwidget.AppWidgetManager;
@@ -9,15 +9,15 @@ import android.os.Handler;
 import android.util.Log;
 import android.view.View;
 
-import com.android.colorfulos.AppWidgetResizeFrame;
-import com.android.colorfulos.DropTarget;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.LauncherAppWidgetProviderInfo;
-import com.android.colorfulos.compat.AppWidgetManagerCompat;
-import com.android.colorfulos.dragndrop.DragController;
-import com.android.colorfulos.dragndrop.DragLayer;
-import com.android.colorfulos.dragndrop.DragOptions;
-import com.android.colorfulos.util.Thunk;
+import com.aoleyun.os.AppWidgetResizeFrame;
+import com.aoleyun.os.DropTarget;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.LauncherAppWidgetProviderInfo;
+import com.aoleyun.os.compat.AppWidgetManagerCompat;
+import com.aoleyun.os.dragndrop.DragController;
+import com.aoleyun.os.dragndrop.DragLayer;
+import com.aoleyun.os.dragndrop.DragOptions;
+import com.aoleyun.os.util.Thunk;
 
 public class WidgetHostViewLoader implements DragController.DragListener {
     private static final String TAG = "WidgetHostViewLoader";
@@ -28,7 +28,8 @@ public class WidgetHostViewLoader implements DragController.DragListener {
     private Runnable mBindWidgetRunnable = null;
 
     // TODO: technically, this class should not have to know the existence of the launcher.
-    @Thunk Launcher mLauncher;
+    @Thunk
+    Launcher mLauncher;
     @Thunk Handler mHandler;
     @Thunk final View mView;
     @Thunk final PendingAddWidgetInfo mInfo;
diff --git a/src/com/android/colorfulos/widget/WidgetImageView.java b/src/com/aoleyun/os/widget/WidgetImageView.java
similarity index 97%
rename from src/com/android/colorfulos/widget/WidgetImageView.java
rename to src/com/aoleyun/os/widget/WidgetImageView.java
index bd8cdbe..1cf5247 100644
--- a/src/com/android/colorfulos/widget/WidgetImageView.java
+++ b/src/com/aoleyun/os/widget/WidgetImageView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.widget;
+package com.aoleyun.os.widget;
 
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -26,8 +26,8 @@ import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
 import android.view.View;
 
-import com.android.colorfulos.R;
-import com.android.colorfulos.Utilities;
+import com.aoleyun.os.R;
+import com.aoleyun.os.Utilities;
 
 /**
  * View that draws a bitmap horizontally centered. If the image width is greater than the view
diff --git a/src/com/android/colorfulos/widget/WidgetItemComparator.java b/src/com/aoleyun/os/widget/WidgetItemComparator.java
similarity index 95%
rename from src/com/android/colorfulos/widget/WidgetItemComparator.java
rename to src/com/aoleyun/os/widget/WidgetItemComparator.java
index 76b138c..c0ef366 100644
--- a/src/com/android/colorfulos/widget/WidgetItemComparator.java
+++ b/src/com/aoleyun/os/widget/WidgetItemComparator.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.widget;
+package com.aoleyun.os.widget;
 
 import android.os.Process;
 import android.os.UserHandle;
 
-import com.android.colorfulos.model.WidgetItem;
+import com.aoleyun.os.model.WidgetItem;
 
 import java.text.Collator;
 import java.util.Comparator;
diff --git a/src/com/android/colorfulos/widget/WidgetListRowEntry.java b/src/com/aoleyun/os/widget/WidgetListRowEntry.java
similarity index 88%
rename from src/com/android/colorfulos/widget/WidgetListRowEntry.java
rename to src/com/aoleyun/os/widget/WidgetListRowEntry.java
index 701d215..118df47 100644
--- a/src/com/android/colorfulos/widget/WidgetListRowEntry.java
+++ b/src/com/aoleyun/os/widget/WidgetListRowEntry.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.widget;
+package com.aoleyun.os.widget;
 
-import com.android.colorfulos.ItemInfo;
-import com.android.colorfulos.model.PackageItemInfo;
-import com.android.colorfulos.model.WidgetItem;
+import com.aoleyun.os.ItemInfo;
+import com.aoleyun.os.model.PackageItemInfo;
+import com.aoleyun.os.model.WidgetItem;
 
 import java.util.ArrayList;
 
diff --git a/src/com/android/colorfulos/widget/WidgetsBottomSheet.java b/src/com/aoleyun/os/widget/WidgetsBottomSheet.java
similarity index 94%
rename from src/com/android/colorfulos/widget/WidgetsBottomSheet.java
rename to src/com/aoleyun/os/widget/WidgetsBottomSheet.java
index 2d908e6..54106ac 100644
--- a/src/com/android/colorfulos/widget/WidgetsBottomSheet.java
+++ b/src/com/aoleyun/os/widget/WidgetsBottomSheet.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.widget;
+package com.aoleyun.os.widget;
 
 import android.animation.Animator;
 import android.animation.ObjectAnimator;
@@ -32,14 +32,14 @@ import android.widget.TextView;
 
 import androidx.annotation.Nullable;
 
-import com.android.colorfulos.Insettable;
-import com.android.colorfulos.ItemInfo;
-import com.android.colorfulos.LauncherAppState;
-import com.android.colorfulos.R;
-import com.android.colorfulos.ResourceUtils;
-import com.android.colorfulos.anim.Interpolators;
-import com.android.colorfulos.model.WidgetItem;
-import com.android.colorfulos.util.PackageUserKey;
+import com.aoleyun.os.Insettable;
+import com.aoleyun.os.ItemInfo;
+import com.aoleyun.os.LauncherAppState;
+import com.aoleyun.os.R;
+import com.aoleyun.os.ResourceUtils;
+import com.aoleyun.os.anim.Interpolators;
+import com.aoleyun.os.model.WidgetItem;
+import com.aoleyun.os.util.PackageUserKey;
 
 import java.util.List;
 
diff --git a/src/com/android/colorfulos/widget/WidgetsDiffReporter.java b/src/com/aoleyun/os/widget/WidgetsDiffReporter.java
similarity index 96%
rename from src/com/android/colorfulos/widget/WidgetsDiffReporter.java
rename to src/com/aoleyun/os/widget/WidgetsDiffReporter.java
index 73b21ab..372d442 100644
--- a/src/com/android/colorfulos/widget/WidgetsDiffReporter.java
+++ b/src/com/aoleyun/os/widget/WidgetsDiffReporter.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.widget;
+package com.aoleyun.os.widget;
 
 import android.util.Log;
 
-import com.android.colorfulos.icons.IconCache;
-import com.android.colorfulos.model.PackageItemInfo;
-import com.android.colorfulos.widget.WidgetsListAdapter.WidgetListRowEntryComparator;
+import com.aoleyun.os.icons.IconCache;
+import com.aoleyun.os.model.PackageItemInfo;
+import com.aoleyun.os.widget.WidgetsListAdapter.WidgetListRowEntryComparator;
 
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/src/com/android/colorfulos/widget/WidgetsFullSheet.java b/src/com/aoleyun/os/widget/WidgetsFullSheet.java
similarity index 95%
rename from src/com/android/colorfulos/widget/WidgetsFullSheet.java
rename to src/com/aoleyun/os/widget/WidgetsFullSheet.java
index 24f75b6..2b4b675 100644
--- a/src/com/android/colorfulos/widget/WidgetsFullSheet.java
+++ b/src/com/aoleyun/os/widget/WidgetsFullSheet.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.widget;
+package com.aoleyun.os.widget;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -32,13 +32,13 @@ import android.view.animation.AnimationUtils;
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 
-import com.android.colorfulos.Insettable;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.LauncherAppState;
-import com.android.colorfulos.LauncherAppWidgetHost.ProviderChangedListener;
-import com.android.colorfulos.R;
-import com.android.colorfulos.views.RecyclerViewFastScroller;
-import com.android.colorfulos.views.TopRoundedCornerView;
+import com.aoleyun.os.Insettable;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.LauncherAppState;
+import com.aoleyun.os.LauncherAppWidgetHost.ProviderChangedListener;
+import com.aoleyun.os.R;
+import com.aoleyun.os.views.RecyclerViewFastScroller;
+import com.aoleyun.os.views.TopRoundedCornerView;
 
 /**
  * Popup for showing the full list of available widgets
diff --git a/src/com/android/colorfulos/widget/WidgetsListAdapter.java b/src/com/aoleyun/os/widget/WidgetsListAdapter.java
similarity index 96%
rename from src/com/android/colorfulos/widget/WidgetsListAdapter.java
rename to src/com/aoleyun/os/widget/WidgetsListAdapter.java
index 6fc9559..dc92ddf 100644
--- a/src/com/android/colorfulos/widget/WidgetsListAdapter.java
+++ b/src/com/aoleyun/os/widget/WidgetsListAdapter.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.widget;
+package com.aoleyun.os.widget;
 
 import android.content.Context;
 import android.util.Log;
@@ -23,11 +23,11 @@ import android.view.View.OnClickListener;
 import android.view.View.OnLongClickListener;
 import android.view.ViewGroup;
 
-import com.android.colorfulos.icons.IconCache;
-import com.android.colorfulos.R;
-import com.android.colorfulos.WidgetPreviewLoader;
-import com.android.colorfulos.model.WidgetItem;
-import com.android.colorfulos.util.LabelComparator;
+import com.aoleyun.os.icons.IconCache;
+import com.aoleyun.os.R;
+import com.aoleyun.os.WidgetPreviewLoader;
+import com.aoleyun.os.model.WidgetItem;
+import com.aoleyun.os.util.LabelComparator;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/src/com/android/colorfulos/widget/WidgetsRecyclerView.java b/src/com/aoleyun/os/widget/WidgetsRecyclerView.java
similarity index 97%
rename from src/com/android/colorfulos/widget/WidgetsRecyclerView.java
rename to src/com/aoleyun/os/widget/WidgetsRecyclerView.java
index 8560c49..d94fb0a 100644
--- a/src/com/android/colorfulos/widget/WidgetsRecyclerView.java
+++ b/src/com/aoleyun/os/widget/WidgetsRecyclerView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.widget;
+package com.aoleyun.os.widget;
 
 import android.content.Context;
 import android.graphics.Point;
@@ -22,8 +22,8 @@ import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;
 
-import com.android.colorfulos.BaseRecyclerView;
-import com.android.colorfulos.R;
+import com.aoleyun.os.BaseRecyclerView;
+import com.aoleyun.os.R;
 
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
diff --git a/src/com/android/colorfulos/widget/WidgetsRowViewHolder.java b/src/com/aoleyun/os/widget/WidgetsRowViewHolder.java
similarity index 90%
rename from src/com/android/colorfulos/widget/WidgetsRowViewHolder.java
rename to src/com/aoleyun/os/widget/WidgetsRowViewHolder.java
index 8eda6a1..7efb063 100644
--- a/src/com/android/colorfulos/widget/WidgetsRowViewHolder.java
+++ b/src/com/aoleyun/os/widget/WidgetsRowViewHolder.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.widget;
+package com.aoleyun.os.widget;
 
 import android.view.ViewGroup;
 
-import com.android.colorfulos.BubbleTextView;
-import com.android.colorfulos.R;
+import com.aoleyun.os.BubbleTextView;
+import com.aoleyun.os.R;
 
 import androidx.recyclerview.widget.RecyclerView.ViewHolder;
 
diff --git a/src/com/android/colorfulos/widget/custom/CustomAppWidgetProviderInfo.java b/src/com/aoleyun/os/widget/custom/CustomAppWidgetProviderInfo.java
similarity index 95%
rename from src/com/android/colorfulos/widget/custom/CustomAppWidgetProviderInfo.java
rename to src/com/aoleyun/os/widget/custom/CustomAppWidgetProviderInfo.java
index f185c9a..1ab4006 100644
--- a/src/com/android/colorfulos/widget/custom/CustomAppWidgetProviderInfo.java
+++ b/src/com/aoleyun/os/widget/custom/CustomAppWidgetProviderInfo.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.widget.custom;
+package com.aoleyun.os.widget.custom;
 
 import android.content.ComponentName;
 import android.content.Context;
@@ -22,8 +22,8 @@ import android.content.pm.PackageManager;
 import android.os.Parcel;
 import android.os.Parcelable;
 
-import com.android.colorfulos.LauncherAppWidgetProviderInfo;
-import com.android.colorfulos.Utilities;
+import com.aoleyun.os.LauncherAppWidgetProviderInfo;
+import com.aoleyun.os.Utilities;
 
 /**
  * Custom app widget provider info that can be used as a widget, but provide extra functionality
diff --git a/src/com/android/colorfulos/widget/custom/CustomWidgetParser.java b/src/com/aoleyun/os/widget/custom/CustomWidgetParser.java
similarity index 95%
rename from src/com/android/colorfulos/widget/custom/CustomWidgetParser.java
rename to src/com/aoleyun/os/widget/custom/CustomWidgetParser.java
index 1b011ff..0dc438c 100644
--- a/src/com/android/colorfulos/widget/custom/CustomWidgetParser.java
+++ b/src/com/aoleyun/os/widget/custom/CustomWidgetParser.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.widget.custom;
+package com.aoleyun.os.widget.custom;
 
 import android.appwidget.AppWidgetManager;
 import android.appwidget.AppWidgetProviderInfo;
@@ -26,9 +26,9 @@ import android.os.Process;
 import android.util.SparseArray;
 import android.util.Xml;
 
-import com.android.colorfulos.LauncherAppWidgetInfo;
-import com.android.colorfulos.LauncherAppWidgetProviderInfo;
-import com.android.colorfulos.R;
+import com.aoleyun.os.LauncherAppWidgetInfo;
+import com.aoleyun.os.LauncherAppWidgetProviderInfo;
+import com.aoleyun.os.R;
 
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
@@ -37,7 +37,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.android.colorfulos.LauncherAppWidgetProviderInfo.CLS_CUSTOM_WIDGET_PREFIX;
+import static com.aoleyun.os.LauncherAppWidgetProviderInfo.CLS_CUSTOM_WIDGET_PREFIX;
 
 /**
  * Utility class to parse {@ink CustomAppWidgetProviderInfo} definitions from xml
diff --git a/src_build_config/BuildConfig.java b/src_build_config/BuildConfig.java
index 5a677fa..9dc2238 100644
--- a/src_build_config/BuildConfig.java
+++ b/src_build_config/BuildConfig.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos;
+package com.aoleyun.os;
 
 public final class BuildConfig {
   public static final String APPLICATION_ID = "com.android.uiuios";
diff --git a/src_flags/com/android/launcher3/config/FeatureFlags.java b/src_flags/com/aoleyun/os/config/FeatureFlags.java
similarity index 95%
rename from src_flags/com/android/launcher3/config/FeatureFlags.java
rename to src_flags/com/aoleyun/os/config/FeatureFlags.java
index 886d649..55df957 100644
--- a/src_flags/com/android/launcher3/config/FeatureFlags.java
+++ b/src_flags/com/aoleyun/os/config/FeatureFlags.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.config;
+package com.aoleyun.os.config;
 
 /**
  * Defines a set of flags used to control various launcher behaviors
diff --git a/src_plugins/com/android/systemui/plugins/AllAppsRow.java b/src_plugins/com/aoleyun/systemui/plugins/AllAppsRow.java
similarity index 95%
rename from src_plugins/com/android/systemui/plugins/AllAppsRow.java
rename to src_plugins/com/aoleyun/systemui/plugins/AllAppsRow.java
index c003fc1..d079a1e 100644
--- a/src_plugins/com/android/systemui/plugins/AllAppsRow.java
+++ b/src_plugins/com/aoleyun/systemui/plugins/AllAppsRow.java
@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.systemui.plugins;
+package com.aoleyun.systemui.plugins;
 
 import android.view.View;
 import android.view.ViewGroup;
 
+import com.android.systemui.plugins.Plugin;
 import com.android.systemui.plugins.annotations.ProvidesInterface;
 
 /**
diff --git a/src_plugins/com/android/systemui/plugins/FirstScreenWidget.java b/src_plugins/com/aoleyun/systemui/plugins/FirstScreenWidget.java
similarity index 85%
rename from src_plugins/com/android/systemui/plugins/FirstScreenWidget.java
rename to src_plugins/com/aoleyun/systemui/plugins/FirstScreenWidget.java
index 8d7dd4b..e95f85c 100644
--- a/src_plugins/com/android/systemui/plugins/FirstScreenWidget.java
+++ b/src_plugins/com/aoleyun/systemui/plugins/FirstScreenWidget.java
@@ -1,6 +1,8 @@
-package com.android.systemui.plugins;
+package com.aoleyun.systemui.plugins;
 
 import android.view.ViewGroup;
+
+import com.android.systemui.plugins.Plugin;
 import com.android.systemui.plugins.annotations.ProvidesInterface;
 
 /**
diff --git a/src_shortcuts_overrides/com/android/launcher3/model/LoaderResults.java b/src_shortcuts_overrides/com/aoleyun/os/model/LoaderResults.java
similarity index 81%
rename from src_shortcuts_overrides/com/android/launcher3/model/LoaderResults.java
rename to src_shortcuts_overrides/com/aoleyun/os/model/LoaderResults.java
index 972a822..0627e3c 100644
--- a/src_shortcuts_overrides/com/android/launcher3/model/LoaderResults.java
+++ b/src_shortcuts_overrides/com/aoleyun/os/model/LoaderResults.java
@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.model;
+package com.aoleyun.os.model;
 
-import com.android.colorfulos.AllAppsList;
-import com.android.colorfulos.LauncherAppState;
-import com.android.colorfulos.LauncherModel.Callbacks;
-import com.android.colorfulos.util.ComponentKey;
-import com.android.colorfulos.widget.WidgetListRowEntry;
+import com.aoleyun.os.AllAppsList;
+import com.aoleyun.os.LauncherAppState;
+import com.aoleyun.os.LauncherModel.Callbacks;
+import com.aoleyun.os.util.ComponentKey;
+import com.aoleyun.os.widget.WidgetListRowEntry;
 
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.HashMap;
 
 /**
- * Helper class to handle results of {@link com.android.colorfulos.model.LoaderTask}.
+ * Helper class to handle results of {@link LoaderTask}.
  */
 public class LoaderResults extends BaseLoaderResults {
 
diff --git a/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java b/src_shortcuts_overrides/com/aoleyun/os/model/WidgetsModel.java
similarity index 89%
rename from src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java
rename to src_shortcuts_overrides/com/aoleyun/os/model/WidgetsModel.java
index 530baca..7e0da41 100644
--- a/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java
+++ b/src_shortcuts_overrides/com/aoleyun/os/model/WidgetsModel.java
@@ -1,5 +1,5 @@
 
-package com.android.colorfulos.model;
+package com.aoleyun.os.model;
 
 import static android.appwidget.AppWidgetProviderInfo.WIDGET_FEATURE_HIDE_FROM_PICKER;
 
@@ -10,23 +10,25 @@ import android.os.Process;
 import android.os.UserHandle;
 import android.util.Log;
 
-import com.android.colorfulos.AppFilter;
-import com.android.colorfulos.icons.ComponentWithLabel;
-import com.android.colorfulos.icons.IconCache;
-import com.android.colorfulos.InvariantDeviceProfile;
-import com.android.colorfulos.LauncherAppState;
-import com.android.colorfulos.LauncherAppWidgetProviderInfo;
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.compat.AlphabeticIndexCompat;
-import com.android.colorfulos.compat.AppWidgetManagerCompat;
-import com.android.colorfulos.compat.LauncherAppsCompat;
-import com.android.colorfulos.compat.ShortcutConfigActivityInfo;
-import com.android.colorfulos.config.FeatureFlags;
-import com.android.colorfulos.util.MultiHashMap;
-import com.android.colorfulos.util.PackageUserKey;
-import com.android.colorfulos.util.Preconditions;
-import com.android.colorfulos.widget.WidgetItemComparator;
-import com.android.colorfulos.widget.WidgetListRowEntry;
+import com.aoleyun.os.AppFilter;
+import com.aoleyun.os.icons.ComponentWithLabel;
+import com.aoleyun.os.icons.IconCache;
+import com.aoleyun.os.InvariantDeviceProfile;
+import com.aoleyun.os.LauncherAppState;
+import com.aoleyun.os.LauncherAppWidgetProviderInfo;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.compat.AlphabeticIndexCompat;
+import com.aoleyun.os.compat.AppWidgetManagerCompat;
+import com.aoleyun.os.compat.LauncherAppsCompat;
+import com.aoleyun.os.compat.ShortcutConfigActivityInfo;
+import com.aoleyun.os.widget.WidgetsDiffReporter;
+import com.aoleyun.os.config.FeatureFlags;
+import com.aoleyun.os.util.MultiHashMap;
+import com.aoleyun.os.util.PackageUserKey;
+import com.aoleyun.os.util.Preconditions;
+import com.aoleyun.os.widget.WidgetItemComparator;
+import com.aoleyun.os.widget.WidgetListRowEntry;
+import com.aoleyun.os.widget.WidgetsListAdapter;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -58,9 +60,9 @@ public class WidgetsModel {
      * 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.colorfulos.widget.WidgetsDiffReporter}
+     * {@link WidgetsDiffReporter}
      *
-     * @see com.android.colorfulos.widget.WidgetsListAdapter#setWidgets(ArrayList)
+     * @see WidgetsListAdapter#setWidgets(ArrayList)
      */
     public synchronized ArrayList<WidgetListRowEntry> getWidgetsList(Context context) {
         ArrayList<WidgetListRowEntry> result = new ArrayList<>();
diff --git a/src_shortcuts_overrides/com/android/launcher3/shortcuts/DeepShortcutManager.java b/src_shortcuts_overrides/com/aoleyun/os/shortcuts/DeepShortcutManager.java
similarity index 97%
rename from src_shortcuts_overrides/com/android/launcher3/shortcuts/DeepShortcutManager.java
rename to src_shortcuts_overrides/com/aoleyun/os/shortcuts/DeepShortcutManager.java
index 0bf3595..70fe315 100644
--- a/src_shortcuts_overrides/com/android/launcher3/shortcuts/DeepShortcutManager.java
+++ b/src_shortcuts_overrides/com/aoleyun/os/shortcuts/DeepShortcutManager.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.shortcuts;
+package com.aoleyun.os.shortcuts;
 
 import android.content.ComponentName;
 import android.content.Context;
@@ -27,9 +27,9 @@ import android.os.Bundle;
 import android.os.UserHandle;
 import android.util.Log;
 
-import com.android.colorfulos.ItemInfo;
-import com.android.colorfulos.LauncherSettings;
-import com.android.colorfulos.WorkspaceItemInfo;
+import com.aoleyun.os.ItemInfo;
+import com.aoleyun.os.LauncherSettings;
+import com.aoleyun.os.WorkspaceItemInfo;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/src_ui_overrides/com/android/colorfulos/uioverrides/AllAppsSwipeController.java b/src_ui_overrides/com/aoleyun/os/uioverrides/AllAppsSwipeController.java
similarity index 82%
rename from src_ui_overrides/com/android/colorfulos/uioverrides/AllAppsSwipeController.java
rename to src_ui_overrides/com/aoleyun/os/uioverrides/AllAppsSwipeController.java
index bee0e35..443161d 100644
--- a/src_ui_overrides/com/android/colorfulos/uioverrides/AllAppsSwipeController.java
+++ b/src_ui_overrides/com/aoleyun/os/uioverrides/AllAppsSwipeController.java
@@ -1,16 +1,16 @@
-package com.android.colorfulos.uioverrides;
+package com.aoleyun.os.uioverrides;
 
-import static com.android.colorfulos.LauncherState.ALL_APPS;
-import static com.android.colorfulos.LauncherState.NORMAL;
+import static com.aoleyun.os.LauncherState.ALL_APPS;
+import static com.aoleyun.os.LauncherState.NORMAL;
 
 import android.view.MotionEvent;
 
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.LauncherState;
-import com.android.colorfulos.LauncherStateManager.AnimationComponents;
-import com.android.colorfulos.touch.AbstractStateChangeTouchController;
-import com.android.colorfulos.touch.SwipeDetector;
-import com.android.colorfulos.userevent.nano.LauncherLogProto.ContainerType;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.LauncherState;
+import com.aoleyun.os.LauncherStateManager.AnimationComponents;
+import com.aoleyun.os.touch.AbstractStateChangeTouchController;
+import com.aoleyun.os.touch.SwipeDetector;
+import com.aoleyun.os.userevent.nano.LauncherLogProto.ContainerType;
 
 /**
  * TouchController to switch between NORMAL and ALL_APPS state.
diff --git a/src_ui_overrides/com/android/colorfulos/uioverrides/DisplayRotationListener.java b/src_ui_overrides/com/aoleyun/os/uioverrides/DisplayRotationListener.java
similarity index 96%
rename from src_ui_overrides/com/android/colorfulos/uioverrides/DisplayRotationListener.java
rename to src_ui_overrides/com/aoleyun/os/uioverrides/DisplayRotationListener.java
index d4ec90e..d985279 100644
--- a/src_ui_overrides/com/android/colorfulos/uioverrides/DisplayRotationListener.java
+++ b/src_ui_overrides/com/aoleyun/os/uioverrides/DisplayRotationListener.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.uioverrides;
+package com.aoleyun.os.uioverrides;
 
 import android.content.Context;
 import android.view.OrientationEventListener;
diff --git a/src_ui_overrides/com/android/colorfulos/uioverrides/UiFactory.java b/src_ui_overrides/com/aoleyun/os/uioverrides/UiFactory.java
similarity index 89%
rename from src_ui_overrides/com/android/colorfulos/uioverrides/UiFactory.java
rename to src_ui_overrides/com/aoleyun/os/uioverrides/UiFactory.java
index e6b4564..95b0d7a 100644
--- a/src_ui_overrides/com/android/colorfulos/uioverrides/UiFactory.java
+++ b/src_ui_overrides/com/aoleyun/os/uioverrides/UiFactory.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.uioverrides;
+package com.aoleyun.os.uioverrides;
 
 import android.app.Activity;
 import android.content.Context;
@@ -23,12 +23,12 @@ import android.content.IntentSender;
 import android.os.Bundle;
 import android.os.CancellationSignal;
 
-import com.android.colorfulos.DeviceProfile;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.LauncherState.ScaleAndTranslation;
-import com.android.colorfulos.LauncherStateManager.StateHandler;
-import com.android.colorfulos.graphics.RotationMode;
-import com.android.colorfulos.util.TouchController;
+import com.aoleyun.os.DeviceProfile;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.LauncherState.ScaleAndTranslation;
+import com.aoleyun.os.LauncherStateManager.StateHandler;
+import com.aoleyun.os.graphics.RotationMode;
+import com.aoleyun.os.util.TouchController;
 
 import java.io.PrintWriter;
 
diff --git a/src_ui_overrides/com/android/colorfulos/uioverrides/WallpaperColorInfo.java b/src_ui_overrides/com/aoleyun/os/uioverrides/WallpaperColorInfo.java
similarity index 94%
rename from src_ui_overrides/com/android/colorfulos/uioverrides/WallpaperColorInfo.java
rename to src_ui_overrides/com/aoleyun/os/uioverrides/WallpaperColorInfo.java
index ad566cf..dd3cbdb 100644
--- a/src_ui_overrides/com/android/colorfulos/uioverrides/WallpaperColorInfo.java
+++ b/src_ui_overrides/com/aoleyun/os/uioverrides/WallpaperColorInfo.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.uioverrides;
+package com.aoleyun.os.uioverrides;
 
 import android.content.Context;
 import android.graphics.Color;
 import android.util.Pair;
 
-import com.android.colorfulos.uioverrides.dynamicui.WallpaperColorsCompat;
-import com.android.colorfulos.uioverrides.dynamicui.WallpaperManagerCompat;
-import com.android.colorfulos.uioverrides.dynamicui.ColorExtractionAlgorithm;
+import com.aoleyun.os.uioverrides.dynamicui.WallpaperColorsCompat;
+import com.aoleyun.os.uioverrides.dynamicui.WallpaperManagerCompat;
+import com.aoleyun.os.uioverrides.dynamicui.ColorExtractionAlgorithm;
 
 import java.util.ArrayList;
 
diff --git a/src_ui_overrides/com/android/colorfulos/uioverrides/dynamicui/ColorExtractionAlgorithm.java b/src_ui_overrides/com/aoleyun/os/uioverrides/dynamicui/ColorExtractionAlgorithm.java
similarity index 99%
rename from src_ui_overrides/com/android/colorfulos/uioverrides/dynamicui/ColorExtractionAlgorithm.java
rename to src_ui_overrides/com/aoleyun/os/uioverrides/dynamicui/ColorExtractionAlgorithm.java
index 047f6e3..7099cef 100644
--- a/src_ui_overrides/com/android/colorfulos/uioverrides/dynamicui/ColorExtractionAlgorithm.java
+++ b/src_ui_overrides/com/aoleyun/os/uioverrides/dynamicui/ColorExtractionAlgorithm.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.uioverrides.dynamicui;
+package com.aoleyun.os.uioverrides.dynamicui;
 
 import android.graphics.Color;
 import android.util.Log;
 import android.util.Pair;
 import android.util.Range;
 
-import com.android.colorfulos.Utilities;
+import com.aoleyun.os.Utilities;
 
 import java.util.Arrays;
 import java.util.LinkedList;
diff --git a/src_ui_overrides/com/android/colorfulos/uioverrides/dynamicui/WallpaperColorsCompat.java b/src_ui_overrides/com/aoleyun/os/uioverrides/dynamicui/WallpaperColorsCompat.java
similarity index 96%
rename from src_ui_overrides/com/android/colorfulos/uioverrides/dynamicui/WallpaperColorsCompat.java
rename to src_ui_overrides/com/aoleyun/os/uioverrides/dynamicui/WallpaperColorsCompat.java
index 0be4d1d..cd25049 100644
--- a/src_ui_overrides/com/android/colorfulos/uioverrides/dynamicui/WallpaperColorsCompat.java
+++ b/src_ui_overrides/com/aoleyun/os/uioverrides/dynamicui/WallpaperColorsCompat.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.uioverrides.dynamicui;
+package com.aoleyun.os.uioverrides.dynamicui;
 
 /**
  * A compatibility layer around platform implementation of WallpaperColors
diff --git a/src_ui_overrides/com/android/colorfulos/uioverrides/dynamicui/WallpaperManagerCompat.java b/src_ui_overrides/com/aoleyun/os/uioverrides/dynamicui/WallpaperManagerCompat.java
similarity index 95%
rename from src_ui_overrides/com/android/colorfulos/uioverrides/dynamicui/WallpaperManagerCompat.java
rename to src_ui_overrides/com/aoleyun/os/uioverrides/dynamicui/WallpaperManagerCompat.java
index 5b0dd0d..3e26733 100644
--- a/src_ui_overrides/com/android/colorfulos/uioverrides/dynamicui/WallpaperManagerCompat.java
+++ b/src_ui_overrides/com/aoleyun/os/uioverrides/dynamicui/WallpaperManagerCompat.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.uioverrides.dynamicui;
+package com.aoleyun.os.uioverrides.dynamicui;
 
 import android.content.Context;
 
-import com.android.colorfulos.Utilities;
+import com.aoleyun.os.Utilities;
 
 import androidx.annotation.Nullable;
 
diff --git a/src_ui_overrides/com/android/colorfulos/uioverrides/dynamicui/WallpaperManagerCompatVL.java b/src_ui_overrides/com/aoleyun/os/uioverrides/dynamicui/WallpaperManagerCompatVL.java
similarity index 97%
rename from src_ui_overrides/com/android/colorfulos/uioverrides/dynamicui/WallpaperManagerCompatVL.java
rename to src_ui_overrides/com/aoleyun/os/uioverrides/dynamicui/WallpaperManagerCompatVL.java
index 831f679..7abd088 100644
--- a/src_ui_overrides/com/android/colorfulos/uioverrides/dynamicui/WallpaperManagerCompatVL.java
+++ b/src_ui_overrides/com/aoleyun/os/uioverrides/dynamicui/WallpaperManagerCompatVL.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.uioverrides.dynamicui;
+package com.aoleyun.os.uioverrides.dynamicui;
 
 import static android.app.WallpaperManager.FLAG_SYSTEM;
 
-import static com.android.colorfulos.Utilities.getDevicePrefs;
+import static com.aoleyun.os.Utilities.getDevicePrefs;
 
 import android.app.WallpaperInfo;
 import android.app.WallpaperManager;
@@ -44,7 +44,7 @@ import android.os.ParcelFileDescriptor;
 import android.util.Log;
 import android.util.Pair;
 
-import com.android.colorfulos.icons.ColorExtractor;
+import com.aoleyun.os.icons.ColorExtractor;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -58,7 +58,7 @@ public class WallpaperManagerCompatVL extends WallpaperManagerCompat {
     private static final String VERSION_PREFIX = "1,";
     private static final String KEY_COLORS = "wallpaper_parsed_colors";
     private static final String ACTION_EXTRACTION_COMPLETE =
-            "com.android.colorfulos.uioverrides.dynamicui.WallpaperManagerCompatVL.EXTRACTION_COMPLETE";
+            "com.aoleyun.os.uioverrides.dynamicui.WallpaperManagerCompatVL.EXTRACTION_COMPLETE";
 
     public static final int WALLPAPER_COMPAT_JOB_ID = 1;
 
diff --git a/src_ui_overrides/com/android/colorfulos/uioverrides/dynamicui/WallpaperManagerCompatVOMR1.java b/src_ui_overrides/com/aoleyun/os/uioverrides/dynamicui/WallpaperManagerCompatVOMR1.java
similarity index 98%
rename from src_ui_overrides/com/android/colorfulos/uioverrides/dynamicui/WallpaperManagerCompatVOMR1.java
rename to src_ui_overrides/com/aoleyun/os/uioverrides/dynamicui/WallpaperManagerCompatVOMR1.java
index 5285ade..824d072 100644
--- a/src_ui_overrides/com/android/colorfulos/uioverrides/dynamicui/WallpaperManagerCompatVOMR1.java
+++ b/src_ui_overrides/com/aoleyun/os/uioverrides/dynamicui/WallpaperManagerCompatVOMR1.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.uioverrides.dynamicui;
+package com.aoleyun.os.uioverrides.dynamicui;
 
 import android.annotation.TargetApi;
 import android.app.WallpaperColors;
diff --git a/src_ui_overrides/com/android/colorfulos/uioverrides/plugins/PluginManagerWrapper.java b/src_ui_overrides/com/aoleyun/os/uioverrides/plugins/PluginManagerWrapper.java
similarity index 94%
rename from src_ui_overrides/com/android/colorfulos/uioverrides/plugins/PluginManagerWrapper.java
rename to src_ui_overrides/com/aoleyun/os/uioverrides/plugins/PluginManagerWrapper.java
index 8bcbb98..5b79ca7 100644
--- a/src_ui_overrides/com/android/colorfulos/uioverrides/plugins/PluginManagerWrapper.java
+++ b/src_ui_overrides/com/aoleyun/os/uioverrides/plugins/PluginManagerWrapper.java
@@ -12,12 +12,12 @@
  * permissions and limitations under the License.
  */
 
-package com.android.colorfulos.uioverrides.plugins;
+package com.aoleyun.os.uioverrides.plugins;
 
 import android.content.ComponentName;
 import android.content.Context;
 
-import com.android.colorfulos.util.MainThreadInitializedObject;
+import com.aoleyun.os.util.MainThreadInitializedObject;
 import com.android.systemui.plugins.Plugin;
 import com.android.systemui.plugins.PluginListener;
 
diff --git a/src_ui_overrides/com/android/colorfulos/uioverrides/states/AllAppsState.java b/src_ui_overrides/com/aoleyun/os/uioverrides/states/AllAppsState.java
similarity index 81%
rename from src_ui_overrides/com/android/colorfulos/uioverrides/states/AllAppsState.java
rename to src_ui_overrides/com/aoleyun/os/uioverrides/states/AllAppsState.java
index 0e74e2d..93aa99e 100644
--- a/src_ui_overrides/com/android/colorfulos/uioverrides/states/AllAppsState.java
+++ b/src_ui_overrides/com/aoleyun/os/uioverrides/states/AllAppsState.java
@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.uioverrides.states;
+package com.aoleyun.os.uioverrides.states;
 
-import static com.android.colorfulos.LauncherAnimUtils.ALL_APPS_TRANSITION_MS;
-import static com.android.colorfulos.allapps.DiscoveryBounce.HOME_BOUNCE_SEEN;
-import static com.android.colorfulos.anim.Interpolators.DEACCEL_2;
+import static com.aoleyun.os.LauncherAnimUtils.ALL_APPS_TRANSITION_MS;
+import static com.aoleyun.os.allapps.DiscoveryBounce.HOME_BOUNCE_SEEN;
+import static com.aoleyun.os.anim.Interpolators.DEACCEL_2;
 
-import com.android.colorfulos.AbstractFloatingView;
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.LauncherState;
-import com.android.colorfulos.R;
-import com.android.colorfulos.userevent.nano.LauncherLogProto.ContainerType;
+import com.aoleyun.os.AbstractFloatingView;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.LauncherState;
+import com.aoleyun.os.R;
+import com.aoleyun.os.userevent.nano.LauncherLogProto.ContainerType;
 
 /**
  * Definition for AllApps state
diff --git a/src_ui_overrides/com/android/colorfulos/uioverrides/states/OverviewState.java b/src_ui_overrides/com/aoleyun/os/uioverrides/states/OverviewState.java
similarity index 82%
rename from src_ui_overrides/com/android/colorfulos/uioverrides/states/OverviewState.java
rename to src_ui_overrides/com/aoleyun/os/uioverrides/states/OverviewState.java
index a0c9ac5..3d40bf6 100644
--- a/src_ui_overrides/com/android/colorfulos/uioverrides/states/OverviewState.java
+++ b/src_ui_overrides/com/aoleyun/os/uioverrides/states/OverviewState.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.uioverrides.states;
+package com.aoleyun.os.uioverrides.states;
 
-import static com.android.colorfulos.LauncherAnimUtils.OVERVIEW_TRANSITION_MS;
+import static com.aoleyun.os.LauncherAnimUtils.OVERVIEW_TRANSITION_MS;
 
-import com.android.colorfulos.LauncherState;
-import com.android.colorfulos.userevent.nano.LauncherLogProto.ContainerType;
+import com.aoleyun.os.LauncherState;
+import com.aoleyun.os.userevent.nano.LauncherLogProto.ContainerType;
 
 /**
  * Definition for overview state
diff --git a/tests/AndroidManifest-common.xml b/tests/AndroidManifest-common.xml
index a21766b..fd7e6c1 100644
--- a/tests/AndroidManifest-common.xml
+++ b/tests/AndroidManifest-common.xml
@@ -16,7 +16,7 @@
 
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.colorfulos.tests">
+    package="com.aoleyun.os.tests">
 
     <uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES"/>
 
@@ -24,7 +24,7 @@
         <uses-library android:name="android.test.runner"/>
 
         <receiver
-            android:name="com.android.colorfulos.testcomponent.AppWidgetNoConfig"
+            android:name="com.aoleyun.os.testcomponent.AppWidgetNoConfig"
             android:label="No Config">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
@@ -34,7 +34,7 @@
         </receiver>
 
         <receiver
-            android:name="com.android.colorfulos.testcomponent.AppWdigetHidden"
+            android:name="com.aoleyun.os.testcomponent.AppWdigetHidden"
             android:label="Hidden widget">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
@@ -44,7 +44,7 @@
         </receiver>
 
         <receiver
-            android:name="com.android.colorfulos.testcomponent.AppWidgetWithConfig"
+            android:name="com.aoleyun.os.testcomponent.AppWidgetWithConfig"
             android:label="With Config">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
@@ -54,13 +54,13 @@
         </receiver>
 
         <activity
-            android:name="com.android.colorfulos.testcomponent.WidgetConfigActivity">
+            android:name="com.aoleyun.os.testcomponent.WidgetConfigActivity">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE"/>
             </intent-filter>
         </activity>
         <activity
-            android:name="com.android.colorfulos.testcomponent.RequestPinItemActivity"
+            android:name="com.aoleyun.os.testcomponent.RequestPinItemActivity"
             android:icon="@drawable/test_drawable_pin_item"
             android:label="Test Pin Item">
             <intent-filter>
@@ -71,12 +71,12 @@
         </activity>
 
         <provider
-            android:name="com.android.colorfulos.testcomponent.TestCommandReceiver"
+            android:name="com.aoleyun.os.testcomponent.TestCommandReceiver"
             android:authorities="${packageName}.commands"
             android:exported="true"/>
 
         <activity
-            android:name="com.android.colorfulos.testcomponent.TestLauncherActivity"
+            android:name="com.aoleyun.os.testcomponent.TestLauncherActivity"
             android:clearTaskOnLaunch="true"
             android:configChanges="keyboard|keyboardHidden|mcc|mnc|navigation|orientation|screenSize|screenLayout|smallestScreenSize"
             android:enabled="false"
@@ -98,15 +98,15 @@
             </intent-filter>
         </activity>
         <activity
-            android:name="com.android.colorfulos.testcomponent.BaseTestingActivity"
+            android:name="com.aoleyun.os.testcomponent.BaseTestingActivity"
             android:label="LauncherTestApp"
-            android:taskAffinity="com.android.colorfulos.testcomponent.Affinity1">
+            android:taskAffinity="com.aoleyun.os.testcomponent.Affinity1">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
             <intent-filter>
-                <action android:name="com.android.colorfulos.intent.action.test_shortcut"/>
+                <action android:name="com.aoleyun.os.intent.action.test_shortcut"/>
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
             <meta-data android:name="android.app.shortcuts"
@@ -114,7 +114,7 @@
         </activity>
         <activity-alias android:name="Activity2"
                         android:label="TestActivity2"
-                        android:targetActivity="com.android.colorfulos.testcomponent.BaseTestingActivity">
+                        android:targetActivity="com.aoleyun.os.testcomponent.BaseTestingActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
@@ -122,7 +122,7 @@
         </activity-alias>
         <activity-alias android:name="Activity3"
                         android:label="TestActivity3"
-                        android:targetActivity="com.android.colorfulos.testcomponent.BaseTestingActivity">
+                        android:targetActivity="com.aoleyun.os.testcomponent.BaseTestingActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
@@ -130,7 +130,7 @@
         </activity-alias>
         <activity-alias android:name="Activity4"
                         android:label="TestActivity4"
-                        android:targetActivity="com.android.colorfulos.testcomponent.BaseTestingActivity">
+                        android:targetActivity="com.aoleyun.os.testcomponent.BaseTestingActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
@@ -138,7 +138,7 @@
         </activity-alias>
         <activity-alias android:name="Activity5"
                         android:label="TestActivity5"
-                        android:targetActivity="com.android.colorfulos.testcomponent.BaseTestingActivity">
+                        android:targetActivity="com.aoleyun.os.testcomponent.BaseTestingActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
@@ -146,7 +146,7 @@
         </activity-alias>
         <activity-alias android:name="Activity6"
                         android:label="TestActivity6"
-                        android:targetActivity="com.android.colorfulos.testcomponent.BaseTestingActivity">
+                        android:targetActivity="com.aoleyun.os.testcomponent.BaseTestingActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
@@ -154,7 +154,7 @@
         </activity-alias>
         <activity-alias android:name="Activity7"
                         android:label="TestActivity7"
-                        android:targetActivity="com.android.colorfulos.testcomponent.BaseTestingActivity">
+                        android:targetActivity="com.aoleyun.os.testcomponent.BaseTestingActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
@@ -162,7 +162,7 @@
         </activity-alias>
         <activity-alias android:name="Activity8"
                         android:label="TestActivity8"
-                        android:targetActivity="com.android.colorfulos.testcomponent.BaseTestingActivity">
+                        android:targetActivity="com.aoleyun.os.testcomponent.BaseTestingActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
@@ -170,7 +170,7 @@
         </activity-alias>
         <activity-alias android:name="Activity9"
                         android:label="TestActivity9"
-                        android:targetActivity="com.android.colorfulos.testcomponent.BaseTestingActivity">
+                        android:targetActivity="com.aoleyun.os.testcomponent.BaseTestingActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
@@ -178,7 +178,7 @@
         </activity-alias>
         <activity-alias android:name="Activity10"
                         android:label="TestActivity10"
-                        android:targetActivity="com.android.colorfulos.testcomponent.BaseTestingActivity">
+                        android:targetActivity="com.aoleyun.os.testcomponent.BaseTestingActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
@@ -186,7 +186,7 @@
         </activity-alias>
         <activity-alias android:name="Activity11"
                         android:label="TestActivity11"
-                        android:targetActivity="com.android.colorfulos.testcomponent.BaseTestingActivity">
+                        android:targetActivity="com.aoleyun.os.testcomponent.BaseTestingActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index 8992ee1..a112800 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -16,7 +16,7 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.android.colorfulos.tests">
+    package="com.aoleyun.os.tests">
 
     <uses-sdk android:targetSdkVersion="28" android:minSdkVersion="25"
               tools:overrideLibrary="android.support.test.uiautomator.v18"/>
@@ -29,6 +29,6 @@
         android:functionalTest="false"
         android:handleProfiling="false"
         android:name="androidx.test.runner.AndroidJUnitRunner"
-        android:targetPackage="com.android.colorfulos" >
+        android:targetPackage="com.aoleyun.os" >
     </instrumentation>
 </manifest>
diff --git a/tests/res/xml/appwidget_with_config.xml b/tests/res/xml/appwidget_with_config.xml
index 68caf9a..fbc0bf9 100644
--- a/tests/res/xml/appwidget_with_config.xml
+++ b/tests/res/xml/appwidget_with_config.xml
@@ -5,7 +5,7 @@
     android:minHeight="110dp"
     android:updatePeriodMillis="86400000"
     android:initialLayout="@layout/test_layout_appwidget_blue"
-    android:configure="com.android.colorfulos.testcomponent.WidgetConfigActivity"
+    android:configure="com.aoleyun.os.testcomponent.WidgetConfigActivity"
     android:resizeMode="horizontal|vertical"
     android:widgetFeatures="reconfigurable"
     android:widgetCategory="home_screen">
diff --git a/tests/res/xml/shortcuts.xml b/tests/res/xml/shortcuts.xml
index af789f3..ea77594 100644
--- a/tests/res/xml/shortcuts.xml
+++ b/tests/res/xml/shortcuts.xml
@@ -3,16 +3,16 @@
     <shortcut
         android:shortcutId="shortcut1"
         android:shortcutShortLabel="@string/shortcut1">
-        <intent android:action="com.android.colorfulos.intent.action.test_shortcut"/>
+        <intent android:action="com.aoleyun.os.intent.action.test_shortcut"/>
     </shortcut>
     <shortcut
         android:shortcutId="shortcut2"
         android:shortcutShortLabel="@string/shortcut2">
-        <intent android:action="com.android.colorfulos.intent.action.test_shortcut"/>
+        <intent android:action="com.aoleyun.os.intent.action.test_shortcut"/>
     </shortcut>
     <shortcut
         android:shortcutId="shortcut3"
         android:shortcutShortLabel="@string/shortcut3">
-        <intent android:action="com.android.colorfulos.intent.action.test_shortcut"/>
+        <intent android:action="com.aoleyun.os.intent.action.test_shortcut"/>
     </shortcut>
 </shortcuts>
diff --git a/tests/src/com/android/colorfulos/allapps/search/DefaultAppSearchAlgorithmTest.java b/tests/src/com/aoleyun/os/allapps/search/DefaultAppSearchAlgorithmTest.java
similarity index 98%
rename from tests/src/com/android/colorfulos/allapps/search/DefaultAppSearchAlgorithmTest.java
rename to tests/src/com/aoleyun/os/allapps/search/DefaultAppSearchAlgorithmTest.java
index 22666be..8bbe385 100644
--- a/tests/src/com/android/colorfulos/allapps/search/DefaultAppSearchAlgorithmTest.java
+++ b/tests/src/com/aoleyun/os/allapps/search/DefaultAppSearchAlgorithmTest.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.allapps.search;
+package com.aoleyun.os.allapps.search;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import android.content.ComponentName;
 
-import com.android.colorfulos.AppInfo;
+import com.aoleyun.os.AppInfo;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/tests/src/com/android/colorfulos/model/LoaderCursorTest.java b/tests/src/com/aoleyun/os/model/LoaderCursorTest.java
similarity index 79%
rename from tests/src/com/android/colorfulos/model/LoaderCursorTest.java
rename to tests/src/com/aoleyun/os/model/LoaderCursorTest.java
index f23be78..d49e8c2 100644
--- a/tests/src/com/android/colorfulos/model/LoaderCursorTest.java
+++ b/tests/src/com/aoleyun/os/model/LoaderCursorTest.java
@@ -1,4 +1,4 @@
-package com.android.colorfulos.model;
+package com.aoleyun.os.model;
 
 import android.content.ComponentName;
 import android.content.Context;
@@ -10,36 +10,36 @@ import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.SmallTest;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.colorfulos.WorkspaceItemInfo;
-import com.android.colorfulos.icons.IconCache;
-import com.android.colorfulos.InvariantDeviceProfile;
-import com.android.colorfulos.ItemInfo;
-import com.android.colorfulos.LauncherAppState;
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.compat.LauncherAppsCompat;
-import com.android.colorfulos.icons.BitmapInfo;
+import com.aoleyun.os.WorkspaceItemInfo;
+import com.aoleyun.os.icons.IconCache;
+import com.aoleyun.os.InvariantDeviceProfile;
+import com.aoleyun.os.ItemInfo;
+import com.aoleyun.os.LauncherAppState;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.compat.LauncherAppsCompat;
+import com.aoleyun.os.icons.BitmapInfo;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import static com.android.colorfulos.LauncherSettings.Favorites.INTENT;
-import static com.android.colorfulos.LauncherSettings.Favorites.CELLX;
-import static com.android.colorfulos.LauncherSettings.Favorites.CELLY;
-import static com.android.colorfulos.LauncherSettings.Favorites.CONTAINER;
-import static com.android.colorfulos.LauncherSettings.Favorites.CONTAINER_DESKTOP;
-import static com.android.colorfulos.LauncherSettings.Favorites.CONTAINER_HOTSEAT;
-import static com.android.colorfulos.LauncherSettings.Favorites.ICON;
-import static com.android.colorfulos.LauncherSettings.Favorites.ICON_PACKAGE;
-import static com.android.colorfulos.LauncherSettings.Favorites.ICON_RESOURCE;
-import static com.android.colorfulos.LauncherSettings.Favorites.ITEM_TYPE;
-import static com.android.colorfulos.LauncherSettings.Favorites.ITEM_TYPE_APPLICATION;
-import static com.android.colorfulos.LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT;
-import static com.android.colorfulos.LauncherSettings.Favorites.PROFILE_ID;
-import static com.android.colorfulos.LauncherSettings.Favorites.RESTORED;
-import static com.android.colorfulos.LauncherSettings.Favorites.SCREEN;
-import static com.android.colorfulos.LauncherSettings.Favorites.TITLE;
-import static com.android.colorfulos.LauncherSettings.Favorites._ID;
+import static com.aoleyun.os.LauncherSettings.Favorites.INTENT;
+import static com.aoleyun.os.LauncherSettings.Favorites.CELLX;
+import static com.aoleyun.os.LauncherSettings.Favorites.CELLY;
+import static com.aoleyun.os.LauncherSettings.Favorites.CONTAINER;
+import static com.aoleyun.os.LauncherSettings.Favorites.CONTAINER_DESKTOP;
+import static com.aoleyun.os.LauncherSettings.Favorites.CONTAINER_HOTSEAT;
+import static com.aoleyun.os.LauncherSettings.Favorites.ICON;
+import static com.aoleyun.os.LauncherSettings.Favorites.ICON_PACKAGE;
+import static com.aoleyun.os.LauncherSettings.Favorites.ICON_RESOURCE;
+import static com.aoleyun.os.LauncherSettings.Favorites.ITEM_TYPE;
+import static com.aoleyun.os.LauncherSettings.Favorites.ITEM_TYPE_APPLICATION;
+import static com.aoleyun.os.LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT;
+import static com.aoleyun.os.LauncherSettings.Favorites.PROFILE_ID;
+import static com.aoleyun.os.LauncherSettings.Favorites.RESTORED;
+import static com.aoleyun.os.LauncherSettings.Favorites.SCREEN;
+import static com.aoleyun.os.LauncherSettings.Favorites.TITLE;
+import static com.aoleyun.os.LauncherSettings.Favorites._ID;
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertFalse;
 import static junit.framework.Assert.assertNotNull;
diff --git a/tests/src/com/android/colorfulos/provider/RestoreDbTaskTest.java b/tests/src/com/aoleyun/os/provider/RestoreDbTaskTest.java
similarity index 95%
rename from tests/src/com/android/colorfulos/provider/RestoreDbTaskTest.java
rename to tests/src/com/aoleyun/os/provider/RestoreDbTaskTest.java
index 888c6fb..07f642b 100644
--- a/tests/src/com/android/colorfulos/provider/RestoreDbTaskTest.java
+++ b/tests/src/com/aoleyun/os/provider/RestoreDbTaskTest.java
@@ -1,4 +1,4 @@
-package com.android.colorfulos.provider;
+package com.aoleyun.os.provider;
 
 import android.content.ContentValues;
 import android.database.Cursor;
@@ -7,8 +7,8 @@ import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.MediumTest;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.colorfulos.LauncherProvider.DatabaseHelper;
-import com.android.colorfulos.LauncherSettings.Favorites;
+import com.aoleyun.os.LauncherProvider.DatabaseHelper;
+import com.aoleyun.os.LauncherSettings.Favorites;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/tests/src/com/android/colorfulos/testcomponent/AppWidgetHidden.java b/tests/src/com/aoleyun/os/testcomponent/AppWidgetHidden.java
similarity index 94%
rename from tests/src/com/android/colorfulos/testcomponent/AppWidgetHidden.java
rename to tests/src/com/aoleyun/os/testcomponent/AppWidgetHidden.java
index 02d350f..a9c8346 100644
--- a/tests/src/com/android/colorfulos/testcomponent/AppWidgetHidden.java
+++ b/tests/src/com/aoleyun/os/testcomponent/AppWidgetHidden.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.android.colorfulos.testcomponent;
+package com.aoleyun.os.testcomponent;
 
 import android.appwidget.AppWidgetProvider;
 
diff --git a/tests/src/com/android/colorfulos/testcomponent/AppWidgetNoConfig.java b/tests/src/com/aoleyun/os/testcomponent/AppWidgetNoConfig.java
similarity index 94%
rename from tests/src/com/android/colorfulos/testcomponent/AppWidgetNoConfig.java
rename to tests/src/com/aoleyun/os/testcomponent/AppWidgetNoConfig.java
index 78bcd50..ab15291 100644
--- a/tests/src/com/android/colorfulos/testcomponent/AppWidgetNoConfig.java
+++ b/tests/src/com/aoleyun/os/testcomponent/AppWidgetNoConfig.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.android.colorfulos.testcomponent;
+package com.aoleyun.os.testcomponent;
 
 import android.appwidget.AppWidgetProvider;
 
diff --git a/tests/src/com/android/colorfulos/testcomponent/AppWidgetWithConfig.java b/tests/src/com/aoleyun/os/testcomponent/AppWidgetWithConfig.java
similarity index 94%
rename from tests/src/com/android/colorfulos/testcomponent/AppWidgetWithConfig.java
rename to tests/src/com/aoleyun/os/testcomponent/AppWidgetWithConfig.java
index 88e9abd..a7bdd51 100644
--- a/tests/src/com/android/colorfulos/testcomponent/AppWidgetWithConfig.java
+++ b/tests/src/com/aoleyun/os/testcomponent/AppWidgetWithConfig.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.android.colorfulos.testcomponent;
+package com.aoleyun.os.testcomponent;
 
 /**
  * A simple app widget with configuration sceen.
diff --git a/tests/src/com/android/colorfulos/testcomponent/BaseTestingActivity.java b/tests/src/com/aoleyun/os/testcomponent/BaseTestingActivity.java
similarity index 98%
rename from tests/src/com/android/colorfulos/testcomponent/BaseTestingActivity.java
rename to tests/src/com/aoleyun/os/testcomponent/BaseTestingActivity.java
index c10bb32..8436d21 100644
--- a/tests/src/com/android/colorfulos/testcomponent/BaseTestingActivity.java
+++ b/tests/src/com/aoleyun/os/testcomponent/BaseTestingActivity.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.android.colorfulos.testcomponent;
+package com.aoleyun.os.testcomponent;
 
 import android.app.Activity;
 import android.content.BroadcastReceiver;
diff --git a/tests/src/com/android/colorfulos/testcomponent/RequestPinItemActivity.java b/tests/src/com/aoleyun/os/testcomponent/RequestPinItemActivity.java
similarity index 98%
rename from tests/src/com/android/colorfulos/testcomponent/RequestPinItemActivity.java
rename to tests/src/com/aoleyun/os/testcomponent/RequestPinItemActivity.java
index 63c5ea1..5f253a9 100644
--- a/tests/src/com/android/colorfulos/testcomponent/RequestPinItemActivity.java
+++ b/tests/src/com/aoleyun/os/testcomponent/RequestPinItemActivity.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.android.colorfulos.testcomponent;
+package com.aoleyun.os.testcomponent;
 
 import android.annotation.TargetApi;
 import android.app.PendingIntent;
diff --git a/tests/src/com/android/colorfulos/testcomponent/TestCommandReceiver.java b/tests/src/com/aoleyun/os/testcomponent/TestCommandReceiver.java
similarity index 99%
rename from tests/src/com/android/colorfulos/testcomponent/TestCommandReceiver.java
rename to tests/src/com/aoleyun/os/testcomponent/TestCommandReceiver.java
index 931d06f..e62396f 100644
--- a/tests/src/com/android/colorfulos/testcomponent/TestCommandReceiver.java
+++ b/tests/src/com/aoleyun/os/testcomponent/TestCommandReceiver.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.android.colorfulos.testcomponent;
+package com.aoleyun.os.testcomponent;
 
 import static android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_DISABLED;
 import static android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_ENABLED;
diff --git a/tests/src/com/android/colorfulos/testcomponent/TestLauncherActivity.java b/tests/src/com/aoleyun/os/testcomponent/TestLauncherActivity.java
similarity index 96%
rename from tests/src/com/android/colorfulos/testcomponent/TestLauncherActivity.java
rename to tests/src/com/aoleyun/os/testcomponent/TestLauncherActivity.java
index b1e4533..8aa2499 100644
--- a/tests/src/com/android/colorfulos/testcomponent/TestLauncherActivity.java
+++ b/tests/src/com/aoleyun/os/testcomponent/TestLauncherActivity.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.android.colorfulos.testcomponent;
+package com.aoleyun.os.testcomponent;
 
 import static android.content.Intent.ACTION_MAIN;
 import static android.content.Intent.CATEGORY_LAUNCHER;
diff --git a/tests/src/com/android/colorfulos/testcomponent/TouchEventGenerator.java b/tests/src/com/aoleyun/os/testcomponent/TouchEventGenerator.java
similarity index 99%
rename from tests/src/com/android/colorfulos/testcomponent/TouchEventGenerator.java
rename to tests/src/com/aoleyun/os/testcomponent/TouchEventGenerator.java
index cfbcea0..717b091 100644
--- a/tests/src/com/android/colorfulos/testcomponent/TouchEventGenerator.java
+++ b/tests/src/com/aoleyun/os/testcomponent/TouchEventGenerator.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.testcomponent;
+package com.aoleyun.os.testcomponent;
 
 import android.graphics.Point;
 import android.util.Pair;
diff --git a/tests/src/com/android/colorfulos/testcomponent/WidgetConfigActivity.java b/tests/src/com/aoleyun/os/testcomponent/WidgetConfigActivity.java
similarity index 96%
rename from tests/src/com/android/colorfulos/testcomponent/WidgetConfigActivity.java
rename to tests/src/com/aoleyun/os/testcomponent/WidgetConfigActivity.java
index b41460d..b483ea5 100644
--- a/tests/src/com/android/colorfulos/testcomponent/WidgetConfigActivity.java
+++ b/tests/src/com/aoleyun/os/testcomponent/WidgetConfigActivity.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.android.colorfulos.testcomponent;
+package com.aoleyun.os.testcomponent;
 
 import android.os.Bundle;
 
diff --git a/tests/src/com/android/colorfulos/touch/SwipeDetectorTest.java b/tests/src/com/aoleyun/os/touch/SwipeDetectorTest.java
similarity index 98%
rename from tests/src/com/android/colorfulos/touch/SwipeDetectorTest.java
rename to tests/src/com/aoleyun/os/touch/SwipeDetectorTest.java
index 8d9db48..4ae2809 100644
--- a/tests/src/com/android/colorfulos/touch/SwipeDetectorTest.java
+++ b/tests/src/com/aoleyun/os/touch/SwipeDetectorTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.touch;
+package com.aoleyun.os.touch;
 
 import static org.mockito.Matchers.anyBoolean;
 import static org.mockito.Matchers.anyFloat;
@@ -25,7 +25,7 @@ import static org.mockito.Mockito.verify;
 import android.util.Log;
 import android.view.ViewConfiguration;
 
-import com.android.colorfulos.testcomponent.TouchEventGenerator;
+import com.aoleyun.os.testcomponent.TouchEventGenerator;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/src/com/android/colorfulos/ui/AbstractLauncherUiTest.java b/tests/src/com/aoleyun/os/ui/AbstractLauncherUiTest.java
similarity index 92%
rename from tests/src/com/android/colorfulos/ui/AbstractLauncherUiTest.java
rename to tests/src/com/aoleyun/os/ui/AbstractLauncherUiTest.java
index 5de1663..35a4c37 100644
--- a/tests/src/com/android/colorfulos/ui/AbstractLauncherUiTest.java
+++ b/tests/src/com/aoleyun/os/ui/AbstractLauncherUiTest.java
@@ -13,12 +13,10 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.android.colorfulos.ui;
+package com.aoleyun.os.ui;
 
 import static androidx.test.InstrumentationRegistry.getInstrumentation;
 
-import static com.android.colorfulos.ui.TaplTestsLauncher3.getAppPackageName;
-
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
@@ -44,22 +42,22 @@ import androidx.test.uiautomator.UiDevice;
 import androidx.test.uiautomator.UiObject2;
 import androidx.test.uiautomator.Until;
 
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.LauncherAppState;
-import com.android.colorfulos.LauncherModel;
-import com.android.colorfulos.LauncherSettings;
-import com.android.colorfulos.LauncherState;
-import com.android.colorfulos.MainThreadExecutor;
-import com.android.colorfulos.ResourceUtils;
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.compat.LauncherAppsCompat;
-import com.android.colorfulos.model.AppLaunchTracker;
-import com.android.colorfulos.tapl.LauncherInstrumentation;
-import com.android.colorfulos.tapl.TestHelpers;
-import com.android.colorfulos.util.Wait;
-import com.android.colorfulos.util.rule.FailureWatcher;
-import com.android.colorfulos.util.rule.LauncherActivityRule;
-import com.android.colorfulos.util.rule.ShellCommandRule;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.LauncherAppState;
+import com.aoleyun.os.LauncherModel;
+import com.aoleyun.os.LauncherSettings;
+import com.aoleyun.os.LauncherState;
+import com.aoleyun.os.MainThreadExecutor;
+import com.aoleyun.os.ResourceUtils;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.compat.LauncherAppsCompat;
+import com.aoleyun.os.model.AppLaunchTracker;
+import com.aoleyun.os.tapl.LauncherInstrumentation;
+import com.aoleyun.os.tapl.TestHelpers;
+import com.aoleyun.os.util.Wait;
+import com.aoleyun.os.util.rule.FailureWatcher;
+import com.aoleyun.os.util.rule.LauncherActivityRule;
+import com.aoleyun.os.util.rule.ShellCommandRule;
 
 import org.junit.After;
 import org.junit.Before;
@@ -342,14 +340,14 @@ public abstract class AbstractLauncherUiTest {
     }
 
     protected void startTestActivity(int activityNumber) {
-        final String packageName = getAppPackageName();
+        final String packageName = TaplTestsLauncher3.getAppPackageName();
         final Instrumentation instrumentation = getInstrumentation();
         final Intent intent = instrumentation.getContext().getPackageManager().
                 getLaunchIntentForPackage(packageName);
         intent.addCategory(Intent.CATEGORY_LAUNCHER);
         intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         intent.setComponent(new ComponentName(packageName,
-                "com.android.colorfulos.tests.Activity" + activityNumber));
+                "com.aoleyun.os.tests.Activity" + activityNumber));
         instrumentation.getTargetContext().startActivity(intent);
         assertTrue(packageName + " didn't start",
                 mDevice.wait(
diff --git a/tests/src/com/android/colorfulos/ui/DefaultLayoutProviderTest.java b/tests/src/com/aoleyun/os/ui/DefaultLayoutProviderTest.java
similarity index 94%
rename from tests/src/com/android/colorfulos/ui/DefaultLayoutProviderTest.java
rename to tests/src/com/aoleyun/os/ui/DefaultLayoutProviderTest.java
index 4db007f..e16de27 100644
--- a/tests/src/com/android/colorfulos/ui/DefaultLayoutProviderTest.java
+++ b/tests/src/com/aoleyun/os/ui/DefaultLayoutProviderTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.android.colorfulos.ui;
+package com.aoleyun.os.ui;
 
 import static org.junit.Assert.assertTrue;
 
@@ -29,10 +29,10 @@ import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.MediumTest;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.colorfulos.LauncherAppWidgetProviderInfo;
-import com.android.colorfulos.testcomponent.TestCommandReceiver;
-import com.android.colorfulos.util.LauncherLayoutBuilder;
-import com.android.colorfulos.util.rule.ShellCommandRule;
+import com.aoleyun.os.LauncherAppWidgetProviderInfo;
+import com.aoleyun.os.testcomponent.TestCommandReceiver;
+import com.aoleyun.os.util.LauncherLayoutBuilder;
+import com.aoleyun.os.util.rule.ShellCommandRule;
 
 import org.junit.After;
 import org.junit.Before;
diff --git a/tests/src/com/android/colorfulos/ui/PortraitLandscapeRunner.java b/tests/src/com/aoleyun/os/ui/PortraitLandscapeRunner.java
similarity index 96%
rename from tests/src/com/android/colorfulos/ui/PortraitLandscapeRunner.java
rename to tests/src/com/aoleyun/os/ui/PortraitLandscapeRunner.java
index b357e27..5c7986a 100644
--- a/tests/src/com/android/colorfulos/ui/PortraitLandscapeRunner.java
+++ b/tests/src/com/aoleyun/os/ui/PortraitLandscapeRunner.java
@@ -1,8 +1,8 @@
-package com.android.colorfulos.ui;
+package com.aoleyun.os.ui;
 
 import android.view.Surface;
 
-import com.android.colorfulos.tapl.TestHelpers;
+import com.aoleyun.os.tapl.TestHelpers;
 
 import org.junit.rules.TestRule;
 import org.junit.runner.Description;
diff --git a/tests/src/com/android/colorfulos/ui/TaplTestsLauncher3.java b/tests/src/com/aoleyun/os/ui/TaplTestsLauncher3.java
similarity index 95%
rename from tests/src/com/android/colorfulos/ui/TaplTestsLauncher3.java
rename to tests/src/com/aoleyun/os/ui/TaplTestsLauncher3.java
index 4b33929..b6f4301 100644
--- a/tests/src/com/android/colorfulos/ui/TaplTestsLauncher3.java
+++ b/tests/src/com/aoleyun/os/ui/TaplTestsLauncher3.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.ui;
+package com.aoleyun.os.ui;
 
 import static androidx.test.InstrumentationRegistry.getInstrumentation;
 
@@ -27,18 +27,18 @@ import static org.junit.Assert.assertTrue;
 import androidx.test.filters.LargeTest;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.LauncherState;
-import com.android.colorfulos.popup.ArrowPopup;
-import com.android.colorfulos.tapl.AllApps;
-import com.android.colorfulos.tapl.AppIcon;
-import com.android.colorfulos.tapl.AppIconMenu;
-import com.android.colorfulos.tapl.AppIconMenuItem;
-import com.android.colorfulos.tapl.Widgets;
-import com.android.colorfulos.tapl.Workspace;
-import com.android.colorfulos.views.OptionsPopupView;
-import com.android.colorfulos.widget.WidgetsFullSheet;
-import com.android.colorfulos.widget.WidgetsRecyclerView;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.LauncherState;
+import com.aoleyun.os.popup.ArrowPopup;
+import com.aoleyun.os.tapl.AllApps;
+import com.aoleyun.os.tapl.AppIcon;
+import com.aoleyun.os.tapl.AppIconMenu;
+import com.aoleyun.os.tapl.AppIconMenuItem;
+import com.aoleyun.os.tapl.Widgets;
+import com.aoleyun.os.tapl.Workspace;
+import com.aoleyun.os.views.OptionsPopupView;
+import com.aoleyun.os.widget.WidgetsFullSheet;
+import com.aoleyun.os.widget.WidgetsRecyclerView;
 
 import org.junit.Before;
 import org.junit.Ignore;
diff --git a/tests/src/com/android/colorfulos/ui/TestViewHelpers.java b/tests/src/com/aoleyun/os/ui/TestViewHelpers.java
similarity index 95%
rename from tests/src/com/android/colorfulos/ui/TestViewHelpers.java
rename to tests/src/com/aoleyun/os/ui/TestViewHelpers.java
index ba20403..0e03eb6 100644
--- a/tests/src/com/android/colorfulos/ui/TestViewHelpers.java
+++ b/tests/src/com/aoleyun/os/ui/TestViewHelpers.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.android.colorfulos.ui;
+package com.aoleyun.os.ui;
 
 import static androidx.test.InstrumentationRegistry.getInstrumentation;
 import static androidx.test.InstrumentationRegistry.getTargetContext;
@@ -38,11 +38,11 @@ import androidx.test.uiautomator.UiDevice;
 import androidx.test.uiautomator.UiObject2;
 import androidx.test.uiautomator.Until;
 
-import com.android.colorfulos.LauncherAppWidgetProviderInfo;
-import com.android.colorfulos.R;
-import com.android.colorfulos.compat.AppWidgetManagerCompat;
-import com.android.colorfulos.testcomponent.AppWidgetNoConfig;
-import com.android.colorfulos.testcomponent.AppWidgetWithConfig;
+import com.aoleyun.os.LauncherAppWidgetProviderInfo;
+import com.aoleyun.os.R;
+import com.aoleyun.os.compat.AppWidgetManagerCompat;
+import com.aoleyun.os.testcomponent.AppWidgetNoConfig;
+import com.aoleyun.os.testcomponent.AppWidgetWithConfig;
 
 import java.util.concurrent.Callable;
 import java.util.function.Function;
diff --git a/tests/src/com/android/colorfulos/ui/WorkTabTest.java b/tests/src/com/aoleyun/os/ui/WorkTabTest.java
similarity index 95%
rename from tests/src/com/android/colorfulos/ui/WorkTabTest.java
rename to tests/src/com/aoleyun/os/ui/WorkTabTest.java
index f657189..3249d26 100644
--- a/tests/src/com/android/colorfulos/ui/WorkTabTest.java
+++ b/tests/src/com/aoleyun/os/ui/WorkTabTest.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.ui;
+package com.aoleyun.os.ui;
 
-import static com.android.colorfulos.LauncherState.ALL_APPS;
+import static com.aoleyun.os.LauncherState.ALL_APPS;
 
 import static org.junit.Assert.assertTrue;
 
diff --git a/tests/src/com/android/colorfulos/ui/widget/AddConfigWidgetTest.java b/tests/src/com/aoleyun/os/ui/widget/AddConfigWidgetTest.java
similarity index 90%
rename from tests/src/com/android/colorfulos/ui/widget/AddConfigWidgetTest.java
rename to tests/src/com/aoleyun/os/ui/widget/AddConfigWidgetTest.java
index e16b10b..8761cee 100644
--- a/tests/src/com/android/colorfulos/ui/widget/AddConfigWidgetTest.java
+++ b/tests/src/com/aoleyun/os/ui/widget/AddConfigWidgetTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.android.colorfulos.ui.widget;
+package com.aoleyun.os.ui.widget;
 
 import static androidx.test.InstrumentationRegistry.getInstrumentation;
 
@@ -30,17 +30,17 @@ import androidx.test.runner.AndroidJUnit4;
 import androidx.test.uiautomator.By;
 import androidx.test.uiautomator.UiObject2;
 
-import com.android.colorfulos.ItemInfo;
-import com.android.colorfulos.LauncherAppWidgetInfo;
-import com.android.colorfulos.LauncherAppWidgetProviderInfo;
-import com.android.colorfulos.Workspace;
-import com.android.colorfulos.testcomponent.WidgetConfigActivity;
-import com.android.colorfulos.ui.AbstractLauncherUiTest;
-import com.android.colorfulos.ui.TestViewHelpers;
-import com.android.colorfulos.util.Condition;
-import com.android.colorfulos.util.Wait;
-import com.android.colorfulos.util.rule.ShellCommandRule;
-import com.android.colorfulos.widget.WidgetCell;
+import com.aoleyun.os.ItemInfo;
+import com.aoleyun.os.LauncherAppWidgetInfo;
+import com.aoleyun.os.LauncherAppWidgetProviderInfo;
+import com.aoleyun.os.Workspace;
+import com.aoleyun.os.testcomponent.WidgetConfigActivity;
+import com.aoleyun.os.ui.AbstractLauncherUiTest;
+import com.aoleyun.os.ui.TestViewHelpers;
+import com.aoleyun.os.util.Condition;
+import com.aoleyun.os.util.Wait;
+import com.aoleyun.os.util.rule.ShellCommandRule;
+import com.aoleyun.os.widget.WidgetCell;
 
 import org.junit.Before;
 import org.junit.Ignore;
diff --git a/tests/src/com/android/colorfulos/ui/widget/AddWidgetTest.java b/tests/src/com/aoleyun/os/ui/widget/AddWidgetTest.java
similarity index 83%
rename from tests/src/com/android/colorfulos/ui/widget/AddWidgetTest.java
rename to tests/src/com/aoleyun/os/ui/widget/AddWidgetTest.java
index a120d37..2aa01fc 100644
--- a/tests/src/com/android/colorfulos/ui/widget/AddWidgetTest.java
+++ b/tests/src/com/aoleyun/os/ui/widget/AddWidgetTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.android.colorfulos.ui.widget;
+package com.aoleyun.os.ui.widget;
 
 import static org.junit.Assert.assertTrue;
 
@@ -23,16 +23,16 @@ import androidx.test.uiautomator.By;
 import androidx.test.uiautomator.UiObject2;
 import android.view.View;
 
-import com.android.colorfulos.ItemInfo;
-import com.android.colorfulos.LauncherAppWidgetInfo;
-import com.android.colorfulos.LauncherAppWidgetProviderInfo;
-import com.android.colorfulos.Workspace.ItemOperator;
-import com.android.colorfulos.ui.AbstractLauncherUiTest;
-import com.android.colorfulos.ui.TestViewHelpers;
-import com.android.colorfulos.util.Condition;
-import com.android.colorfulos.util.Wait;
-import com.android.colorfulos.util.rule.ShellCommandRule;
-import com.android.colorfulos.widget.WidgetCell;
+import com.aoleyun.os.ItemInfo;
+import com.aoleyun.os.LauncherAppWidgetInfo;
+import com.aoleyun.os.LauncherAppWidgetProviderInfo;
+import com.aoleyun.os.Workspace.ItemOperator;
+import com.aoleyun.os.ui.AbstractLauncherUiTest;
+import com.aoleyun.os.ui.TestViewHelpers;
+import com.aoleyun.os.util.Condition;
+import com.aoleyun.os.util.Wait;
+import com.aoleyun.os.util.rule.ShellCommandRule;
+import com.aoleyun.os.widget.WidgetCell;
 
 import org.junit.Ignore;
 import org.junit.Rule;
diff --git a/tests/src/com/android/colorfulos/ui/widget/BindWidgetTest.java b/tests/src/com/aoleyun/os/ui/widget/BindWidgetTest.java
similarity index 93%
rename from tests/src/com/android/colorfulos/ui/widget/BindWidgetTest.java
rename to tests/src/com/aoleyun/os/ui/widget/BindWidgetTest.java
index 6bcaf1d..15fad49 100644
--- a/tests/src/com/android/colorfulos/ui/widget/BindWidgetTest.java
+++ b/tests/src/com/aoleyun/os/ui/widget/BindWidgetTest.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.android.colorfulos.ui.widget;
+package com.aoleyun.os.ui.widget;
 
-import static com.android.colorfulos.WorkspaceLayoutManager.FIRST_SCREEN_ID;
+import static com.aoleyun.os.WorkspaceLayoutManager.FIRST_SCREEN_ID;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -34,19 +34,19 @@ import android.os.Bundle;
 import androidx.test.filters.LargeTest;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.colorfulos.LauncherAppWidgetHost;
-import com.android.colorfulos.LauncherAppWidgetInfo;
-import com.android.colorfulos.LauncherAppWidgetProviderInfo;
-import com.android.colorfulos.LauncherSettings;
-import com.android.colorfulos.compat.AppWidgetManagerCompat;
-import com.android.colorfulos.compat.PackageInstallerCompat;
-import com.android.colorfulos.tapl.Workspace;
-import com.android.colorfulos.ui.AbstractLauncherUiTest;
-import com.android.colorfulos.ui.TestViewHelpers;
-import com.android.colorfulos.util.ContentWriter;
-import com.android.colorfulos.util.rule.ShellCommandRule;
-import com.android.colorfulos.widget.PendingAddWidgetInfo;
-import com.android.colorfulos.widget.WidgetHostViewLoader;
+import com.aoleyun.os.LauncherAppWidgetHost;
+import com.aoleyun.os.LauncherAppWidgetInfo;
+import com.aoleyun.os.LauncherAppWidgetProviderInfo;
+import com.aoleyun.os.LauncherSettings;
+import com.aoleyun.os.compat.AppWidgetManagerCompat;
+import com.aoleyun.os.compat.PackageInstallerCompat;
+import com.aoleyun.os.tapl.Workspace;
+import com.aoleyun.os.ui.AbstractLauncherUiTest;
+import com.aoleyun.os.ui.TestViewHelpers;
+import com.aoleyun.os.util.ContentWriter;
+import com.aoleyun.os.util.rule.ShellCommandRule;
+import com.aoleyun.os.widget.PendingAddWidgetInfo;
+import com.aoleyun.os.widget.WidgetHostViewLoader;
 
 import org.junit.After;
 import org.junit.Before;
diff --git a/tests/src/com/android/colorfulos/ui/widget/RequestPinItemTest.java b/tests/src/com/aoleyun/os/ui/widget/RequestPinItemTest.java
similarity index 86%
rename from tests/src/com/android/colorfulos/ui/widget/RequestPinItemTest.java
rename to tests/src/com/aoleyun/os/ui/widget/RequestPinItemTest.java
index cd979b8..42dc5cf 100644
--- a/tests/src/com/android/colorfulos/ui/widget/RequestPinItemTest.java
+++ b/tests/src/com/aoleyun/os/ui/widget/RequestPinItemTest.java
@@ -13,9 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.android.colorfulos.ui.widget;
-
-import static com.android.colorfulos.ui.TaplTestsLauncher3.getAppPackageName;
+package com.aoleyun.os.ui.widget;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNotSame;
@@ -29,21 +27,22 @@ import android.view.View;
 import androidx.test.filters.LargeTest;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.colorfulos.ItemInfo;
-import com.android.colorfulos.LauncherAppWidgetInfo;
-import com.android.colorfulos.LauncherSettings.Favorites;
-import com.android.colorfulos.Utilities;
-import com.android.colorfulos.Workspace.ItemOperator;
-import com.android.colorfulos.WorkspaceItemInfo;
-import com.android.colorfulos.shortcuts.ShortcutKey;
-import com.android.colorfulos.tapl.AddToHomeScreenPrompt;
-import com.android.colorfulos.testcomponent.AppWidgetNoConfig;
-import com.android.colorfulos.testcomponent.AppWidgetWithConfig;
-import com.android.colorfulos.testcomponent.RequestPinItemActivity;
-import com.android.colorfulos.ui.AbstractLauncherUiTest;
-import com.android.colorfulos.util.Condition;
-import com.android.colorfulos.util.Wait;
-import com.android.colorfulos.util.rule.ShellCommandRule;
+import com.aoleyun.os.ItemInfo;
+import com.aoleyun.os.LauncherAppWidgetInfo;
+import com.aoleyun.os.LauncherSettings.Favorites;
+import com.aoleyun.os.Utilities;
+import com.aoleyun.os.Workspace.ItemOperator;
+import com.aoleyun.os.WorkspaceItemInfo;
+import com.aoleyun.os.shortcuts.ShortcutKey;
+import com.aoleyun.os.tapl.AddToHomeScreenPrompt;
+import com.aoleyun.os.testcomponent.AppWidgetNoConfig;
+import com.aoleyun.os.testcomponent.AppWidgetWithConfig;
+import com.aoleyun.os.testcomponent.RequestPinItemActivity;
+import com.aoleyun.os.ui.AbstractLauncherUiTest;
+import com.aoleyun.os.util.Condition;
+import com.aoleyun.os.util.Wait;
+import com.aoleyun.os.util.rule.ShellCommandRule;
+import com.aoleyun.os.ui.TaplTestsLauncher3;
 
 import org.junit.Before;
 import org.junit.Rule;
@@ -140,7 +139,7 @@ public class RequestPinItemTest extends AbstractLauncherUiTest {
                 getWorkspace().
                 switchToAllApps().
                 getAppIcon("Test Pin Item").
-                launch(getAppPackageName());
+                launch(TaplTestsLauncher3.getAppPackageName());
         assertNotNull(openMonitor.blockingGetExtraIntent());
 
         // Set callback
diff --git a/tests/src/com/android/colorfulos/util/Condition.java b/tests/src/com/aoleyun/os/util/Condition.java
similarity index 93%
rename from tests/src/com/android/colorfulos/util/Condition.java
rename to tests/src/com/aoleyun/os/util/Condition.java
index 0a84564..ce34a3b 100644
--- a/tests/src/com/android/colorfulos/util/Condition.java
+++ b/tests/src/com/aoleyun/os/util/Condition.java
@@ -1,8 +1,8 @@
-package com.android.colorfulos.util;
+package com.aoleyun.os.util;
 
 import androidx.test.uiautomator.UiObject2;
 
-import com.android.colorfulos.MainThreadExecutor;
+import com.aoleyun.os.MainThreadExecutor;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
diff --git a/tests/src/com/android/colorfulos/util/LauncherLayoutBuilder.java b/tests/src/com/aoleyun/os/util/LauncherLayoutBuilder.java
similarity index 99%
rename from tests/src/com/android/colorfulos/util/LauncherLayoutBuilder.java
rename to tests/src/com/aoleyun/os/util/LauncherLayoutBuilder.java
index 05979ec..e00ff96 100644
--- a/tests/src/com/android/colorfulos/util/LauncherLayoutBuilder.java
+++ b/tests/src/com/aoleyun/os/util/LauncherLayoutBuilder.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.android.colorfulos.util;
+package com.aoleyun.os.util;
 
 
 import android.text.TextUtils;
diff --git a/tests/src/com/android/colorfulos/util/RaceConditionReproducer.java b/tests/src/com/aoleyun/os/util/RaceConditionReproducer.java
similarity index 99%
rename from tests/src/com/android/colorfulos/util/RaceConditionReproducer.java
rename to tests/src/com/aoleyun/os/util/RaceConditionReproducer.java
index 7ba9dbc..7913323 100644
--- a/tests/src/com/android/colorfulos/util/RaceConditionReproducer.java
+++ b/tests/src/com/aoleyun/os/util/RaceConditionReproducer.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.util;
+package com.aoleyun.os.util;
 
-import static com.android.colorfulos.util.RaceConditionTracker.ENTER_POSTFIX;
-import static com.android.colorfulos.util.RaceConditionTracker.EXIT_POSTFIX;
+import static com.aoleyun.os.util.RaceConditionTracker.ENTER_POSTFIX;
+import static com.aoleyun.os.util.RaceConditionTracker.EXIT_POSTFIX;
 
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
diff --git a/tests/src/com/android/colorfulos/util/RaceConditionReproducerTest.java b/tests/src/com/aoleyun/os/util/RaceConditionReproducerTest.java
similarity index 99%
rename from tests/src/com/android/colorfulos/util/RaceConditionReproducerTest.java
rename to tests/src/com/aoleyun/os/util/RaceConditionReproducerTest.java
index 83ea29c..e87e413 100644
--- a/tests/src/com/android/colorfulos/util/RaceConditionReproducerTest.java
+++ b/tests/src/com/aoleyun/os/util/RaceConditionReproducerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.util;
+package com.aoleyun.os.util;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
diff --git a/tests/src/com/android/colorfulos/util/TestUtil.java b/tests/src/com/aoleyun/os/util/TestUtil.java
similarity index 98%
rename from tests/src/com/android/colorfulos/util/TestUtil.java
rename to tests/src/com/aoleyun/os/util/TestUtil.java
index e610448..9f08b56 100644
--- a/tests/src/com/android/colorfulos/util/TestUtil.java
+++ b/tests/src/com/aoleyun/os/util/TestUtil.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.util;
+package com.aoleyun.os.util;
 
 import static androidx.test.InstrumentationRegistry.getContext;
 import static androidx.test.InstrumentationRegistry.getInstrumentation;
diff --git a/tests/src/com/android/colorfulos/util/Wait.java b/tests/src/com/aoleyun/os/util/Wait.java
similarity index 96%
rename from tests/src/com/android/colorfulos/util/Wait.java
rename to tests/src/com/aoleyun/os/util/Wait.java
index f3d56ce..2d621cf 100644
--- a/tests/src/com/android/colorfulos/util/Wait.java
+++ b/tests/src/com/aoleyun/os/util/Wait.java
@@ -1,4 +1,4 @@
-package com.android.colorfulos.util;
+package com.aoleyun.os.util;
 
 import android.os.SystemClock;
 
diff --git a/tests/src/com/android/colorfulos/util/rule/FailureWatcher.java b/tests/src/com/aoleyun/os/util/rule/FailureWatcher.java
similarity index 97%
rename from tests/src/com/android/colorfulos/util/rule/FailureWatcher.java
rename to tests/src/com/aoleyun/os/util/rule/FailureWatcher.java
index b8fd793..f6b6ec1 100644
--- a/tests/src/com/android/colorfulos/util/rule/FailureWatcher.java
+++ b/tests/src/com/aoleyun/os/util/rule/FailureWatcher.java
@@ -1,4 +1,4 @@
-package com.android.colorfulos.util.rule;
+package com.aoleyun.os.util.rule;
 
 import static androidx.test.InstrumentationRegistry.getInstrumentation;
 
diff --git a/tests/src/com/android/colorfulos/util/rule/LauncherActivityRule.java b/tests/src/com/aoleyun/os/util/rule/LauncherActivityRule.java
similarity index 91%
rename from tests/src/com/android/colorfulos/util/rule/LauncherActivityRule.java
rename to tests/src/com/aoleyun/os/util/rule/LauncherActivityRule.java
index 134cfdc..5c35552 100644
--- a/tests/src/com/android/colorfulos/util/rule/LauncherActivityRule.java
+++ b/tests/src/com/aoleyun/os/util/rule/LauncherActivityRule.java
@@ -13,9 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.android.colorfulos.util.rule;
-
-import static com.android.colorfulos.tapl.TestHelpers.getHomeIntentInPackage;
+package com.aoleyun.os.util.rule;
 
 import static androidx.test.InstrumentationRegistry.getInstrumentation;
 import static androidx.test.InstrumentationRegistry.getTargetContext;
@@ -26,8 +24,9 @@ import android.app.Application.ActivityLifecycleCallbacks;
 import android.os.Bundle;
 import androidx.test.InstrumentationRegistry;
 
-import com.android.colorfulos.Launcher;
-import com.android.colorfulos.Workspace.ItemOperator;
+import com.aoleyun.os.Launcher;
+import com.aoleyun.os.Workspace.ItemOperator;
+import com.aoleyun.os.tapl.TestHelpers;
 
 import org.junit.rules.TestRule;
 import org.junit.runner.Description;
@@ -69,7 +68,7 @@ public class LauncherActivityRule implements TestRule {
      * Starts the launcher activity in the target package.
      */
     public void startLauncher() {
-        getInstrumentation().startActivitySync(getHomeIntentInPackage(getTargetContext()));
+        getInstrumentation().startActivitySync(TestHelpers.getHomeIntentInPackage(getTargetContext()));
     }
 
     private class MyStatement extends Statement implements ActivityLifecycleCallbacks {
diff --git a/tests/src/com/android/colorfulos/util/rule/ShellCommandRule.java b/tests/src/com/aoleyun/os/util/rule/ShellCommandRule.java
similarity index 93%
rename from tests/src/com/android/colorfulos/util/rule/ShellCommandRule.java
rename to tests/src/com/aoleyun/os/util/rule/ShellCommandRule.java
index 9bb2c31..725f760 100644
--- a/tests/src/com/android/colorfulos/util/rule/ShellCommandRule.java
+++ b/tests/src/com/aoleyun/os/util/rule/ShellCommandRule.java
@@ -13,9 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.android.colorfulos.util.rule;
-
-import static com.android.colorfulos.tapl.TestHelpers.getLauncherInMyProcess;
+package com.aoleyun.os.util.rule;
 
 import static androidx.test.InstrumentationRegistry.getInstrumentation;
 
@@ -30,6 +28,8 @@ import androidx.annotation.Nullable;
 import androidx.test.InstrumentationRegistry;
 import androidx.test.uiautomator.UiDevice;
 
+import com.aoleyun.os.tapl.TestHelpers;
+
 /**
  * Test rule which executes a shell command at the start of the test.
  */
@@ -72,7 +72,7 @@ public class ShellCommandRule implements TestRule {
      * Sets the target launcher as default launcher.
      */
     public static ShellCommandRule setDefaultLauncher() {
-        return new ShellCommandRule(getLauncherCommand(getLauncherInMyProcess()), null);
+        return new ShellCommandRule(getLauncherCommand(TestHelpers.getLauncherInMyProcess()), null);
     }
 
     public static String getLauncherCommand(ActivityInfo launcher) {
diff --git a/tests/src/com/android/colorfulos/widget/WidgetsListAdapterTest.java b/tests/src/com/aoleyun/os/widget/WidgetsListAdapterTest.java
similarity index 91%
rename from tests/src/com/android/colorfulos/widget/WidgetsListAdapterTest.java
rename to tests/src/com/aoleyun/os/widget/WidgetsListAdapterTest.java
index 590038e..a6ef240 100644
--- a/tests/src/com/android/colorfulos/widget/WidgetsListAdapterTest.java
+++ b/tests/src/com/aoleyun/os/widget/WidgetsListAdapterTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.colorfulos.widget;
+package com.aoleyun.os.widget;
 
 import static org.mockito.Matchers.eq;
 import static org.mockito.Matchers.isNull;
@@ -28,14 +28,14 @@ import androidx.test.filters.SmallTest;
 import androidx.test.runner.AndroidJUnit4;
 import android.view.LayoutInflater;
 
-import com.android.colorfulos.icons.IconCache;
-import com.android.colorfulos.InvariantDeviceProfile;
-import com.android.colorfulos.LauncherAppWidgetProviderInfo;
-import com.android.colorfulos.WidgetPreviewLoader;
-import com.android.colorfulos.compat.AppWidgetManagerCompat;
-import com.android.colorfulos.model.PackageItemInfo;
-import com.android.colorfulos.model.WidgetItem;
-import com.android.colorfulos.util.MultiHashMap;
+import com.aoleyun.os.icons.IconCache;
+import com.aoleyun.os.InvariantDeviceProfile;
+import com.aoleyun.os.LauncherAppWidgetProviderInfo;
+import com.aoleyun.os.WidgetPreviewLoader;
+import com.aoleyun.os.compat.AppWidgetManagerCompat;
+import com.aoleyun.os.model.PackageItemInfo;
+import com.aoleyun.os.model.WidgetItem;
+import com.aoleyun.os.util.MultiHashMap;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/tapl/AndroidManifest.xml b/tests/tapl/AndroidManifest.xml
index 31a5a91..b78ff5d 100644
--- a/tests/tapl/AndroidManifest.xml
+++ b/tests/tapl/AndroidManifest.xml
@@ -19,7 +19,7 @@
 -->
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.colorfulos.tapl"
+    package="com.aoleyun.os.tapl"
 >
 
     <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS"/>
diff --git a/tests/tapl/com/android/colorfulos/tapl/AddToHomeScreenPrompt.java b/tests/tapl/com/aoleyun/os/tapl/AddToHomeScreenPrompt.java
similarity index 93%
rename from tests/tapl/com/android/colorfulos/tapl/AddToHomeScreenPrompt.java
rename to tests/tapl/com/aoleyun/os/tapl/AddToHomeScreenPrompt.java
index 1c58a01..000cd67 100644
--- a/tests/tapl/com/android/colorfulos/tapl/AddToHomeScreenPrompt.java
+++ b/tests/tapl/com/aoleyun/os/tapl/AddToHomeScreenPrompt.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.tapl;
+package com.aoleyun.os.tapl;
 
 import androidx.test.uiautomator.By;
 import androidx.test.uiautomator.UiObject2;
@@ -26,7 +26,7 @@ public class AddToHomeScreenPrompt {
     AddToHomeScreenPrompt(LauncherInstrumentation launcher) {
         mLauncher = launcher;
         mWidgetCell = launcher.waitForLauncherObject(By.clazz(
-                "com.android.colorfulos.widget.WidgetCell"));
+                "com.aoleyun.os.widget.WidgetCell"));
         mLauncher.assertNotNull("Can't find widget cell object", mWidgetCell);
     }
 
diff --git a/tests/tapl/com/android/colorfulos/tapl/AllApps.java b/tests/tapl/com/aoleyun/os/tapl/AllApps.java
similarity index 98%
rename from tests/tapl/com/android/colorfulos/tapl/AllApps.java
rename to tests/tapl/com/aoleyun/os/tapl/AllApps.java
index df77a2f..2d55984 100644
--- a/tests/tapl/com/android/colorfulos/tapl/AllApps.java
+++ b/tests/tapl/com/aoleyun/os/tapl/AllApps.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.tapl;
+package com.aoleyun.os.tapl;
 
 import android.graphics.Point;
 import android.graphics.Rect;
@@ -26,8 +26,8 @@ import androidx.test.uiautomator.BySelector;
 import androidx.test.uiautomator.Direction;
 import androidx.test.uiautomator.UiObject2;
 
-import com.android.colorfulos.ResourceUtils;
-import com.android.colorfulos.testing.TestProtocol;
+import com.aoleyun.os.ResourceUtils;
+import com.aoleyun.os.testing.TestProtocol;
 
 /**
  * Operations on AllApps opened from Home. Also a parent for All Apps opened from Overview.
diff --git a/tests/tapl/com/android/colorfulos/tapl/AllAppsFromOverview.java b/tests/tapl/com/aoleyun/os/tapl/AllAppsFromOverview.java
similarity index 92%
rename from tests/tapl/com/android/colorfulos/tapl/AllAppsFromOverview.java
rename to tests/tapl/com/aoleyun/os/tapl/AllAppsFromOverview.java
index 60bf691..01b7fba 100644
--- a/tests/tapl/com/android/colorfulos/tapl/AllAppsFromOverview.java
+++ b/tests/tapl/com/aoleyun/os/tapl/AllAppsFromOverview.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.tapl;
+package com.aoleyun.os.tapl;
 
-import static com.android.colorfulos.testing.TestProtocol.OVERVIEW_STATE_ORDINAL;
+import static com.aoleyun.os.testing.TestProtocol.OVERVIEW_STATE_ORDINAL;
 
 import android.graphics.Point;
 
 import androidx.annotation.NonNull;
 import androidx.test.uiautomator.UiObject2;
 
-import com.android.colorfulos.testing.TestProtocol;
+import com.aoleyun.os.testing.TestProtocol;
 
 /**
  * Operations on AllApps opened from Overview.
diff --git a/tests/tapl/com/android/colorfulos/tapl/AppIcon.java b/tests/tapl/com/aoleyun/os/tapl/AppIcon.java
similarity index 98%
rename from tests/tapl/com/android/colorfulos/tapl/AppIcon.java
rename to tests/tapl/com/aoleyun/os/tapl/AppIcon.java
index e269d95..6cc5b5f 100644
--- a/tests/tapl/com/android/colorfulos/tapl/AppIcon.java
+++ b/tests/tapl/com/aoleyun/os/tapl/AppIcon.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.tapl;
+package com.aoleyun.os.tapl;
 
 import android.graphics.Point;
 import android.os.SystemClock;
diff --git a/tests/tapl/com/android/colorfulos/tapl/AppIconMenu.java b/tests/tapl/com/aoleyun/os/tapl/AppIconMenu.java
similarity index 97%
rename from tests/tapl/com/android/colorfulos/tapl/AppIconMenu.java
rename to tests/tapl/com/aoleyun/os/tapl/AppIconMenu.java
index 80a183f..cf47b75 100644
--- a/tests/tapl/com/android/colorfulos/tapl/AppIconMenu.java
+++ b/tests/tapl/com/aoleyun/os/tapl/AppIconMenu.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.tapl;
+package com.aoleyun.os.tapl;
 
 import static org.junit.Assert.assertTrue;
 
diff --git a/tests/tapl/com/android/colorfulos/tapl/AppIconMenuItem.java b/tests/tapl/com/aoleyun/os/tapl/AppIconMenuItem.java
similarity index 96%
rename from tests/tapl/com/android/colorfulos/tapl/AppIconMenuItem.java
rename to tests/tapl/com/aoleyun/os/tapl/AppIconMenuItem.java
index bb2dbde..4e85347 100644
--- a/tests/tapl/com/android/colorfulos/tapl/AppIconMenuItem.java
+++ b/tests/tapl/com/aoleyun/os/tapl/AppIconMenuItem.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.tapl;
+package com.aoleyun.os.tapl;
 
 import androidx.test.uiautomator.UiObject2;
 
diff --git a/tests/tapl/com/android/colorfulos/tapl/Background.java b/tests/tapl/com/aoleyun/os/tapl/Background.java
similarity index 96%
rename from tests/tapl/com/android/colorfulos/tapl/Background.java
rename to tests/tapl/com/aoleyun/os/tapl/Background.java
index 9c930cd..9a054d2 100644
--- a/tests/tapl/com/android/colorfulos/tapl/Background.java
+++ b/tests/tapl/com/aoleyun/os/tapl/Background.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.tapl;
+package com.aoleyun.os.tapl;
 
-import static com.android.colorfulos.testing.TestProtocol.BACKGROUND_APP_STATE_ORDINAL;
+import static com.aoleyun.os.testing.TestProtocol.BACKGROUND_APP_STATE_ORDINAL;
 
 import android.graphics.Point;
 import android.os.SystemClock;
@@ -24,7 +24,7 @@ import android.view.MotionEvent;
 
 import androidx.annotation.NonNull;
 
-import com.android.colorfulos.testing.TestProtocol;
+import com.aoleyun.os.testing.TestProtocol;
 
 /**
  * Indicates the base state with a UI other than Overview running as foreground. It can also
diff --git a/tests/tapl/com/android/colorfulos/tapl/BaseOverview.java b/tests/tapl/com/aoleyun/os/tapl/BaseOverview.java
similarity index 99%
rename from tests/tapl/com/android/colorfulos/tapl/BaseOverview.java
rename to tests/tapl/com/aoleyun/os/tapl/BaseOverview.java
index 170c075..45e55a8 100644
--- a/tests/tapl/com/android/colorfulos/tapl/BaseOverview.java
+++ b/tests/tapl/com/aoleyun/os/tapl/BaseOverview.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.tapl;
+package com.aoleyun.os.tapl;
 
 import androidx.annotation.NonNull;
 import androidx.test.uiautomator.BySelector;
diff --git a/tests/tapl/com/android/colorfulos/tapl/Folder.java b/tests/tapl/com/aoleyun/os/tapl/Folder.java
similarity index 96%
rename from tests/tapl/com/android/colorfulos/tapl/Folder.java
rename to tests/tapl/com/aoleyun/os/tapl/Folder.java
index 28b85ac..bc9d263 100644
--- a/tests/tapl/com/android/colorfulos/tapl/Folder.java
+++ b/tests/tapl/com/aoleyun/os/tapl/Folder.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.tapl;
+package com.aoleyun.os.tapl;
 
 import android.widget.FrameLayout;
 
diff --git a/tests/tapl/com/android/colorfulos/tapl/Home.java b/tests/tapl/com/aoleyun/os/tapl/Home.java
similarity index 94%
rename from tests/tapl/com/android/colorfulos/tapl/Home.java
rename to tests/tapl/com/aoleyun/os/tapl/Home.java
index 9f5a768..5b362c1 100644
--- a/tests/tapl/com/android/colorfulos/tapl/Home.java
+++ b/tests/tapl/com/aoleyun/os/tapl/Home.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.tapl;
+package com.aoleyun.os.tapl;
 
-import static com.android.colorfulos.testing.TestProtocol.OVERVIEW_STATE_ORDINAL;
+import static com.aoleyun.os.testing.TestProtocol.OVERVIEW_STATE_ORDINAL;
 
 import androidx.annotation.NonNull;
 
diff --git a/tests/tapl/com/android/colorfulos/tapl/Launchable.java b/tests/tapl/com/aoleyun/os/tapl/Launchable.java
similarity index 97%
rename from tests/tapl/com/android/colorfulos/tapl/Launchable.java
rename to tests/tapl/com/aoleyun/os/tapl/Launchable.java
index fd6e018..bd80e71 100644
--- a/tests/tapl/com/android/colorfulos/tapl/Launchable.java
+++ b/tests/tapl/com/aoleyun/os/tapl/Launchable.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.tapl;
+package com.aoleyun.os.tapl;
 
 import android.graphics.Point;
 
@@ -23,7 +23,7 @@ import androidx.test.uiautomator.BySelector;
 import androidx.test.uiautomator.UiObject2;
 import androidx.test.uiautomator.Until;
 
-import com.android.colorfulos.testing.TestProtocol;
+import com.aoleyun.os.testing.TestProtocol;
 
 /**
  * Ancestor for AppIcon and AppMenuItem.
diff --git a/tests/tapl/com/android/colorfulos/tapl/LauncherInstrumentation.java b/tests/tapl/com/aoleyun/os/tapl/LauncherInstrumentation.java
similarity index 98%
rename from tests/tapl/com/android/colorfulos/tapl/LauncherInstrumentation.java
rename to tests/tapl/com/aoleyun/os/tapl/LauncherInstrumentation.java
index dae733b..a311115 100644
--- a/tests/tapl/com/android/colorfulos/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/aoleyun/os/tapl/LauncherInstrumentation.java
@@ -14,16 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.tapl;
+package com.aoleyun.os.tapl;
 
 import static android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_ENABLED;
 import static android.content.pm.PackageManager.DONT_KILL_APP;
 import static android.content.pm.PackageManager.MATCH_ALL;
 import static android.content.pm.PackageManager.MATCH_DISABLED_COMPONENTS;
 
-import static com.android.colorfulos.tapl.TestHelpers.getOverviewPackageName;
-import static com.android.colorfulos.testing.TestProtocol.BACKGROUND_APP_STATE_ORDINAL;
-import static com.android.colorfulos.testing.TestProtocol.NORMAL_STATE_ORDINAL;
+import static com.aoleyun.os.testing.TestProtocol.BACKGROUND_APP_STATE_ORDINAL;
+import static com.aoleyun.os.testing.TestProtocol.NORMAL_STATE_ORDINAL;
 
 import android.app.ActivityManager;
 import android.app.Instrumentation;
@@ -60,7 +59,7 @@ import androidx.test.uiautomator.UiDevice;
 import androidx.test.uiautomator.UiObject2;
 import androidx.test.uiautomator.Until;
 
-import com.android.colorfulos.testing.TestProtocol;
+import com.aoleyun.os.testing.TestProtocol;
 import com.android.systemui.shared.system.QuickStepContract;
 
 import org.junit.Assert;
@@ -642,7 +641,7 @@ public final class LauncherInstrumentation {
     }
 
     BySelector getFallbackLauncherObjectSelector(String resName) {
-        return By.res(getOverviewPackageName(), resName);
+        return By.res(TestHelpers.getOverviewPackageName(), resName);
     }
 
     String getLauncherPackageName() {
diff --git a/tests/tapl/com/android/colorfulos/tapl/Overview.java b/tests/tapl/com/aoleyun/os/tapl/Overview.java
similarity index 91%
rename from tests/tapl/com/android/colorfulos/tapl/Overview.java
rename to tests/tapl/com/aoleyun/os/tapl/Overview.java
index b2e292d..8c39da9 100644
--- a/tests/tapl/com/android/colorfulos/tapl/Overview.java
+++ b/tests/tapl/com/aoleyun/os/tapl/Overview.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.tapl;
+package com.aoleyun.os.tapl;
 
-import static com.android.colorfulos.testing.TestProtocol.ALL_APPS_STATE_ORDINAL;
+import static com.aoleyun.os.testing.TestProtocol.ALL_APPS_STATE_ORDINAL;
 
 import androidx.annotation.NonNull;
 import androidx.test.uiautomator.UiObject2;
 
-import com.android.colorfulos.tapl.LauncherInstrumentation.ContainerType;
+import com.aoleyun.os.tapl.LauncherInstrumentation.ContainerType;
 
 /**
  * Overview pane.
diff --git a/tests/tapl/com/android/colorfulos/tapl/OverviewTask.java b/tests/tapl/com/aoleyun/os/tapl/OverviewTask.java
similarity index 96%
rename from tests/tapl/com/android/colorfulos/tapl/OverviewTask.java
rename to tests/tapl/com/aoleyun/os/tapl/OverviewTask.java
index ebd3b76..379314a 100644
--- a/tests/tapl/com/android/colorfulos/tapl/OverviewTask.java
+++ b/tests/tapl/com/aoleyun/os/tapl/OverviewTask.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.tapl;
+package com.aoleyun.os.tapl;
 
 import android.graphics.Rect;
 
 import androidx.test.uiautomator.UiObject2;
 import androidx.test.uiautomator.Until;
 
-import com.android.colorfulos.testing.TestProtocol;
+import com.aoleyun.os.testing.TestProtocol;
 
 /**
  * A recent task in the overview panel carousel.
diff --git a/tests/tapl/com/android/colorfulos/tapl/TestHelpers.java b/tests/tapl/com/aoleyun/os/tapl/TestHelpers.java
similarity index 95%
rename from tests/tapl/com/android/colorfulos/tapl/TestHelpers.java
rename to tests/tapl/com/aoleyun/os/tapl/TestHelpers.java
index 5ac07aa..f48befe 100644
--- a/tests/tapl/com/android/colorfulos/tapl/TestHelpers.java
+++ b/tests/tapl/com/aoleyun/os/tapl/TestHelpers.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.android.colorfulos.tapl;
+package com.aoleyun.os.tapl;
 
 import static androidx.test.InstrumentationRegistry.getInstrumentation;
 import static androidx.test.InstrumentationRegistry.getTargetContext;
@@ -45,7 +45,7 @@ public class TestHelpers {
 
         // If we are in the same process, we can instantiate the class name.
         try {
-            Class launcherClazz = Class.forName("com.android.colorfulos.Launcher");
+            Class launcherClazz = Class.forName("com.aoleyun.os.Launcher");
             return launcherClazz.isAssignableFrom(Class.forName(info.name));
         } catch (Exception e) {
             return false;
diff --git a/tests/tapl/com/android/colorfulos/tapl/Widget.java b/tests/tapl/com/aoleyun/os/tapl/Widget.java
similarity index 95%
rename from tests/tapl/com/android/colorfulos/tapl/Widget.java
rename to tests/tapl/com/aoleyun/os/tapl/Widget.java
index 25dab7b..d0eb22b 100644
--- a/tests/tapl/com/android/colorfulos/tapl/Widget.java
+++ b/tests/tapl/com/aoleyun/os/tapl/Widget.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.tapl;
+package com.aoleyun.os.tapl;
 
 import androidx.test.uiautomator.UiObject2;
 
diff --git a/tests/tapl/com/android/colorfulos/tapl/Widgets.java b/tests/tapl/com/aoleyun/os/tapl/Widgets.java
similarity index 97%
rename from tests/tapl/com/android/colorfulos/tapl/Widgets.java
rename to tests/tapl/com/aoleyun/os/tapl/Widgets.java
index 87ca9c4..86d7d0f 100644
--- a/tests/tapl/com/android/colorfulos/tapl/Widgets.java
+++ b/tests/tapl/com/aoleyun/os/tapl/Widgets.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.tapl;
+package com.aoleyun.os.tapl;
 
 import androidx.test.uiautomator.Direction;
 import androidx.test.uiautomator.UiObject2;
 
-import com.android.colorfulos.ResourceUtils;
+import com.aoleyun.os.ResourceUtils;
 
 /**
  * All widgets container.
diff --git a/tests/tapl/com/android/colorfulos/tapl/Workspace.java b/tests/tapl/com/aoleyun/os/tapl/Workspace.java
similarity index 96%
rename from tests/tapl/com/android/colorfulos/tapl/Workspace.java
rename to tests/tapl/com/aoleyun/os/tapl/Workspace.java
index 741083a..bed67ec 100644
--- a/tests/tapl/com/android/colorfulos/tapl/Workspace.java
+++ b/tests/tapl/com/aoleyun/os/tapl/Workspace.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.colorfulos.tapl;
+package com.aoleyun.os.tapl;
 
-import static com.android.colorfulos.testing.TestProtocol.ALL_APPS_STATE_ORDINAL;
+import static com.aoleyun.os.testing.TestProtocol.ALL_APPS_STATE_ORDINAL;
 
 import static junit.framework.TestCase.assertTrue;
 
@@ -31,7 +31,7 @@ import androidx.test.uiautomator.By;
 import androidx.test.uiautomator.Direction;
 import androidx.test.uiautomator.UiObject2;
 
-import com.android.colorfulos.testing.TestProtocol;
+import com.aoleyun.os.testing.TestProtocol;
 
 /**
  * Operations on the workspace screen.
@@ -226,7 +226,7 @@ public final class Workspace extends Home {
     @Nullable
     public Widget tryGetWidget(String label, long timeout) {
         final UiObject2 widget = mLauncher.tryWaitForLauncherObject(
-                By.clazz("com.android.colorfulos.widget.LauncherAppWidgetHostView").desc(label),
+                By.clazz("com.aoleyun.os.widget.LauncherAppWidgetHostView").desc(label),
                 timeout);
         return widget != null ? new Widget(mLauncher, widget) : null;
     }
@@ -234,7 +234,7 @@ public final class Workspace extends Home {
     @Nullable
     public Widget tryGetPendingWidget(long timeout) {
         final UiObject2 widget = mLauncher.tryWaitForLauncherObject(
-                By.clazz("com.android.colorfulos.widget.PendingAppWidgetHostView"), timeout);
+                By.clazz("com.aoleyun.os.widget.PendingAppWidgetHostView"), timeout);
         return widget != null ? new Widget(mLauncher, widget) : null;
     }
 }
\ No newline at end of file