diff --git a/Android.mk b/Android.mk index 8949c12..4e5b954 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.uiuios.* +LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.android.colorfulos.* 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.uiuios.* +LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.android.colorfulos.* 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.uiuios.* +LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.android.colorfulos.* 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.uiuios.* +LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.android.colorfulos.* 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.uiuios.* +LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.android.colorfulos.* include $(BUILD_PACKAGE) diff --git a/AndroidManifest-common.xml b/AndroidManifest-common.xml index cb9d48e..ea7a010 100644 --- a/AndroidManifest-common.xml +++ b/AndroidManifest-common.xml @@ -21,7 +21,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:sharedUserId="android.uid.system" - package="com.android.uiuios"> + package="com.android.colorfulos"> @@ -95,27 +95,27 @@ + android:name="com.android.colorfulos.SessionCommitReceiver" > - + @@ -127,7 +127,7 @@ - + android:name="com.android.colorfulos.launcher_dump_provider" + android:value="com.android.colorfulos.LauncherProvider" /> @@ -172,7 +172,7 @@ The settings activity. To extend point settings_fragment_name to appropriate fragment class --> @@ -182,7 +182,7 @@ - + tools:replace="android:authorities" /> @@ -275,7 +275,7 @@ android:authorities="${applicationId}.DownloadProvider" android:name="cn.jpush.android.service.DownloadProvider" android:exported="true" - /> + tools:replace="android:authorities" /> @@ -322,12 +322,16 @@ - + + - diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 7e7e8f3..2549d6c 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,70 +1,57 @@ - - - - + + + - + android:supportsRtl="true" + android:theme="@style/AppTheme"> + + android:windowSoftInputMode="adjustPan"> + - + + - - + + \ No newline at end of file diff --git a/SecondaryDisplayLauncher/AndroidManifest.xml b/SecondaryDisplayLauncher/AndroidManifest.xml index 2f61c2c..ebf55a5 100644 --- a/SecondaryDisplayLauncher/AndroidManifest.xml +++ b/SecondaryDisplayLauncher/AndroidManifest.xml @@ -19,12 +19,12 @@ --> + package="com.android.colorfulos"> + variant.outputs.each { output -> + def outputFile = output.outputFile + if (outputFile != null) { + def fileName = "${appName()}-${variant.versionCode}-V${variant.versionName}-${releaseTime()}-${buildType.name}.apk" + output.outputFileName = fileName + } + } + } } + release { - // 不显示Log - buildConfigField "boolean", "LOG_DEBUG", "false" + buildConfigField "String", "platform", '"MTK"' //混淆 minifyEnabled false - //Zipalign优化 - zipAlignEnabled true //前一部分代表系统默认的android程序的混淆文件，该文件已经包含了基本的混淆声明，后一个文件是自己的定义混淆文件 proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + //Zipalign优化 + zipAlignEnabled true //签名 signingConfig signingConfigs.release -// 将release版本的包名重命名，加上版本及日期 + //将release版本的包名重命名，加上版本及日期 + applicationVariants.all { variant -> + variant.outputs.each { output -> + def outputFile = "" + if (outputFile != null) { + def fileName = "${appName()}-${variant.versionCode}-V${variant.versionName}-${releaseTime()}-${buildType.name}.apk" + output.outputFileName = fileName + } + } + } } } + compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 @@ -97,14 +148,14 @@ android { productFlavors { aosp { dimension "app" - applicationId 'com.android.uiuios' - testApplicationId 'com.android.uiuios.tests' + applicationId 'com.android.colorfulos' + testApplicationId 'com.android.colorfulos.tests' } l3go { dimension "app" - applicationId 'com.android.uiuios' - testApplicationId 'com.android.uiuios.tests' + applicationId 'com.android.colorfulos' + testApplicationId 'com.android.colorfulos.tests' } /*withQuickstep { @@ -202,6 +253,7 @@ dependencies { implementation "androidx.dynamicanimation:dynamicanimation:${ANDROID_X_VERSION}" implementation "androidx.recyclerview:recyclerview:${ANDROID_X_VERSION}" implementation "androidx.preference:preference:${ANDROID_X_VERSION}" + implementation "androidx.constraintlayout:constraintlayout:2.0.4" implementation project(':IconLoader') implementation fileTree(dir: "${ANDROID_TOP}/libs", include: 'launcher_protos.jar') @@ -212,6 +264,7 @@ dependencies { //withQuickstepIconRecentsImplementation fileTree(dir: "${ANDROID_TOP}/libs", include: 'sysui_shared.jar') // Required for AOSP to compile. This is already included in ANDROID_TOP sysui_shared.jar + implementation 'androidx.appcompat:appcompat:1.3.0' withoutQuickstepImplementation fileTree(dir: "${ANDROID_TOP}/libs", include: 'plugin_core.jar') testImplementation 'junit:junit:4.12' @@ -224,15 +277,20 @@ dependencies { androidTestImplementation "androidx.annotation:annotation:${ANDROID_X_VERSION}" //RxJava和Retrofit - implementation 'io.reactivex.rxjava2:rxjava:2.2.5' - implementation 'io.reactivex.rxjava2:rxandroid:2.1.0' - implementation 'com.squareup.retrofit2:retrofit:2.3.0' - implementation 'com.squareup.retrofit2:converter-gson:2.3.0' - implementation 'com.squareup.retrofit2:adapter-rxjava2:2.3.0' + implementation 'io.reactivex.rxjava2:rxjava:2.2.8' + 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.google.code.gson:gson:2.8.7' //极光推送 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' } protobuf { @@ -245,9 +303,9 @@ protobuf { task.builtins { remove java javanano { - option "java_package=launcher_log_extension.proto|com.android.uiuios.userevent.nano" - option "java_package=launcher_log.proto|com.android.uiuios.userevent.nano" - option "java_package=launcher_dump.proto|com.android.uiuios.model.nano" + 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 "enum_style=java" } } diff --git a/go/AndroidManifest.xml b/go/AndroidManifest.xml index 5d28885..e38c336 100644 --- a/go/AndroidManifest.xml +++ b/go/AndroidManifest.xml @@ -20,12 +20,12 @@ + package="com.android.colorfulos" > - - com.android.uiuios.GoLauncherAppTransitionManagerImpl + com.android.colorfulos.GoLauncherAppTransitionManagerImpl com.android.quickstep.InstantAppResolverImpl diff --git a/go/quickstep/src/com/android/launcher3/GoLauncherAppTransitionManagerImpl.java b/go/quickstep/src/com/android/launcher3/GoLauncherAppTransitionManagerImpl.java index 558532f..b328d90 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.uiuios; +package com.android.colorfulos; -import static com.android.uiuios.Utilities.postAsyncCallback; -import static com.android.uiuios.anim.Interpolators.AGGRESSIVE_EASE; -import static com.android.uiuios.anim.Interpolators.LINEAR; +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.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 46d4f49..ae0e3d5 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.uiuios; +package com.android.colorfulos; -import static com.android.uiuios.LauncherState.NORMAL; +import static com.android.colorfulos.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 4675c86..f14b75e 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.uiuios.uioverrides; +package com.android.colorfulos.uioverrides; -import com.android.uiuios.DeviceProfile; -import com.android.uiuios.Launcher; -import com.android.uiuios.LauncherStateManager.StateHandler; -import com.android.uiuios.Utilities; -import com.android.uiuios.config.FeatureFlags; -import com.android.uiuios.graphics.RotationMode; -import com.android.uiuios.uioverrides.touchcontrollers.LandscapeEdgeSwipeController; -import com.android.uiuios.uioverrides.touchcontrollers.LandscapeStatesTouchController; -import com.android.uiuios.uioverrides.touchcontrollers.PortraitStatesTouchController; -import com.android.uiuios.uioverrides.touchcontrollers.StatusBarTouchController; -import com.android.uiuios.util.TouchController; +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.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 acaecb8..fc96060 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.uiuios.uioverrides; +package com.android.colorfulos.uioverrides; import static com.android.quickstep.views.IconRecentsView.CONTENT_ALPHA; import android.util.FloatProperty; -import com.android.uiuios.Launcher; -import com.android.uiuios.LauncherRecentsToActivityHelper; +import com.android.colorfulos.Launcher; +import com.android.colorfulos.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 abfa8ad..21942c9 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.uiuios.uioverrides.states; +package com.android.colorfulos.uioverrides.states; import static android.view.View.VISIBLE; -import static com.android.uiuios.LauncherAnimUtils.OVERVIEW_TRANSITION_MS; -import static com.android.uiuios.LauncherAnimUtils.SCALE_PROPERTY; -import static com.android.uiuios.anim.AnimatorSetBuilder.ANIM_OVERVIEW_FADE; -import static com.android.uiuios.anim.AnimatorSetBuilder.ANIM_OVERVIEW_SCALE; -import static com.android.uiuios.anim.AnimatorSetBuilder.ANIM_OVERVIEW_TRANSLATE_X; -import static com.android.uiuios.anim.AnimatorSetBuilder.ANIM_WORKSPACE_FADE; -import static com.android.uiuios.anim.AnimatorSetBuilder.ANIM_WORKSPACE_SCALE; -import static com.android.uiuios.anim.AnimatorSetBuilder.ANIM_WORKSPACE_TRANSLATE; -import static com.android.uiuios.anim.Interpolators.ACCEL; -import static com.android.uiuios.anim.Interpolators.DEACCEL_2; -import static com.android.uiuios.anim.Interpolators.OVERSHOOT_1_2; -import static com.android.uiuios.anim.Interpolators.OVERSHOOT_1_7; -import static com.android.uiuios.states.RotationHelper.REQUEST_ROTATE; +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 android.view.View; -import com.android.uiuios.DeviceProfile; -import com.android.uiuios.Launcher; -import com.android.uiuios.LauncherState; -import com.android.uiuios.R; -import com.android.uiuios.anim.AnimatorSetBuilder; -import com.android.uiuios.userevent.nano.LauncherLogProto; +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.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 0b48d8a..4984c69 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.uiuios.uioverrides.touchcontrollers; +package com.android.colorfulos.uioverrides.touchcontrollers; -import static com.android.uiuios.LauncherState.ALL_APPS; -import static com.android.uiuios.LauncherState.NORMAL; +import static com.android.colorfulos.LauncherState.ALL_APPS; +import static com.android.colorfulos.LauncherState.NORMAL; import android.view.MotionEvent; -import com.android.uiuios.AbstractFloatingView; -import com.android.uiuios.Launcher; -import com.android.uiuios.LauncherState; -import com.android.uiuios.userevent.nano.LauncherLogProto; +import com.android.colorfulos.AbstractFloatingView; +import com.android.colorfulos.Launcher; +import com.android.colorfulos.LauncherState; +import com.android.colorfulos.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 b531c5a..5b1740c 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.uiuios.uioverrides.touchcontrollers; +package com.android.colorfulos.uioverrides.touchcontrollers; import android.view.MotionEvent; -import com.android.uiuios.Launcher; -import com.android.uiuios.util.PendingAnimation; +import com.android.colorfulos.Launcher; +import com.android.colorfulos.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 d73c801..8fdec0a 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.uiuios.Utilities.postAsyncCallback; -import static com.android.uiuios.anim.Interpolators.FAST_OUT_SLOW_IN; +import static com.android.colorfulos.Utilities.postAsyncCallback; +import static com.android.colorfulos.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.uiuios.BaseDraggingActivity; -import com.android.uiuios.LauncherAnimationRunner; +import com.android.colorfulos.BaseDraggingActivity; +import com.android.colorfulos.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 7812bdf..7e9e95a 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.uiuios.anim.Interpolators.LINEAR; +import static com.android.colorfulos.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.uiuios.anim.AnimatorPlaybackController; -import com.android.uiuios.userevent.nano.LauncherLogProto; +import com.android.colorfulos.anim.AnimatorPlaybackController; +import com.android.colorfulos.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 e85fd7d..7bb5ea4 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.uiuios.BaseDraggingActivity; -import com.android.uiuios.DeviceProfile; +import com.android.colorfulos.BaseDraggingActivity; +import com.android.colorfulos.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 b00767d..1d6a6c0 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.uiuios.R; +import com.android.colorfulos.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 3bac510..fd8ff1b 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.uiuios.LauncherState.OVERVIEW; +import static com.android.colorfulos.LauncherState.OVERVIEW; -import com.android.uiuios.Launcher; -import com.android.uiuios.LauncherAppState; -import com.android.uiuios.LauncherInitListener; -import com.android.uiuios.LauncherState; -import com.android.uiuios.anim.AnimatorPlaybackController; -import com.android.uiuios.userevent.nano.LauncherLogProto; +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.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 808402a..3b5c99f 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.uiuios.BaseDraggingActivity; -import com.android.uiuios.MainThreadExecutor; -import com.android.uiuios.logging.UserEventDispatcher; -import com.android.uiuios.userevent.nano.LauncherLogProto; +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.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 106c244..82dba72 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.uiuios.R; -import com.android.uiuios.views.BaseDragLayer; +import com.android.colorfulos.R; +import com.android.colorfulos.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 24d34a2..d925b78 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.uiuios.logging.StatsLogManager; +import com.android.colorfulos.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 b2abcf1..72a14d5 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.uiuios.R; +import com.android.colorfulos.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 1b4a8c3..3dbd0e2 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.uiuios.R; +import com.android.colorfulos.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 82454a3..736dad5 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.uiuios.Utilities; -import com.android.uiuios.compat.UserManagerCompat; +import com.android.colorfulos.Utilities; +import com.android.colorfulos.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 174bdce..37a89b7 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.uiuios.util.TouchController; -import com.android.uiuios.views.BaseDragLayer; +import com.android.colorfulos.util.TouchController; +import com.android.colorfulos.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 9481d6b..e4252cf 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.uiuios.anim.Interpolators.ACCEL_2; +import static com.android.colorfulos.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.uiuios.BaseActivity; -import com.android.uiuios.Insettable; -import com.android.uiuios.R; -import com.android.uiuios.util.Themes; +import com.android.colorfulos.BaseActivity; +import com.android.colorfulos.Insettable; +import com.android.colorfulos.R; +import com.android.colorfulos.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 1229090..a139747 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.uiuios.R; +import com.android.colorfulos.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 8266fe5..328a4ba 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.uiuios.R; +import com.android.colorfulos.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 1bfd054..d4c205b 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.uiuios.R; +import com.android.colorfulos.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 4872df9..9c9218b 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.uiuios.config; +package com.android.colorfulos.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 1620477..21a8697 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.uiuios.model; +package com.android.colorfulos.model; -import com.android.uiuios.AllAppsList; -import com.android.uiuios.LauncherAppState; -import com.android.uiuios.LauncherModel.Callbacks; +import com.android.colorfulos.AllAppsList; +import com.android.colorfulos.LauncherAppState; +import com.android.colorfulos.LauncherModel.Callbacks; import java.lang.ref.WeakReference; /** - * Helper class to handle results of {@link com.android.uiuios.model.LoaderTask}. + * Helper class to handle results of {@link com.android.colorfulos.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 5a43509..74990b9 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.uiuios.model; +package com.android.colorfulos.model; import android.content.Context; import android.os.UserHandle; -import com.android.uiuios.icons.ComponentWithLabel; -import com.android.uiuios.LauncherAppState; -import com.android.uiuios.util.PackageUserKey; -import com.android.uiuios.widget.WidgetListRowEntry; +import com.android.colorfulos.icons.ComponentWithLabel; +import com.android.colorfulos.LauncherAppState; +import com.android.colorfulos.util.PackageUserKey; +import com.android.colorfulos.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.uiuios.widget.WidgetsDiffReporter} + * {@link com.android.colorfulos.widget.WidgetsDiffReporter} * - * @see com.android.uiuios.widget.WidgetsListAdapter#setWidgets(ArrayList) + * @see com.android.colorfulos.widget.WidgetsListAdapter#setWidgets(ArrayList) */ public synchronized ArrayList 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 2e31039..72f4845 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.uiuios.shortcuts; +package com.android.colorfulos.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.uiuios.ItemInfo; +import com.android.colorfulos.ItemInfo; import java.util.Collections; import java.util.List; diff --git a/iconloaderlib/AndroidManifest.xml b/iconloaderlib/AndroidManifest.xml index df1ffdf..e654818 100644 --- a/iconloaderlib/AndroidManifest.xml +++ b/iconloaderlib/AndroidManifest.xml @@ -16,5 +16,5 @@ --> + package="com.android.colorfulos.icons"> diff --git a/iconloaderlib/build.gradle b/iconloaderlib/build.gradle index 34c6539..88508c2 100644 --- a/iconloaderlib/build.gradle +++ b/iconloaderlib/build.gradle @@ -13,6 +13,15 @@ android { } buildTypes { + zhanRuiRelease.initWith(release) + zhanRuiRelease { + minifyEnabled false + } + + zhanRuiDebug.initWith(debug) + zhanRuiDebug { + minifyEnabled false + } debug { minifyEnabled false } diff --git a/iconloaderlib/res/drawable-v26/adaptive_icon_drawable_wrapper.xml b/iconloaderlib/res/drawable-v26/adaptive_icon_drawable_wrapper.xml index 002357e..f2a5941 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 @@ - + diff --git a/iconloaderlib/src/com/android/uiuios/icons/BaseIconFactory.java b/iconloaderlib/src/com/android/colorfulos/icons/BaseIconFactory.java similarity index 98% rename from iconloaderlib/src/com/android/uiuios/icons/BaseIconFactory.java rename to iconloaderlib/src/com/android/colorfulos/icons/BaseIconFactory.java index 461bcbb..fb99bd8 100644 --- a/iconloaderlib/src/com/android/uiuios/icons/BaseIconFactory.java +++ b/iconloaderlib/src/com/android/colorfulos/icons/BaseIconFactory.java @@ -1,9 +1,9 @@ -package com.android.uiuios.icons; +package com.android.colorfulos.icons; import static android.graphics.Paint.DITHER_FLAG; import static android.graphics.Paint.FILTER_BITMAP_FLAG; -import static com.android.uiuios.icons.ShadowGenerator.BLUR_FACTOR; +import static com.android.colorfulos.icons.ShadowGenerator.BLUR_FACTOR; import android.content.Context; import android.content.Intent; @@ -17,7 +17,6 @@ import android.graphics.Rect; import android.graphics.RectF; import android.graphics.drawable.AdaptiveIconDrawable; import android.graphics.drawable.BitmapDrawable; -import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; import android.os.Build; import android.os.Process; diff --git a/iconloaderlib/src/com/android/uiuios/icons/BitmapInfo.java b/iconloaderlib/src/com/android/colorfulos/icons/BitmapInfo.java similarity index 97% rename from iconloaderlib/src/com/android/uiuios/icons/BitmapInfo.java rename to iconloaderlib/src/com/android/colorfulos/icons/BitmapInfo.java index 5da374f..7df26f0 100644 --- a/iconloaderlib/src/com/android/uiuios/icons/BitmapInfo.java +++ b/iconloaderlib/src/com/android/colorfulos/icons/BitmapInfo.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.icons; +package com.android.colorfulos.icons; import android.graphics.Bitmap; import android.graphics.Bitmap.Config; diff --git a/iconloaderlib/src/com/android/uiuios/icons/BitmapRenderer.java b/iconloaderlib/src/com/android/colorfulos/icons/BitmapRenderer.java similarity index 97% rename from iconloaderlib/src/com/android/uiuios/icons/BitmapRenderer.java rename to iconloaderlib/src/com/android/colorfulos/icons/BitmapRenderer.java index 28d02b0..3feeb27 100644 --- a/iconloaderlib/src/com/android/uiuios/icons/BitmapRenderer.java +++ b/iconloaderlib/src/com/android/colorfulos/icons/BitmapRenderer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.icons; +package com.android.colorfulos.icons; import android.annotation.TargetApi; import android.graphics.Bitmap; diff --git a/iconloaderlib/src/com/android/uiuios/icons/ColorExtractor.java b/iconloaderlib/src/com/android/colorfulos/icons/ColorExtractor.java similarity index 99% rename from iconloaderlib/src/com/android/uiuios/icons/ColorExtractor.java rename to iconloaderlib/src/com/android/colorfulos/icons/ColorExtractor.java index 25c1b79..03dd992 100644 --- a/iconloaderlib/src/com/android/uiuios/icons/ColorExtractor.java +++ b/iconloaderlib/src/com/android/colorfulos/icons/ColorExtractor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.icons; +package com.android.colorfulos.icons; import android.graphics.Bitmap; import android.graphics.Color; diff --git a/iconloaderlib/src/com/android/uiuios/icons/DotRenderer.java b/iconloaderlib/src/com/android/colorfulos/icons/DotRenderer.java similarity index 98% rename from iconloaderlib/src/com/android/uiuios/icons/DotRenderer.java rename to iconloaderlib/src/com/android/colorfulos/icons/DotRenderer.java index a1dedbe..20c09cc 100644 --- a/iconloaderlib/src/com/android/uiuios/icons/DotRenderer.java +++ b/iconloaderlib/src/com/android/colorfulos/icons/DotRenderer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.icons; +package com.android.colorfulos.icons; import static android.graphics.Paint.ANTI_ALIAS_FLAG; import static android.graphics.Paint.FILTER_BITMAP_FLAG; @@ -26,7 +26,6 @@ import android.graphics.Paint; import android.graphics.Path; import android.graphics.PathMeasure; import android.graphics.Rect; -import android.graphics.RectF; import android.util.Log; import android.view.ViewDebug; diff --git a/iconloaderlib/src/com/android/uiuios/icons/FixedScaleDrawable.java b/iconloaderlib/src/com/android/colorfulos/icons/FixedScaleDrawable.java similarity index 97% rename from iconloaderlib/src/com/android/uiuios/icons/FixedScaleDrawable.java rename to iconloaderlib/src/com/android/colorfulos/icons/FixedScaleDrawable.java index b6e1b7c..5342e1a 100644 --- a/iconloaderlib/src/com/android/uiuios/icons/FixedScaleDrawable.java +++ b/iconloaderlib/src/com/android/colorfulos/icons/FixedScaleDrawable.java @@ -1,4 +1,4 @@ -package com.android.uiuios.icons; +package com.android.colorfulos.icons; import android.content.res.Resources; import android.content.res.Resources.Theme; diff --git a/iconloaderlib/src/com/android/uiuios/icons/GraphicsUtils.java b/iconloaderlib/src/com/android/colorfulos/icons/GraphicsUtils.java similarity index 98% rename from iconloaderlib/src/com/android/uiuios/icons/GraphicsUtils.java rename to iconloaderlib/src/com/android/colorfulos/icons/GraphicsUtils.java index 74e4eb2..ee7ec8d 100644 --- a/iconloaderlib/src/com/android/uiuios/icons/GraphicsUtils.java +++ b/iconloaderlib/src/com/android/colorfulos/icons/GraphicsUtils.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.icons; +package com.android.colorfulos.icons; import android.graphics.Bitmap; import android.graphics.Rect; diff --git a/iconloaderlib/src/com/android/uiuios/icons/IconNormalizer.java b/iconloaderlib/src/com/android/colorfulos/icons/IconNormalizer.java similarity index 99% rename from iconloaderlib/src/com/android/uiuios/icons/IconNormalizer.java rename to iconloaderlib/src/com/android/colorfulos/icons/IconNormalizer.java index 9a8acd5..228210b 100644 --- a/iconloaderlib/src/com/android/uiuios/icons/IconNormalizer.java +++ b/iconloaderlib/src/com/android/colorfulos/icons/IconNormalizer.java @@ -14,11 +14,10 @@ * limitations under the License. */ -package com.android.uiuios.icons; +package com.android.colorfulos.icons; import android.annotation.TargetApi; import android.content.Context; -import android.content.res.Resources; import android.graphics.Bitmap; import android.graphics.Canvas; import android.graphics.Color; diff --git a/iconloaderlib/src/com/android/uiuios/icons/ShadowGenerator.java b/iconloaderlib/src/com/android/colorfulos/icons/ShadowGenerator.java similarity index 98% rename from iconloaderlib/src/com/android/uiuios/icons/ShadowGenerator.java rename to iconloaderlib/src/com/android/colorfulos/icons/ShadowGenerator.java index 8b9d472..c59d645 100644 --- a/iconloaderlib/src/com/android/uiuios/icons/ShadowGenerator.java +++ b/iconloaderlib/src/com/android/colorfulos/icons/ShadowGenerator.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.android.uiuios.icons; +package com.android.colorfulos.icons; -import static com.android.uiuios.icons.GraphicsUtils.setColorAlphaBound; +import static com.android.colorfulos.icons.GraphicsUtils.setColorAlphaBound; import android.graphics.Bitmap; import android.graphics.Bitmap.Config; diff --git a/iconloaderlib/src/com/android/uiuios/icons/cache/BaseIconCache.java b/iconloaderlib/src/com/android/colorfulos/icons/cache/BaseIconCache.java similarity index 97% rename from iconloaderlib/src/com/android/uiuios/icons/cache/BaseIconCache.java rename to iconloaderlib/src/com/android/colorfulos/icons/cache/BaseIconCache.java index d6de73f..2ccf0bb 100644 --- a/iconloaderlib/src/com/android/uiuios/icons/cache/BaseIconCache.java +++ b/iconloaderlib/src/com/android/colorfulos/icons/cache/BaseIconCache.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.icons.cache; +package com.android.colorfulos.icons.cache; -import static com.android.uiuios.icons.BaseIconFactory.getFullResDefaultActivityIcon; -import static com.android.uiuios.icons.BitmapInfo.LOW_RES_ICON; -import static com.android.uiuios.icons.GraphicsUtils.setColorAlphaBound; +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; import android.content.ComponentName; import android.content.ContentValues; @@ -42,12 +42,12 @@ import android.os.UserHandle; import android.text.TextUtils; import android.util.Log; -import com.android.uiuios.icons.BaseIconFactory; -import com.android.uiuios.icons.BitmapInfo; -import com.android.uiuios.icons.BitmapRenderer; -import com.android.uiuios.icons.GraphicsUtils; -import com.android.uiuios.util.ComponentKey; -import com.android.uiuios.util.SQLiteCacheHelper; +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 java.util.AbstractMap; import java.util.Collections; diff --git a/iconloaderlib/src/com/android/uiuios/icons/cache/CachingLogic.java b/iconloaderlib/src/com/android/colorfulos/icons/cache/CachingLogic.java similarity index 91% rename from iconloaderlib/src/com/android/uiuios/icons/cache/CachingLogic.java rename to iconloaderlib/src/com/android/colorfulos/icons/cache/CachingLogic.java index fbf0542..da7b9d2 100644 --- a/iconloaderlib/src/com/android/uiuios/icons/cache/CachingLogic.java +++ b/iconloaderlib/src/com/android/colorfulos/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.uiuios.icons.cache; +package com.android.colorfulos.icons.cache; import android.content.ComponentName; import android.content.Context; import android.os.UserHandle; -import com.android.uiuios.icons.BitmapInfo; +import com.android.colorfulos.icons.BitmapInfo; public interface CachingLogic { diff --git a/iconloaderlib/src/com/android/uiuios/icons/cache/HandlerRunnable.java b/iconloaderlib/src/com/android/colorfulos/icons/cache/HandlerRunnable.java similarity index 97% rename from iconloaderlib/src/com/android/uiuios/icons/cache/HandlerRunnable.java rename to iconloaderlib/src/com/android/colorfulos/icons/cache/HandlerRunnable.java index 432cc59..def39d3 100644 --- a/iconloaderlib/src/com/android/uiuios/icons/cache/HandlerRunnable.java +++ b/iconloaderlib/src/com/android/colorfulos/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.uiuios.icons.cache; +package com.android.colorfulos.icons.cache; import android.os.Handler; diff --git a/iconloaderlib/src/com/android/uiuios/icons/cache/IconCacheUpdateHandler.java b/iconloaderlib/src/com/android/colorfulos/icons/cache/IconCacheUpdateHandler.java similarity index 99% rename from iconloaderlib/src/com/android/uiuios/icons/cache/IconCacheUpdateHandler.java rename to iconloaderlib/src/com/android/colorfulos/icons/cache/IconCacheUpdateHandler.java index eebe38c..19ed9ff 100644 --- a/iconloaderlib/src/com/android/uiuios/icons/cache/IconCacheUpdateHandler.java +++ b/iconloaderlib/src/com/android/colorfulos/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.uiuios.icons.cache; +package com.android.colorfulos.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.uiuios.icons.cache.BaseIconCache.IconDB; +import com.android.colorfulos.icons.cache.BaseIconCache.IconDB; import java.util.Collections; import java.util.HashMap; diff --git a/iconloaderlib/src/com/android/uiuios/util/ComponentKey.java b/iconloaderlib/src/com/android/colorfulos/util/ComponentKey.java similarity index 97% rename from iconloaderlib/src/com/android/uiuios/util/ComponentKey.java rename to iconloaderlib/src/com/android/colorfulos/util/ComponentKey.java index 824b9ab..3f1b1a1 100644 --- a/iconloaderlib/src/com/android/uiuios/util/ComponentKey.java +++ b/iconloaderlib/src/com/android/colorfulos/util/ComponentKey.java @@ -1,4 +1,4 @@ -package com.android.uiuios.util; +package com.android.colorfulos.util; /** * Copyright (C) 2015 The Android Open Source Project diff --git a/iconloaderlib/src/com/android/uiuios/util/NoLocaleSQLiteHelper.java b/iconloaderlib/src/com/android/colorfulos/util/NoLocaleSQLiteHelper.java similarity index 98% rename from iconloaderlib/src/com/android/uiuios/util/NoLocaleSQLiteHelper.java rename to iconloaderlib/src/com/android/colorfulos/util/NoLocaleSQLiteHelper.java index 6866e1d..471f386 100644 --- a/iconloaderlib/src/com/android/uiuios/util/NoLocaleSQLiteHelper.java +++ b/iconloaderlib/src/com/android/colorfulos/util/NoLocaleSQLiteHelper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.util; +package com.android.colorfulos.util; import static android.database.sqlite.SQLiteDatabase.NO_LOCALIZED_COLLATORS; diff --git a/iconloaderlib/src/com/android/uiuios/util/SQLiteCacheHelper.java b/iconloaderlib/src/com/android/colorfulos/util/SQLiteCacheHelper.java similarity index 99% rename from iconloaderlib/src/com/android/uiuios/util/SQLiteCacheHelper.java rename to iconloaderlib/src/com/android/colorfulos/util/SQLiteCacheHelper.java index c80a886..4851f1d 100644 --- a/iconloaderlib/src/com/android/uiuios/util/SQLiteCacheHelper.java +++ b/iconloaderlib/src/com/android/colorfulos/util/SQLiteCacheHelper.java @@ -1,4 +1,4 @@ -package com.android.uiuios.util; +package com.android.colorfulos.util; import android.content.ContentValues; import android.content.Context; diff --git a/iconloaderlib/src_full_lib/com/android/uiuios/icons/IconFactory.java b/iconloaderlib/src_full_lib/com/android/colorfulos/icons/IconFactory.java similarity index 98% rename from iconloaderlib/src_full_lib/com/android/uiuios/icons/IconFactory.java rename to iconloaderlib/src_full_lib/com/android/colorfulos/icons/IconFactory.java index 4afbe34..fd6bd1d 100644 --- a/iconloaderlib/src_full_lib/com/android/uiuios/icons/IconFactory.java +++ b/iconloaderlib/src_full_lib/com/android/colorfulos/icons/IconFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.icons; +package com.android.colorfulos.icons; import android.content.Context; diff --git a/iconloaderlib/src_full_lib/com/android/uiuios/icons/SimpleIconCache.java b/iconloaderlib/src_full_lib/com/android/colorfulos/icons/SimpleIconCache.java similarity index 97% rename from iconloaderlib/src_full_lib/com/android/uiuios/icons/SimpleIconCache.java rename to iconloaderlib/src_full_lib/com/android/colorfulos/icons/SimpleIconCache.java index 5ff5917..62d1dfd 100644 --- a/iconloaderlib/src_full_lib/com/android/uiuios/icons/SimpleIconCache.java +++ b/iconloaderlib/src_full_lib/com/android/colorfulos/icons/SimpleIconCache.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.icons; +package com.android.colorfulos.icons; import static android.content.Intent.ACTION_MANAGED_PROFILE_ADDED; import static android.content.Intent.ACTION_MANAGED_PROFILE_REMOVED; @@ -32,7 +32,7 @@ import android.os.UserHandle; import android.os.UserManager; import android.util.SparseLongArray; -import com.android.uiuios.icons.cache.BaseIconCache; +import com.android.colorfulos.icons.cache.BaseIconCache; /** * Wrapper class to provide access to {@link BaseIconFactory} and also to provide pool of this class diff --git a/print_db.py b/print_db.py index 9542c87..a1a4bc7 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.uiuios/databases/launcher.db" + + " /data/data/com.android.colorfulos/databases/launcher.db" + " " + fn); if rv != 0: print "adb pull failed" diff --git a/proguard.flags b/proguard.flags index bb31c67..5439265 100644 --- a/proguard.flags +++ b/proguard.flags @@ -1,14 +1,14 @@ --keep,allowshrinking,allowoptimization class com.android.uiuios.** { +-keep,allowshrinking,allowoptimization class com.android.colorfulos.** { *; } # 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.uiuios.compat.** { +-keep class com.android.colorfulos.compat.** { *; } --keep class com.android.uiuios.graphics.ShadowDrawable { +-keep class com.android.colorfulos.graphics.ShadowDrawable { public (...); } @@ -29,19 +29,19 @@ } ## Prevent obfuscating various overridable objects --keep class ** implements com.android.uiuios.util.ResourceBasedOverride { +-keep class ** implements com.android.colorfulos.util.ResourceBasedOverride { public (...); } --keep interface com.android.uiuios.userevent.nano.LauncherLogProto.** { +-keep interface com.android.colorfulos.userevent.nano.LauncherLogProto.** { *; } --keep interface com.android.uiuios.model.nano.LauncherDumpProto.** { +-keep interface com.android.colorfulos.model.nano.LauncherDumpProto.** { *; } # Discovery bounce animation --keep class com.android.uiuios.allapps.DiscoveryBounce$VerticalProgressWrapper { +-keep class com.android.colorfulos.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 161e9a2..979132d 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.uiuios.userevent"; +option java_package = "com.android.colorfulos.userevent"; option java_outer_classname = "LauncherLogExtensions"; package userevent; diff --git a/protos/launcher_dump.proto b/protos/launcher_dump.proto index 267e769..d5592ef 100644 --- a/protos/launcher_dump.proto +++ b/protos/launcher_dump.proto @@ -15,7 +15,7 @@ */ syntax = "proto2"; -option java_package = "com.android.uiuios.model"; +option java_package = "com.android.colorfulos.model"; option java_outer_classname = "LauncherDumpProto"; package model; diff --git a/protos/launcher_log.proto b/protos/launcher_log.proto index 812ef2a..e02bc75 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.uiuios.userevent"; +option java_package = "com.android.colorfulos.userevent"; option java_outer_classname = "LauncherLogProto"; package userevent; diff --git a/quickstep/AndroidManifest.xml b/quickstep/AndroidManifest.xml index f9cf54d..74457b0 100644 --- a/quickstep/AndroidManifest.xml +++ b/quickstep/AndroidManifest.xml @@ -20,12 +20,12 @@ + package="com.android.colorfulos" > - - diff --git a/quickstep/recents_ui_overrides/res/values/override.xml b/quickstep/recents_ui_overrides/res/values/override.xml index 2017c29..0dc358f 100644 --- a/quickstep/recents_ui_overrides/res/values/override.xml +++ b/quickstep/recents_ui_overrides/res/values/override.xml @@ -17,11 +17,11 @@ - com.android.uiuios.LauncherAppTransitionManagerImpl + com.android.colorfulos.LauncherAppTransitionManagerImpl com.android.quickstep.InstantAppResolverImpl - com.android.uiuios.appprediction.PredictionAppTracker + com.android.colorfulos.appprediction.PredictionAppTracker com.android.quickstep.QuickstepProcessInitializer 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 f559904..dc60538 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.uiuios; +package com.android.colorfulos; -import static com.android.uiuios.LauncherAnimUtils.VIEW_TRANSLATE_X; -import static com.android.uiuios.LauncherState.NORMAL; -import static com.android.uiuios.allapps.AllAppsTransitionController.ALL_APPS_PROGRESS; -import static com.android.uiuios.anim.Interpolators.AGGRESSIVE_EASE; -import static com.android.uiuios.anim.Interpolators.LINEAR; +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.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.uiuios.allapps.AllAppsTransitionController; -import com.android.uiuios.anim.AnimatorPlaybackController; -import com.android.uiuios.anim.Interpolators; -import com.android.uiuios.anim.SpringObjectAnimator; +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.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 6446033..7e9533d 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.uiuios; +package com.android.colorfulos; -import com.android.uiuios.appprediction.PredictionUiStateManager; -import com.android.uiuios.appprediction.PredictionUiStateManager.Client; +import com.android.colorfulos.appprediction.PredictionUiStateManager; +import com.android.colorfulos.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 d2fc82f..31837f9 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.uiuios.appprediction; +package com.android.colorfulos.appprediction; -import static com.android.uiuios.LauncherState.ALL_APPS; +import static com.android.colorfulos.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.uiuios.AbstractFloatingView; -import com.android.uiuios.Launcher; -import com.android.uiuios.LauncherState; -import com.android.uiuios.LauncherStateManager; -import com.android.uiuios.R; -import com.android.uiuios.Utilities; -import com.android.uiuios.allapps.FloatingHeaderView; -import com.android.uiuios.anim.Interpolators; -import com.android.uiuios.compat.UserManagerCompat; -import com.android.uiuios.dragndrop.DragLayer; -import com.android.uiuios.graphics.TriangleShape; +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.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 4918b70..f211c5b 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.uiuios.appprediction; +package com.android.colorfulos.appprediction; -import static com.android.uiuios.LauncherState.ALL_APPS; +import static com.android.colorfulos.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.uiuios.DeviceProfile; -import com.android.uiuios.Launcher; -import com.android.uiuios.LauncherState; -import com.android.uiuios.LauncherStateManager; -import com.android.uiuios.R; -import com.android.uiuios.allapps.FloatingHeaderRow; -import com.android.uiuios.allapps.FloatingHeaderView; -import com.android.uiuios.anim.PropertySetter; -import com.android.uiuios.util.Themes; +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 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 2ba96f3..a8eacd3 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.uiuios.appprediction; +package com.android.colorfulos.appprediction; import static com.android.quickstep.InstantAppResolverImpl.COMPONENT_CLASS_MARKER; import android.content.Context; -import com.android.uiuios.AppInfo; -import com.android.uiuios.ItemInfoWithIcon; -import com.android.uiuios.allapps.AllAppsStore; -import com.android.uiuios.shortcuts.ShortcutKey; -import com.android.uiuios.util.ComponentKey; +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; 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 64b9767..e8082b7 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.uiuios.appprediction; +package com.android.colorfulos.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.uiuios.LauncherAppState; -import com.android.uiuios.LauncherModel; -import com.android.uiuios.WorkspaceItemInfo; -import com.android.uiuios.icons.IconCache; -import com.android.uiuios.icons.LauncherIcons; -import com.android.uiuios.shortcuts.DeepShortcutManager; -import com.android.uiuios.shortcuts.ShortcutKey; -import com.android.uiuios.util.InstantAppResolver; +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 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 09e842f..60e322d 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.uiuios.appprediction; +package com.android.colorfulos.appprediction; import static com.android.quickstep.InstantAppResolverImpl.COMPONENT_CLASS_MARKER; import android.content.ComponentName; import android.content.Intent; -import com.android.uiuios.AppInfo; -import com.android.uiuios.LauncherSettings; -import com.android.uiuios.WorkspaceItemInfo; +import com.android.colorfulos.AppInfo; +import com.android.colorfulos.LauncherSettings; +import com.android.colorfulos.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 728cd8b..14d5699 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.uiuios.appprediction; +package com.android.colorfulos.appprediction; -import static com.android.uiuios.InvariantDeviceProfile.CHANGE_FLAG_GRID; +import static com.android.colorfulos.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.uiuios.InvariantDeviceProfile; -import com.android.uiuios.appprediction.PredictionUiStateManager.Client; -import com.android.uiuios.model.AppLaunchTracker; -import com.android.uiuios.util.UiThreadHelper; +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 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 c59405f..9964469 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.uiuios.appprediction; +package com.android.colorfulos.appprediction; -import static com.android.uiuios.anim.Interpolators.LINEAR; -import static com.android.uiuios.icons.GraphicsUtils.setColorAlphaBound; +import static com.android.colorfulos.anim.Interpolators.LINEAR; +import static com.android.colorfulos.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.uiuios.AppInfo; -import com.android.uiuios.BubbleTextView; -import com.android.uiuios.DeviceProfile; -import com.android.uiuios.DeviceProfile.OnDeviceProfileChangeListener; -import com.android.uiuios.ItemInfo; -import com.android.uiuios.ItemInfoWithIcon; -import com.android.uiuios.Launcher; -import com.android.uiuios.LauncherAppState; -import com.android.uiuios.R; -import com.android.uiuios.WorkspaceItemInfo; -import com.android.uiuios.allapps.AllAppsStore; -import com.android.uiuios.allapps.FloatingHeaderRow; -import com.android.uiuios.allapps.FloatingHeaderView; -import com.android.uiuios.anim.AlphaUpdateListener; -import com.android.uiuios.anim.PropertySetter; -import com.android.uiuios.config.FeatureFlags; -import com.android.uiuios.keyboard.FocusIndicatorHelper; -import com.android.uiuios.keyboard.FocusIndicatorHelper.SimpleFocusIndicatorHelper; -import com.android.uiuios.logging.StatsLogUtils.LogContainerProvider; -import com.android.uiuios.model.AppLaunchTracker; -import com.android.uiuios.touch.ItemClickHandler; -import com.android.uiuios.touch.ItemLongClickListener; -import com.android.uiuios.userevent.nano.LauncherLogProto; -import com.android.uiuios.util.Themes; +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.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 e14e058..a680871 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.uiuios.appprediction; +package com.android.colorfulos.appprediction; -import static com.android.uiuios.LauncherState.BACKGROUND_APP; -import static com.android.uiuios.LauncherState.OVERVIEW; +import static com.android.colorfulos.LauncherState.BACKGROUND_APP; +import static com.android.colorfulos.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.uiuios.AppInfo; -import com.android.uiuios.InvariantDeviceProfile; -import com.android.uiuios.InvariantDeviceProfile.OnIDPChangeListener; -import com.android.uiuios.ItemInfoWithIcon; -import com.android.uiuios.Launcher; -import com.android.uiuios.LauncherAppState; -import com.android.uiuios.Utilities; -import com.android.uiuios.allapps.AllAppsContainerView; -import com.android.uiuios.allapps.AllAppsStore.OnUpdateListener; -import com.android.uiuios.icons.IconCache; -import com.android.uiuios.icons.IconCache.ItemInfoUpdateReceiver; -import com.android.uiuios.shortcuts.ShortcutKey; -import com.android.uiuios.util.ComponentKey; -import com.android.uiuios.util.MainThreadInitializedObject; +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 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 3e68f77..3c56758 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.uiuios.uioverrides; +package com.android.colorfulos.uioverrides; -import static com.android.uiuios.LauncherState.NORMAL; -import static com.android.uiuios.LauncherState.OVERVIEW; +import static com.android.colorfulos.LauncherState.NORMAL; +import static com.android.colorfulos.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.uiuios.DeviceProfile; -import com.android.uiuios.Launcher; -import com.android.uiuios.LauncherState; -import com.android.uiuios.LauncherStateManager.StateHandler; -import com.android.uiuios.Utilities; -import com.android.uiuios.anim.AnimatorPlaybackController; -import com.android.uiuios.config.FeatureFlags; -import com.android.uiuios.graphics.RotationMode; -import com.android.uiuios.uioverrides.touchcontrollers.FlingAndHoldTouchController; -import com.android.uiuios.uioverrides.touchcontrollers.LandscapeEdgeSwipeController; -import com.android.uiuios.uioverrides.touchcontrollers.NavBarToHomeTouchController; -import com.android.uiuios.uioverrides.touchcontrollers.OverviewToAllAppsTouchController; -import com.android.uiuios.uioverrides.touchcontrollers.PortraitStatesTouchController; -import com.android.uiuios.uioverrides.touchcontrollers.StatusBarTouchController; -import com.android.uiuios.uioverrides.touchcontrollers.QuickSwitchTouchController; -import com.android.uiuios.uioverrides.touchcontrollers.TaskViewTouchController; -import com.android.uiuios.uioverrides.touchcontrollers.TransposedQuickSwitchTouchController; -import com.android.uiuios.util.TouchController; -import com.android.uiuios.util.UiThreadHelper; -import com.android.uiuios.util.UiThreadHelper.AsyncCommand; +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.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 d1dd6de..37fe2fb 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.uiuios.uioverrides; +package com.android.colorfulos.uioverrides; -import static com.android.uiuios.LauncherState.RECENTS_CLEAR_ALL_BUTTON; -import static com.android.uiuios.anim.Interpolators.LINEAR; +import static com.android.colorfulos.LauncherState.RECENTS_CLEAR_ALL_BUTTON; +import static com.android.colorfulos.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.uiuios.Launcher; -import com.android.uiuios.LauncherState; -import com.android.uiuios.LauncherStateManager.AnimationConfig; -import com.android.uiuios.anim.AnimatorSetBuilder; -import com.android.uiuios.anim.PropertySetter; +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.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 9dbfe5f..7ef7921 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.uiuios.uioverrides.states; +package com.android.colorfulos.uioverrides.states; -import static com.android.uiuios.LauncherAnimUtils.OVERVIEW_TRANSITION_MS; +import static com.android.colorfulos.LauncherAnimUtils.OVERVIEW_TRANSITION_MS; -import com.android.uiuios.AbstractFloatingView; -import com.android.uiuios.Launcher; -import com.android.uiuios.allapps.AllAppsTransitionController; -import com.android.uiuios.userevent.nano.LauncherLogProto; +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.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 a6b0620..9825f36 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.uiuios.uioverrides.states; -import static com.android.uiuios.anim.AnimatorSetBuilder.ANIM_OVERVIEW_FADE; -import static com.android.uiuios.anim.AnimatorSetBuilder.ANIM_OVERVIEW_TRANSLATE_X; -import static com.android.uiuios.anim.Interpolators.INSTANT; -import static com.android.uiuios.anim.Interpolators.OVERSHOOT_1_7; +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; -import com.android.uiuios.Launcher; -import com.android.uiuios.LauncherState; -import com.android.uiuios.R; -import com.android.uiuios.anim.AnimatorSetBuilder; +import com.android.colorfulos.Launcher; +import com.android.colorfulos.LauncherState; +import com.android.colorfulos.R; +import com.android.colorfulos.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 59a151d..239af62 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.uiuios.uioverrides.states; +package com.android.colorfulos.uioverrides.states; import static android.view.View.VISIBLE; -import static com.android.uiuios.LauncherAnimUtils.OVERVIEW_TRANSITION_MS; -import static com.android.uiuios.LauncherAnimUtils.SCALE_PROPERTY; -import static com.android.uiuios.anim.AnimatorSetBuilder.ANIM_OVERVIEW_FADE; -import static com.android.uiuios.anim.AnimatorSetBuilder.ANIM_OVERVIEW_SCALE; -import static com.android.uiuios.anim.AnimatorSetBuilder.ANIM_OVERVIEW_TRANSLATE_X; -import static com.android.uiuios.anim.AnimatorSetBuilder.ANIM_WORKSPACE_FADE; -import static com.android.uiuios.anim.AnimatorSetBuilder.ANIM_WORKSPACE_SCALE; -import static com.android.uiuios.anim.AnimatorSetBuilder.ANIM_WORKSPACE_TRANSLATE; -import static com.android.uiuios.anim.Interpolators.ACCEL; -import static com.android.uiuios.anim.Interpolators.DEACCEL_2; -import static com.android.uiuios.anim.Interpolators.OVERSHOOT_1_2; -import static com.android.uiuios.anim.Interpolators.OVERSHOOT_1_7; -import static com.android.uiuios.logging.LoggerUtils.newContainerTarget; -import static com.android.uiuios.states.RotationHelper.REQUEST_ROTATE; +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 android.graphics.Rect; import android.view.View; -import com.android.uiuios.AbstractFloatingView; -import com.android.uiuios.DeviceProfile; -import com.android.uiuios.Launcher; -import com.android.uiuios.LauncherState; -import com.android.uiuios.R; -import com.android.uiuios.Workspace; -import com.android.uiuios.allapps.DiscoveryBounce; -import com.android.uiuios.anim.AnimatorSetBuilder; -import com.android.uiuios.uioverrides.UiFactory; -import com.android.uiuios.userevent.nano.LauncherLogProto.Action; -import com.android.uiuios.userevent.nano.LauncherLogProto.ContainerType; +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.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 ae16ddd..24ce64b 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.uiuios.uioverrides.states; +package com.android.colorfulos.uioverrides.states; import android.os.Handler; import android.os.Looper; -import com.android.uiuios.Launcher; -import com.android.uiuios.userevent.nano.LauncherLogProto; +import com.android.colorfulos.Launcher; +import com.android.colorfulos.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 5d9469a..15c4ec5 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.uiuios.uioverrides.touchcontrollers; +package com.android.colorfulos.uioverrides.touchcontrollers; -import static com.android.uiuios.LauncherState.ALL_APPS; -import static com.android.uiuios.LauncherState.HOTSEAT_ICONS; -import static com.android.uiuios.LauncherState.NORMAL; -import static com.android.uiuios.LauncherState.OVERVIEW; -import static com.android.uiuios.LauncherState.OVERVIEW_PEEK; -import static com.android.uiuios.LauncherStateManager.ANIM_ALL; -import static com.android.uiuios.LauncherStateManager.ATOMIC_OVERVIEW_PEEK_COMPONENT; -import static com.android.uiuios.anim.AnimatorSetBuilder.ANIM_HOTSEAT_SCALE; -import static com.android.uiuios.anim.AnimatorSetBuilder.ANIM_HOTSEAT_TRANSLATE; -import static com.android.uiuios.anim.AnimatorSetBuilder.ANIM_VERTICAL_PROGRESS; -import static com.android.uiuios.anim.AnimatorSetBuilder.ANIM_WORKSPACE_FADE; -import static com.android.uiuios.anim.AnimatorSetBuilder.ANIM_WORKSPACE_SCALE; -import static com.android.uiuios.anim.AnimatorSetBuilder.ANIM_WORKSPACE_TRANSLATE; -import static com.android.uiuios.anim.Interpolators.DEACCEL_3; -import static com.android.uiuios.anim.Interpolators.OVERSHOOT_1_2; +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.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.uiuios.Launcher; -import com.android.uiuios.LauncherState; -import com.android.uiuios.anim.AnimatorSetBuilder; -import com.android.uiuios.userevent.nano.LauncherLogProto.Action.Touch; +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.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 af9052c..52025b7 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.uiuios.uioverrides.touchcontrollers; +package com.android.colorfulos.uioverrides.touchcontrollers; import static android.view.View.TRANSLATION_X; -import static com.android.uiuios.LauncherState.ALL_APPS; -import static com.android.uiuios.LauncherState.NORMAL; -import static com.android.uiuios.LauncherState.OVERVIEW; -import static com.android.uiuios.allapps.AllAppsTransitionController.ALL_APPS_PROGRESS; -import static com.android.uiuios.anim.Interpolators.DEACCEL_3; -import static com.android.uiuios.touch.AbstractStateChangeTouchController.SUCCESS_TRANSITION_PROGRESS; +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 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.uiuios.AbstractFloatingView; -import com.android.uiuios.Launcher; -import com.android.uiuios.LauncherState; -import com.android.uiuios.LauncherStateManager.AnimationConfig; -import com.android.uiuios.R; -import com.android.uiuios.Utilities; -import com.android.uiuios.allapps.AllAppsTransitionController; -import com.android.uiuios.anim.AnimationSuccessListener; -import com.android.uiuios.anim.AnimatorPlaybackController; -import com.android.uiuios.anim.AnimatorSetBuilder; -import com.android.uiuios.anim.Interpolators; -import com.android.uiuios.compat.AccessibilityManagerCompat; -import com.android.uiuios.touch.SwipeDetector; -import com.android.uiuios.userevent.nano.LauncherLogProto; -import com.android.uiuios.userevent.nano.LauncherLogProto.Action.Touch; -import com.android.uiuios.util.TouchController; +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.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 8bbcb50..310b1bc 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.uiuios.uioverrides.touchcontrollers; +package com.android.colorfulos.uioverrides.touchcontrollers; -import static com.android.uiuios.LauncherState.ALL_APPS; -import static com.android.uiuios.LauncherState.NORMAL; -import static com.android.uiuios.LauncherState.OVERVIEW; +import static com.android.colorfulos.LauncherState.ALL_APPS; +import static com.android.colorfulos.LauncherState.NORMAL; +import static com.android.colorfulos.LauncherState.OVERVIEW; import android.view.MotionEvent; -import com.android.uiuios.AbstractFloatingView; -import com.android.uiuios.Launcher; -import com.android.uiuios.LauncherState; -import com.android.uiuios.Utilities; -import com.android.uiuios.userevent.nano.LauncherLogProto; +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.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 f1f63a8..dde7806 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.uiuios.uioverrides.touchcontrollers; +package com.android.colorfulos.uioverrides.touchcontrollers; -import static com.android.uiuios.uioverrides.touchcontrollers.PortraitStatesTouchController.isTouchOverHotseat; +import static com.android.colorfulos.uioverrides.touchcontrollers.PortraitStatesTouchController.isTouchOverHotseat; import android.view.MotionEvent; -import com.android.uiuios.Launcher; -import com.android.uiuios.util.PendingAnimation; +import com.android.colorfulos.Launcher; +import com.android.colorfulos.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 68c3e34..b7e0055 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.uiuios.uioverrides.touchcontrollers; +package com.android.colorfulos.uioverrides.touchcontrollers; -import static com.android.uiuios.LauncherState.NORMAL; -import static com.android.uiuios.LauncherState.QUICK_SWITCH; -import static com.android.uiuios.anim.AnimatorSetBuilder.ANIM_ALL_APPS_FADE; -import static com.android.uiuios.anim.AnimatorSetBuilder.ANIM_OVERVIEW_FADE; -import static com.android.uiuios.anim.AnimatorSetBuilder.ANIM_OVERVIEW_SCALE; -import static com.android.uiuios.anim.AnimatorSetBuilder.ANIM_OVERVIEW_TRANSLATE_Y; -import static com.android.uiuios.anim.AnimatorSetBuilder.ANIM_VERTICAL_PROGRESS; -import static com.android.uiuios.anim.AnimatorSetBuilder.ANIM_WORKSPACE_FADE; -import static com.android.uiuios.anim.AnimatorSetBuilder.ANIM_WORKSPACE_TRANSLATE; -import static com.android.uiuios.anim.Interpolators.ACCEL_2; -import static com.android.uiuios.anim.Interpolators.DEACCEL_2; -import static com.android.uiuios.anim.Interpolators.INSTANT; -import static com.android.uiuios.anim.Interpolators.LINEAR; -import static com.android.uiuios.util.SystemUiController.UI_STATE_OVERVIEW; +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.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.uiuios.Launcher; -import com.android.uiuios.LauncherState; -import com.android.uiuios.LauncherStateManager; -import com.android.uiuios.Utilities; -import com.android.uiuios.anim.AnimatorSetBuilder; -import com.android.uiuios.touch.AbstractStateChangeTouchController; -import com.android.uiuios.touch.SwipeDetector; -import com.android.uiuios.userevent.nano.LauncherLogProto; -import com.android.uiuios.userevent.nano.LauncherLogProto.Action.Direction; +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.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 3564bcf..06b5111 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.uiuios.uioverrides.touchcontrollers; +package com.android.colorfulos.uioverrides.touchcontrollers; -import static com.android.uiuios.AbstractFloatingView.TYPE_ACCESSIBLE; -import static com.android.uiuios.Utilities.SINGLE_FRAME_MS; -import static com.android.uiuios.anim.Interpolators.scrollInterpolatorForVelocity; -import static com.android.uiuios.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE; -import static com.android.uiuios.config.FeatureFlags.QUICKSTEP_SPRINGS; +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 android.animation.Animator; import android.animation.AnimatorListenerAdapter; import android.animation.ValueAnimator; import android.view.MotionEvent; -import com.android.uiuios.AbstractFloatingView; -import com.android.uiuios.BaseDraggingActivity; -import com.android.uiuios.LauncherAnimUtils; -import com.android.uiuios.Utilities; -import com.android.uiuios.anim.AnimatorPlaybackController; -import com.android.uiuios.anim.Interpolators; -import com.android.uiuios.touch.SwipeDetector; -import com.android.uiuios.userevent.nano.LauncherLogProto.Action.Touch; -import com.android.uiuios.util.FlingBlockCheck; -import com.android.uiuios.util.PendingAnimation; -import com.android.uiuios.util.TouchController; -import com.android.uiuios.views.BaseDragLayer; +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.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 e7769c6..7cabb83 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.uiuios.uioverrides.touchcontrollers; +package com.android.colorfulos.uioverrides.touchcontrollers; -import com.android.uiuios.Launcher; -import com.android.uiuios.LauncherState; -import com.android.uiuios.touch.SwipeDetector; +import com.android.colorfulos.Launcher; +import com.android.colorfulos.LauncherState; +import com.android.colorfulos.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 05c789e..e9e2efa 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.uiuios.anim.Interpolators.FAST_OUT_SLOW_IN; -import static com.android.uiuios.anim.Interpolators.TOUCH_RESPONSE_INTERPOLATOR; +import static com.android.colorfulos.anim.Interpolators.FAST_OUT_SLOW_IN; +import static com.android.colorfulos.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.uiuios.AbstractFloatingView; -import com.android.uiuios.BaseDraggingActivity; -import com.android.uiuios.anim.AnimationSuccessListener; +import com.android.colorfulos.AbstractFloatingView; +import com.android.colorfulos.BaseDraggingActivity; +import com.android.colorfulos.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 e30f2d6..e81f773 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.uiuios.anim.Interpolators.LINEAR; +import static com.android.colorfulos.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.uiuios.DeviceProfile; -import com.android.uiuios.anim.AnimationSuccessListener; -import com.android.uiuios.anim.AnimatorPlaybackController; -import com.android.uiuios.userevent.nano.LauncherLogProto; +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.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 291b311..e56b913 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.uiuios.LauncherAnimUtils.SCALE_PROPERTY; -import static com.android.uiuios.LauncherAppTransitionManagerImpl.INDEX_RECENTS_FADE_ANIM; -import static com.android.uiuios.LauncherAppTransitionManagerImpl.INDEX_RECENTS_TRANSLATE_X_ANIM; -import static com.android.uiuios.LauncherAppTransitionManagerImpl.INDEX_SHELF_ANIM; -import static com.android.uiuios.LauncherState.BACKGROUND_APP; -import static com.android.uiuios.LauncherState.NORMAL; -import static com.android.uiuios.LauncherState.OVERVIEW; -import static com.android.uiuios.LauncherStateManager.ANIM_ALL; -import static com.android.uiuios.anim.Interpolators.ACCEL_2; -import static com.android.uiuios.anim.Interpolators.ACCEL_DEACCEL; -import static com.android.uiuios.anim.Interpolators.INSTANT; -import static com.android.uiuios.anim.Interpolators.LINEAR; +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.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.uiuios.DeviceProfile; -import com.android.uiuios.Launcher; -import com.android.uiuios.LauncherAppState; -import com.android.uiuios.LauncherInitListenerEx; -import com.android.uiuios.LauncherState; -import com.android.uiuios.LauncherStateManager; -import com.android.uiuios.allapps.DiscoveryBounce; -import com.android.uiuios.anim.AnimatorPlaybackController; -import com.android.uiuios.anim.AnimatorSetBuilder; -import com.android.uiuios.testing.TestProtocol; -import com.android.uiuios.uioverrides.states.OverviewState; -import com.android.uiuios.userevent.nano.LauncherLogProto; -import com.android.uiuios.views.FloatingIconView; +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.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 4d4e67b..5afc012 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.uiuios.config.FeatureFlags; +import com.android.colorfulos.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 cef9362..df451bb 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.uiuios.BaseDraggingActivity; -import com.android.uiuios.MainThreadExecutor; -import com.android.uiuios.logging.UserEventDispatcher; -import com.android.uiuios.userevent.nano.LauncherLogProto; +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.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 0e8604d..7e773df 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.uiuios.QuickstepAppTransitionManagerImpl.RECENTS_LAUNCH_DURATION; -import static com.android.uiuios.QuickstepAppTransitionManagerImpl +import static com.android.colorfulos.QuickstepAppTransitionManagerImpl.RECENTS_LAUNCH_DURATION; +import static com.android.colorfulos.QuickstepAppTransitionManagerImpl .STATUS_BAR_TRANSITION_DURATION; -import static com.android.uiuios.QuickstepAppTransitionManagerImpl +import static com.android.colorfulos.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.uiuios.DeviceProfile; -import com.android.uiuios.InvariantDeviceProfile; -import com.android.uiuios.LauncherAnimationRunner; -import com.android.uiuios.R; -import com.android.uiuios.anim.Interpolators; -import com.android.uiuios.views.BaseDragLayer; +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.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 3e99dfe..cf2ee7c 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.uiuios.Utilities.FLAG_NO_GESTURES; +import static com.android.colorfulos.Utilities.FLAG_NO_GESTURES; import android.view.InputEvent; import android.view.KeyEvent; import android.view.MotionEvent; -import com.android.uiuios.util.Preconditions; +import com.android.colorfulos.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 646adf8..2b9fa88 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.uiuios.Utilities; -import com.android.uiuios.config.FeatureFlags; -import com.android.uiuios.util.Preconditions; +import com.android.colorfulos.Utilities; +import com.android.colorfulos.config.FeatureFlags; +import com.android.colorfulos.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 48b1fcc..1f5a95b 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.uiuios.BaseActivity; -import com.android.uiuios.BaseDraggingActivity; -import com.android.uiuios.R; -import com.android.uiuios.util.MainThreadInitializedObject; -import com.android.uiuios.util.ResourceBasedOverride; +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.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 baadacf..c353dd6 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.uiuios.userevent.nano.LauncherLogProto.Action.Touch.TAP; +import static com.android.colorfulos.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.uiuios.BaseDraggingActivity; -import com.android.uiuios.DeviceProfile; -import com.android.uiuios.ItemInfo; -import com.android.uiuios.Launcher; -import com.android.uiuios.LauncherState; -import com.android.uiuios.R; -import com.android.uiuios.WorkspaceItemInfo; -import com.android.uiuios.popup.SystemShortcut; -import com.android.uiuios.userevent.nano.LauncherLogProto; -import com.android.uiuios.util.InstantAppResolver; +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.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 8fc1905..52fb72c 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.uiuios.anim.Interpolators.LINEAR; -import static com.android.uiuios.anim.Interpolators.TOUCH_RESPONSE_INTERPOLATOR; +import static com.android.colorfulos.anim.Interpolators.LINEAR; +import static com.android.colorfulos.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.uiuios.BaseActivity; -import com.android.uiuios.BaseDraggingActivity; -import com.android.uiuios.ItemInfo; -import com.android.uiuios.Utilities; +import com.android.colorfulos.BaseActivity; +import com.android.colorfulos.BaseDraggingActivity; +import com.android.colorfulos.ItemInfo; +import com.android.colorfulos.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 738c101..0a28487 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.uiuios.config.FeatureFlags.ADAPTIVE_ICON_WINDOW_ANIM; -import static com.android.uiuios.config.FeatureFlags.APPLY_CONFIG_AT_RUNTIME; -import static com.android.uiuios.config.FeatureFlags.ENABLE_HINTS_IN_OVERVIEW; -import static com.android.uiuios.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE; -import static com.android.uiuios.config.FeatureFlags.FAKE_LANDSCAPE_UI; -import static com.android.uiuios.config.FeatureFlags.QUICKSTEP_SPRINGS; +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.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.uiuios.BaseDraggingActivity; -import com.android.uiuios.MainThreadExecutor; -import com.android.uiuios.R; -import com.android.uiuios.ResourceUtils; -import com.android.uiuios.Utilities; -import com.android.uiuios.compat.UserManagerCompat; -import com.android.uiuios.logging.EventLogArray; -import com.android.uiuios.logging.UserEventDispatcher; -import com.android.uiuios.util.LooperExecutor; -import com.android.uiuios.util.UiThreadHelper; +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.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 4bcd0b1..4678ebc 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.uiuios.BaseActivity.INVISIBLE_BY_STATE_HANDLER; -import static com.android.uiuios.BaseActivity.STATE_HANDLER_INVISIBILITY_FLAGS; -import static com.android.uiuios.Utilities.SINGLE_FRAME_MS; -import static com.android.uiuios.Utilities.postAsyncCallback; -import static com.android.uiuios.anim.Interpolators.ACCEL_1_5; -import static com.android.uiuios.anim.Interpolators.DEACCEL; -import static com.android.uiuios.anim.Interpolators.LINEAR; -import static com.android.uiuios.anim.Interpolators.OVERSHOOT_1_2; -import static com.android.uiuios.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE; -import static com.android.uiuios.config.FeatureFlags.QUICKSTEP_SPRINGS; -import static com.android.uiuios.util.RaceConditionTracker.ENTER; -import static com.android.uiuios.util.RaceConditionTracker.EXIT; -import static com.android.uiuios.util.SystemUiController.UI_STATE_OVERVIEW; -import static com.android.uiuios.views.FloatingIconView.SHAPE_PROGRESS_DURATION; +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.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.uiuios.AbstractFloatingView; -import com.android.uiuios.BaseDraggingActivity; -import com.android.uiuios.DeviceProfile; -import com.android.uiuios.InvariantDeviceProfile; -import com.android.uiuios.R; -import com.android.uiuios.Utilities; -import com.android.uiuios.anim.AnimationSuccessListener; -import com.android.uiuios.anim.AnimatorPlaybackController; -import com.android.uiuios.anim.Interpolators; -import com.android.uiuios.graphics.RotationMode; -import com.android.uiuios.logging.UserEventDispatcher; -import com.android.uiuios.testing.TestProtocol; -import com.android.uiuios.userevent.nano.LauncherLogProto.Action.Direction; -import com.android.uiuios.userevent.nano.LauncherLogProto.Action.Touch; -import com.android.uiuios.userevent.nano.LauncherLogProto.ContainerType; -import com.android.uiuios.util.RaceConditionTracker; -import com.android.uiuios.util.TraceHelper; -import com.android.uiuios.views.FloatingIconView; +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.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 0f47154..bc9263b 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.uiuios.LauncherAnimUtils.SCALE_PROPERTY; +import static com.android.colorfulos.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.uiuios.DeviceProfile; -import com.android.uiuios.LauncherState.ScaleAndTranslation; -import com.android.uiuios.Utilities; +import com.android.colorfulos.DeviceProfile; +import com.android.colorfulos.LauncherState.ScaleAndTranslation; +import com.android.colorfulos.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 43c2e63..394629f 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.uiuios.BaseActivity; -import com.android.uiuios.R; -import com.android.uiuios.util.Themes; -import com.android.uiuios.util.TouchController; -import com.android.uiuios.views.BaseDragLayer; +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.android.quickstep.RecentsActivity; public class RecentsRootView extends BaseDragLayer { 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 4ef6a8f..1474f46 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.uiuios.uioverrides.touchcontrollers.TaskViewTouchController; +import com.android.colorfulos.uioverrides.touchcontrollers.TaskViewTouchController; import com.android.quickstep.RecentsActivity; public class RecentsTaskController extends TaskViewTouchController { 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 ea4202d..a8cd4f1 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.uiuios.R; +import com.android.colorfulos.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 694ab56..7fdf493 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.uiuios.Utilities.squaredHypot; -import static com.android.uiuios.userevent.nano.LauncherLogProto.Action.Direction.UPLEFT; -import static com.android.uiuios.userevent.nano.LauncherLogProto.Action.Direction.UPRIGHT; -import static com.android.uiuios.userevent.nano.LauncherLogProto.Action.Touch.FLING; -import static com.android.uiuios.userevent.nano.LauncherLogProto.Action.Touch.SWIPE; -import static com.android.uiuios.userevent.nano.LauncherLogProto.Action.Touch.SWIPE_NOOP; -import static com.android.uiuios.userevent.nano.LauncherLogProto.ContainerType.NAVBAR; +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 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.uiuios.BaseDraggingActivity; -import com.android.uiuios.R; -import com.android.uiuios.anim.Interpolators; -import com.android.uiuios.logging.UserEventDispatcher; +import com.android.colorfulos.BaseDraggingActivity; +import com.android.colorfulos.R; +import com.android.colorfulos.anim.Interpolators; +import com.android.colorfulos.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 d0c4357..df572ac 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.uiuios.Utilities.squaredHypot; -import static com.android.uiuios.Utilities.squaredTouchSlop; +import static com.android.colorfulos.Utilities.squaredHypot; +import static com.android.colorfulos.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.uiuios.R; -import com.android.uiuios.Utilities; +import com.android.colorfulos.R; +import com.android.colorfulos.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 b903574..093dcf2 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.uiuios.DeviceProfile; -import com.android.uiuios.InvariantDeviceProfile; -import com.android.uiuios.R; +import com.android.colorfulos.DeviceProfile; +import com.android.colorfulos.InvariantDeviceProfile; +import com.android.colorfulos.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 3fa09a3..a508462 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.uiuios.Utilities.EDGE_NAV_BAR; -import static com.android.uiuios.Utilities.squaredHypot; -import static com.android.uiuios.util.RaceConditionTracker.ENTER; -import static com.android.uiuios.util.RaceConditionTracker.EXIT; +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.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.uiuios.R; -import com.android.uiuios.util.Preconditions; -import com.android.uiuios.util.RaceConditionTracker; -import com.android.uiuios.util.TraceHelper; +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.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 750cc17..c653ea1 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.uiuios.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE; +import static com.android.colorfulos.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.uiuios.BaseDraggingActivity; -import com.android.uiuios.Utilities; -import com.android.uiuios.views.BaseDragLayer; +import com.android.colorfulos.BaseDraggingActivity; +import com.android.colorfulos.Utilities; +import com.android.colorfulos.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 9ab210b..095e3ba 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.uiuios.Utilities.squaredHypot; +import static com.android.colorfulos.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.uiuios.Utilities; +import com.android.colorfulos.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 81bd19f..ad32029 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.uiuios.BaseDraggingActivity; -import com.android.uiuios.R; +import com.android.colorfulos.BaseDraggingActivity; +import com.android.colorfulos.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 98d2925..4665f66 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.uiuios.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE; +import static com.android.colorfulos.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.uiuios.BaseDraggingActivity; -import com.android.uiuios.DeviceProfile; -import com.android.uiuios.LauncherState; -import com.android.uiuios.R; -import com.android.uiuios.Utilities; -import com.android.uiuios.views.BaseDragLayer; +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.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 b16aef6..f2f5a1f 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.uiuios.uioverrides.RecentsUiFactory.ROTATION_LANDSCAPE; -import static com.android.uiuios.uioverrides.RecentsUiFactory.ROTATION_SEASCAPE; +import static com.android.colorfulos.uioverrides.RecentsUiFactory.ROTATION_LANDSCAPE; +import static com.android.colorfulos.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.uiuios.graphics.RotationMode; +import com.android.colorfulos.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 bbd7bd5..d1bb6d3 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.uiuios.Utilities; -import com.android.uiuios.util.Preconditions; +import com.android.colorfulos.Utilities; +import com.android.colorfulos.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 8e6e2fb..1b29452 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.uiuios.R; -import com.android.uiuios.Utilities; -import com.android.uiuios.anim.FlingSpringAnim; +import com.android.colorfulos.R; +import com.android.colorfulos.Utilities; +import com.android.colorfulos.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 ba23d18..b196126 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.uiuios.CellLayout; -import com.android.uiuios.DeviceProfile; -import com.android.uiuios.Launcher; -import com.android.uiuios.LauncherState; -import com.android.uiuios.LauncherStateManager.AnimationConfig; -import com.android.uiuios.R; -import com.android.uiuios.ShortcutAndWidgetContainer; -import com.android.uiuios.anim.AnimatorSetBuilder; -import com.android.uiuios.anim.PropertySetter; -import com.android.uiuios.anim.SpringObjectAnimator; +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 java.util.ArrayList; import java.util.List; -import static com.android.uiuios.LauncherAnimUtils.VIEW_TRANSLATE_Y; -import static com.android.uiuios.LauncherState.BACKGROUND_APP; -import static com.android.uiuios.LauncherState.NORMAL; -import static com.android.uiuios.anim.Interpolators.LINEAR; +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; /** * 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 1d7ba3f..a10fbb7 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.uiuios.R; -import com.android.uiuios.util.Themes; +import com.android.colorfulos.R; +import com.android.colorfulos.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 0181427..1bcd9b9 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.uiuios.Utilities; +import com.android.colorfulos.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 c610db8..ddb856b 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.uiuios.Utilities.prefixTextWithIcon; +import static com.android.colorfulos.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.uiuios.BaseActivity; -import com.android.uiuios.BaseDraggingActivity; -import com.android.uiuios.R; -import com.android.uiuios.Utilities; -import com.android.uiuios.userevent.nano.LauncherLogProto; +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.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 dc60cee..9a8f044 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.uiuios.FastBitmapDrawable; +import com.android.colorfulos.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 53e830b..77bf301 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.uiuios.LauncherState.ALL_APPS; -import static com.android.uiuios.LauncherState.ALL_APPS_HEADER_EXTRA; -import static com.android.uiuios.LauncherState.NORMAL; -import static com.android.uiuios.LauncherState.OVERVIEW; -import static com.android.uiuios.LauncherState.RECENTS_CLEAR_ALL_BUTTON; -import static com.android.uiuios.LauncherState.SPRING_LOADED; -import static com.android.uiuios.QuickstepAppTransitionManagerImpl.ALL_APPS_PROGRESS_OFF_SCREEN; -import static com.android.uiuios.allapps.AllAppsTransitionController.ALL_APPS_PROGRESS; -import static com.android.uiuios.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE; +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 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.uiuios.DeviceProfile; -import com.android.uiuios.Hotseat; -import com.android.uiuios.Launcher; -import com.android.uiuios.LauncherState; -import com.android.uiuios.LauncherStateManager.StateListener; -import com.android.uiuios.R; -import com.android.uiuios.anim.Interpolators; -import com.android.uiuios.appprediction.PredictionUiStateManager; -import com.android.uiuios.appprediction.PredictionUiStateManager.Client; -import com.android.uiuios.views.ScrimView; +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.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 4e41dcd..0cbd7d7 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.uiuios.anim.Interpolators.FAST_OUT_SLOW_IN; -import static com.android.uiuios.anim.Interpolators.LINEAR; +import static com.android.colorfulos.anim.Interpolators.FAST_OUT_SLOW_IN; +import static com.android.colorfulos.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.uiuios.anim.Interpolators; +import com.android.colorfulos.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 a5f8b45..5db3d0f 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.uiuios.BaseActivity.STATE_HANDLER_INVISIBILITY_FLAGS; -import static com.android.uiuios.InvariantDeviceProfile.CHANGE_FLAG_ICON_PARAMS; -import static com.android.uiuios.LauncherAnimUtils.SCALE_PROPERTY; -import static com.android.uiuios.LauncherAnimUtils.VIEW_TRANSLATE_X; -import static com.android.uiuios.LauncherAnimUtils.VIEW_TRANSLATE_Y; -import static com.android.uiuios.Utilities.EDGE_NAV_BAR; -import static com.android.uiuios.Utilities.squaredHypot; -import static com.android.uiuios.Utilities.squaredTouchSlop; -import static com.android.uiuios.anim.Interpolators.ACCEL; -import static com.android.uiuios.anim.Interpolators.ACCEL_2; -import static com.android.uiuios.anim.Interpolators.FAST_OUT_SLOW_IN; -import static com.android.uiuios.anim.Interpolators.LINEAR; -import static com.android.uiuios.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE; -import static com.android.uiuios.config.FeatureFlags.QUICKSTEP_SPRINGS; -import static com.android.uiuios.uioverrides.touchcontrollers.TaskViewTouchController.SUCCESS_TRANSITION_PROGRESS; -import static com.android.uiuios.userevent.nano.LauncherLogProto.Action.Touch.TAP; -import static com.android.uiuios.userevent.nano.LauncherLogProto.ControlType.CLEAR_ALL_BUTTON; -import static com.android.uiuios.util.SystemUiController.UI_STATE_OVERVIEW; +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.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.uiuios.BaseActivity; -import com.android.uiuios.DeviceProfile; -import com.android.uiuios.Insettable; -import com.android.uiuios.InvariantDeviceProfile; -import com.android.uiuios.LauncherState; -import com.android.uiuios.PagedView; -import com.android.uiuios.R; -import com.android.uiuios.Utilities; -import com.android.uiuios.anim.AnimatorPlaybackController; -import com.android.uiuios.anim.PropertyListBuilder; -import com.android.uiuios.anim.SpringObjectAnimator; -import com.android.uiuios.config.FeatureFlags; -import com.android.uiuios.graphics.RotationMode; -import com.android.uiuios.userevent.nano.LauncherLogProto; -import com.android.uiuios.userevent.nano.LauncherLogProto.Action.Direction; -import com.android.uiuios.userevent.nano.LauncherLogProto.Action.Touch; -import com.android.uiuios.util.OverScroller; -import com.android.uiuios.util.PendingAnimation; -import com.android.uiuios.util.Themes; -import com.android.uiuios.util.ViewPool; +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.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 217cb42..e6e2d71 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.uiuios.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE; +import static com.android.colorfulos.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.uiuios.AbstractFloatingView; -import com.android.uiuios.BaseDraggingActivity; -import com.android.uiuios.FastBitmapDrawable; -import com.android.uiuios.R; -import com.android.uiuios.anim.AnimationSuccessListener; -import com.android.uiuios.anim.Interpolators; -import com.android.uiuios.anim.RoundedRectRevealOutlineProvider; -import com.android.uiuios.util.Themes; -import com.android.uiuios.views.BaseDragLayer; +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.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 698942d..d4d0d25 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.uiuios.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE; +import static com.android.colorfulos.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.uiuios.BaseActivity; -import com.android.uiuios.DeviceProfile; -import com.android.uiuios.R; -import com.android.uiuios.Utilities; -import com.android.uiuios.config.FeatureFlags; -import com.android.uiuios.util.SystemUiController; -import com.android.uiuios.util.Themes; +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.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 2d00a81..b527e69 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.uiuios.QuickstepAppTransitionManagerImpl.RECENTS_LAUNCH_DURATION; -import static com.android.uiuios.anim.Interpolators.FAST_OUT_SLOW_IN; -import static com.android.uiuios.anim.Interpolators.LINEAR; -import static com.android.uiuios.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE; +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 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.uiuios.BaseDraggingActivity; -import com.android.uiuios.R; -import com.android.uiuios.Utilities; -import com.android.uiuios.anim.AnimatorPlaybackController; -import com.android.uiuios.anim.Interpolators; -import com.android.uiuios.logging.UserEventDispatcher; -import com.android.uiuios.testing.TestProtocol; -import com.android.uiuios.userevent.nano.LauncherLogProto; -import com.android.uiuios.userevent.nano.LauncherLogProto.Action.Direction; -import com.android.uiuios.userevent.nano.LauncherLogProto.Action.Touch; -import com.android.uiuios.util.PendingAnimation; -import com.android.uiuios.util.ViewPool.Reusable; +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.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.uiuios.testing.TestProtocol.sDebugTracing) { + if (com.android.colorfulos.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 resultCallback, Handler resultCallbackHandler) { - if (com.android.uiuios.testing.TestProtocol.sDebugTracing) { + if (com.android.colorfulos.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 resultCallback, Handler resultCallbackHandler) { - if (com.android.uiuios.testing.TestProtocol.sDebugTracing) { + if (com.android.colorfulos.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 1510ecf..455d4ad 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.uiuios; +package com.android.colorfulos; -import static com.android.uiuios.Utilities.SINGLE_FRAME_MS; -import static com.android.uiuios.Utilities.postAsyncCallback; +import static com.android.colorfulos.Utilities.SINGLE_FRAME_MS; +import static com.android.colorfulos.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 c91bb63..560d1ea 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.uiuios; +package com.android.colorfulos; 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.uiuios.states.InternalStateHandler; +import com.android.colorfulos.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 a47a40c..3b5b4de 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.uiuios; +package com.android.colorfulos; -import static com.android.uiuios.BaseActivity.INVISIBLE_ALL; -import static com.android.uiuios.BaseActivity.INVISIBLE_BY_APP_TRANSITIONS; -import static com.android.uiuios.BaseActivity.INVISIBLE_BY_PENDING_FLAGS; -import static com.android.uiuios.BaseActivity.PENDING_INVISIBLE_BY_WALLPAPER_ANIMATION; -import static com.android.uiuios.LauncherState.ALL_APPS; -import static com.android.uiuios.LauncherState.OVERVIEW; -import static com.android.uiuios.Utilities.postAsyncCallback; -import static com.android.uiuios.allapps.AllAppsTransitionController.ALL_APPS_PROGRESS; -import static com.android.uiuios.anim.Interpolators.AGGRESSIVE_EASE; -import static com.android.uiuios.anim.Interpolators.DEACCEL_1_7; -import static com.android.uiuios.anim.Interpolators.EXAGGERATED_EASE; -import static com.android.uiuios.anim.Interpolators.LINEAR; -import static com.android.uiuios.dragndrop.DragLayer.ALPHA_INDEX_TRANSITIONS; -import static com.android.uiuios.views.FloatingIconView.SHAPE_PROGRESS_DURATION; +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.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.uiuios.DeviceProfile.OnDeviceProfileChangeListener; -import com.android.uiuios.allapps.AllAppsTransitionController; -import com.android.uiuios.anim.Interpolators; -import com.android.uiuios.config.FeatureFlags; -import com.android.uiuios.dragndrop.DragLayer; -import com.android.uiuios.shortcuts.DeepShortcutView; -import com.android.uiuios.util.MultiValueAlpha; -import com.android.uiuios.util.MultiValueAlpha.AlphaProperty; -import com.android.uiuios.views.FloatingIconView; +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.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 3bbbba4..825b1e5 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.uiuios.proxy; +package com.android.colorfulos.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 2b22ece..31102e2 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.uiuios.proxy; +package com.android.colorfulos.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 6d0bbf0..60e3d80 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.uiuios.uioverrides; +package com.android.colorfulos.uioverrides; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; import android.animation.ValueAnimator; -import com.android.uiuios.Launcher; -import com.android.uiuios.LauncherState; -import com.android.uiuios.LauncherStateManager; -import com.android.uiuios.anim.AnimatorSetBuilder; +import com.android.colorfulos.Launcher; +import com.android.colorfulos.LauncherState; +import com.android.colorfulos.LauncherStateManager; +import com.android.colorfulos.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 fe3ebb0..1f80a4a 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.uiuios.uioverrides; +package com.android.colorfulos.uioverrides; -import static com.android.uiuios.LauncherAnimUtils.SCALE_PROPERTY; -import static com.android.uiuios.anim.AnimatorSetBuilder.ANIM_OVERVIEW_FADE; -import static com.android.uiuios.anim.AnimatorSetBuilder.ANIM_OVERVIEW_SCALE; -import static com.android.uiuios.anim.AnimatorSetBuilder.ANIM_OVERVIEW_TRANSLATE_X; -import static com.android.uiuios.anim.AnimatorSetBuilder.ANIM_OVERVIEW_TRANSLATE_Y; -import static com.android.uiuios.anim.AnimatorSetBuilder.FLAG_DONT_ANIMATE_OVERVIEW; -import static com.android.uiuios.anim.Interpolators.AGGRESSIVE_EASE_IN_OUT; -import static com.android.uiuios.anim.Interpolators.LINEAR; +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 android.util.FloatProperty; import android.view.View; import android.view.animation.Interpolator; -import com.android.uiuios.Launcher; -import com.android.uiuios.LauncherState; -import com.android.uiuios.LauncherState.ScaleAndTranslation; -import com.android.uiuios.LauncherStateManager.AnimationConfig; -import com.android.uiuios.LauncherStateManager.StateHandler; -import com.android.uiuios.anim.AnimatorSetBuilder; -import com.android.uiuios.anim.PropertySetter; +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 androidx.annotation.NonNull; diff --git a/quickstep/src/com/android/launcher3/uioverrides/DisplayRotationListener.java b/quickstep/src/com/android/launcher3/uioverrides/DisplayRotationListener.java index 873429f..18e97c3 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.uiuios.uioverrides; +package com.android.colorfulos.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 5f85012..a2009b6 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.uiuios.uioverrides; +package com.android.colorfulos.uioverrides; import static android.app.Activity.RESULT_CANCELED; -import static com.android.uiuios.AbstractFloatingView.TYPE_ALL; -import static com.android.uiuios.AbstractFloatingView.TYPE_HIDE_BACK_BUTTON; -import static com.android.uiuios.LauncherState.ALL_APPS; -import static com.android.uiuios.LauncherState.NORMAL; -import static com.android.uiuios.LauncherState.OVERVIEW; -import static com.android.uiuios.allapps.DiscoveryBounce.BOUNCE_MAX_COUNT; -import static com.android.uiuios.allapps.DiscoveryBounce.HOME_BOUNCE_COUNT; -import static com.android.uiuios.allapps.DiscoveryBounce.HOME_BOUNCE_SEEN; -import static com.android.uiuios.allapps.DiscoveryBounce.SHELF_BOUNCE_COUNT; -import static com.android.uiuios.allapps.DiscoveryBounce.SHELF_BOUNCE_SEEN; +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 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.uiuios.AbstractFloatingView; -import com.android.uiuios.Launcher; -import com.android.uiuios.LauncherState; -import com.android.uiuios.LauncherState.ScaleAndTranslation; -import com.android.uiuios.LauncherStateManager; -import com.android.uiuios.LauncherStateManager.StateHandler; -import com.android.uiuios.QuickstepAppTransitionManagerImpl; -import com.android.uiuios.Utilities; -import com.android.uiuios.proxy.ProxyActivityStarter; -import com.android.uiuios.proxy.StartActivityParams; +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.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 769bc31..c1b535c 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.uiuios.uioverrides; +package com.android.colorfulos.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 cf568e6..6541c84 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.uiuios.uioverrides.plugins; +package com.android.colorfulos.uioverrides.plugins; import android.content.ComponentName; import android.content.Context; import android.content.SharedPreferences; -import com.android.uiuios.Utilities; +import com.android.colorfulos.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 63639e1..b8d2026 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.uiuios.uioverrides.plugins; +package com.android.colorfulos.uioverrides.plugins; import android.content.Context; import android.os.Looper; -import com.android.uiuios.LauncherModel; +import com.android.colorfulos.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 566ce9f..61f5f41 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.uiuios.uioverrides.plugins; +package com.android.colorfulos.uioverrides.plugins; import android.content.ComponentName; import android.content.Context; -import com.android.uiuios.util.MainThreadInitializedObject; +import com.android.colorfulos.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 8c181ba..f433275 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.uiuios.uioverrides.states; +package com.android.colorfulos.uioverrides.states; -import static com.android.uiuios.LauncherAnimUtils.ALL_APPS_TRANSITION_MS; -import static com.android.uiuios.anim.Interpolators.DEACCEL_2; +import static com.android.colorfulos.LauncherAnimUtils.ALL_APPS_TRANSITION_MS; +import static com.android.colorfulos.anim.Interpolators.DEACCEL_2; -import com.android.uiuios.AbstractFloatingView; -import com.android.uiuios.Launcher; -import com.android.uiuios.LauncherState; -import com.android.uiuios.allapps.AllAppsContainerView; -import com.android.uiuios.userevent.nano.LauncherLogProto.ContainerType; +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.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 30205ae..bfd692a 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.uiuios.uioverrides.touchcontrollers; +package com.android.colorfulos.uioverrides.touchcontrollers; -import static com.android.uiuios.LauncherState.NORMAL; -import static com.android.uiuios.LauncherState.OVERVIEW; -import static com.android.uiuios.Utilities.EDGE_NAV_BAR; +import static com.android.colorfulos.LauncherState.NORMAL; +import static com.android.colorfulos.LauncherState.OVERVIEW; +import static com.android.colorfulos.Utilities.EDGE_NAV_BAR; import android.view.MotionEvent; -import com.android.uiuios.AbstractFloatingView; -import com.android.uiuios.Launcher; -import com.android.uiuios.LauncherState; -import com.android.uiuios.LauncherStateManager.AnimationComponents; -import com.android.uiuios.touch.AbstractStateChangeTouchController; -import com.android.uiuios.touch.SwipeDetector; -import com.android.uiuios.userevent.nano.LauncherLogProto; -import com.android.uiuios.userevent.nano.LauncherLogProto.Action.Direction; +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.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 6b65547..fb8cce3 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.uiuios.uioverrides.touchcontrollers; +package com.android.colorfulos.uioverrides.touchcontrollers; -import static com.android.uiuios.AbstractFloatingView.TYPE_ACCESSIBLE; -import static com.android.uiuios.LauncherState.ALL_APPS; -import static com.android.uiuios.LauncherState.NORMAL; -import static com.android.uiuios.LauncherState.OVERVIEW; -import static com.android.uiuios.anim.AnimatorSetBuilder.ANIM_ALL_APPS_FADE; -import static com.android.uiuios.anim.AnimatorSetBuilder.ANIM_OVERVIEW_FADE; -import static com.android.uiuios.anim.AnimatorSetBuilder.ANIM_VERTICAL_PROGRESS; -import static com.android.uiuios.anim.Interpolators.ACCEL; -import static com.android.uiuios.anim.Interpolators.DEACCEL; -import static com.android.uiuios.anim.Interpolators.LINEAR; -import static com.android.uiuios.config.FeatureFlags.QUICKSTEP_SPRINGS; +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.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.uiuios.AbstractFloatingView; -import com.android.uiuios.DeviceProfile; -import com.android.uiuios.Launcher; -import com.android.uiuios.LauncherState; -import com.android.uiuios.LauncherStateManager.AnimationComponents; -import com.android.uiuios.allapps.AllAppsTransitionController; -import com.android.uiuios.anim.AnimatorPlaybackController; -import com.android.uiuios.anim.AnimatorSetBuilder; -import com.android.uiuios.anim.Interpolators; -import com.android.uiuios.touch.AbstractStateChangeTouchController; -import com.android.uiuios.touch.SwipeDetector; -import com.android.uiuios.uioverrides.states.OverviewState; -import com.android.uiuios.userevent.nano.LauncherLogProto.Action.Touch; -import com.android.uiuios.userevent.nano.LauncherLogProto.ContainerType; +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.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 f0a277f..192dd08 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.uiuios.uioverrides.touchcontrollers; +package com.android.colorfulos.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.uiuios.AbstractFloatingView; -import com.android.uiuios.DeviceProfile; -import com.android.uiuios.Launcher; -import com.android.uiuios.LauncherState; -import com.android.uiuios.touch.TouchEventTranslator; -import com.android.uiuios.util.TouchController; +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.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 7d61dc4..0d5828c 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.uiuios.BaseDraggingActivity; -import com.android.uiuios.DeviceProfile; -import com.android.uiuios.anim.AnimatorPlaybackController; +import com.android.colorfulos.BaseDraggingActivity; +import com.android.colorfulos.DeviceProfile; +import com.android.colorfulos.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 { } /** - * Used for containerType in {@link com.android.uiuios.logging.UserEventDispatcher} + * Used for containerType in {@link com.android.colorfulos.logging.UserEventDispatcher} */ int getContainerType(); diff --git a/quickstep/src/com/android/quickstep/BaseRecentsActivity.java b/quickstep/src/com/android/quickstep/BaseRecentsActivity.java index 08442b1..fdc54d8 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.uiuios.AbstractFloatingView; -import com.android.uiuios.BaseDraggingActivity; -import com.android.uiuios.DeviceProfile; -import com.android.uiuios.InvariantDeviceProfile; -import com.android.uiuios.R; -import com.android.uiuios.uioverrides.UiFactory; -import com.android.uiuios.util.SystemUiController; -import com.android.uiuios.util.Themes; +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 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 0f03a54..5e0a590 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.uiuios.AppInfo; -import com.android.uiuios.util.InstantAppResolver; +import com.android.colorfulos.AppInfo; +import com.android.colorfulos.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 6ccc0bf..761568b 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.uiuios.R; +import com.android.colorfulos.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 88eacdd..45cf61c 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.uiuios.FastBitmapDrawable; -import com.android.uiuios.icons.BitmapInfo; -import com.android.uiuios.graphics.DrawableFactory; -import com.android.uiuios.icons.LauncherIcons; +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.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 5a6530d..98c975d 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.uiuios.R; -import com.android.uiuios.util.Preconditions; -import com.android.uiuios.util.ResourceBasedOverride; +import com.android.colorfulos.R; +import com.android.colorfulos.util.Preconditions; +import com.android.colorfulos.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 b62391e..140dfef 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.uiuios.util.PackageManagerHelper.getPackageFilter; +import static com.android.colorfulos.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 573ccb4..bc41f05 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.uiuios.Utilities; -import com.android.uiuios.allapps.DiscoveryBounce; -import com.android.uiuios.util.MainThreadInitializedObject; -import com.android.uiuios.util.UiThreadHelper; +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.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 0722670..674f059 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.uiuios.BuildConfig; -import com.android.uiuios.MainProcessInitializer; -import com.android.uiuios.Utilities; +import com.android.colorfulos.BuildConfig; +import com.android.colorfulos.MainProcessInitializer; +import com.android.colorfulos.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 f1f5f8e..c3b0565 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.uiuios.testing.TestInformationHandler; -import com.android.uiuios.testing.TestProtocol; -import com.android.uiuios.uioverrides.states.OverviewState; +import com.android.colorfulos.testing.TestInformationHandler; +import com.android.colorfulos.testing.TestProtocol; +import com.android.colorfulos.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 23a2997..a74ca57 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.uiuios.MainThreadExecutor; +import com.android.colorfulos.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 2fe6876..5e58eb1 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.uiuios.MainThreadExecutor; +import com.android.colorfulos.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 1282e11..2277ce7 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.uiuios.util.MainThreadInitializedObject; +import com.android.colorfulos.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 f6eb3af..1c5773d 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.uiuios.util.PackageManagerHelper.getPackageFilter; +import static com.android.colorfulos.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.uiuios.util.MainThreadInitializedObject; +import com.android.colorfulos.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 f976cf0..f945ad1 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.uiuios.uioverrides.RecentsUiFactory.GO_LOW_RAM_RECENTS_ENABLED; +import static com.android.colorfulos.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.uiuios.MainThreadExecutor; -import com.android.uiuios.R; -import com.android.uiuios.Utilities; -import com.android.uiuios.icons.cache.HandlerRunnable; -import com.android.uiuios.uioverrides.RecentsUiFactory; -import com.android.uiuios.util.Preconditions; +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.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 d998062..54c3138 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.uiuios.MainThreadExecutor; -import com.android.uiuios.R; -import com.android.uiuios.Utilities; -import com.android.uiuios.icons.cache.HandlerRunnable; -import com.android.uiuios.util.Preconditions; +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.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 2a27aa6..7dffd62 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.uiuios.compat.LauncherAppsCompat; -import com.android.uiuios.compat.UserManagerCompat; -import com.android.uiuios.util.ComponentKey; +import com.android.colorfulos.compat.LauncherAppsCompat; +import com.android.colorfulos.compat.UserManagerCompat; +import com.android.colorfulos.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 eed5c90..b710c11 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.uiuios.ItemInfo; -import com.android.uiuios.logging.StatsLogManager; -import com.android.uiuios.logging.StatsLogUtils; -import com.android.uiuios.userevent.nano.LauncherLogProto.Target; -import com.android.uiuios.util.ComponentKey; +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.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 d162f81..2be1564 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.uiuios.logging.LoggerUtils.newLauncherEvent; -import static com.android.uiuios.userevent.nano.LauncherLogProto.ControlType.CANCEL_TARGET; +import static com.android.colorfulos.logging.LoggerUtils.newLauncherEvent; +import static com.android.colorfulos.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.uiuios.logging.UserEventDispatcher; -import com.android.uiuios.userevent.nano.LauncherLogProto; +import com.android.colorfulos.logging.UserEventDispatcher; +import com.android.colorfulos.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 1b6b87b..c6e7569 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.uiuios.config.FeatureFlags; +import com.android.colorfulos.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 133ce33..cfb2b1c 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.uiuios.DeviceProfile; -import com.android.uiuios.R; -import com.android.uiuios.config.FeatureFlags; +import com.android.colorfulos.DeviceProfile; +import com.android.colorfulos.R; +import com.android.colorfulos.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 a745de8..6428211 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.uiuios.Alarm; -import com.android.uiuios.R; -import com.android.uiuios.compat.AccessibilityManagerCompat; +import com.android.colorfulos.Alarm; +import com.android.colorfulos.R; +import com.android.colorfulos.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 ed3fe11..e8215c6 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.uiuios.LauncherAnimationRunner; +import com.android.colorfulos.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 7b6b044..f696e44 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.uiuios.LauncherState.ALL_APPS_HEADER_EXTRA; -import static com.android.uiuios.LauncherState.BACKGROUND_APP; -import static com.android.uiuios.LauncherState.OVERVIEW; -import static com.android.uiuios.anim.Interpolators.ACCEL; -import static com.android.uiuios.anim.Interpolators.ACCEL_2; -import static com.android.uiuios.anim.Interpolators.LINEAR; -import static com.android.uiuios.icons.GraphicsUtils.setColorAlphaBound; +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 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.uiuios.DeviceProfile; -import com.android.uiuios.R; -import com.android.uiuios.Utilities; -import com.android.uiuios.anim.Interpolators; -import com.android.uiuios.uioverrides.states.OverviewState; -import com.android.uiuios.util.Themes; -import com.android.uiuios.views.ScrimView; +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.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 9810c99..d68858f 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.uiuios.ui.AbstractLauncherUiTest; +import com.android.colorfulos.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 bba9efd..9e8fbb9 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.uiuios.BubbleTextView; -import com.android.uiuios.Launcher; -import com.android.uiuios.appprediction.PredictionRowView; -import com.android.uiuios.appprediction.PredictionUiStateManager; -import com.android.uiuios.appprediction.PredictionUiStateManager.Client; -import com.android.uiuios.compat.LauncherAppsCompat; -import com.android.uiuios.model.AppLaunchTracker; +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 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 98da60b..f6b4365 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.uiuios.LauncherState.OVERVIEW; +import static com.android.colorfulos.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.uiuios.Launcher; +import com.android.colorfulos.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 11dbcaf..73b5aca 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.uiuios.tapl.LauncherInstrumentation.WAIT_TIME_MS; -import static com.android.uiuios.tapl.TestHelpers.getHomeIntentInPackage; -import static com.android.uiuios.tapl.TestHelpers.getLauncherInMyProcess; -import static com.android.uiuios.ui.AbstractLauncherUiTest.resolveSystemApp; -import static com.android.uiuios.util.rule.ShellCommandRule.disableHeadsUpNotification; -import static com.android.uiuios.util.rule.ShellCommandRule.getLauncherCommand; +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.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.uiuios.tapl.LauncherInstrumentation; -import com.android.uiuios.testcomponent.TestCommandReceiver; -import com.android.uiuios.util.rule.FailureWatcher; +import com.android.colorfulos.tapl.LauncherInstrumentation; +import com.android.colorfulos.testcomponent.TestCommandReceiver; +import com.android.colorfulos.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 b30d72e..9c877c3 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.uiuios.tapl.LauncherInstrumentation; -import com.android.uiuios.tapl.TestHelpers; +import com.android.colorfulos.tapl.LauncherInstrumentation; +import com.android.colorfulos.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 609d415..c0742b6 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.uiuios.util.RaceConditionTracker.enterEvt; -import static com.android.uiuios.util.RaceConditionTracker.exitEvt; +import static com.android.colorfulos.util.RaceConditionTracker.enterEvt; +import static com.android.colorfulos.util.RaceConditionTracker.exitEvt; import android.content.Intent; import androidx.test.filters.LargeTest; import androidx.test.runner.AndroidJUnit4; -import com.android.uiuios.Launcher; -import com.android.uiuios.util.RaceConditionReproducer; +import com.android.colorfulos.Launcher; +import com.android.colorfulos.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 e5e72e8..52c4cc5 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.uiuios.ui.TaplTestsLauncher3.getAppPackageName; +import static com.android.colorfulos.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.uiuios.Launcher; -import com.android.uiuios.LauncherState; -import com.android.uiuios.tapl.AllApps; -import com.android.uiuios.tapl.AllAppsFromOverview; -import com.android.uiuios.tapl.Background; -import com.android.uiuios.tapl.Overview; -import com.android.uiuios.tapl.OverviewTask; -import com.android.uiuios.tapl.TestHelpers; -import com.android.uiuios.ui.TaplTestsLauncher3; +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.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 2f53339..30862b0 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 ef2b45f..892b435 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 499ac3f..761fc13 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 10b9972..93ef0a6 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 2860606..86e6155 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 dc64fcb..7baf8a2 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 1441340..686a553 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 6f3ebeb..ba985e6 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 7df6b47..7083624 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 22065cd..6c2fcf5 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 5e83cd3..2704c93 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 d5b9a8f..aea3f99 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 c2e7c8b..afaa1cc 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 7fd6a09..3e7daad 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 fada6fb..fed06bb 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 851bce1..c683b06 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 d3e40a1..4d10a8c 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 21345bb..6529029 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 6bccd3d..22e10cc 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 eb149f8..a68cc03 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 9dae937..4bf4867 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/wallpapers.jpg b/res/drawable-hdpi/wallpapers.jpg deleted file mode 100644 index 6ce8944..0000000 Binary files a/res/drawable-hdpi/wallpapers.jpg and /dev/null differ diff --git a/res/drawable-hdpi/wallpapers.png b/res/drawable-hdpi/wallpapers.png new file mode 100644 index 0000000..b999b83 Binary files /dev/null and b/res/drawable-hdpi/wallpapers.png differ diff --git a/res/drawable-v24/ic_remove_shadow.xml b/res/drawable-v24/ic_remove_shadow.xml index 5d1b467..a9daf3f 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. --> - diff --git a/res/drawable-v24/ic_setup_shadow.xml b/res/drawable-v24/ic_setup_shadow.xml index c418dfe..c77ceb8 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. --> - diff --git a/res/drawable-v24/ic_uninstall_shadow.xml b/res/drawable-v24/ic_uninstall_shadow.xml index 3c8a8a2..b033cb1 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. --> - diff --git a/res/layout/add_item_confirmation_activity.xml b/res/layout/add_item_confirmation_activity.xml index d9d05ef..173600d 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"> - - + diff --git a/res/layout/all_apps.xml b/res/layout/all_apps.xml index fbcb0ca..d30972b 100644 --- a/res/layout/all_apps.xml +++ b/res/layout/all_apps.xml @@ -16,7 +16,7 @@ - - - - - + + - \ No newline at end of file + \ 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 e95ef4b..6c00448 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" /> - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/res/layout/app_icon.xml b/res/layout/app_icon.xml index 437da14..9fbcecc 100644 --- a/res/layout/app_icon.xml +++ b/res/layout/app_icon.xml @@ -14,4 +14,4 @@ limitations under the License. --> - + diff --git a/res/layout/app_widget_resize_frame.xml b/res/layout/app_widget_resize_frame.xml index 1ecd664..608dae7 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. --> - - \ No newline at end of file + \ No newline at end of file diff --git a/res/layout/deep_shortcut.xml b/res/layout/deep_shortcut.xml index dde0fba..66a5ba5 100644 --- a/res/layout/deep_shortcut.xml +++ b/res/layout/deep_shortcut.xml @@ -14,14 +14,14 @@ limitations under the License. --> - - - + diff --git a/res/layout/drop_target_bar.xml b/res/layout/drop_target_bar.xml index 2d87a72..e719be3 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. --> - - - - \ No newline at end of file + \ No newline at end of file diff --git a/res/layout/floating_icon_view.xml b/res/layout/floating_icon_view.xml index 0bb5518..f63f453 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. --> - diff --git a/res/layout/folder_application.xml b/res/layout/folder_application.xml index d1a452c..12690c1 100644 --- a/res/layout/folder_application.xml +++ b/res/layout/folder_application.xml @@ -14,7 +14,7 @@ limitations under the License. --> - - - - + diff --git a/res/layout/folder_page.xml b/res/layout/folder_page.xml index 4382808..fff59d7 100644 --- a/res/layout/folder_page.xml +++ b/res/layout/folder_page.xml @@ -14,7 +14,7 @@ limitations under the License. --> - - - - - - - + - + diff --git a/res/layout/launcher_preview_layout.xml b/res/layout/launcher_preview_layout.xml index 3152776..0a92dcf 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. --> - - - - @@ -45,6 +45,6 @@ android:id="@id/search_container_all_apps" layout="@layout/search_container_all_apps"/> - + - \ No newline at end of file + \ No newline at end of file diff --git a/res/layout/longpress_options_menu.xml b/res/layout/longpress_options_menu.xml index 4602885..4911c12 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. --> - - - + - - + \ No newline at end of file diff --git a/res/layout/popup_container.xml b/res/layout/popup_container.xml index 0c6cbb1..3cb8335 100644 --- a/res/layout/popup_container.xml +++ b/res/layout/popup_container.xml @@ -14,7 +14,7 @@ limitations under the License. --> - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/res/layout/system_shortcut.xml b/res/layout/system_shortcut.xml index 12ed18a..be37873 100644 --- a/res/layout/system_shortcut.xml +++ b/res/layout/system_shortcut.xml @@ -14,14 +14,14 @@ limitations under the License. --> - - - + diff --git a/res/layout/user_folder_icon_normalized.xml b/res/layout/user_folder_icon_normalized.xml index 385315c..5baac0a 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. --> - - - - - + diff --git a/res/layout/widget_cell.xml b/res/layout/widget_cell.xml index ca3c467..e9355db 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. --> - - \ No newline at end of file + \ No newline at end of file diff --git a/res/layout/widget_cell_content.xml b/res/layout/widget_cell_content.xml index fd73b52..95e520e 100644 --- a/res/layout/widget_cell_content.xml +++ b/res/layout/widget_cell_content.xml @@ -55,7 +55,7 @@ - - - \ No newline at end of file + \ No newline at end of file diff --git a/res/layout/widgets_full_sheet.xml b/res/layout/widgets_full_sheet.xml index 83f147f..d2564b9 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. --> - - - - - - \ No newline at end of file + + \ 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 2a72719..77a3693 100644 --- a/res/layout/widgets_list_row_view.xml +++ b/res/layout/widgets_list_row_view.xml @@ -25,7 +25,7 @@ - - - \ No newline at end of file + \ No newline at end of file diff --git a/res/layout/work_tab_footer.xml b/res/layout/work_tab_footer.xml index 7776f2e..62bb0dd 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. --> - - - \ No newline at end of file + \ No newline at end of file diff --git a/res/layout/workspace_screen.xml b/res/layout/workspace_screen.xml index 9ac5de1..d97cb98 100644 --- a/res/layout/workspace_screen.xml +++ b/res/layout/workspace_screen.xml @@ -14,7 +14,7 @@ limitations under the License. --> -#ecb012 #494949 + #33FFFFFF diff --git a/res/values/config.xml b/res/values/config.xml index 2a7d449..52fc2c5 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -19,7 +19,7 @@ #Intent;action=android.intent.action.DELETE;launchFlags=0x10800000;end - com.android.uiuios.settings.SettingsActivity$LauncherSettingsFragment + com.android.colorfulos.settings.SettingsActivity$LauncherSettingsFragment diff --git a/res/values/strings.xml b/res/values/strings.xml index 240cb36..a971af3 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -23,7 +23,7 @@ Launcher3 - UIUIOS + ColorfulOS diff --git a/res/xml/backupscheme.xml b/res/xml/backupscheme.xml index 8dbf799..3d05f86 100644 --- a/res/xml/backupscheme.xml +++ b/res/xml/backupscheme.xml @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/res/xml/default_workspace_6x4.xml b/res/xml/default_workspace_6x4.xml index e6992cd..f593580 100644 --- a/res/xml/default_workspace_6x4.xml +++ b/res/xml/default_workspace_6x4.xml @@ -18,27 +18,39 @@ - - - - - - - + - - - - - - + launcher:y="0" /> + + + + + + + + + + + + + + + + + + + + + --> - - + + + + + + + + + + + + diff --git a/res/xml/default_workspace_6x4_back.xml b/res/xml/default_workspace_6x4_back.xml new file mode 100644 index 0000000..e6992cd --- /dev/null +++ b/res/xml/default_workspace_6x4_back.xml @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/xml/launcher_preferences.xml b/res/xml/launcher_preferences.xml index 2e1493e..85e5205 100644 --- a/res/xml/launcher_preferences.xml +++ b/res/xml/launcher_preferences.xml @@ -17,7 +17,7 @@ - - + + android:fragment="com.android.colorfulos.settings.DeveloperOptionsFragment"/> diff --git a/robolectric_tests/resources/cache_data_updated_task_data.txt b/robolectric_tests/resources/cache_data_updated_task_data.txt index 27ec6fa..9f011ee 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.uiuios.WorkspaceItemInfo +classMap s com.android.colorfulos.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 b256ea1..027f7a0 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.uiuios.WorkspaceItemInfo -classMap w com.android.uiuios.LauncherAppWidgetInfo +classMap s com.android.colorfulos.WorkspaceItemInfo +classMap w com.android.colorfulos.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 ae2894a..0d82343 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.uiuios.config; +package com.android.colorfulos.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 8ec3801..c5f4051 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.uiuios.config; +package com.android.colorfulos.config; -import com.android.uiuios.config.FlagOverrideRule.FlagOverride; +import com.android.colorfulos.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 d87f285..02f329d 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.uiuios.logging; +package com.android.colorfulos.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 4357f01..fbd0800 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.uiuios.model; +package com.android.colorfulos.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.uiuios.ItemInfo; -import com.android.uiuios.LauncherSettings; -import com.android.uiuios.LauncherSettings.Favorites; -import com.android.uiuios.WorkspaceItemInfo; -import com.android.uiuios.util.ContentWriter; -import com.android.uiuios.util.GridOccupancy; -import com.android.uiuios.util.IntArray; -import com.android.uiuios.util.IntSparseArrayMap; +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 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 129124c..5384abc 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.uiuios.model; +package com.android.colorfulos.model; import android.content.ContentValues; import android.content.Context; import android.content.Intent; import android.database.sqlite.SQLiteDatabase; -import com.android.uiuios.LauncherProvider; -import com.android.uiuios.LauncherSettings; -import com.android.uiuios.util.TestLauncherProvider; +import com.android.colorfulos.LauncherProvider; +import com.android.colorfulos.LauncherSettings; +import com.android.colorfulos.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.uiuios.validpackage"; + public static final String TEST_PACKAGE = "com.android.colorfulos.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 aa65d5d..a487803 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.uiuios.model; +package com.android.colorfulos.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.uiuios.AllAppsList; -import com.android.uiuios.AppFilter; -import com.android.uiuios.AppInfo; -import com.android.uiuios.InvariantDeviceProfile; -import com.android.uiuios.ItemInfo; -import com.android.uiuios.LauncherAppState; -import com.android.uiuios.LauncherModel; -import com.android.uiuios.LauncherModel.Callbacks; -import com.android.uiuios.LauncherModel.ModelUpdateTask; -import com.android.uiuios.LauncherProvider; -import com.android.uiuios.icons.IconCache; -import com.android.uiuios.icons.cache.CachingLogic; -import com.android.uiuios.util.ComponentKey; -import com.android.uiuios.util.TestLauncherProvider; +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 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 661548e..be033e5 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.uiuios.model; +package com.android.colorfulos.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.uiuios.AppInfo; -import com.android.uiuios.ItemInfo; -import com.android.uiuios.WorkspaceItemInfo; +import com.android.colorfulos.AppInfo; +import com.android.colorfulos.ItemInfo; +import com.android.colorfulos.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 fa3685a..e1ac1b5 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.uiuios.model; +package com.android.colorfulos.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.uiuios.LauncherProvider; -import com.android.uiuios.LauncherProvider.DatabaseHelper; -import com.android.uiuios.LauncherSettings.Favorites; -import com.android.uiuios.R; +import com.android.colorfulos.LauncherProvider; +import com.android.colorfulos.LauncherProvider.DatabaseHelper; +import com.android.colorfulos.LauncherSettings.Favorites; +import com.android.colorfulos.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 5f0a347..608cc7f 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.uiuios.model; +package com.android.colorfulos.model; import static android.database.DatabaseUtils.queryNumEntries; -import static com.android.uiuios.LauncherSettings.Favorites.BACKUP_TABLE_NAME; -import static com.android.uiuios.LauncherSettings.Favorites.TABLE_NAME; -import static com.android.uiuios.provider.LauncherDbUtils.tableExists; +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 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.uiuios.LauncherSettings.Favorites; -import com.android.uiuios.LauncherSettings.Settings; +import com.android.colorfulos.LauncherSettings.Favorites; +import com.android.colorfulos.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 05ef61c..3f636f5 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.uiuios.model; +package com.android.colorfulos.model; -import static com.android.uiuios.model.GridSizeMigrationTask.getWorkspaceScreenIds; +import static com.android.colorfulos.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.uiuios.InvariantDeviceProfile; -import com.android.uiuios.LauncherSettings; -import com.android.uiuios.config.FeatureFlags; -import com.android.uiuios.config.FlagOverrideRule; -import com.android.uiuios.model.GridSizeMigrationTask.MultiStepMigrationTask; -import com.android.uiuios.util.IntArray; +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 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 4eb5477..c1c85a1 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.uiuios.model; +package com.android.colorfulos.model; import static org.junit.Assert.assertEquals; -import com.android.uiuios.ItemInfo; -import com.android.uiuios.LauncherAppWidgetInfo; -import com.android.uiuios.WorkspaceItemInfo; -import com.android.uiuios.compat.PackageInstallerCompat; -import com.android.uiuios.compat.PackageInstallerCompat.PackageInstallInfo; +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 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 92ef3ff..b4e8038 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.uiuios.popup; +package com.android.colorfulos.popup; -import static com.android.uiuios.popup.PopupPopulator.MAX_SHORTCUTS; -import static com.android.uiuios.popup.PopupPopulator.NUM_DYNAMIC; +import static com.android.colorfulos.popup.PopupPopulator.MAX_SHORTCUTS; +import static com.android.colorfulos.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 10ba123..870a874 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.uiuios.util; +package com.android.colorfulos.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 1ae3ccb..2710a3b 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.uiuios.util; +package com.android.colorfulos.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 4cbbd3e..3c04c4f 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.uiuios.util; +package com.android.colorfulos.util; import android.content.Context; import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteOpenHelper; -import com.android.uiuios.LauncherProvider; +import com.android.colorfulos.LauncherProvider; /** * An extension of LauncherProvider backed up by in-memory database. diff --git a/src/com/android/uiuios/AbstractFloatingView.java b/src/com/android/colorfulos/AbstractFloatingView.java similarity index 94% rename from src/com/android/uiuios/AbstractFloatingView.java rename to src/com/android/colorfulos/AbstractFloatingView.java index bf70cb6..ef334f3 100644 --- a/src/com/android/uiuios/AbstractFloatingView.java +++ b/src/com/android/colorfulos/AbstractFloatingView.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.android.uiuios; +package com.android.colorfulos; 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.uiuios.compat.AccessibilityManagerCompat.isAccessibilityEnabled; -import static com.android.uiuios.compat.AccessibilityManagerCompat.sendCustomAccessibilityEvent; +import static com.android.colorfulos.compat.AccessibilityManagerCompat.isAccessibilityEnabled; +import static com.android.colorfulos.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.uiuios.userevent.nano.LauncherLogProto.Action; -import com.android.uiuios.userevent.nano.LauncherLogProto.ContainerType; -import com.android.uiuios.util.TouchController; -import com.android.uiuios.views.ActivityContext; -import com.android.uiuios.views.BaseDragLayer; +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 java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/src/com/android/uiuios/Alarm.java b/src/com/android/colorfulos/Alarm.java similarity index 98% rename from src/com/android/uiuios/Alarm.java rename to src/com/android/colorfulos/Alarm.java index ff6f95d..122f0d4 100644 --- a/src/com/android/uiuios/Alarm.java +++ b/src/com/android/colorfulos/Alarm.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios; +package com.android.colorfulos; import android.os.Handler; import android.os.SystemClock; diff --git a/src/com/android/uiuios/AllAppsList.java b/src/com/android/colorfulos/AllAppsList.java similarity index 96% rename from src/com/android/uiuios/AllAppsList.java rename to src/com/android/colorfulos/AllAppsList.java index 079958f..ea7eae0 100644 --- a/src/com/android/uiuios/AllAppsList.java +++ b/src/com/android/colorfulos/AllAppsList.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios; +package com.android.colorfulos; 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.uiuios.compat.LauncherAppsCompat; -import com.android.uiuios.compat.PackageInstallerCompat; -import com.android.uiuios.icons.IconCache; -import com.android.uiuios.util.FlagOp; -import com.android.uiuios.util.ItemInfoMatcher; +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 java.util.ArrayList; import java.util.HashSet; diff --git a/src/com/android/uiuios/AppFilter.java b/src/com/android/colorfulos/AppFilter.java similarity index 80% rename from src/com/android/uiuios/AppFilter.java rename to src/com/android/colorfulos/AppFilter.java index 656c7d3..e744ae6 100644 --- a/src/com/android/uiuios/AppFilter.java +++ b/src/com/android/colorfulos/AppFilter.java @@ -1,9 +1,9 @@ -package com.android.uiuios; +package com.android.colorfulos; import android.content.ComponentName; import android.content.Context; -import com.android.uiuios.util.ResourceBasedOverride; +import com.android.colorfulos.util.ResourceBasedOverride; public class AppFilter implements ResourceBasedOverride { diff --git a/src/com/android/uiuios/AppInfo.java b/src/com/android/colorfulos/AppInfo.java similarity index 95% rename from src/com/android/uiuios/AppInfo.java rename to src/com/android/colorfulos/AppInfo.java index d7be84e..74d1652 100644 --- a/src/com/android/uiuios/AppInfo.java +++ b/src/com/android/colorfulos/AppInfo.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios; +package com.android.colorfulos; 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.uiuios.compat.UserManagerCompat; -import com.android.uiuios.util.ComponentKey; -import com.android.uiuios.util.PackageManagerHelper; +import com.android.colorfulos.compat.UserManagerCompat; +import com.android.colorfulos.util.ComponentKey; +import com.android.colorfulos.util.PackageManagerHelper; /** * Represents an app in AllAppsView. diff --git a/src/com/android/uiuios/AppWidgetResizeFrame.java b/src/com/android/colorfulos/AppWidgetResizeFrame.java similarity index 97% rename from src/com/android/uiuios/AppWidgetResizeFrame.java rename to src/com/android/colorfulos/AppWidgetResizeFrame.java index 04f9c76..8b18a8d 100644 --- a/src/com/android/uiuios/AppWidgetResizeFrame.java +++ b/src/com/android/colorfulos/AppWidgetResizeFrame.java @@ -1,9 +1,9 @@ -package com.android.uiuios; +package com.android.colorfulos; -import static com.android.uiuios.LauncherAnimUtils.LAYOUT_HEIGHT; -import static com.android.uiuios.LauncherAnimUtils.LAYOUT_WIDTH; -import static com.android.uiuios.views.BaseDragLayer.LAYOUT_X; -import static com.android.uiuios.views.BaseDragLayer.LAYOUT_Y; +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; import android.animation.AnimatorSet; import android.animation.ObjectAnimator; @@ -19,10 +19,10 @@ import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; -import com.android.uiuios.accessibility.DragViewStateAnnouncer; -import com.android.uiuios.dragndrop.DragLayer; -import com.android.uiuios.util.FocusLogic; -import com.android.uiuios.widget.LauncherAppWidgetHostView; +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 java.util.ArrayList; import java.util.List; diff --git a/src/com/android/uiuios/AppWidgetsRestoredReceiver.java b/src/com/android/colorfulos/AppWidgetsRestoredReceiver.java similarity index 93% rename from src/com/android/uiuios/AppWidgetsRestoredReceiver.java rename to src/com/android/colorfulos/AppWidgetsRestoredReceiver.java index 88b2523..e78eec8 100644 --- a/src/com/android/uiuios/AppWidgetsRestoredReceiver.java +++ b/src/com/android/colorfulos/AppWidgetsRestoredReceiver.java @@ -1,4 +1,4 @@ -package com.android.uiuios; +package com.android.colorfulos; import android.appwidget.AppWidgetHost; import android.appwidget.AppWidgetManager; @@ -10,11 +10,11 @@ import android.content.Intent; import android.database.Cursor; import android.util.Log; -import com.android.uiuios.LauncherSettings.Favorites; -import com.android.uiuios.config.FeatureFlags; -import com.android.uiuios.model.LoaderTask; -import com.android.uiuios.provider.RestoreDbTask; -import com.android.uiuios.util.ContentWriter; +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 androidx.annotation.WorkerThread; diff --git a/src/com/android/uiuios/AutoInstallsLayout.java b/src/com/android/colorfulos/AutoInstallsLayout.java similarity index 98% rename from src/com/android/uiuios/AutoInstallsLayout.java rename to src/com/android/colorfulos/AutoInstallsLayout.java index 1b85124..9bf1a3c 100644 --- a/src/com/android/uiuios/AutoInstallsLayout.java +++ b/src/com/android/colorfulos/AutoInstallsLayout.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios; +package com.android.colorfulos; 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.uiuios.LauncherProvider.SqlArguments; -import com.android.uiuios.LauncherSettings.Favorites; -import com.android.uiuios.icons.GraphicsUtils; -import com.android.uiuios.icons.LauncherIcons; -import com.android.uiuios.util.IntArray; -import com.android.uiuios.util.Thunk; +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 org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; diff --git a/src/com/android/uiuios/BaseActivity.java b/src/com/android/colorfulos/BaseActivity.java similarity index 92% rename from src/com/android/uiuios/BaseActivity.java rename to src/com/android/colorfulos/BaseActivity.java index 76a98bf..8adbeef 100644 --- a/src/com/android/uiuios/BaseActivity.java +++ b/src/com/android/colorfulos/BaseActivity.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.android.uiuios; +package com.android.colorfulos; -import static com.android.uiuios.util.SystemUiController.UI_STATE_OVERVIEW; +import static com.android.colorfulos.util.SystemUiController.UI_STATE_OVERVIEW; import static java.lang.annotation.RetentionPolicy.SOURCE; @@ -27,17 +27,17 @@ import android.content.Intent; import android.content.res.Configuration; import android.view.ContextThemeWrapper; -import com.android.uiuios.DeviceProfile.OnDeviceProfileChangeListener; -import com.android.uiuios.logging.StatsLogManager; -import com.android.uiuios.logging.StatsLogUtils; -import com.android.uiuios.logging.StatsLogUtils.LogStateProvider; -import com.android.uiuios.logging.UserEventDispatcher; -import com.android.uiuios.logging.UserEventDispatcher.UserEventDelegate; -import com.android.uiuios.uioverrides.UiFactory; -import com.android.uiuios.userevent.nano.LauncherLogProto; -import com.android.uiuios.util.SystemUiController; -import com.android.uiuios.util.ViewCache; -import com.android.uiuios.views.ActivityContext; +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 java.io.FileDescriptor; import java.io.PrintWriter; diff --git a/src/com/android/uiuios/BaseDraggingActivity.java b/src/com/android/colorfulos/BaseDraggingActivity.java similarity index 95% rename from src/com/android/uiuios/BaseDraggingActivity.java rename to src/com/android/colorfulos/BaseDraggingActivity.java index 7c97cf3..930d8b1 100644 --- a/src/com/android/uiuios/BaseDraggingActivity.java +++ b/src/com/android/colorfulos/BaseDraggingActivity.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios; +package com.android.colorfulos; import android.app.ActivityOptions; import android.content.ActivityNotFoundException; @@ -30,14 +30,14 @@ import android.view.ActionMode; import android.view.View; import android.widget.Toast; -import com.android.uiuios.LauncherSettings.Favorites; -import com.android.uiuios.compat.LauncherAppsCompat; -import com.android.uiuios.model.AppLaunchTracker; -import com.android.uiuios.shortcuts.DeepShortcutManager; -import com.android.uiuios.testing.TestProtocol; -import com.android.uiuios.uioverrides.DisplayRotationListener; -import com.android.uiuios.uioverrides.WallpaperColorInfo; -import com.android.uiuios.util.Themes; +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 androidx.annotation.Nullable; diff --git a/src/com/android/uiuios/BaseRecyclerView.java b/src/com/android/colorfulos/BaseRecyclerView.java similarity index 98% rename from src/com/android/uiuios/BaseRecyclerView.java rename to src/com/android/colorfulos/BaseRecyclerView.java index c9bb607..8245136 100644 --- a/src/com/android/uiuios/BaseRecyclerView.java +++ b/src/com/android/colorfulos/BaseRecyclerView.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios; +package com.android.colorfulos; import android.content.Context; import android.util.AttributeSet; @@ -22,7 +22,7 @@ import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; -import com.android.uiuios.views.RecyclerViewFastScroller; +import com.android.colorfulos.views.RecyclerViewFastScroller; import androidx.recyclerview.widget.RecyclerView; diff --git a/src/com/android/uiuios/BubbleTextView.java b/src/com/android/colorfulos/BubbleTextView.java similarity index 96% rename from src/com/android/uiuios/BubbleTextView.java rename to src/com/android/colorfulos/BubbleTextView.java index f22340c..c04cec1 100644 --- a/src/com/android/uiuios/BubbleTextView.java +++ b/src/com/android/colorfulos/BubbleTextView.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.android.uiuios; +package com.android.colorfulos; -import static com.android.uiuios.icons.GraphicsUtils.setColorAlphaBound; +import static com.android.colorfulos.icons.GraphicsUtils.setColorAlphaBound; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -42,20 +42,20 @@ import android.view.ViewConfiguration; import android.view.ViewDebug; import android.widget.TextView; -import com.android.uiuios.Launcher.OnResumeCallback; -import com.android.uiuios.accessibility.LauncherAccessibilityDelegate; -import com.android.uiuios.dot.DotInfo; -import com.android.uiuios.folder.FolderIcon; -import com.android.uiuios.graphics.DrawableFactory; -import com.android.uiuios.graphics.IconPalette; -import com.android.uiuios.graphics.IconShape; -import com.android.uiuios.graphics.PreloadIconDrawable; -import com.android.uiuios.icons.DotRenderer; -import com.android.uiuios.icons.IconCache.IconLoadRequest; -import com.android.uiuios.icons.IconCache.ItemInfoUpdateReceiver; -import com.android.uiuios.model.PackageItemInfo; -import com.android.uiuios.testing.TestProtocol; -import com.android.uiuios.views.ActivityContext; +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 java.text.NumberFormat; diff --git a/src/com/android/uiuios/ButtonDropTarget.java b/src/com/android/colorfulos/ButtonDropTarget.java similarity index 96% rename from src/com/android/uiuios/ButtonDropTarget.java rename to src/com/android/colorfulos/ButtonDropTarget.java index 2e3e769..0191daa 100644 --- a/src/com/android/uiuios/ButtonDropTarget.java +++ b/src/com/android/colorfulos/ButtonDropTarget.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.android.uiuios; +package com.android.colorfulos; import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT; -import static com.android.uiuios.LauncherState.NORMAL; +import static com.android.colorfulos.LauncherState.NORMAL; import android.animation.AnimatorSet; import android.animation.FloatArrayEvaluator; @@ -41,14 +41,14 @@ import android.view.accessibility.AccessibilityEvent; import android.widget.PopupWindow; import android.widget.TextView; -import com.android.uiuios.anim.Interpolators; -import com.android.uiuios.dragndrop.DragController; -import com.android.uiuios.dragndrop.DragLayer; -import com.android.uiuios.dragndrop.DragOptions; -import com.android.uiuios.dragndrop.DragView; -import com.android.uiuios.userevent.nano.LauncherLogProto.Target; -import com.android.uiuios.util.Themes; -import com.android.uiuios.util.Thunk; +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; /** * Implements a DropTarget. diff --git a/src/com/android/uiuios/CellLayout.java b/src/com/android/colorfulos/CellLayout.java similarity index 99% rename from src/com/android/uiuios/CellLayout.java rename to src/com/android/colorfulos/CellLayout.java index d7db302..ba2fac3 100644 --- a/src/com/android/uiuios/CellLayout.java +++ b/src/com/android/colorfulos/CellLayout.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.android.uiuios; +package com.android.colorfulos; -import static com.android.uiuios.anim.Interpolators.DEACCEL_1_5; +import static com.android.colorfulos.anim.Interpolators.DEACCEL_1_5; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -51,24 +51,24 @@ import android.view.accessibility.AccessibilityEvent; import androidx.annotation.IntDef; import androidx.core.view.ViewCompat; -import com.android.uiuios.LauncherSettings.Favorites; -import com.android.uiuios.accessibility.DragAndDropAccessibilityDelegate; -import com.android.uiuios.accessibility.FolderAccessibilityHelper; -import com.android.uiuios.accessibility.WorkspaceAccessibilityHelper; -import com.android.uiuios.anim.Interpolators; -import com.android.uiuios.anim.PropertyListBuilder; -import com.android.uiuios.config.FeatureFlags; -import com.android.uiuios.folder.PreviewBackground; -import com.android.uiuios.graphics.DragPreviewProvider; -import com.android.uiuios.graphics.RotationMode; -import com.android.uiuios.util.CellAndSpan; -import com.android.uiuios.util.GridOccupancy; -import com.android.uiuios.util.ParcelableSparseArray; -import com.android.uiuios.util.Themes; -import com.android.uiuios.util.Thunk; -import com.android.uiuios.views.ActivityContext; -import com.android.uiuios.views.Transposable; -import com.android.uiuios.widget.LauncherAppWidgetHostView; +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 java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/src/com/android/uiuios/CheckLongPressHelper.java b/src/com/android/colorfulos/CheckLongPressHelper.java similarity index 97% rename from src/com/android/uiuios/CheckLongPressHelper.java rename to src/com/android/colorfulos/CheckLongPressHelper.java index 3970c7c..9fa7eb7 100644 --- a/src/com/android/uiuios/CheckLongPressHelper.java +++ b/src/com/android/colorfulos/CheckLongPressHelper.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.android.uiuios; +package com.android.colorfulos; import android.view.View; import android.view.ViewConfiguration; -import com.android.uiuios.util.Thunk; +import com.android.colorfulos.util.Thunk; public class CheckLongPressHelper { diff --git a/src/com/android/uiuios/DefaultLayoutParser.java b/src/com/android/colorfulos/DefaultLayoutParser.java similarity index 99% rename from src/com/android/uiuios/DefaultLayoutParser.java rename to src/com/android/colorfulos/DefaultLayoutParser.java index 79b657c..ad3a763 100644 --- a/src/com/android/uiuios/DefaultLayoutParser.java +++ b/src/com/android/colorfulos/DefaultLayoutParser.java @@ -1,4 +1,4 @@ -package com.android.uiuios; +package com.android.colorfulos; import android.appwidget.AppWidgetHost; import android.appwidget.AppWidgetManager; @@ -14,8 +14,8 @@ import android.os.Bundle; import android.text.TextUtils; import android.util.ArrayMap; import android.util.Log; -import com.android.uiuios.LauncherSettings.Favorites; -import com.android.uiuios.util.Thunk; +import com.android.colorfulos.LauncherSettings.Favorites; +import com.android.colorfulos.util.Thunk; import java.io.IOException; import java.net.URISyntaxException; import java.util.List; diff --git a/src/com/android/uiuios/DeleteDropTarget.java b/src/com/android/colorfulos/DeleteDropTarget.java similarity index 90% rename from src/com/android/uiuios/DeleteDropTarget.java rename to src/com/android/colorfulos/DeleteDropTarget.java index ed8c362..1a4581b 100644 --- a/src/com/android/uiuios/DeleteDropTarget.java +++ b/src/com/android/colorfulos/DeleteDropTarget.java @@ -14,23 +14,22 @@ * limitations under the License. */ -package com.android.uiuios; +package com.android.colorfulos; -import static com.android.uiuios.userevent.nano.LauncherLogProto.Action.Touch.TAP; -import static com.android.uiuios.userevent.nano.LauncherLogProto.ControlType.UNDO; +import static com.android.colorfulos.userevent.nano.LauncherLogProto.Action.Touch.TAP; +import static com.android.colorfulos.userevent.nano.LauncherLogProto.ControlType.UNDO; import android.content.Context; import android.text.TextUtils; import android.util.AttributeSet; import android.view.View; -import com.android.uiuios.accessibility.LauncherAccessibilityDelegate; -import com.android.uiuios.dragndrop.DragOptions; -import com.android.uiuios.logging.LoggerUtils; -import com.android.uiuios.model.ModelWriter; -import com.android.uiuios.userevent.nano.LauncherLogProto.ControlType; -import com.android.uiuios.userevent.nano.LauncherLogProto.Target; -import com.android.uiuios.views.Snackbar; +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; public class DeleteDropTarget extends ButtonDropTarget { diff --git a/src/com/android/uiuios/DeviceProfile.java b/src/com/android/colorfulos/DeviceProfile.java similarity index 99% rename from src/com/android/uiuios/DeviceProfile.java rename to src/com/android/colorfulos/DeviceProfile.java index 7b094b8..9c55854 100644 --- a/src/com/android/uiuios/DeviceProfile.java +++ b/src/com/android/colorfulos/DeviceProfile.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios; +package com.android.colorfulos; import android.content.Context; import android.content.res.Configuration; @@ -26,10 +26,10 @@ import android.util.DisplayMetrics; import android.view.Surface; import android.view.WindowManager; -import com.android.uiuios.CellLayout.ContainerType; -import com.android.uiuios.graphics.IconShape; -import com.android.uiuios.icons.DotRenderer; -import com.android.uiuios.icons.IconNormalizer; +import com.android.colorfulos.CellLayout.ContainerType; +import com.android.colorfulos.graphics.IconShape; +import com.android.colorfulos.icons.DotRenderer; +import com.android.colorfulos.icons.IconNormalizer; public class DeviceProfile { diff --git a/src/com/android/uiuios/DragSource.java b/src/com/android/colorfulos/DragSource.java similarity index 86% rename from src/com/android/uiuios/DragSource.java rename to src/com/android/colorfulos/DragSource.java index 7399eac..8fdd55b 100644 --- a/src/com/android/uiuios/DragSource.java +++ b/src/com/android/colorfulos/DragSource.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.android.uiuios; +package com.android.colorfulos; import android.view.View; -import com.android.uiuios.DropTarget.DragObject; -import com.android.uiuios.logging.StatsLogUtils.LogContainerProvider; +import com.android.colorfulos.DropTarget.DragObject; +import com.android.colorfulos.logging.StatsLogUtils.LogContainerProvider; /** * Interface defining an object that can originate a drag. diff --git a/src/com/android/uiuios/DropTarget.java b/src/com/android/colorfulos/DropTarget.java similarity index 95% rename from src/com/android/uiuios/DropTarget.java rename to src/com/android/colorfulos/DropTarget.java index e6f8299..b436d8b 100644 --- a/src/com/android/uiuios/DropTarget.java +++ b/src/com/android/colorfulos/DropTarget.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.android.uiuios; +package com.android.colorfulos; import android.graphics.Rect; -import com.android.uiuios.accessibility.DragViewStateAnnouncer; -import com.android.uiuios.dragndrop.DragOptions; -import com.android.uiuios.dragndrop.DragView; +import com.android.colorfulos.accessibility.DragViewStateAnnouncer; +import com.android.colorfulos.dragndrop.DragOptions; +import com.android.colorfulos.dragndrop.DragView; /** * Interface defining an object that can receive a drag. diff --git a/src/com/android/uiuios/DropTargetBar.java b/src/com/android/colorfulos/DropTargetBar.java similarity index 94% rename from src/com/android/uiuios/DropTargetBar.java rename to src/com/android/colorfulos/DropTargetBar.java index 292f83c..fa144e3 100644 --- a/src/com/android/uiuios/DropTargetBar.java +++ b/src/com/android/colorfulos/DropTargetBar.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.android.uiuios; +package com.android.colorfulos; -import static com.android.uiuios.ButtonDropTarget.TOOLTIP_DEFAULT; -import static com.android.uiuios.ButtonDropTarget.TOOLTIP_LEFT; -import static com.android.uiuios.ButtonDropTarget.TOOLTIP_RIGHT; -import static com.android.uiuios.anim.AlphaUpdateListener.updateVisibility; +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; import android.animation.TimeInterpolator; import android.content.Context; @@ -31,10 +31,10 @@ import android.view.ViewDebug; import android.view.ViewPropertyAnimator; import android.widget.FrameLayout; -import com.android.uiuios.anim.Interpolators; -import com.android.uiuios.dragndrop.DragController; -import com.android.uiuios.dragndrop.DragController.DragListener; -import com.android.uiuios.dragndrop.DragOptions; +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; /* * The top bar containing various drop targets: Delete/App Info/Uninstall. diff --git a/src/com/android/uiuios/ExtendedEditText.java b/src/com/android/colorfulos/ExtendedEditText.java similarity index 98% rename from src/com/android/uiuios/ExtendedEditText.java rename to src/com/android/colorfulos/ExtendedEditText.java index 81176ee..6558a9a 100644 --- a/src/com/android/uiuios/ExtendedEditText.java +++ b/src/com/android/colorfulos/ExtendedEditText.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios; +package com.android.colorfulos; 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.uiuios.util.UiThreadHelper; +import com.android.colorfulos.util.UiThreadHelper; /** diff --git a/src/com/android/uiuios/FastBitmapDrawable.java b/src/com/android/colorfulos/FastBitmapDrawable.java similarity index 98% rename from src/com/android/uiuios/FastBitmapDrawable.java rename to src/com/android/colorfulos/FastBitmapDrawable.java index 7d367ef..4cc0948 100644 --- a/src/com/android/uiuios/FastBitmapDrawable.java +++ b/src/com/android/colorfulos/FastBitmapDrawable.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.android.uiuios; +package com.android.colorfulos; -import static com.android.uiuios.anim.Interpolators.ACCEL; -import static com.android.uiuios.anim.Interpolators.DEACCEL; +import static com.android.colorfulos.anim.Interpolators.ACCEL; +import static com.android.colorfulos.anim.Interpolators.DEACCEL; import android.animation.ObjectAnimator; import android.graphics.Bitmap; @@ -35,7 +35,7 @@ import android.graphics.drawable.Drawable; import android.util.Property; import android.util.SparseArray; -import com.android.uiuios.icons.BitmapInfo; +import com.android.colorfulos.icons.BitmapInfo; public class FastBitmapDrawable extends Drawable { diff --git a/src/com/android/uiuios/FirstFrameAnimatorHelper.java b/src/com/android/colorfulos/FirstFrameAnimatorHelper.java similarity index 98% rename from src/com/android/uiuios/FirstFrameAnimatorHelper.java rename to src/com/android/colorfulos/FirstFrameAnimatorHelper.java index 87e26d6..22efe07 100644 --- a/src/com/android/uiuios/FirstFrameAnimatorHelper.java +++ b/src/com/android/colorfulos/FirstFrameAnimatorHelper.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios; +package com.android.colorfulos; -import static com.android.uiuios.Utilities.SINGLE_FRAME_MS; +import static com.android.colorfulos.Utilities.SINGLE_FRAME_MS; import android.animation.ValueAnimator; import android.animation.ValueAnimator.AnimatorUpdateListener; diff --git a/src/com/android/uiuios/FocusHelper.java b/src/com/android/colorfulos/FocusHelper.java similarity index 98% rename from src/com/android/uiuios/FocusHelper.java rename to src/com/android/colorfulos/FocusHelper.java index 13fd47d..ea3ee6d 100644 --- a/src/com/android/uiuios/FocusHelper.java +++ b/src/com/android/colorfulos/FocusHelper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios; +package com.android.colorfulos; import android.util.Log; import android.view.KeyEvent; @@ -22,11 +22,11 @@ import android.view.SoundEffectConstants; import android.view.View; import android.view.ViewGroup; -import com.android.uiuios.config.FeatureFlags; -import com.android.uiuios.folder.Folder; -import com.android.uiuios.folder.FolderPagedView; -import com.android.uiuios.util.FocusLogic; -import com.android.uiuios.util.Thunk; +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; /** * A keyboard listener we set on all the workspace icons. diff --git a/src/com/android/uiuios/FolderInfo.java b/src/com/android/colorfulos/FolderInfo.java similarity index 97% rename from src/com/android/uiuios/FolderInfo.java rename to src/com/android/colorfulos/FolderInfo.java index 904911d..7d23ac1 100644 --- a/src/com/android/uiuios/FolderInfo.java +++ b/src/com/android/colorfulos/FolderInfo.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.android.uiuios; +package com.android.colorfulos; import android.os.Process; -import com.android.uiuios.model.ModelWriter; -import com.android.uiuios.util.ContentWriter; +import com.android.colorfulos.model.ModelWriter; +import com.android.colorfulos.util.ContentWriter; import java.util.ArrayList; diff --git a/src/com/android/uiuios/Hotseat.java b/src/com/android/colorfulos/Hotseat.java similarity index 91% rename from src/com/android/uiuios/Hotseat.java rename to src/com/android/colorfulos/Hotseat.java index af9277a..d7f00b5 100644 --- a/src/com/android/uiuios/Hotseat.java +++ b/src/com/android/colorfulos/Hotseat.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios; +package com.android.colorfulos; import android.content.Context; import android.graphics.Rect; @@ -26,11 +26,11 @@ import android.view.ViewDebug; import android.view.ViewGroup; import android.widget.FrameLayout; -import com.android.uiuios.graphics.RotationMode; -import com.android.uiuios.logging.StatsLogUtils.LogContainerProvider; -import com.android.uiuios.userevent.nano.LauncherLogProto; -import com.android.uiuios.userevent.nano.LauncherLogProto.Target; -import com.android.uiuios.views.Transposable; +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; public class Hotseat extends CellLayout implements LogContainerProvider, Insettable, Transposable { diff --git a/src/com/android/uiuios/IconProvider.java b/src/com/android/colorfulos/IconProvider.java similarity index 90% rename from src/com/android/uiuios/IconProvider.java rename to src/com/android/colorfulos/IconProvider.java index 5b47c6b..37a3d78 100644 --- a/src/com/android/uiuios/IconProvider.java +++ b/src/com/android/colorfulos/IconProvider.java @@ -1,10 +1,10 @@ -package com.android.uiuios; +package com.android.colorfulos; import android.content.Context; import android.content.pm.LauncherActivityInfo; import android.graphics.drawable.Drawable; -import com.android.uiuios.util.ResourceBasedOverride; +import com.android.colorfulos.util.ResourceBasedOverride; public class IconProvider implements ResourceBasedOverride { diff --git a/src/com/android/uiuios/Insettable.java b/src/com/android/colorfulos/Insettable.java similarity index 96% rename from src/com/android/uiuios/Insettable.java rename to src/com/android/colorfulos/Insettable.java index 0852f4d..3f6c83a 100644 --- a/src/com/android/uiuios/Insettable.java +++ b/src/com/android/colorfulos/Insettable.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios; +package com.android.colorfulos; import android.graphics.Rect; diff --git a/src/com/android/uiuios/InsettableFrameLayout.java b/src/com/android/colorfulos/InsettableFrameLayout.java similarity index 99% rename from src/com/android/uiuios/InsettableFrameLayout.java rename to src/com/android/colorfulos/InsettableFrameLayout.java index 9fc3cad..3d1944f 100644 --- a/src/com/android/uiuios/InsettableFrameLayout.java +++ b/src/com/android/colorfulos/InsettableFrameLayout.java @@ -1,4 +1,4 @@ -package com.android.uiuios; +package com.android.colorfulos; import android.content.Context; import android.content.res.TypedArray; diff --git a/src/com/android/uiuios/InstallShortcutReceiver.java b/src/com/android/colorfulos/InstallShortcutReceiver.java similarity index 98% rename from src/com/android/uiuios/InstallShortcutReceiver.java rename to src/com/android/colorfulos/InstallShortcutReceiver.java index 07dc2c0..bc7b0bf 100644 --- a/src/com/android/uiuios/InstallShortcutReceiver.java +++ b/src/com/android/colorfulos/InstallShortcutReceiver.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios; +package com.android.colorfulos; 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.uiuios.compat.LauncherAppsCompat; -import com.android.uiuios.compat.UserManagerCompat; -import com.android.uiuios.icons.BitmapInfo; -import com.android.uiuios.icons.GraphicsUtils; -import com.android.uiuios.icons.LauncherIcons; -import com.android.uiuios.shortcuts.DeepShortcutManager; -import com.android.uiuios.shortcuts.ShortcutKey; -import com.android.uiuios.util.PackageManagerHelper; -import com.android.uiuios.util.Preconditions; -import com.android.uiuios.util.Thunk; +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 org.json.JSONException; import org.json.JSONObject; diff --git a/src/com/android/uiuios/InterruptibleInOutAnimator.java b/src/com/android/colorfulos/InterruptibleInOutAnimator.java similarity index 98% rename from src/com/android/uiuios/InterruptibleInOutAnimator.java rename to src/com/android/colorfulos/InterruptibleInOutAnimator.java index b5f1d6b..4d791b1 100644 --- a/src/com/android/uiuios/InterruptibleInOutAnimator.java +++ b/src/com/android/colorfulos/InterruptibleInOutAnimator.java @@ -14,16 +14,15 @@ * limitations under the License. */ -package com.android.uiuios; +package com.android.colorfulos; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; import android.animation.ObjectAnimator; import android.animation.ValueAnimator; import android.util.Property; -import android.view.View; -import com.android.uiuios.util.Thunk; +import com.android.colorfulos.util.Thunk; /** * A convenience class for two-way animations, e.g. a fadeIn/fadeOut animation. diff --git a/src/com/android/uiuios/InvariantDeviceProfile.java b/src/com/android/colorfulos/InvariantDeviceProfile.java similarity index 97% rename from src/com/android/uiuios/InvariantDeviceProfile.java rename to src/com/android/colorfulos/InvariantDeviceProfile.java index 63f3a0d..57e143b 100644 --- a/src/com/android/uiuios/InvariantDeviceProfile.java +++ b/src/com/android/colorfulos/InvariantDeviceProfile.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.android.uiuios; +package com.android.colorfulos; -import static com.android.uiuios.Utilities.getDevicePrefs; -import static com.android.uiuios.config.FeatureFlags.APPLY_CONFIG_AT_RUNTIME; -import static com.android.uiuios.util.PackageManagerHelper.getPackageFilter; +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 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.uiuios.graphics.IconShape; -import com.android.uiuios.util.ConfigMonitor; -import com.android.uiuios.util.IntArray; -import com.android.uiuios.util.MainThreadInitializedObject; -import com.android.uiuios.util.Themes; +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 org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; diff --git a/src/com/android/uiuios/ItemInfo.java b/src/com/android/colorfulos/ItemInfo.java similarity index 98% rename from src/com/android/uiuios/ItemInfo.java rename to src/com/android/colorfulos/ItemInfo.java index d15f60b..7d81cc7 100644 --- a/src/com/android/uiuios/ItemInfo.java +++ b/src/com/android/colorfulos/ItemInfo.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios; +package com.android.colorfulos; 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.uiuios.util.ContentWriter; +import com.android.colorfulos.util.ContentWriter; /** * Represents an item in the launcher. diff --git a/src/com/android/uiuios/ItemInfoWithIcon.java b/src/com/android/colorfulos/ItemInfoWithIcon.java similarity index 96% rename from src/com/android/uiuios/ItemInfoWithIcon.java rename to src/com/android/colorfulos/ItemInfoWithIcon.java index a5558e5..8f6a491 100644 --- a/src/com/android/uiuios/ItemInfoWithIcon.java +++ b/src/com/android/colorfulos/ItemInfoWithIcon.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.android.uiuios; +package com.android.colorfulos; -import static com.android.uiuios.icons.BitmapInfo.LOW_RES_ICON; +import static com.android.colorfulos.icons.BitmapInfo.LOW_RES_ICON; import android.graphics.Bitmap; -import com.android.uiuios.icons.BitmapInfo; +import com.android.colorfulos.icons.BitmapInfo; /** * Represents an ItemInfo which also holds an icon. diff --git a/src/com/android/uiuios/Launcher.java b/src/com/android/colorfulos/Launcher.java similarity index 91% rename from src/com/android/uiuios/Launcher.java rename to src/com/android/colorfulos/Launcher.java index cc75c35..10ef44e 100644 --- a/src/com/android/uiuios/Launcher.java +++ b/src/com/android/colorfulos/Launcher.java @@ -14,25 +14,7 @@ * limitations under the License. */ -package com.android.uiuios; - -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.uiuios.AbstractFloatingView.TYPE_SNACKBAR; -import static com.android.uiuios.LauncherAnimUtils.SPRING_LOADED_EXIT_DELAY; -import static com.android.uiuios.LauncherState.ALL_APPS; -import static com.android.uiuios.LauncherState.NORMAL; -import static com.android.uiuios.LauncherState.OVERVIEW; -import static com.android.uiuios.LauncherState.OVERVIEW_PEEK; -import static com.android.uiuios.dragndrop.DragLayer.ALPHA_INDEX_LAUNCHER_LOAD; -import static com.android.uiuios.jpush.TagAliasOperatorHelper.ACTION_SET; -import static com.android.uiuios.logging.LoggerUtils.newContainerTarget; -import static com.android.uiuios.logging.LoggerUtils.newTarget; -import static com.android.uiuios.states.RotationHelper.REQUEST_NONE; -import static com.android.uiuios.util.RaceConditionTracker.ENTER; -import static com.android.uiuios.util.RaceConditionTracker.EXIT; +package com.android.colorfulos; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -63,6 +45,7 @@ import android.graphics.Point; import android.graphics.Rect; import android.os.Build; import android.os.Bundle; +import android.os.Environment; import android.os.Handler; import android.os.Parcelable; import android.os.Process; @@ -83,82 +66,89 @@ import android.view.accessibility.AccessibilityEvent; import android.view.animation.OvershootInterpolator; import android.widget.Toast; -import com.android.uiuios.DropTarget.DragObject; -import com.android.uiuios.TTUtils.Utils; -import com.android.uiuios.accessibility.LauncherAccessibilityDelegate; -import com.android.uiuios.allapps.AllAppsContainerView; -import com.android.uiuios.allapps.AllAppsStore; -import com.android.uiuios.allapps.AllAppsTransitionController; -import com.android.uiuios.allapps.DiscoveryBounce; -import com.android.uiuios.anim.PropertyListBuilder; -import com.android.uiuios.compat.AppWidgetManagerCompat; -import com.android.uiuios.compat.LauncherAppsCompatVO; -import com.android.uiuios.config.FeatureFlags; -import com.android.uiuios.dot.DotInfo; -import com.android.uiuios.dragndrop.DragController; -import com.android.uiuios.dragndrop.DragLayer; -import com.android.uiuios.dragndrop.DragView; -import com.android.uiuios.folder.Folder; -import com.android.uiuios.folder.FolderIcon; -import com.android.uiuios.folder.FolderIconPreviewVerifier; -import com.android.uiuios.graphics.RotationMode; -import com.android.uiuios.icons.IconCache; -import com.android.uiuios.jpush.ExampleUtil; -import com.android.uiuios.jpush.LocalBroadcastManager; -import com.android.uiuios.jpush.TagAliasOperatorHelper; -import com.android.uiuios.keyboard.CustomActionsPopup; -import com.android.uiuios.keyboard.ViewGroupFocusHelper; -import com.android.uiuios.logging.FileLog; -import com.android.uiuios.logging.StatsLogUtils; -import com.android.uiuios.logging.UserEventDispatcher; -import com.android.uiuios.logging.UserEventDispatcher.UserEventDelegate; -import com.android.uiuios.model.AppLaunchTracker; -import com.android.uiuios.model.ModelWriter; -import com.android.uiuios.network.BaseResponse; -import com.android.uiuios.network.NetWorkManager; -import com.android.uiuios.network.api.AddAppLog; -import com.android.uiuios.notification.NotificationListener; -import com.android.uiuios.pageindicators.PageIndicatorDots; -import com.android.uiuios.popup.PopupContainerWithArrow; -import com.android.uiuios.popup.PopupDataProvider; -import com.android.uiuios.shortcuts.DeepShortcutManager; -import com.android.uiuios.states.InternalStateHandler; -import com.android.uiuios.states.RotationHelper; -import com.android.uiuios.testing.TestProtocol; -import com.android.uiuios.touch.ItemClickHandler; -import com.android.uiuios.uioverrides.UiFactory; -import com.android.uiuios.userevent.nano.LauncherLogProto; -import com.android.uiuios.userevent.nano.LauncherLogProto.Action; -import com.android.uiuios.userevent.nano.LauncherLogProto.ContainerType; -import com.android.uiuios.userevent.nano.LauncherLogProto.Target; -import com.android.uiuios.util.ActivityResultInfo; -import com.android.uiuios.util.ComponentKey; -import com.android.uiuios.util.IntArray; -import com.android.uiuios.util.ItemInfoMatcher; -import com.android.uiuios.util.MultiValueAlpha; -import com.android.uiuios.util.MultiValueAlpha.AlphaProperty; -import com.android.uiuios.util.PackageManagerHelper; -import com.android.uiuios.util.PackageUserKey; -import com.android.uiuios.util.PendingRequestArgs; -import com.android.uiuios.util.RaceConditionTracker; -import com.android.uiuios.util.SystemUiController; -import com.android.uiuios.util.Themes; -import com.android.uiuios.util.Thunk; -import com.android.uiuios.util.TraceHelper; -import com.android.uiuios.util.UiThreadHelper; -import com.android.uiuios.util.ViewOnDrawExecutor; -import com.android.uiuios.views.ActivityContext; -import com.android.uiuios.views.OptionsPopupView; -import com.android.uiuios.views.ScrimView; -import com.android.uiuios.widget.LauncherAppWidgetHostView; -import com.android.uiuios.widget.PendingAddShortcutInfo; -import com.android.uiuios.widget.PendingAddWidgetInfo; -import com.android.uiuios.widget.PendingAppWidgetHostView; -import com.android.uiuios.widget.WidgetAddFlowHandler; -import com.android.uiuios.widget.WidgetHostViewLoader; -import com.android.uiuios.widget.WidgetListRowEntry; -import com.android.uiuios.widget.WidgetsFullSheet; -import com.android.uiuios.widget.custom.CustomWidgetParser; +import androidx.annotation.Nullable; + +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.arialyy.aria.core.Aria; import java.io.FileDescriptor; import java.io.IOException; @@ -169,17 +159,36 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Random; +import java.util.concurrent.TimeUnit; import java.util.function.Predicate; -import androidx.annotation.Nullable; - import cn.jpush.android.api.JPushInterface; +import io.reactivex.Observable; +import io.reactivex.ObservableEmitter; +import io.reactivex.ObservableOnSubscribe; import io.reactivex.Observer; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.disposables.Disposable; import io.reactivex.schedulers.Schedulers; -import static com.android.uiuios.jpush.TagAliasOperatorHelper.sequence; +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; + /** * Default launcher application. */ @@ -322,6 +331,10 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns, @Override protected void onCreate(Bundle savedInstanceState) { RaceConditionTracker.onEvent(ON_CREATE_EVT, ENTER); + Observable.create(subscribe) + .throttleFirst(1, TimeUnit.MINUTES) + .subscribe(updateObserver); + startService(new Intent(Launcher.this, MainService.class)); if (DEBUG_STRICT_MODE) { StrictMode.setThreadPolicy(new StrictMode.ThreadPolicy.Builder() .detectDiskReads() @@ -493,7 +506,7 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns, showMsg.append(KEY_EXTRAS + " : " + extras + "\n"); } } - } catch (Exception e){ + } catch (Exception e) { } } } @@ -1142,9 +1155,9 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns, public void onNext(BaseResponse baseResponse) { int code = baseResponse.code; if (code == 200) { - Log.e("SendcloseApp", "onNext:" + code + baseResponse.data); + Log.e("SendcloseApp", "onNext: " + code + baseResponse.data); } else { - Log.e("SendcloseApp", "onNext:" + code + baseResponse.msg); + Log.e("SendcloseApp", "onNext: " + code + baseResponse.msg); } } @@ -1208,6 +1221,7 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns, RaceConditionTracker.onEvent(ON_RESUME_EVT, ENTER); TraceHelper.beginSection("ON_RESUME"); super.onResume(); + start.onstar(System.currentTimeMillis()); TraceHelper.partitionSection("ON_RESUME", "superCall"); mHandler.removeCallbacks(mHandleDeferredResume); @@ -1231,7 +1245,106 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns, isForeground = true; MyApplication.getInstance().setAppPackageName(BuildConfig.APPLICATION_ID); MyApplication.getInstance().setOnClickTime(System.currentTimeMillis()); + start.onstar(System.currentTimeMillis()); + } + private Start start; + + private interface Start { + void onstar(long time); + } + + private ObservableOnSubscribe subscribe = new ObservableOnSubscribe() { + @Override + public void subscribe(ObservableEmitter emitter) throws Exception { + start = emitter::onNext; + } + }; + + private Observer updateObserver = new Observer() { + + @Override + public void onSubscribe(Disposable d) { + Log.e("updateObserver", "onSubscribe: "); + } + + @Override + public void onNext(Long aLong) { + Log.e("updateObserver", "onNext: " + aLong); + checkUpdate(); + } + + @Override + public void onError(Throwable e) { + Log.e("updateObserver", "onError: " + e.getMessage()); + } + + @Override + public void onComplete() { + Log.e("updateObserver", "onComplete: "); + } + }; + + private void checkUpdate() { + NetWorkManager.getInstance().getCheckUpdateObservable() + .getCheckUpdate(BuildConfig.APPLICATION_ID, + BuildConfig.VERSION_CODE, + JGYUtils.getInstance().checkAppPlatform()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer>() { + @Override + public void onSubscribe(Disposable d) { + Log.e("checkUpdate", "onSubscribe: "); + } + + @Override + public void onNext(BaseResponse response) { + Log.e("checkUpdate", "onNext: " + response); + int code = response.code; + if (code == 200) { + NewestAppUpdateResult result = response.data; + checkAppUpdate(result); + } else { + Log.e(TAG, "onNext: " + "not find update"); + } + } + + @Override + public void onError(Throwable e) { + Log.e("checkUpdate", "onError: " + e.getMessage()); + } + + @Override + public void onComplete() { + Log.e("checkUpdate", "onComplete: "); + } + }); + } + + private void checkAppUpdate(NewestAppUpdateResult result) { + int app_version_code = result.getApp_version_code(); + String app_package = result.getApp_package(); + String url = result.getUrl(); + PackageInfo info = null; + try { + info = getPackageManager().getPackageInfo(app_package, 0); + } catch (PackageManager.NameNotFoundException e) { + e.printStackTrace(); + } + 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) + .create(); + } else { + Log.e(TAG, "checkAppUpdate: " + app_package + " :无需更新"); + } + } + + public static String getFileNamefromURL(String url) { + int position = url.lastIndexOf("/"); + return url.substring(position + 1); } @Override @@ -1725,7 +1838,7 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns, @Override public void onDestroy() { super.onDestroy(); - + unregisterReceiver(mTimeChangedReceiver); unregisterReceiver(mScreenOffReceiver); mWorkspace.removeFolderListeners(); diff --git a/src/com/android/uiuios/LauncherAnimUtils.java b/src/com/android/colorfulos/LauncherAnimUtils.java similarity index 99% rename from src/com/android/uiuios/LauncherAnimUtils.java rename to src/com/android/colorfulos/LauncherAnimUtils.java index 2f3d22c..aa71ecb 100644 --- a/src/com/android/uiuios/LauncherAnimUtils.java +++ b/src/com/android/colorfulos/LauncherAnimUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios; +package com.android.colorfulos; import android.graphics.drawable.Drawable; import android.util.FloatProperty; diff --git a/src/com/android/uiuios/LauncherAppState.java b/src/com/android/colorfulos/LauncherAppState.java similarity index 89% rename from src/com/android/uiuios/LauncherAppState.java rename to src/com/android/colorfulos/LauncherAppState.java index b86b8a4..58f181e 100644 --- a/src/com/android/uiuios/LauncherAppState.java +++ b/src/com/android/colorfulos/LauncherAppState.java @@ -14,31 +14,29 @@ * limitations under the License. */ -package com.android.uiuios; +package com.android.colorfulos; -import static com.android.uiuios.InvariantDeviceProfile.CHANGE_FLAG_ICON_PARAMS; -import static com.android.uiuios.util.SecureSettingsObserver.newNotificationSettingsObserver; +import static com.android.colorfulos.InvariantDeviceProfile.CHANGE_FLAG_ICON_PARAMS; +import static com.android.colorfulos.util.SecureSettingsObserver.newNotificationSettingsObserver; -import android.app.KeyguardManager; import android.content.ComponentName; import android.content.ContentProviderClient; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.os.Handler; -import android.os.Process; import android.util.Log; -import com.android.uiuios.compat.LauncherAppsCompat; -import com.android.uiuios.compat.PackageInstallerCompat; -import com.android.uiuios.compat.UserManagerCompat; -import com.android.uiuios.config.FeatureFlags; -import com.android.uiuios.icons.IconCache; -import com.android.uiuios.icons.LauncherIcons; -import com.android.uiuios.notification.NotificationListener; -import com.android.uiuios.util.MainThreadInitializedObject; -import com.android.uiuios.util.Preconditions; -import com.android.uiuios.util.SecureSettingsObserver; +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; public class LauncherAppState { diff --git a/src/com/android/uiuios/LauncherAppTransitionManager.java b/src/com/android/colorfulos/LauncherAppTransitionManager.java similarity index 96% rename from src/com/android/uiuios/LauncherAppTransitionManager.java rename to src/com/android/colorfulos/LauncherAppTransitionManager.java index 9bc116d..18b8b98 100644 --- a/src/com/android/uiuios/LauncherAppTransitionManager.java +++ b/src/com/android/colorfulos/LauncherAppTransitionManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios; +package com.android.colorfulos; import android.animation.Animator; @@ -24,7 +24,7 @@ import android.graphics.Rect; import android.graphics.drawable.Drawable; import android.view.View; -import com.android.uiuios.util.ResourceBasedOverride; +import com.android.colorfulos.util.ResourceBasedOverride; /** * Manages the opening and closing app transitions from Launcher. diff --git a/src/com/android/uiuios/LauncherAppWidgetHost.java b/src/com/android/colorfulos/LauncherAppWidgetHost.java similarity index 97% rename from src/com/android/uiuios/LauncherAppWidgetHost.java rename to src/com/android/colorfulos/LauncherAppWidgetHost.java index fbf681c..670df42 100644 --- a/src/com/android/uiuios/LauncherAppWidgetHost.java +++ b/src/com/android/colorfulos/LauncherAppWidgetHost.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios; +package com.android.colorfulos; import static android.app.Activity.RESULT_CANCELED; @@ -30,9 +30,9 @@ import android.util.SparseArray; import android.view.LayoutInflater; import android.widget.Toast; -import com.android.uiuios.config.FeatureFlags; -import com.android.uiuios.widget.DeferredAppWidgetHostView; -import com.android.uiuios.widget.LauncherAppWidgetHostView; +import com.android.colorfulos.config.FeatureFlags; +import com.android.colorfulos.widget.DeferredAppWidgetHostView; +import com.android.colorfulos.widget.LauncherAppWidgetHostView; import java.util.ArrayList; diff --git a/src/com/android/uiuios/LauncherAppWidgetInfo.java b/src/com/android/colorfulos/LauncherAppWidgetInfo.java similarity index 97% rename from src/com/android/uiuios/LauncherAppWidgetInfo.java rename to src/com/android/colorfulos/LauncherAppWidgetInfo.java index 3ab36e2..5f2edbf 100644 --- a/src/com/android/uiuios/LauncherAppWidgetInfo.java +++ b/src/com/android/colorfulos/LauncherAppWidgetInfo.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package com.android.uiuios; +package com.android.colorfulos; import android.appwidget.AppWidgetHostView; import android.content.ComponentName; import android.content.Intent; import android.os.Process; -import com.android.uiuios.model.PackageItemInfo; -import com.android.uiuios.util.ContentWriter; +import com.android.colorfulos.model.PackageItemInfo; +import com.android.colorfulos.util.ContentWriter; /** * Represents a widget (either instantiated or about to be) in the Launcher. diff --git a/src/com/android/uiuios/LauncherAppWidgetProviderInfo.java b/src/com/android/colorfulos/LauncherAppWidgetProviderInfo.java similarity index 97% rename from src/com/android/uiuios/LauncherAppWidgetProviderInfo.java rename to src/com/android/colorfulos/LauncherAppWidgetProviderInfo.java index f2825e6..6cb8c16 100644 --- a/src/com/android/uiuios/LauncherAppWidgetProviderInfo.java +++ b/src/com/android/colorfulos/LauncherAppWidgetProviderInfo.java @@ -1,4 +1,4 @@ -package com.android.uiuios; +package com.android.colorfulos; 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.uiuios.icons.ComponentWithLabel; +import com.android.colorfulos.icons.ComponentWithLabel; /** * This class is a thin wrapper around the framework AppWidgetProviderInfo class. This class affords diff --git a/src/com/android/uiuios/LauncherBackupAgent.java b/src/com/android/colorfulos/LauncherBackupAgent.java similarity index 87% rename from src/com/android/uiuios/LauncherBackupAgent.java rename to src/com/android/colorfulos/LauncherBackupAgent.java index fac4491..31b8368 100644 --- a/src/com/android/uiuios/LauncherBackupAgent.java +++ b/src/com/android/colorfulos/LauncherBackupAgent.java @@ -1,12 +1,12 @@ -package com.android.uiuios; +package com.android.colorfulos; import android.app.backup.BackupAgent; import android.app.backup.BackupDataInput; import android.app.backup.BackupDataOutput; import android.os.ParcelFileDescriptor; -import com.android.uiuios.logging.FileLog; -import com.android.uiuios.provider.RestoreDbTask; +import com.android.colorfulos.logging.FileLog; +import com.android.colorfulos.provider.RestoreDbTask; public class LauncherBackupAgent extends BackupAgent { diff --git a/src/com/android/uiuios/LauncherCallbacks.java b/src/com/android/colorfulos/LauncherCallbacks.java similarity index 98% rename from src/com/android/uiuios/LauncherCallbacks.java rename to src/com/android/colorfulos/LauncherCallbacks.java index 4123414..546bd7f 100644 --- a/src/com/android/uiuios/LauncherCallbacks.java +++ b/src/com/android/colorfulos/LauncherCallbacks.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios; +package com.android.colorfulos; import android.content.Intent; import android.os.Bundle; diff --git a/src/com/android/uiuios/LauncherExterns.java b/src/com/android/colorfulos/LauncherExterns.java similarity index 97% rename from src/com/android/uiuios/LauncherExterns.java rename to src/com/android/colorfulos/LauncherExterns.java index eb83548..33afcc3 100644 --- a/src/com/android/uiuios/LauncherExterns.java +++ b/src/com/android/colorfulos/LauncherExterns.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios; +package com.android.colorfulos; import android.content.SharedPreferences; diff --git a/src/com/android/uiuios/LauncherFiles.java b/src/com/android/colorfulos/LauncherFiles.java similarity index 89% rename from src/com/android/uiuios/LauncherFiles.java rename to src/com/android/colorfulos/LauncherFiles.java index 91ee6c6..ff26629 100644 --- a/src/com/android/uiuios/LauncherFiles.java +++ b/src/com/android/colorfulos/LauncherFiles.java @@ -1,4 +1,4 @@ -package com.android.uiuios; +package com.android.colorfulos; 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.uiuios.prefs"; - public static final String MANAGED_USER_PREFERENCES_KEY = "com.android.uiuios.managedusers.prefs"; + public static final String SHARED_PREFERENCES_KEY = "com.android.colorfulos.prefs"; + public static final String MANAGED_USER_PREFERENCES_KEY = "com.android.colorfulos.managedusers.prefs"; // This preference file is not backed up to cloud. - public static final String DEVICE_PREFERENCES_KEY = "com.android.uiuios.device.prefs"; + public static final String DEVICE_PREFERENCES_KEY = "com.android.colorfulos.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/uiuios/LauncherModel.java b/src/com/android/colorfulos/LauncherModel.java similarity index 93% rename from src/com/android/uiuios/LauncherModel.java rename to src/com/android/colorfulos/LauncherModel.java index a504b46..f8c90c6 100644 --- a/src/com/android/uiuios/LauncherModel.java +++ b/src/com/android/colorfulos/LauncherModel.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.android.uiuios; +package com.android.colorfulos; -import static com.android.uiuios.LauncherAppState.ACTION_FORCE_ROLOAD; -import static com.android.uiuios.config.FeatureFlags.IS_DOGFOOD_BUILD; +import static com.android.colorfulos.LauncherAppState.ACTION_FORCE_ROLOAD; +import static com.android.colorfulos.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.uiuios.compat.LauncherAppsCompat; -import com.android.uiuios.compat.PackageInstallerCompat.PackageInstallInfo; -import com.android.uiuios.compat.UserManagerCompat; -import com.android.uiuios.icons.IconCache; -import com.android.uiuios.icons.LauncherIcons; -import com.android.uiuios.model.AddWorkspaceItemsTask; -import com.android.uiuios.model.BaseModelUpdateTask; -import com.android.uiuios.model.BgDataModel; -import com.android.uiuios.model.CacheDataUpdatedTask; -import com.android.uiuios.model.LoaderResults; -import com.android.uiuios.model.LoaderTask; -import com.android.uiuios.model.ModelWriter; -import com.android.uiuios.model.PackageInstallStateChangedTask; -import com.android.uiuios.model.PackageUpdatedTask; -import com.android.uiuios.model.ShortcutsChangedTask; -import com.android.uiuios.model.UserLockStateChangedTask; -import com.android.uiuios.shortcuts.DeepShortcutManager; -import com.android.uiuios.util.ComponentKey; -import com.android.uiuios.util.IntArray; -import com.android.uiuios.util.ItemInfoMatcher; -import com.android.uiuios.util.PackageUserKey; -import com.android.uiuios.util.Preconditions; -import com.android.uiuios.util.Thunk; -import com.android.uiuios.util.ViewOnDrawExecutor; -import com.android.uiuios.widget.WidgetListRowEntry; +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 java.io.FileDescriptor; import java.io.PrintWriter; diff --git a/src/com/android/uiuios/LauncherProvider.java b/src/com/android/colorfulos/LauncherProvider.java similarity index 97% rename from src/com/android/uiuios/LauncherProvider.java rename to src/com/android/colorfulos/LauncherProvider.java index 94689ff..7dde6cd 100644 --- a/src/com/android/uiuios/LauncherProvider.java +++ b/src/com/android/colorfulos/LauncherProvider.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.android.uiuios; +package com.android.colorfulos; -import static com.android.uiuios.provider.LauncherDbUtils.dropTable; -import static com.android.uiuios.provider.LauncherDbUtils.tableExists; +import static com.android.colorfulos.provider.LauncherDbUtils.dropTable; +import static com.android.colorfulos.provider.LauncherDbUtils.tableExists; import android.annotation.TargetApi; import android.app.backup.BackupManager; @@ -33,7 +33,6 @@ import android.content.Context; import android.content.Intent; import android.content.OperationApplicationException; import android.content.SharedPreferences; -import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.ProviderInfo; import android.content.res.Resources; import android.database.Cursor; @@ -50,34 +49,32 @@ import android.os.Handler; import android.os.Message; import android.os.Process; import android.os.UserHandle; -import android.os.UserManager; import android.provider.BaseColumns; import android.provider.Settings; import android.text.TextUtils; import android.util.Log; import android.util.Xml; -import com.android.uiuios.AutoInstallsLayout.LayoutParserCallback; -import com.android.uiuios.LauncherSettings.Favorites; -import com.android.uiuios.compat.UserManagerCompat; -import com.android.uiuios.config.FeatureFlags; -import com.android.uiuios.logging.FileLog; -import com.android.uiuios.model.DbDowngradeHelper; -import com.android.uiuios.provider.LauncherDbUtils; -import com.android.uiuios.provider.LauncherDbUtils.SQLiteTransaction; -import com.android.uiuios.provider.RestoreDbTask; -import com.android.uiuios.util.IOUtils; -import com.android.uiuios.util.IntArray; -import com.android.uiuios.util.IntSet; -import com.android.uiuios.util.NoLocaleSQLiteHelper; -import com.android.uiuios.util.Preconditions; -import com.android.uiuios.util.Thunk; +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 org.xmlpull.v1.XmlPullParser; import java.io.File; import java.io.FileDescriptor; -import java.io.IOException; import java.io.InputStream; import java.io.PrintWriter; import java.io.StringReader; diff --git a/src/com/android/uiuios/LauncherProviderChangeListener.java b/src/com/android/colorfulos/LauncherProviderChangeListener.java similarity index 91% rename from src/com/android/uiuios/LauncherProviderChangeListener.java rename to src/com/android/colorfulos/LauncherProviderChangeListener.java index 036f615..6cb5b9c 100644 --- a/src/com/android/uiuios/LauncherProviderChangeListener.java +++ b/src/com/android/colorfulos/LauncherProviderChangeListener.java @@ -1,4 +1,4 @@ -package com.android.uiuios; +package com.android.colorfulos; /** * This class is a listener for {@link LauncherProvider} changes. It gets notified in the diff --git a/src/com/android/uiuios/LauncherRootView.java b/src/com/android/colorfulos/LauncherRootView.java similarity index 97% rename from src/com/android/uiuios/LauncherRootView.java rename to src/com/android/colorfulos/LauncherRootView.java index 2d0a512..8952fa8 100644 --- a/src/com/android/uiuios/LauncherRootView.java +++ b/src/com/android/colorfulos/LauncherRootView.java @@ -1,14 +1,13 @@ -package com.android.uiuios; +package com.android.colorfulos; -import static com.android.uiuios.util.SystemUiController.FLAG_DARK_NAV; -import static com.android.uiuios.util.SystemUiController.UI_STATE_ROOT_VIEW; +import static com.android.colorfulos.util.SystemUiController.FLAG_DARK_NAV; +import static com.android.colorfulos.util.SystemUiController.UI_STATE_ROOT_VIEW; import android.annotation.TargetApi; import android.app.ActivityManager; import android.content.Context; import android.graphics.Canvas; import android.graphics.Color; -import android.graphics.Insets; import android.graphics.Paint; import android.graphics.Rect; import android.os.Build; diff --git a/src/com/android/uiuios/LauncherSettings.java b/src/com/android/colorfulos/LauncherSettings.java similarity index 99% rename from src/com/android/uiuios/LauncherSettings.java rename to src/com/android/colorfulos/LauncherSettings.java index 4d3dbfb..246bfa5 100644 --- a/src/com/android/uiuios/LauncherSettings.java +++ b/src/com/android/colorfulos/LauncherSettings.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios; +package com.android.colorfulos; import android.content.ContentResolver; import android.database.sqlite.SQLiteDatabase; diff --git a/src/com/android/uiuios/LauncherState.java b/src/com/android/colorfulos/LauncherState.java similarity index 86% rename from src/com/android/uiuios/LauncherState.java rename to src/com/android/colorfulos/LauncherState.java index 191afe3..6d4b78b 100644 --- a/src/com/android/uiuios/LauncherState.java +++ b/src/com/android/colorfulos/LauncherState.java @@ -13,40 +13,40 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios; +package com.android.colorfulos; 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.uiuios.anim.AnimatorSetBuilder.ANIM_OVERVIEW_FADE; -import static com.android.uiuios.anim.AnimatorSetBuilder.ANIM_OVERVIEW_SCALE; -import static com.android.uiuios.anim.AnimatorSetBuilder.ANIM_OVERVIEW_TRANSLATE_X; -import static com.android.uiuios.anim.AnimatorSetBuilder.ANIM_WORKSPACE_FADE; -import static com.android.uiuios.anim.AnimatorSetBuilder.ANIM_WORKSPACE_SCALE; -import static com.android.uiuios.anim.Interpolators.ACCEL; -import static com.android.uiuios.anim.Interpolators.DEACCEL; -import static com.android.uiuios.anim.Interpolators.DEACCEL_1_7; -import static com.android.uiuios.anim.Interpolators.clampToProgress; -import static com.android.uiuios.testing.TestProtocol.ALL_APPS_STATE_ORDINAL; -import static com.android.uiuios.testing.TestProtocol.BACKGROUND_APP_STATE_ORDINAL; -import static com.android.uiuios.testing.TestProtocol.NORMAL_STATE_ORDINAL; -import static com.android.uiuios.testing.TestProtocol.OVERVIEW_PEEK_STATE_ORDINAL; -import static com.android.uiuios.testing.TestProtocol.OVERVIEW_STATE_ORDINAL; -import static com.android.uiuios.testing.TestProtocol.QUICK_SWITCH_STATE_ORDINAL; -import static com.android.uiuios.testing.TestProtocol.SPRING_LOADED_STATE_ORDINAL; -import static com.android.uiuios.anim.Interpolators.ACCEL_2; -import static com.android.uiuios.states.RotationHelper.REQUEST_NONE; +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.uiuios.anim.AnimatorSetBuilder; -import com.android.uiuios.states.SpringLoadedState; -import com.android.uiuios.uioverrides.UiFactory; -import com.android.uiuios.uioverrides.states.AllAppsState; -import com.android.uiuios.uioverrides.states.OverviewState; -import com.android.uiuios.userevent.nano.LauncherLogProto.ContainerType; +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 java.util.Arrays; @@ -117,7 +117,7 @@ public class LauncherState { public final int ordinal; /** - * Used for containerType in {@link com.android.uiuios.logging.UserEventDispatcher} + * Used for containerType in {@link com.android.colorfulos.logging.UserEventDispatcher} */ public final int containerType; @@ -233,7 +233,7 @@ public class LauncherState { /** * Fraction shift in the vertical translation UI and related properties * - * @see com.android.uiuios.allapps.AllAppsTransitionController + * @see com.android.colorfulos.allapps.AllAppsTransitionController */ public float getVerticalProgress(Launcher launcher) { return 1f; diff --git a/src/com/android/uiuios/LauncherStateManager.java b/src/com/android/colorfulos/LauncherStateManager.java similarity index 97% rename from src/com/android/uiuios/LauncherStateManager.java rename to src/com/android/colorfulos/LauncherStateManager.java index 771bf51..409d9d1 100644 --- a/src/com/android/uiuios/LauncherStateManager.java +++ b/src/com/android/colorfulos/LauncherStateManager.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.android.uiuios; +package com.android.colorfulos; -import static com.android.uiuios.LauncherState.NORMAL; -import static com.android.uiuios.anim.PropertySetter.NO_ANIM_PROPERTY_SETTER; +import static com.android.colorfulos.LauncherState.NORMAL; +import static com.android.colorfulos.anim.PropertySetter.NO_ANIM_PROPERTY_SETTER; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -26,14 +26,14 @@ import android.os.Handler; import android.os.Looper; import android.util.Log; -import com.android.uiuios.anim.AnimationSuccessListener; -import com.android.uiuios.anim.AnimatorPlaybackController; -import com.android.uiuios.anim.AnimatorSetBuilder; -import com.android.uiuios.anim.PropertySetter; -import com.android.uiuios.anim.PropertySetter.AnimatedPropertySetter; -import com.android.uiuios.compat.AccessibilityManagerCompat; -import com.android.uiuios.testing.TestProtocol; -import com.android.uiuios.uioverrides.UiFactory; +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 java.io.PrintWriter; import java.lang.annotation.Retention; diff --git a/src/com/android/uiuios/LogAccelerateInterpolator.java b/src/com/android/colorfulos/LogAccelerateInterpolator.java similarity index 96% rename from src/com/android/uiuios/LogAccelerateInterpolator.java rename to src/com/android/colorfulos/LogAccelerateInterpolator.java index eb30ba0..908f05f 100644 --- a/src/com/android/uiuios/LogAccelerateInterpolator.java +++ b/src/com/android/colorfulos/LogAccelerateInterpolator.java @@ -1,4 +1,4 @@ -package com.android.uiuios; +package com.android.colorfulos; import android.animation.TimeInterpolator; diff --git a/src/com/android/uiuios/LogDecelerateInterpolator.java b/src/com/android/colorfulos/LogDecelerateInterpolator.java similarity index 96% rename from src/com/android/uiuios/LogDecelerateInterpolator.java rename to src/com/android/colorfulos/LogDecelerateInterpolator.java index 8ee2cb8..20dc445 100644 --- a/src/com/android/uiuios/LogDecelerateInterpolator.java +++ b/src/com/android/colorfulos/LogDecelerateInterpolator.java @@ -1,4 +1,4 @@ -package com.android.uiuios; +package com.android.colorfulos; import android.animation.TimeInterpolator; diff --git a/src/com/android/uiuios/MainProcessInitializer.java b/src/com/android/colorfulos/MainProcessInitializer.java similarity index 84% rename from src/com/android/uiuios/MainProcessInitializer.java rename to src/com/android/colorfulos/MainProcessInitializer.java index 7fb4298..c622020 100644 --- a/src/com/android/uiuios/MainProcessInitializer.java +++ b/src/com/android/colorfulos/MainProcessInitializer.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.android.uiuios; +package com.android.colorfulos; import android.content.Context; -import com.android.uiuios.config.FeatureFlags; -import com.android.uiuios.graphics.IconShape; -import com.android.uiuios.logging.FileLog; -import com.android.uiuios.util.ResourceBasedOverride; +import com.android.colorfulos.config.FeatureFlags; +import com.android.colorfulos.graphics.IconShape; +import com.android.colorfulos.logging.FileLog; +import com.android.colorfulos.util.ResourceBasedOverride; /** * Utility class to handle one time initializations of the main process diff --git a/src/com/android/uiuios/MainThreadExecutor.java b/src/com/android/colorfulos/MainThreadExecutor.java similarity index 91% rename from src/com/android/uiuios/MainThreadExecutor.java rename to src/com/android/colorfulos/MainThreadExecutor.java index ffd457f..cbccd1f 100644 --- a/src/com/android/uiuios/MainThreadExecutor.java +++ b/src/com/android/colorfulos/MainThreadExecutor.java @@ -14,11 +14,11 @@ * limitations under the License */ -package com.android.uiuios; +package com.android.colorfulos; import android.os.Looper; -import com.android.uiuios.util.LooperExecutor; +import com.android.colorfulos.util.LooperExecutor; /** * An executor service that executes its tasks on the main thread. diff --git a/src/com/android/uiuios/OnAlarmListener.java b/src/com/android/colorfulos/OnAlarmListener.java similarity index 70% rename from src/com/android/uiuios/OnAlarmListener.java rename to src/com/android/colorfulos/OnAlarmListener.java index de72d8b..a78508c 100644 --- a/src/com/android/uiuios/OnAlarmListener.java +++ b/src/com/android/colorfulos/OnAlarmListener.java @@ -1,4 +1,4 @@ -package com.android.uiuios; +package com.android.colorfulos; public interface OnAlarmListener { public void onAlarm(Alarm alarm); diff --git a/src/com/android/uiuios/PagedView.java b/src/com/android/colorfulos/PagedView.java similarity index 98% rename from src/com/android/uiuios/PagedView.java rename to src/com/android/colorfulos/PagedView.java index 69d9cac..483d7c8 100644 --- a/src/com/android/uiuios/PagedView.java +++ b/src/com/android/colorfulos/PagedView.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.android.uiuios; +package com.android.colorfulos; -import static com.android.uiuios.Utilities.shouldDisableGestures; -import static com.android.uiuios.compat.AccessibilityManagerCompat.isAccessibilityEnabled; -import static com.android.uiuios.compat.AccessibilityManagerCompat.isObservedEventType; -import static com.android.uiuios.config.FeatureFlags.QUICKSTEP_SPRINGS; -import static com.android.uiuios.touch.OverScroll.OVERSCROLL_DAMP_FACTOR; +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 android.animation.LayoutTransition; import android.animation.TimeInterpolator; @@ -47,12 +47,12 @@ import android.view.accessibility.AccessibilityNodeInfo; import android.view.animation.Interpolator; import android.widget.ScrollView; -import com.android.uiuios.anim.Interpolators; -import com.android.uiuios.config.FeatureFlags; -import com.android.uiuios.pageindicators.PageIndicator; -import com.android.uiuios.touch.OverScroll; -import com.android.uiuios.util.OverScroller; -import com.android.uiuios.util.Thunk; +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 java.util.ArrayList; diff --git a/src/com/android/uiuios/Partner.java b/src/com/android/colorfulos/Partner.java similarity index 97% rename from src/com/android/uiuios/Partner.java rename to src/com/android/colorfulos/Partner.java index b390a54..eb28e10 100644 --- a/src/com/android/uiuios/Partner.java +++ b/src/com/android/colorfulos/Partner.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios; +package com.android.colorfulos; 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.uiuios.action.PARTNER_CUSTOMIZATION"; + ACTION_PARTNER_CUSTOMIZATION = "com.android.colorfulos.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/uiuios/PendingAddItemInfo.java b/src/com/android/colorfulos/PendingAddItemInfo.java similarity index 97% rename from src/com/android/uiuios/PendingAddItemInfo.java rename to src/com/android/colorfulos/PendingAddItemInfo.java index 616585b..1c8eb33 100644 --- a/src/com/android/uiuios/PendingAddItemInfo.java +++ b/src/com/android/colorfulos/PendingAddItemInfo.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios; +package com.android.colorfulos; import android.content.ComponentName; diff --git a/src/com/android/uiuios/PromiseAppInfo.java b/src/com/android/colorfulos/PromiseAppInfo.java similarity index 92% rename from src/com/android/uiuios/PromiseAppInfo.java rename to src/com/android/colorfulos/PromiseAppInfo.java index 25c0c02..927e6e9 100644 --- a/src/com/android/uiuios/PromiseAppInfo.java +++ b/src/com/android/colorfulos/PromiseAppInfo.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.android.uiuios; +package com.android.colorfulos; import android.content.Context; import android.content.Intent; -import com.android.uiuios.compat.PackageInstallerCompat; -import com.android.uiuios.util.PackageManagerHelper; +import com.android.colorfulos.compat.PackageInstallerCompat; +import com.android.colorfulos.util.PackageManagerHelper; import androidx.annotation.NonNull; diff --git a/src/com/android/uiuios/ResourceUtils.java b/src/com/android/colorfulos/ResourceUtils.java similarity index 98% rename from src/com/android/uiuios/ResourceUtils.java rename to src/com/android/colorfulos/ResourceUtils.java index 2bf3cce..604b1f1 100644 --- a/src/com/android/uiuios/ResourceUtils.java +++ b/src/com/android/colorfulos/ResourceUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios; +package com.android.colorfulos; import android.content.res.Resources; import android.util.DisplayMetrics; diff --git a/src/com/android/uiuios/SecondaryDropTarget.java b/src/com/android/colorfulos/SecondaryDropTarget.java similarity index 92% rename from src/com/android/uiuios/SecondaryDropTarget.java rename to src/com/android/colorfulos/SecondaryDropTarget.java index 8bc74f7..b84ca9a 100644 --- a/src/com/android/uiuios/SecondaryDropTarget.java +++ b/src/com/android/colorfulos/SecondaryDropTarget.java @@ -1,12 +1,12 @@ -package com.android.uiuios; +package com.android.colorfulos; import static android.appwidget.AppWidgetManager.INVALID_APPWIDGET_ID; import static android.appwidget.AppWidgetProviderInfo.WIDGET_FEATURE_RECONFIGURABLE; -import static com.android.uiuios.ItemInfoWithIcon.FLAG_SYSTEM_MASK; -import static com.android.uiuios.ItemInfoWithIcon.FLAG_SYSTEM_NO; -import static com.android.uiuios.LauncherSettings.Favorites.CONTAINER_DESKTOP; -import static com.android.uiuios.accessibility.LauncherAccessibilityDelegate.RECONFIGURE; -import static com.android.uiuios.accessibility.LauncherAccessibilityDelegate.UNINSTALL; +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 +26,13 @@ import android.util.Log; import android.view.View; import android.widget.Toast; -import com.android.uiuios.Launcher.OnResumeCallback; -import com.android.uiuios.compat.LauncherAppsCompat; -import com.android.uiuios.dragndrop.DragOptions; -import com.android.uiuios.logging.LoggerUtils; -import com.android.uiuios.userevent.nano.LauncherLogProto.ControlType; -import com.android.uiuios.userevent.nano.LauncherLogProto.Target; -import com.android.uiuios.util.Themes; +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 java.net.URISyntaxException; diff --git a/src/com/android/uiuios/SessionCommitReceiver.java b/src/com/android/colorfulos/SessionCommitReceiver.java similarity index 98% rename from src/com/android/uiuios/SessionCommitReceiver.java rename to src/com/android/colorfulos/SessionCommitReceiver.java index 59e839c..1008528 100644 --- a/src/com/android/uiuios/SessionCommitReceiver.java +++ b/src/com/android/colorfulos/SessionCommitReceiver.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios; +package com.android.colorfulos; import android.annotation.TargetApi; import android.content.BroadcastReceiver; @@ -30,13 +30,12 @@ import android.database.Cursor; import android.net.Uri; import android.os.AsyncTask; import android.os.Build; -import android.os.Process; import android.os.UserHandle; import android.provider.Settings; import android.text.TextUtils; import android.util.Log; -import com.android.uiuios.compat.LauncherAppsCompat; +import com.android.colorfulos.compat.LauncherAppsCompat; import java.util.List; diff --git a/src/com/android/uiuios/ShortcutAndWidgetContainer.java b/src/com/android/colorfulos/ShortcutAndWidgetContainer.java similarity index 97% rename from src/com/android/uiuios/ShortcutAndWidgetContainer.java rename to src/com/android/colorfulos/ShortcutAndWidgetContainer.java index 9d46480..93b4e6b 100644 --- a/src/com/android/uiuios/ShortcutAndWidgetContainer.java +++ b/src/com/android/colorfulos/ShortcutAndWidgetContainer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios; +package com.android.colorfulos; 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.uiuios.CellLayout.ContainerType; -import com.android.uiuios.views.ActivityContext; -import com.android.uiuios.widget.LauncherAppWidgetHostView; +import com.android.colorfulos.CellLayout.ContainerType; +import com.android.colorfulos.views.ActivityContext; +import com.android.colorfulos.widget.LauncherAppWidgetHostView; public class ShortcutAndWidgetContainer extends ViewGroup { static final String TAG = "ShortcutAndWidgetContainer"; diff --git a/src/com/android/uiuios/SimpleOnStylusPressListener.java b/src/com/android/colorfulos/SimpleOnStylusPressListener.java similarity index 84% rename from src/com/android/uiuios/SimpleOnStylusPressListener.java rename to src/com/android/colorfulos/SimpleOnStylusPressListener.java index 7863bf8..732bee4 100644 --- a/src/com/android/uiuios/SimpleOnStylusPressListener.java +++ b/src/com/android/colorfulos/SimpleOnStylusPressListener.java @@ -1,9 +1,9 @@ -package com.android.uiuios; +package com.android.colorfulos; import android.view.MotionEvent; import android.view.View; -import com.android.uiuios.StylusEventHelper.StylusButtonListener; +import com.android.colorfulos.StylusEventHelper.StylusButtonListener; /** * Simple listener that performs a long click on the view after a stylus button press. diff --git a/src/com/android/uiuios/Statistics/AppInformation.java b/src/com/android/colorfulos/Statistics/AppInformation.java similarity index 98% rename from src/com/android/uiuios/Statistics/AppInformation.java rename to src/com/android/colorfulos/Statistics/AppInformation.java index 4ee8395..838bd29 100644 --- a/src/com/android/uiuios/Statistics/AppInformation.java +++ b/src/com/android/colorfulos/Statistics/AppInformation.java @@ -1,4 +1,4 @@ -package com.android.uiuios.Statistics; +package com.android.colorfulos.Statistics; import android.app.usage.UsageStats; import android.content.Context; diff --git a/src/com/android/uiuios/Statistics/StatisticsInfo.java b/src/com/android/colorfulos/Statistics/StatisticsInfo.java similarity index 98% rename from src/com/android/uiuios/Statistics/StatisticsInfo.java rename to src/com/android/colorfulos/Statistics/StatisticsInfo.java index afbff76..e2a524a 100644 --- a/src/com/android/uiuios/Statistics/StatisticsInfo.java +++ b/src/com/android/colorfulos/Statistics/StatisticsInfo.java @@ -1,4 +1,4 @@ -package com.android.uiuios.Statistics; +package com.android.colorfulos.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.uiuios.Statistics.AppInformation.bootTime; +import static com.android.colorfulos.Statistics.AppInformation.bootTime; public class StatisticsInfo { diff --git a/src/com/android/uiuios/StylusEventHelper.java b/src/com/android/colorfulos/StylusEventHelper.java similarity index 99% rename from src/com/android/uiuios/StylusEventHelper.java rename to src/com/android/colorfulos/StylusEventHelper.java index 1383eff..21d47d3 100644 --- a/src/com/android/uiuios/StylusEventHelper.java +++ b/src/com/android/colorfulos/StylusEventHelper.java @@ -1,4 +1,4 @@ -package com.android.uiuios; +package com.android.colorfulos; import android.view.MotionEvent; import android.view.View; diff --git a/src/com/android/colorfulos/TTUtils/APKUtils.java b/src/com/android/colorfulos/TTUtils/APKUtils.java new file mode 100644 index 0000000..6094767 --- /dev/null +++ b/src/com/android/colorfulos/TTUtils/APKUtils.java @@ -0,0 +1,207 @@ +package com.android.colorfulos.TTUtils; + +import android.app.PendingIntent; +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.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 java.io.BufferedReader; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.OutputStream; + +public class APKUtils { + //判断是否为系统应用 + public static boolean isSystemApp(Context context, String pkgName) { + boolean isSystemApp = false; + PackageInfo pi = null; + try { + PackageManager pm = context.getPackageManager(); + pi = pm.getPackageInfo(pkgName, 0); + } catch (PackageManager.NameNotFoundException e) { + e.printStackTrace(); + Log.e("isSystemApp", e.getMessage(), e); + + } + + // 是系统中已安装的应用 + if (pi != null) { + boolean isSysApp = (pi.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) == 1; + boolean isSysUpd = (pi.applicationInfo.flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) == 1; + isSystemApp = isSysApp || isSysUpd; + } + return isSystemApp; + } + + //获取教管易版本号 + public static String getAPPVersionName(Context context, String packageName) { + String versionName = "0"; + + if (TextUtils.isEmpty(packageName)) { + return versionName; + } + PackageManager pm = context.getPackageManager(); + try { + PackageInfo packageInfo = pm.getPackageInfo(packageName, 0); + versionName = packageInfo.versionName; + } catch (PackageManager.NameNotFoundException e) { + e.printStackTrace(); + } + return versionName; + } + + public static void installApp(Context context, String filePath) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) { + installAppatPie(context, filePath); + } else { + installApps(filePath); + } + } + + public static boolean installApps(String apkPath) { + Process process = null; + BufferedReader successResult = null; + BufferedReader errorResult = null; + StringBuilder successMsg = new StringBuilder(); + StringBuilder errorMsg = new StringBuilder(); + try { + process = new ProcessBuilder("pm", "install", "-i", BuildConfig.APPLICATION_ID, "--user", "0", apkPath).start(); + successResult = new BufferedReader(new InputStreamReader(process.getInputStream())); + errorResult = new BufferedReader(new InputStreamReader(process.getErrorStream())); + String s; + while ((s = successResult.readLine()) != null) { + successMsg.append(s); + } + while ((s = errorResult.readLine()) != null) { + errorMsg.append(s); + } + } catch (Exception e) { + Log.e("installApps1", e.getMessage()); + } finally { + try { + if (successResult != null) { + successResult.close(); + } + if (errorResult != null) { + errorResult.close(); + } + } catch (Exception e) { + Log.e("installApps2", e.getMessage()); + } + if (process != null) { + process.destroy(); + } + } + Log.e("result", "" + errorMsg.toString()); + //如果含有“success”认为安装成功 + Log.e("installApp", successMsg.toString()); +// if (!successMsg.toString().equalsIgnoreCase("success")) { +// ApkUtils.install(context, new File(apkPath)); +// } + return successMsg.toString().equalsIgnoreCase("success"); + } + + @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP) + public static void installAppatPie(Context context, String apkFilePath) { + File file = new File(apkFilePath); + PackageInstaller packageInstaller = context.getPackageManager().getPackageInstaller(); + PackageInstaller.SessionParams sessionParams = new PackageInstaller.SessionParams(PackageInstaller + .SessionParams.MODE_FULL_INSTALL); + sessionParams.setSize(file.length()); + int sessionId = createSession(packageInstaller, sessionParams); + if (sessionId != -1) { + boolean copySuccess = copyApkFile(packageInstaller, sessionId, apkFilePath); + if (copySuccess) { + install(packageInstaller, sessionId, context); + } + + } + } + + @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP) + private static void install(PackageInstaller packageInstaller, int sessionId, Context context) { + try { + PackageInstaller.Session session = packageInstaller.openSession(sessionId); + Intent intent = new Intent(context, InstallResultReceiver.class); + PendingIntent pendingIntent = PendingIntent.getBroadcast( + context, + 1, intent, + PendingIntent.FLAG_UPDATE_CURRENT + ); + session.commit(pendingIntent.getIntentSender()); + } catch (IOException e) { + e.printStackTrace(); + } + } + + @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP) + private static int createSession(PackageInstaller packageInstaller, PackageInstaller.SessionParams sessionParams) { + int sessionId = -1; + try { + sessionId = packageInstaller.createSession(sessionParams); + } catch (IOException e) { + e.printStackTrace(); + } + return sessionId; + } + + @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP) + private static boolean copyApkFile(PackageInstaller pi, int sessionId, String apkFilePath) { + boolean success = false; + File apkFile = new File(apkFilePath); + PackageInstaller.Session session = null; + try { + session = pi.openSession(sessionId); + OutputStream out = session.openWrite("app.apk", 0, apkFile.length()); + FileInputStream input = new FileInputStream(apkFile); + int read = 0; + byte[] buffer = new byte[65536]; +// while (read != -1) { +// read = input.read(buffer); +// out.write(buffer, 0, read); +// } + while (true) { + read = input.read(buffer); + if (read == -1) { + session.fsync(out); + success = true; + out.close(); + input.close(); + break; + } + out.write(buffer, 0, read); + } + } catch (IOException e) { + e.printStackTrace(); + Log.e("fht", "copyApkFile" + e.getMessage()); + } + return success; + } + + /** + * 根据包名卸载应用 + * + * @param packageName + */ + @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP) + public static void uninstall(Context context, String packageName) { + Intent broadcastIntent = new Intent(context, InstallResultReceiver.class); + PendingIntent pendingIntent = PendingIntent.getBroadcast(context, 1, + broadcastIntent, PendingIntent.FLAG_UPDATE_CURRENT); + PackageInstaller packageInstaller = context.getPackageManager().getPackageInstaller(); + packageInstaller.uninstall(packageName, pendingIntent.getIntentSender()); + } +} diff --git a/src/com/android/uiuios/TTUtils/BitmapUtils.java b/src/com/android/colorfulos/TTUtils/BitmapUtils.java similarity index 98% rename from src/com/android/uiuios/TTUtils/BitmapUtils.java rename to src/com/android/colorfulos/TTUtils/BitmapUtils.java index 3c2b363..c68d7bd 100644 --- a/src/com/android/uiuios/TTUtils/BitmapUtils.java +++ b/src/com/android/colorfulos/TTUtils/BitmapUtils.java @@ -1,4 +1,4 @@ -package com.android.uiuios.TTUtils; +package com.android.colorfulos.TTUtils; import android.content.Context; import android.graphics.Bitmap; @@ -14,9 +14,8 @@ import android.graphics.drawable.AdaptiveIconDrawable; import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; -import com.android.uiuios.R; -import com.android.uiuios.Utilities; -import com.android.uiuios.icons.LauncherIcons; +import com.android.colorfulos.R; +import com.android.colorfulos.icons.LauncherIcons; import java.util.Calendar; diff --git a/src/com/android/uiuios/TTUtils/DateUtils.java b/src/com/android/colorfulos/TTUtils/DateUtils.java similarity index 97% rename from src/com/android/uiuios/TTUtils/DateUtils.java rename to src/com/android/colorfulos/TTUtils/DateUtils.java index 9b3cb6b..f9a0fed 100644 --- a/src/com/android/uiuios/TTUtils/DateUtils.java +++ b/src/com/android/colorfulos/TTUtils/DateUtils.java @@ -1,4 +1,4 @@ -package com.android.uiuios.TTUtils; +package com.android.colorfulos.TTUtils; import java.text.SimpleDateFormat; import java.util.Calendar; diff --git a/src/com/android/uiuios/TTUtils/Utils.java b/src/com/android/colorfulos/TTUtils/Utils.java similarity index 96% rename from src/com/android/uiuios/TTUtils/Utils.java rename to src/com/android/colorfulos/TTUtils/Utils.java index 2c98359..b563694 100644 --- a/src/com/android/uiuios/TTUtils/Utils.java +++ b/src/com/android/colorfulos/TTUtils/Utils.java @@ -1,4 +1,4 @@ -package com.android.uiuios.TTUtils; +package com.android.colorfulos.TTUtils; import android.annotation.SuppressLint; import android.os.Build; diff --git a/src/com/android/uiuios/Utilities.java b/src/com/android/colorfulos/Utilities.java similarity index 97% rename from src/com/android/uiuios/Utilities.java rename to src/com/android/colorfulos/Utilities.java index a8110bb..814783b 100644 --- a/src/com/android/uiuios/Utilities.java +++ b/src/com/android/colorfulos/Utilities.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios; +package com.android.colorfulos; import android.animation.ValueAnimator; import android.annotation.TargetApi; @@ -64,19 +64,19 @@ import android.view.View; import android.view.ViewConfiguration; import android.view.animation.Interpolator; -import com.android.uiuios.compat.LauncherAppsCompat; -import com.android.uiuios.compat.ShortcutConfigActivityInfo; -import com.android.uiuios.config.FeatureFlags; -import com.android.uiuios.dragndrop.FolderAdaptiveIcon; -import com.android.uiuios.graphics.RotationMode; -import com.android.uiuios.graphics.TintedDrawableSpan; -import com.android.uiuios.icons.LauncherIcons; -import com.android.uiuios.shortcuts.DeepShortcutManager; -import com.android.uiuios.shortcuts.ShortcutKey; -import com.android.uiuios.util.IntArray; -import com.android.uiuios.util.PackageManagerHelper; -import com.android.uiuios.views.Transposable; -import com.android.uiuios.widget.PendingAddShortcutInfo; +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 java.io.Closeable; import java.io.IOException; @@ -92,7 +92,7 @@ import java.util.concurrent.TimeUnit; import java.util.regex.Matcher; import java.util.regex.Pattern; -import static com.android.uiuios.ItemInfoWithIcon.FLAG_ICON_BADGED; +import static com.android.colorfulos.ItemInfoWithIcon.FLAG_ICON_BADGED; /** * Various utilities shared amongst the Launcher's classes. @@ -151,8 +151,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.uiuios.WALLPAPER_OFFSET"; - public static final String EXTRA_WALLPAPER_FLAVOR = "com.android.uiuios.WALLPAPER_FLAVOR"; + public static final String EXTRA_WALLPAPER_OFFSET = "com.android.colorfulos.WALLPAPER_OFFSET"; + public static final String EXTRA_WALLPAPER_FLAVOR = "com.android.colorfulos.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/uiuios/WidgetPreviewLoader.java b/src/com/android/colorfulos/WidgetPreviewLoader.java similarity index 97% rename from src/com/android/uiuios/WidgetPreviewLoader.java rename to src/com/android/colorfulos/WidgetPreviewLoader.java index 3bec10c..59235ba 100644 --- a/src/com/android/uiuios/WidgetPreviewLoader.java +++ b/src/com/android/colorfulos/WidgetPreviewLoader.java @@ -1,4 +1,4 @@ -package com.android.uiuios; +package com.android.colorfulos; import android.content.ComponentName; import android.content.ContentValues; @@ -29,20 +29,20 @@ import android.os.UserHandle; import android.util.Log; import android.util.LongSparseArray; -import com.android.uiuios.compat.AppWidgetManagerCompat; -import com.android.uiuios.compat.ShortcutConfigActivityInfo; -import com.android.uiuios.compat.UserManagerCompat; -import com.android.uiuios.icons.GraphicsUtils; -import com.android.uiuios.icons.LauncherIcons; -import com.android.uiuios.icons.ShadowGenerator; -import com.android.uiuios.icons.IconCache; -import com.android.uiuios.model.WidgetItem; -import com.android.uiuios.util.ComponentKey; -import com.android.uiuios.util.PackageUserKey; -import com.android.uiuios.util.Preconditions; -import com.android.uiuios.util.SQLiteCacheHelper; -import com.android.uiuios.util.Thunk; -import com.android.uiuios.widget.WidgetCell; +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 java.util.ArrayList; import java.util.Collections; diff --git a/src/com/android/uiuios/Workspace.java b/src/com/android/colorfulos/Workspace.java similarity index 97% rename from src/com/android/uiuios/Workspace.java rename to src/com/android/colorfulos/Workspace.java index e84a2ed..3f99a06 100644 --- a/src/com/android/uiuios/Workspace.java +++ b/src/com/android/colorfulos/Workspace.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package com.android.uiuios; +package com.android.colorfulos; -import static com.android.uiuios.LauncherAnimUtils.OVERVIEW_TRANSITION_MS; -import static com.android.uiuios.LauncherAnimUtils.SPRING_LOADED_EXIT_DELAY; -import static com.android.uiuios.LauncherAnimUtils.SPRING_LOADED_TRANSITION_MS; -import static com.android.uiuios.LauncherSettings.Favorites.ITEM_TYPE_APPLICATION; -import static com.android.uiuios.LauncherState.ALL_APPS; -import static com.android.uiuios.LauncherState.NORMAL; -import static com.android.uiuios.LauncherState.SPRING_LOADED; -import static com.android.uiuios.config.FeatureFlags.ADAPTIVE_ICON_WINDOW_ANIM; -import static com.android.uiuios.dragndrop.DragLayer.ALPHA_INDEX_OVERLAY; +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 android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -60,47 +60,45 @@ import android.view.ViewTreeObserver; import android.view.accessibility.AccessibilityNodeInfo; import android.widget.Toast; -import com.android.uiuios.Launcher.LauncherOverlay; -import com.android.uiuios.LauncherAppWidgetHost.ProviderChangedListener; -import com.android.uiuios.LauncherStateManager.AnimationConfig; -import com.android.uiuios.accessibility.AccessibleDragListenerAdapter; -import com.android.uiuios.accessibility.WorkspaceAccessibilityHelper; -import com.android.uiuios.anim.AnimatorSetBuilder; -import com.android.uiuios.anim.Interpolators; -import com.android.uiuios.dot.FolderDotInfo; -import com.android.uiuios.compat.AppWidgetManagerCompat; -import com.android.uiuios.config.FeatureFlags; -import com.android.uiuios.dragndrop.DragController; -import com.android.uiuios.dragndrop.DragLayer; -import com.android.uiuios.dragndrop.DragOptions; -import com.android.uiuios.dragndrop.DragView; -import com.android.uiuios.dragndrop.SpringLoadedDragController; -import com.android.uiuios.folder.Folder; -import com.android.uiuios.folder.FolderIcon; -import com.android.uiuios.folder.PreviewBackground; -import com.android.uiuios.graphics.DragPreviewProvider; -import com.android.uiuios.graphics.PreloadIconDrawable; -import com.android.uiuios.graphics.RotationMode; -import com.android.uiuios.pageindicators.PageIndicatorDots; -import com.android.uiuios.pageindicators.WorkspacePageIndicator; -import com.android.uiuios.popup.PopupContainerWithArrow; -import com.android.uiuios.shortcuts.ShortcutDragPreviewProvider; -import com.android.uiuios.testing.TestProtocol; -import com.android.uiuios.touch.WorkspaceTouchListener; -import com.android.uiuios.userevent.nano.LauncherLogProto.Action; -import com.android.uiuios.userevent.nano.LauncherLogProto.ContainerType; -import com.android.uiuios.userevent.nano.LauncherLogProto.Target; -import com.android.uiuios.util.IntArray; -import com.android.uiuios.util.IntSet; -import com.android.uiuios.util.IntSparseArrayMap; -import com.android.uiuios.util.ItemInfoMatcher; -import com.android.uiuios.util.PackageUserKey; -import com.android.uiuios.util.Thunk; -import com.android.uiuios.util.WallpaperOffsetInterpolator; -import com.android.uiuios.widget.LauncherAppWidgetHostView; -import com.android.uiuios.widget.PendingAddShortcutInfo; -import com.android.uiuios.widget.PendingAddWidgetInfo; -import com.android.uiuios.widget.PendingAppWidgetHostView; +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 java.util.ArrayList; import java.util.HashSet; diff --git a/src/com/android/uiuios/WorkspaceItemInfo.java b/src/com/android/colorfulos/WorkspaceItemInfo.java similarity index 96% rename from src/com/android/uiuios/WorkspaceItemInfo.java rename to src/com/android/colorfulos/WorkspaceItemInfo.java index fcfe827..b11b739 100644 --- a/src/com/android/uiuios/WorkspaceItemInfo.java +++ b/src/com/android/colorfulos/WorkspaceItemInfo.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios; +package com.android.colorfulos; 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.uiuios.LauncherSettings.Favorites; -import com.android.uiuios.icons.IconCache; -import com.android.uiuios.shortcuts.ShortcutKey; -import com.android.uiuios.util.ContentWriter; +import com.android.colorfulos.LauncherSettings.Favorites; +import com.android.colorfulos.icons.IconCache; +import com.android.colorfulos.shortcuts.ShortcutKey; +import com.android.colorfulos.util.ContentWriter; /** * Represents a launchable icon on the workspaces and in folders. diff --git a/src/com/android/uiuios/WorkspaceLayoutManager.java b/src/com/android/colorfulos/WorkspaceLayoutManager.java similarity index 96% rename from src/com/android/uiuios/WorkspaceLayoutManager.java rename to src/com/android/colorfulos/WorkspaceLayoutManager.java index 70f5c44..06eedb0 100644 --- a/src/com/android/uiuios/WorkspaceLayoutManager.java +++ b/src/com/android/colorfulos/WorkspaceLayoutManager.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios; +package com.android.colorfulos; import android.util.Log; import android.view.View; import android.view.ViewGroup; -import com.android.uiuios.folder.Folder; -import com.android.uiuios.folder.FolderIcon; -import com.android.uiuios.touch.ItemLongClickListener; +import com.android.colorfulos.folder.Folder; +import com.android.colorfulos.folder.FolderIcon; +import com.android.colorfulos.touch.ItemLongClickListener; public interface WorkspaceLayoutManager { diff --git a/src/com/android/uiuios/WorkspaceStateTransitionAnimation.java b/src/com/android/colorfulos/WorkspaceStateTransitionAnimation.java similarity index 82% rename from src/com/android/uiuios/WorkspaceStateTransitionAnimation.java rename to src/com/android/colorfulos/WorkspaceStateTransitionAnimation.java index a005e90..35937fa 100644 --- a/src/com/android/uiuios/WorkspaceStateTransitionAnimation.java +++ b/src/com/android/colorfulos/WorkspaceStateTransitionAnimation.java @@ -14,32 +14,32 @@ * limitations under the License. */ -package com.android.uiuios; +package com.android.colorfulos; -import static com.android.uiuios.LauncherAnimUtils.DRAWABLE_ALPHA; -import static com.android.uiuios.LauncherAnimUtils.SCALE_PROPERTY; -import static com.android.uiuios.LauncherState.HOTSEAT_ICONS; -import static com.android.uiuios.anim.AnimatorSetBuilder.ANIM_HOTSEAT_SCALE; -import static com.android.uiuios.anim.AnimatorSetBuilder.ANIM_HOTSEAT_TRANSLATE; -import static com.android.uiuios.anim.AnimatorSetBuilder.ANIM_WORKSPACE_FADE; -import static com.android.uiuios.anim.AnimatorSetBuilder.ANIM_WORKSPACE_SCALE; -import static com.android.uiuios.anim.AnimatorSetBuilder.ANIM_WORKSPACE_TRANSLATE; -import static com.android.uiuios.anim.Interpolators.LINEAR; -import static com.android.uiuios.anim.Interpolators.ZOOM_OUT; -import static com.android.uiuios.anim.PropertySetter.NO_ANIM_PROPERTY_SETTER; -import static com.android.uiuios.graphics.WorkspaceAndHotseatScrim.SCRIM_PROGRESS; -import static com.android.uiuios.graphics.WorkspaceAndHotseatScrim.SYSUI_PROGRESS; +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; import android.view.View; import android.view.animation.Interpolator; -import com.android.uiuios.LauncherState.PageAlphaProvider; -import com.android.uiuios.LauncherState.ScaleAndTranslation; -import com.android.uiuios.LauncherStateManager.AnimationConfig; -import com.android.uiuios.anim.AnimatorSetBuilder; -import com.android.uiuios.anim.PropertySetter; -import com.android.uiuios.dragndrop.DragLayer; -import com.android.uiuios.graphics.WorkspaceAndHotseatScrim; +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; /** * Manages the animations between each of the workspace states. diff --git a/src/com/android/uiuios/accessibility/AccessibleDragListenerAdapter.java b/src/com/android/colorfulos/accessibility/AccessibleDragListenerAdapter.java similarity index 86% rename from src/com/android/uiuios/accessibility/AccessibleDragListenerAdapter.java rename to src/com/android/colorfulos/accessibility/AccessibleDragListenerAdapter.java index 2786520..d9700cf 100644 --- a/src/com/android/uiuios/accessibility/AccessibleDragListenerAdapter.java +++ b/src/com/android/colorfulos/accessibility/AccessibleDragListenerAdapter.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package com.android.uiuios.accessibility; +package com.android.colorfulos.accessibility; import android.view.ViewGroup; -import com.android.uiuios.CellLayout; -import com.android.uiuios.DropTarget.DragObject; -import com.android.uiuios.Launcher; -import com.android.uiuios.dragndrop.DragController.DragListener; -import com.android.uiuios.dragndrop.DragOptions; +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; /** * Utility listener to enable/disable accessibility drag flags for a ViewGroup diff --git a/src/com/android/uiuios/accessibility/DragAndDropAccessibilityDelegate.java b/src/com/android/colorfulos/accessibility/DragAndDropAccessibilityDelegate.java similarity index 96% rename from src/com/android/uiuios/accessibility/DragAndDropAccessibilityDelegate.java rename to src/com/android/colorfulos/accessibility/DragAndDropAccessibilityDelegate.java index 7e0b696..282c1b3 100644 --- a/src/com/android/uiuios/accessibility/DragAndDropAccessibilityDelegate.java +++ b/src/com/android/colorfulos/accessibility/DragAndDropAccessibilityDelegate.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.accessibility; +package com.android.colorfulos.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.uiuios.CellLayout; -import com.android.uiuios.Launcher; -import com.android.uiuios.R; +import com.android.colorfulos.CellLayout; +import com.android.colorfulos.Launcher; +import com.android.colorfulos.R; import java.util.List; diff --git a/src/com/android/uiuios/accessibility/DragViewStateAnnouncer.java b/src/com/android/colorfulos/accessibility/DragViewStateAnnouncer.java similarity index 91% rename from src/com/android/uiuios/accessibility/DragViewStateAnnouncer.java rename to src/com/android/colorfulos/accessibility/DragViewStateAnnouncer.java index 8c2eb50..a86b938 100644 --- a/src/com/android/uiuios/accessibility/DragViewStateAnnouncer.java +++ b/src/com/android/colorfulos/accessibility/DragViewStateAnnouncer.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.android.uiuios.accessibility; +package com.android.colorfulos.accessibility; -import static com.android.uiuios.compat.AccessibilityManagerCompat.isAccessibilityEnabled; +import static com.android.colorfulos.compat.AccessibilityManagerCompat.isAccessibilityEnabled; import android.view.View; import android.view.accessibility.AccessibilityEvent; -import com.android.uiuios.Launcher; +import com.android.colorfulos.Launcher; /** * Periodically sends accessibility events to announce ongoing state changed. Based on the diff --git a/src/com/android/uiuios/accessibility/FolderAccessibilityHelper.java b/src/com/android/colorfulos/accessibility/FolderAccessibilityHelper.java similarity index 90% rename from src/com/android/uiuios/accessibility/FolderAccessibilityHelper.java rename to src/com/android/colorfulos/accessibility/FolderAccessibilityHelper.java index cd99cb6..5e278a3 100644 --- a/src/com/android/uiuios/accessibility/FolderAccessibilityHelper.java +++ b/src/com/android/colorfulos/accessibility/FolderAccessibilityHelper.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.android.uiuios.accessibility; +package com.android.colorfulos.accessibility; -import com.android.uiuios.CellLayout; -import com.android.uiuios.R; -import com.android.uiuios.folder.FolderPagedView; +import com.android.colorfulos.CellLayout; +import com.android.colorfulos.R; +import com.android.colorfulos.folder.FolderPagedView; /** * Implementation of {@link DragAndDropAccessibilityDelegate} to support DnD in a folder. diff --git a/src/com/android/uiuios/accessibility/LauncherAccessibilityDelegate.java b/src/com/android/colorfulos/accessibility/LauncherAccessibilityDelegate.java similarity index 92% rename from src/com/android/uiuios/accessibility/LauncherAccessibilityDelegate.java rename to src/com/android/colorfulos/accessibility/LauncherAccessibilityDelegate.java index 17def23..0774144 100644 --- a/src/com/android/uiuios/accessibility/LauncherAccessibilityDelegate.java +++ b/src/com/android/colorfulos/accessibility/LauncherAccessibilityDelegate.java @@ -1,6 +1,6 @@ -package com.android.uiuios.accessibility; +package com.android.colorfulos.accessibility; -import static com.android.uiuios.LauncherState.NORMAL; +import static com.android.colorfulos.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.uiuios.AppInfo; -import com.android.uiuios.AppWidgetResizeFrame; -import com.android.uiuios.BubbleTextView; -import com.android.uiuios.ButtonDropTarget; -import com.android.uiuios.CellLayout; -import com.android.uiuios.DropTarget.DragObject; -import com.android.uiuios.FolderInfo; -import com.android.uiuios.ItemInfo; -import com.android.uiuios.Launcher; -import com.android.uiuios.LauncherAppWidgetInfo; -import com.android.uiuios.LauncherSettings; -import com.android.uiuios.LauncherSettings.Favorites; -import com.android.uiuios.PendingAddItemInfo; -import com.android.uiuios.R; -import com.android.uiuios.WorkspaceItemInfo; -import com.android.uiuios.Workspace; -import com.android.uiuios.dragndrop.DragController.DragListener; -import com.android.uiuios.dragndrop.DragOptions; -import com.android.uiuios.folder.Folder; -import com.android.uiuios.notification.NotificationListener; -import com.android.uiuios.popup.PopupContainerWithArrow; -import com.android.uiuios.shortcuts.DeepShortcutManager; -import com.android.uiuios.touch.ItemLongClickListener; -import com.android.uiuios.util.IntArray; -import com.android.uiuios.util.Thunk; -import com.android.uiuios.widget.LauncherAppWidgetHostView; +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 java.util.ArrayList; diff --git a/src/com/android/uiuios/accessibility/ShortcutMenuAccessibilityDelegate.java b/src/com/android/colorfulos/accessibility/ShortcutMenuAccessibilityDelegate.java similarity index 87% rename from src/com/android/uiuios/accessibility/ShortcutMenuAccessibilityDelegate.java rename to src/com/android/colorfulos/accessibility/ShortcutMenuAccessibilityDelegate.java index c78ef30..0b3b69b 100644 --- a/src/com/android/uiuios/accessibility/ShortcutMenuAccessibilityDelegate.java +++ b/src/com/android/colorfulos/accessibility/ShortcutMenuAccessibilityDelegate.java @@ -14,22 +14,22 @@ * limitations under the License. */ -package com.android.uiuios.accessibility; +package com.android.colorfulos.accessibility; -import static com.android.uiuios.LauncherState.NORMAL; +import static com.android.colorfulos.LauncherState.NORMAL; import android.view.View; import android.view.accessibility.AccessibilityNodeInfo; import android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction; -import com.android.uiuios.AbstractFloatingView; -import com.android.uiuios.ItemInfo; -import com.android.uiuios.Launcher; -import com.android.uiuios.LauncherSettings; -import com.android.uiuios.R; -import com.android.uiuios.WorkspaceItemInfo; -import com.android.uiuios.notification.NotificationMainView; -import com.android.uiuios.shortcuts.DeepShortcutView; +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 java.util.ArrayList; diff --git a/src/com/android/uiuios/accessibility/WorkspaceAccessibilityHelper.java b/src/com/android/colorfulos/accessibility/WorkspaceAccessibilityHelper.java similarity index 93% rename from src/com/android/uiuios/accessibility/WorkspaceAccessibilityHelper.java rename to src/com/android/colorfulos/accessibility/WorkspaceAccessibilityHelper.java index f2c2384..548d64e 100644 --- a/src/com/android/uiuios/accessibility/WorkspaceAccessibilityHelper.java +++ b/src/com/android/colorfulos/accessibility/WorkspaceAccessibilityHelper.java @@ -14,22 +14,22 @@ * limitations under the License. */ -package com.android.uiuios.accessibility; +package com.android.colorfulos.accessibility; import android.content.Context; import android.graphics.Rect; import android.text.TextUtils; import android.view.View; -import com.android.uiuios.AppInfo; -import com.android.uiuios.CellLayout; -import com.android.uiuios.FolderInfo; -import com.android.uiuios.ItemInfo; -import com.android.uiuios.Launcher; -import com.android.uiuios.R; -import com.android.uiuios.WorkspaceItemInfo; -import com.android.uiuios.accessibility.LauncherAccessibilityDelegate.DragType; -import com.android.uiuios.dragndrop.DragLayer; +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 androidx.core.view.accessibility.AccessibilityNodeInfoCompat; diff --git a/src/com/android/uiuios/allapps/AllAppsBackgroundDrawable.java b/src/com/android/colorfulos/allapps/AllAppsBackgroundDrawable.java similarity index 97% rename from src/com/android/uiuios/allapps/AllAppsBackgroundDrawable.java rename to src/com/android/colorfulos/allapps/AllAppsBackgroundDrawable.java index 34604a9..bb9caea 100644 --- a/src/com/android/uiuios/allapps/AllAppsBackgroundDrawable.java +++ b/src/com/android/colorfulos/allapps/AllAppsBackgroundDrawable.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.allapps; +package com.android.colorfulos.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.uiuios.LauncherAnimUtils; -import com.android.uiuios.R; -import com.android.uiuios.util.Themes; +import com.android.colorfulos.LauncherAnimUtils; +import com.android.colorfulos.R; +import com.android.colorfulos.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/uiuios/allapps/AllAppsContainerView.java b/src/com/android/colorfulos/allapps/AllAppsContainerView.java similarity index 94% rename from src/com/android/uiuios/allapps/AllAppsContainerView.java rename to src/com/android/colorfulos/allapps/AllAppsContainerView.java index efb7153..e8689d5 100644 --- a/src/com/android/uiuios/allapps/AllAppsContainerView.java +++ b/src/com/android/colorfulos/allapps/AllAppsContainerView.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.allapps; +package com.android.colorfulos.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.uiuios.AppInfo; -import com.android.uiuios.DeviceProfile; -import com.android.uiuios.DeviceProfile.OnDeviceProfileChangeListener; -import com.android.uiuios.DragSource; -import com.android.uiuios.DropTarget.DragObject; -import com.android.uiuios.Insettable; -import com.android.uiuios.InsettableFrameLayout; -import com.android.uiuios.ItemInfo; -import com.android.uiuios.Launcher; -import com.android.uiuios.LauncherState; -import com.android.uiuios.R; -import com.android.uiuios.testing.TestProtocol; -import com.android.uiuios.Utilities; -import com.android.uiuios.compat.AccessibilityManagerCompat; -import com.android.uiuios.config.FeatureFlags; -import com.android.uiuios.keyboard.FocusedItemDecorator; -import com.android.uiuios.userevent.nano.LauncherLogProto.Target; -import com.android.uiuios.util.ItemInfoMatcher; -import com.android.uiuios.util.MultiValueAlpha; -import com.android.uiuios.util.MultiValueAlpha.AlphaProperty; -import com.android.uiuios.util.Themes; -import com.android.uiuios.views.BottomUserEducationView; -import com.android.uiuios.views.RecyclerViewFastScroller; -import com.android.uiuios.views.SpringRelativeLayout; +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 androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/src/com/android/uiuios/allapps/AllAppsFastScrollHelper.java b/src/com/android/colorfulos/allapps/AllAppsFastScrollHelper.java similarity index 99% rename from src/com/android/uiuios/allapps/AllAppsFastScrollHelper.java rename to src/com/android/colorfulos/allapps/AllAppsFastScrollHelper.java index f90528b..2120fd6 100644 --- a/src/com/android/uiuios/allapps/AllAppsFastScrollHelper.java +++ b/src/com/android/colorfulos/allapps/AllAppsFastScrollHelper.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.allapps; +package com.android.colorfulos.allapps; -import com.android.uiuios.util.Thunk; +import com.android.colorfulos.util.Thunk; import java.util.HashSet; import java.util.List; diff --git a/src/com/android/uiuios/allapps/AllAppsGridAdapter.java b/src/com/android/colorfulos/allapps/AllAppsGridAdapter.java similarity index 95% rename from src/com/android/uiuios/allapps/AllAppsGridAdapter.java rename to src/com/android/colorfulos/allapps/AllAppsGridAdapter.java index 22cdbff..5d515cf 100644 --- a/src/com/android/uiuios/allapps/AllAppsGridAdapter.java +++ b/src/com/android/colorfulos/allapps/AllAppsGridAdapter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.allapps; +package com.android.colorfulos.allapps; import android.content.Context; import android.content.Intent; @@ -26,16 +26,16 @@ import android.view.ViewGroup; import android.view.accessibility.AccessibilityEvent; import android.widget.TextView; -import com.android.uiuios.AppInfo; -import com.android.uiuios.BubbleTextView; -import com.android.uiuios.Launcher; -import com.android.uiuios.R; -import com.android.uiuios.allapps.AlphabeticalAppsList.AdapterItem; -import com.android.uiuios.compat.UserManagerCompat; -import com.android.uiuios.model.AppLaunchTracker; -import com.android.uiuios.touch.ItemClickHandler; -import com.android.uiuios.touch.ItemLongClickListener; -import com.android.uiuios.util.PackageManagerHelper; +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 java.util.List; diff --git a/src/com/android/uiuios/allapps/AllAppsPagedView.java b/src/com/android/colorfulos/allapps/AllAppsPagedView.java similarity index 97% rename from src/com/android/uiuios/allapps/AllAppsPagedView.java rename to src/com/android/colorfulos/allapps/AllAppsPagedView.java index 514c95b..824ed79 100644 --- a/src/com/android/uiuios/allapps/AllAppsPagedView.java +++ b/src/com/android/colorfulos/allapps/AllAppsPagedView.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.allapps; +package com.android.colorfulos.allapps; import android.content.Context; import android.util.AttributeSet; import android.view.MotionEvent; -import com.android.uiuios.PagedView; +import com.android.colorfulos.PagedView; public class AllAppsPagedView extends PagedView { diff --git a/src/com/android/uiuios/allapps/AllAppsRecyclerView.java b/src/com/android/colorfulos/allapps/AllAppsRecyclerView.java similarity index 96% rename from src/com/android/uiuios/allapps/AllAppsRecyclerView.java rename to src/com/android/colorfulos/allapps/AllAppsRecyclerView.java index 20ad611..5b4263b 100644 --- a/src/com/android/uiuios/allapps/AllAppsRecyclerView.java +++ b/src/com/android/colorfulos/allapps/AllAppsRecyclerView.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.allapps; +package com.android.colorfulos.allapps; import static android.view.View.MeasureSpec.UNSPECIFIED; @@ -26,18 +26,17 @@ import android.util.SparseIntArray; import android.view.MotionEvent; import android.view.View; -import com.android.uiuios.BaseRecyclerView; -import com.android.uiuios.DeviceProfile; -import com.android.uiuios.ItemInfo; -import com.android.uiuios.Launcher; -import com.android.uiuios.LauncherAppState; -import com.android.uiuios.R; -import com.android.uiuios.Utilities; -import com.android.uiuios.compat.AccessibilityManagerCompat; -import com.android.uiuios.logging.StatsLogUtils.LogContainerProvider; -import com.android.uiuios.userevent.nano.LauncherLogProto.ContainerType; -import com.android.uiuios.userevent.nano.LauncherLogProto.Target; -import com.android.uiuios.views.RecyclerViewFastScroller; +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 java.util.List; diff --git a/src/com/android/uiuios/allapps/AllAppsStore.java b/src/com/android/colorfulos/allapps/AllAppsStore.java similarity index 94% rename from src/com/android/uiuios/allapps/AllAppsStore.java rename to src/com/android/colorfulos/allapps/AllAppsStore.java index b70394f..e64b17c 100644 --- a/src/com/android/uiuios/allapps/AllAppsStore.java +++ b/src/com/android/colorfulos/allapps/AllAppsStore.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.allapps; +package com.android.colorfulos.allapps; import android.view.View; import android.view.ViewGroup; -import com.android.uiuios.AppInfo; -import com.android.uiuios.BubbleTextView; -import com.android.uiuios.ItemInfo; -import com.android.uiuios.PromiseAppInfo; -import com.android.uiuios.util.ComponentKey; -import com.android.uiuios.util.PackageUserKey; +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 java.util.ArrayList; import java.util.Collection; diff --git a/src/com/android/uiuios/allapps/AllAppsTransitionController.java b/src/com/android/colorfulos/allapps/AllAppsTransitionController.java similarity index 84% rename from src/com/android/uiuios/allapps/AllAppsTransitionController.java rename to src/com/android/colorfulos/allapps/AllAppsTransitionController.java index 9b92978..7d9e15d 100644 --- a/src/com/android/uiuios/allapps/AllAppsTransitionController.java +++ b/src/com/android/colorfulos/allapps/AllAppsTransitionController.java @@ -1,18 +1,18 @@ -package com.android.uiuios.allapps; +package com.android.colorfulos.allapps; -import static com.android.uiuios.LauncherState.ALL_APPS_CONTENT; -import static com.android.uiuios.LauncherState.ALL_APPS_HEADER_EXTRA; -import static com.android.uiuios.LauncherState.BACKGROUND_APP; -import static com.android.uiuios.LauncherState.HOTSEAT_ICONS; -import static com.android.uiuios.LauncherState.OVERVIEW; -import static com.android.uiuios.LauncherState.VERTICAL_SWIPE_INDICATOR; -import static com.android.uiuios.anim.AnimatorSetBuilder.ANIM_ALL_APPS_FADE; -import static com.android.uiuios.anim.AnimatorSetBuilder.ANIM_OVERVIEW_SCALE; -import static com.android.uiuios.anim.AnimatorSetBuilder.ANIM_VERTICAL_PROGRESS; -import static com.android.uiuios.anim.Interpolators.FAST_OUT_SLOW_IN; -import static com.android.uiuios.anim.Interpolators.LINEAR; -import static com.android.uiuios.anim.PropertySetter.NO_ANIM_PROPERTY_SETTER; -import static com.android.uiuios.util.SystemUiController.UI_STATE_ALL_APPS; +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 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.uiuios.DeviceProfile; -import com.android.uiuios.DeviceProfile.OnDeviceProfileChangeListener; -import com.android.uiuios.Launcher; -import com.android.uiuios.LauncherState; -import com.android.uiuios.LauncherStateManager.AnimationConfig; -import com.android.uiuios.LauncherStateManager.StateHandler; -import com.android.uiuios.R; -import com.android.uiuios.anim.AnimationSuccessListener; -import com.android.uiuios.anim.AnimatorSetBuilder; -import com.android.uiuios.anim.PropertySetter; -import com.android.uiuios.anim.SpringObjectAnimator; -import com.android.uiuios.testing.TestProtocol; -import com.android.uiuios.util.Themes; -import com.android.uiuios.views.ScrimView; +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; /** * Handles AllApps view transition. diff --git a/src/com/android/uiuios/allapps/AlphabeticalAppsList.java b/src/com/android/colorfulos/allapps/AlphabeticalAppsList.java similarity index 97% rename from src/com/android/uiuios/allapps/AlphabeticalAppsList.java rename to src/com/android/colorfulos/allapps/AlphabeticalAppsList.java index f5c03c1..4958c24 100644 --- a/src/com/android/uiuios/allapps/AlphabeticalAppsList.java +++ b/src/com/android/colorfulos/allapps/AlphabeticalAppsList.java @@ -13,20 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.allapps; +package com.android.colorfulos.allapps; import android.content.Context; import android.content.pm.PackageManager; -import com.android.uiuios.AppInfo; -import com.android.uiuios.Launcher; -import com.android.uiuios.Utilities; -import com.android.uiuios.compat.AlphabeticIndexCompat; -import com.android.uiuios.shortcuts.DeepShortcutManager; -import com.android.uiuios.testing.TestProtocol; -import com.android.uiuios.util.ComponentKey; -import com.android.uiuios.util.ItemInfoMatcher; -import com.android.uiuios.util.LabelComparator; +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 java.util.ArrayList; import java.util.Collections; diff --git a/src/com/android/uiuios/allapps/AppInfoComparator.java b/src/com/android/colorfulos/allapps/AppInfoComparator.java similarity index 91% rename from src/com/android/uiuios/allapps/AppInfoComparator.java rename to src/com/android/colorfulos/allapps/AppInfoComparator.java index d8fcfbc..405ff3c 100644 --- a/src/com/android/uiuios/allapps/AppInfoComparator.java +++ b/src/com/android/colorfulos/allapps/AppInfoComparator.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.allapps; +package com.android.colorfulos.allapps; import android.content.Context; import android.os.Process; import android.os.UserHandle; -import com.android.uiuios.AppInfo; -import com.android.uiuios.compat.UserManagerCompat; -import com.android.uiuios.util.LabelComparator; +import com.android.colorfulos.AppInfo; +import com.android.colorfulos.compat.UserManagerCompat; +import com.android.colorfulos.util.LabelComparator; import java.util.Comparator; diff --git a/src/com/android/uiuios/allapps/DiscoveryBounce.java b/src/com/android/colorfulos/allapps/DiscoveryBounce.java similarity index 91% rename from src/com/android/uiuios/allapps/DiscoveryBounce.java rename to src/com/android/colorfulos/allapps/DiscoveryBounce.java index aba2cf9..be04889 100644 --- a/src/com/android/uiuios/allapps/DiscoveryBounce.java +++ b/src/com/android/colorfulos/allapps/DiscoveryBounce.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.android.uiuios.allapps; +package com.android.colorfulos.allapps; -import static com.android.uiuios.LauncherState.NORMAL; -import static com.android.uiuios.LauncherState.OVERVIEW; -import static com.android.uiuios.userevent.nano.LauncherLogProto.ContainerType.HOTSEAT; -import static com.android.uiuios.userevent.nano.LauncherLogProto.ContainerType.PREDICTION; +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 android.animation.Animator; import android.animation.AnimatorInflater; @@ -28,15 +28,14 @@ import android.content.SharedPreferences; import android.os.Handler; import android.view.MotionEvent; -import com.android.uiuios.AbstractFloatingView; -import com.android.uiuios.Launcher; -import com.android.uiuios.LauncherState; -import com.android.uiuios.LauncherStateManager; -import com.android.uiuios.LauncherStateManager.StateListener; -import com.android.uiuios.R; -import com.android.uiuios.Utilities; -import com.android.uiuios.compat.UserManagerCompat; -import com.android.uiuios.states.InternalStateHandler; +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; /** * Abstract base class of floating view responsible for showing discovery bounce animation diff --git a/src/com/android/uiuios/allapps/FloatingHeaderRow.java b/src/com/android/colorfulos/allapps/FloatingHeaderRow.java similarity index 92% rename from src/com/android/uiuios/allapps/FloatingHeaderRow.java rename to src/com/android/colorfulos/allapps/FloatingHeaderRow.java index 67f836b..44ef185 100644 --- a/src/com/android/uiuios/allapps/FloatingHeaderRow.java +++ b/src/com/android/colorfulos/allapps/FloatingHeaderRow.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.allapps; +package com.android.colorfulos.allapps; import android.graphics.Rect; import android.view.animation.Interpolator; -import com.android.uiuios.DeviceProfile; -import com.android.uiuios.anim.PropertySetter; +import com.android.colorfulos.DeviceProfile; +import com.android.colorfulos.anim.PropertySetter; /** * A abstract representation of a row in all-apps view diff --git a/src/com/android/uiuios/allapps/FloatingHeaderView.java b/src/com/android/colorfulos/allapps/FloatingHeaderView.java similarity index 97% rename from src/com/android/uiuios/allapps/FloatingHeaderView.java rename to src/com/android/colorfulos/allapps/FloatingHeaderView.java index 5ffc32e..b5e40d3 100644 --- a/src/com/android/uiuios/allapps/FloatingHeaderView.java +++ b/src/com/android/colorfulos/allapps/FloatingHeaderView.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.allapps; +package com.android.colorfulos.allapps; import android.animation.ValueAnimator; import android.content.Context; @@ -27,12 +27,12 @@ import android.view.ViewGroup; import android.view.animation.Interpolator; import android.widget.LinearLayout; -import com.android.uiuios.DeviceProfile; -import com.android.uiuios.Insettable; -import com.android.uiuios.Launcher; -import com.android.uiuios.R; -import com.android.uiuios.anim.PropertySetter; -import com.android.uiuios.uioverrides.plugins.PluginManagerWrapper; +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.android.systemui.plugins.PluginListener; diff --git a/src/com/android/uiuios/allapps/PersonalWorkSlidingTabStrip.java b/src/com/android/colorfulos/allapps/PersonalWorkSlidingTabStrip.java similarity index 95% rename from src/com/android/uiuios/allapps/PersonalWorkSlidingTabStrip.java rename to src/com/android/colorfulos/allapps/PersonalWorkSlidingTabStrip.java index dd139d3..11af5df 100644 --- a/src/com/android/uiuios/allapps/PersonalWorkSlidingTabStrip.java +++ b/src/com/android/colorfulos/allapps/PersonalWorkSlidingTabStrip.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.allapps; +package com.android.colorfulos.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.uiuios.Launcher; -import com.android.uiuios.R; -import com.android.uiuios.Utilities; -import com.android.uiuios.pageindicators.PageIndicator; -import com.android.uiuios.util.Themes; +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 androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/src/com/android/uiuios/allapps/PluginHeaderRow.java b/src/com/android/colorfulos/allapps/PluginHeaderRow.java similarity index 94% rename from src/com/android/uiuios/allapps/PluginHeaderRow.java rename to src/com/android/colorfulos/allapps/PluginHeaderRow.java index ee590ab..6e017ec 100644 --- a/src/com/android/uiuios/allapps/PluginHeaderRow.java +++ b/src/com/android/colorfulos/allapps/PluginHeaderRow.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.allapps; +package com.android.colorfulos.allapps; import static android.view.View.ALPHA; import static android.view.View.INVISIBLE; @@ -23,8 +23,8 @@ import android.graphics.Rect; import android.view.View; import android.view.animation.Interpolator; -import com.android.uiuios.DeviceProfile; -import com.android.uiuios.anim.PropertySetter; +import com.android.colorfulos.DeviceProfile; +import com.android.colorfulos.anim.PropertySetter; import com.android.systemui.plugins.AllAppsRow; /** diff --git a/src/com/android/uiuios/allapps/SearchUiManager.java b/src/com/android/colorfulos/allapps/SearchUiManager.java similarity index 94% rename from src/com/android/uiuios/allapps/SearchUiManager.java rename to src/com/android/colorfulos/allapps/SearchUiManager.java index b88b3ec..a9f75b1 100644 --- a/src/com/android/uiuios/allapps/SearchUiManager.java +++ b/src/com/android/colorfulos/allapps/SearchUiManager.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.allapps; +package com.android.colorfulos.allapps; import android.graphics.Rect; import android.view.KeyEvent; import android.view.animation.Interpolator; -import com.android.uiuios.anim.PropertySetter; +import com.android.colorfulos.anim.PropertySetter; /** * Interface for controlling the Apps search UI. diff --git a/src/com/android/uiuios/allapps/WorkModeSwitch.java b/src/com/android/colorfulos/allapps/WorkModeSwitch.java similarity index 97% rename from src/com/android/uiuios/allapps/WorkModeSwitch.java rename to src/com/android/colorfulos/allapps/WorkModeSwitch.java index d28ecd4..ec5c856 100644 --- a/src/com/android/uiuios/allapps/WorkModeSwitch.java +++ b/src/com/android/colorfulos/allapps/WorkModeSwitch.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.allapps; +package com.android.colorfulos.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.uiuios.compat.UserManagerCompat; +import com.android.colorfulos.compat.UserManagerCompat; import java.lang.ref.WeakReference; import java.util.List; diff --git a/src/com/android/uiuios/allapps/search/AllAppsSearchBarController.java b/src/com/android/colorfulos/allapps/search/AllAppsSearchBarController.java similarity index 93% rename from src/com/android/uiuios/allapps/search/AllAppsSearchBarController.java rename to src/com/android/colorfulos/allapps/search/AllAppsSearchBarController.java index bc76e66..5959e83 100644 --- a/src/com/android/uiuios/allapps/search/AllAppsSearchBarController.java +++ b/src/com/android/colorfulos/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.uiuios.allapps.search; +package com.android.colorfulos.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.uiuios.ExtendedEditText; -import com.android.uiuios.Launcher; -import com.android.uiuios.Utilities; -import com.android.uiuios.model.AppLaunchTracker; -import com.android.uiuios.util.ComponentKey; -import com.android.uiuios.util.PackageManagerHelper; +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 java.util.ArrayList; diff --git a/src/com/android/uiuios/allapps/search/AppsSearchContainerLayout.java b/src/com/android/colorfulos/allapps/search/AppsSearchContainerLayout.java similarity index 89% rename from src/com/android/uiuios/allapps/search/AppsSearchContainerLayout.java rename to src/com/android/colorfulos/allapps/search/AppsSearchContainerLayout.java index 03199f0..171eeb1 100644 --- a/src/com/android/uiuios/allapps/search/AppsSearchContainerLayout.java +++ b/src/com/android/colorfulos/allapps/search/AppsSearchContainerLayout.java @@ -13,21 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.allapps.search; +package com.android.colorfulos.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.uiuios.LauncherState.ALL_APPS_HEADER; -import static com.android.uiuios.Utilities.prefixTextWithIcon; -import static com.android.uiuios.icons.IconNormalizer.ICON_VISIBLE_AREA_FACTOR; +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 android.content.Context; import android.graphics.Rect; import android.text.Selection; -import android.text.Spannable; -import android.text.SpannableString; import android.text.SpannableStringBuilder; import android.text.method.TextKeyListener; import android.util.AttributeSet; @@ -36,19 +34,17 @@ import android.view.View; import android.view.ViewGroup.MarginLayoutParams; import android.view.animation.Interpolator; -import com.android.uiuios.DeviceProfile; -import com.android.uiuios.ExtendedEditText; -import com.android.uiuios.Insettable; -import com.android.uiuios.Launcher; -import com.android.uiuios.R; -import com.android.uiuios.Utilities; -import com.android.uiuios.allapps.AllAppsContainerView; -import com.android.uiuios.allapps.AllAppsStore; -import com.android.uiuios.allapps.AlphabeticalAppsList; -import com.android.uiuios.allapps.SearchUiManager; -import com.android.uiuios.anim.PropertySetter; -import com.android.uiuios.graphics.TintedDrawableSpan; -import com.android.uiuios.util.ComponentKey; +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 java.util.ArrayList; diff --git a/src/com/android/uiuios/allapps/search/DefaultAppSearchAlgorithm.java b/src/com/android/colorfulos/allapps/search/DefaultAppSearchAlgorithm.java similarity index 98% rename from src/com/android/uiuios/allapps/search/DefaultAppSearchAlgorithm.java rename to src/com/android/colorfulos/allapps/search/DefaultAppSearchAlgorithm.java index d5fc6c7..a2853b2 100644 --- a/src/com/android/uiuios/allapps/search/DefaultAppSearchAlgorithm.java +++ b/src/com/android/colorfulos/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.uiuios.allapps.search; +package com.android.colorfulos.allapps.search; import android.os.Handler; -import com.android.uiuios.AppInfo; -import com.android.uiuios.util.ComponentKey; +import com.android.colorfulos.AppInfo; +import com.android.colorfulos.util.ComponentKey; import java.text.Collator; import java.util.ArrayList; diff --git a/src/com/android/uiuios/allapps/search/SearchAlgorithm.java b/src/com/android/colorfulos/allapps/search/SearchAlgorithm.java similarity index 95% rename from src/com/android/uiuios/allapps/search/SearchAlgorithm.java rename to src/com/android/colorfulos/allapps/search/SearchAlgorithm.java index d9d541c..2eb3465 100644 --- a/src/com/android/uiuios/allapps/search/SearchAlgorithm.java +++ b/src/com/android/colorfulos/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.uiuios.allapps.search; +package com.android.colorfulos.allapps.search; /** * An interface for handling search. diff --git a/src/com/android/uiuios/anim/AlphaUpdateListener.java b/src/com/android/colorfulos/anim/AlphaUpdateListener.java similarity index 98% rename from src/com/android/uiuios/anim/AlphaUpdateListener.java rename to src/com/android/colorfulos/anim/AlphaUpdateListener.java index 140c710..dc3a860 100644 --- a/src/com/android/uiuios/anim/AlphaUpdateListener.java +++ b/src/com/android/colorfulos/anim/AlphaUpdateListener.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.anim; +package com.android.colorfulos.anim; import android.animation.Animator; import android.animation.ValueAnimator; diff --git a/src/com/android/uiuios/anim/AnimationSuccessListener.java b/src/com/android/colorfulos/anim/AnimationSuccessListener.java similarity index 97% rename from src/com/android/uiuios/anim/AnimationSuccessListener.java rename to src/com/android/colorfulos/anim/AnimationSuccessListener.java index 11bd9fd..1fc1556 100644 --- a/src/com/android/uiuios/anim/AnimationSuccessListener.java +++ b/src/com/android/colorfulos/anim/AnimationSuccessListener.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.anim; +package com.android.colorfulos.anim; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; diff --git a/src/com/android/uiuios/anim/AnimatorPlaybackController.java b/src/com/android/colorfulos/anim/AnimatorPlaybackController.java similarity index 98% rename from src/com/android/uiuios/anim/AnimatorPlaybackController.java rename to src/com/android/colorfulos/anim/AnimatorPlaybackController.java index b56c39b..db0da7d 100644 --- a/src/com/android/uiuios/anim/AnimatorPlaybackController.java +++ b/src/com/android/colorfulos/anim/AnimatorPlaybackController.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.anim; +package com.android.colorfulos.anim; -import static com.android.uiuios.anim.Interpolators.LINEAR; -import static com.android.uiuios.config.FeatureFlags.QUICKSTEP_SPRINGS; +import static com.android.colorfulos.anim.Interpolators.LINEAR; +import static com.android.colorfulos.config.FeatureFlags.QUICKSTEP_SPRINGS; import android.animation.Animator; import android.animation.Animator.AnimatorListener; diff --git a/src/com/android/uiuios/anim/AnimatorSetBuilder.java b/src/com/android/colorfulos/anim/AnimatorSetBuilder.java similarity index 98% rename from src/com/android/uiuios/anim/AnimatorSetBuilder.java rename to src/com/android/colorfulos/anim/AnimatorSetBuilder.java index 0b707ca..72cf8d4 100644 --- a/src/com/android/uiuios/anim/AnimatorSetBuilder.java +++ b/src/com/android/colorfulos/anim/AnimatorSetBuilder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.anim; +package com.android.colorfulos.anim; import android.animation.Animator; import android.animation.AnimatorSet; diff --git a/src/com/android/uiuios/anim/FlingSpringAnim.java b/src/com/android/colorfulos/anim/FlingSpringAnim.java similarity index 98% rename from src/com/android/uiuios/anim/FlingSpringAnim.java rename to src/com/android/colorfulos/anim/FlingSpringAnim.java index 82f8f89..1db6bfa 100644 --- a/src/com/android/uiuios/anim/FlingSpringAnim.java +++ b/src/com/android/colorfulos/anim/FlingSpringAnim.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.anim; +package com.android.colorfulos.anim; import androidx.dynamicanimation.animation.DynamicAnimation.OnAnimationEndListener; import androidx.dynamicanimation.animation.FlingAnimation; diff --git a/src/com/android/uiuios/anim/Interpolators.java b/src/com/android/colorfulos/anim/Interpolators.java similarity index 98% rename from src/com/android/uiuios/anim/Interpolators.java rename to src/com/android/colorfulos/anim/Interpolators.java index 0b1a214..aa2f1b2 100644 --- a/src/com/android/uiuios/anim/Interpolators.java +++ b/src/com/android/colorfulos/anim/Interpolators.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.android.uiuios.anim; +package com.android.colorfulos.anim; -import static com.android.uiuios.Utilities.SINGLE_FRAME_MS; +import static com.android.colorfulos.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.uiuios.Utilities; +import com.android.colorfulos.Utilities; /** diff --git a/src/com/android/uiuios/anim/PropertyListBuilder.java b/src/com/android/colorfulos/anim/PropertyListBuilder.java similarity index 97% rename from src/com/android/uiuios/anim/PropertyListBuilder.java rename to src/com/android/colorfulos/anim/PropertyListBuilder.java index 01bb9bd..1d99bce 100644 --- a/src/com/android/uiuios/anim/PropertyListBuilder.java +++ b/src/com/android/colorfulos/anim/PropertyListBuilder.java @@ -1,4 +1,4 @@ -package com.android.uiuios.anim; +package com.android.colorfulos.anim; import android.animation.ObjectAnimator; import android.animation.PropertyValuesHolder; diff --git a/src/com/android/uiuios/anim/PropertyResetListener.java b/src/com/android/colorfulos/anim/PropertyResetListener.java similarity index 97% rename from src/com/android/uiuios/anim/PropertyResetListener.java rename to src/com/android/colorfulos/anim/PropertyResetListener.java index 8185607..8ee6535 100644 --- a/src/com/android/uiuios/anim/PropertyResetListener.java +++ b/src/com/android/colorfulos/anim/PropertyResetListener.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.anim; +package com.android.colorfulos.anim; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; diff --git a/src/com/android/uiuios/anim/PropertySetter.java b/src/com/android/colorfulos/anim/PropertySetter.java similarity index 98% rename from src/com/android/uiuios/anim/PropertySetter.java rename to src/com/android/colorfulos/anim/PropertySetter.java index 381ceab..eb155b2 100644 --- a/src/com/android/uiuios/anim/PropertySetter.java +++ b/src/com/android/colorfulos/anim/PropertySetter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.anim; +package com.android.colorfulos.anim; import android.animation.Animator; import android.animation.ObjectAnimator; diff --git a/src/com/android/uiuios/anim/RevealOutlineAnimation.java b/src/com/android/colorfulos/anim/RevealOutlineAnimation.java similarity index 98% rename from src/com/android/uiuios/anim/RevealOutlineAnimation.java rename to src/com/android/colorfulos/anim/RevealOutlineAnimation.java index 722faa4..09c7d57 100644 --- a/src/com/android/uiuios/anim/RevealOutlineAnimation.java +++ b/src/com/android/colorfulos/anim/RevealOutlineAnimation.java @@ -1,4 +1,4 @@ -package com.android.uiuios.anim; +package com.android.colorfulos.anim; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; diff --git a/src/com/android/uiuios/anim/RoundedRectRevealOutlineProvider.java b/src/com/android/colorfulos/anim/RoundedRectRevealOutlineProvider.java similarity index 98% rename from src/com/android/uiuios/anim/RoundedRectRevealOutlineProvider.java rename to src/com/android/colorfulos/anim/RoundedRectRevealOutlineProvider.java index da023a1..5b5910c 100644 --- a/src/com/android/uiuios/anim/RoundedRectRevealOutlineProvider.java +++ b/src/com/android/colorfulos/anim/RoundedRectRevealOutlineProvider.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.anim; +package com.android.colorfulos.anim; import android.graphics.Rect; diff --git a/src/com/android/uiuios/anim/SpringObjectAnimator.java b/src/com/android/colorfulos/anim/SpringObjectAnimator.java similarity index 98% rename from src/com/android/uiuios/anim/SpringObjectAnimator.java rename to src/com/android/colorfulos/anim/SpringObjectAnimator.java index 84c3a3f..7025f68 100644 --- a/src/com/android/uiuios/anim/SpringObjectAnimator.java +++ b/src/com/android/colorfulos/anim/SpringObjectAnimator.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.anim; +package com.android.colorfulos.anim; import static androidx.dynamicanimation.animation.FloatPropertyCompat.createFloatPropertyCompat; -import static com.android.uiuios.config.FeatureFlags.QUICKSTEP_SPRINGS; +import static com.android.colorfulos.config.FeatureFlags.QUICKSTEP_SPRINGS; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; diff --git a/src/com/android/uiuios/MyApplication.java b/src/com/android/colorfulos/base/MyApplication.java similarity index 70% rename from src/com/android/uiuios/MyApplication.java rename to src/com/android/colorfulos/base/MyApplication.java index 70d9a23..be03b45 100644 --- a/src/com/android/uiuios/MyApplication.java +++ b/src/com/android/colorfulos/base/MyApplication.java @@ -1,9 +1,11 @@ -package com.android.uiuios; +package com.android.colorfulos.base; import android.app.Application; -import android.content.Context; -import com.android.uiuios.network.NetWorkManager; +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; @@ -19,11 +21,13 @@ public class MyApplication extends Application { super.onCreate(); app = this; initJPush(); + JGYUtils.init(this); + Aria.init(this); NetWorkManager.init(this); } - private void initJPush(){ - JPushInterface.setDebugMode(BuildConfig.DEBUG); // 设置开启日志,发布时请关闭日志 + private void initJPush() { + JPushInterface.setDebugMode(BuildConfig.DEBUG); // 设置开启日志,发布时请关闭日志 JPushInterface.init(this); } diff --git a/src/com/android/uiuios/compat/AccessibilityManagerCompat.java b/src/com/android/colorfulos/compat/AccessibilityManagerCompat.java similarity index 96% rename from src/com/android/uiuios/compat/AccessibilityManagerCompat.java rename to src/com/android/colorfulos/compat/AccessibilityManagerCompat.java index 5751d09..fdfb396 100644 --- a/src/com/android/uiuios/compat/AccessibilityManagerCompat.java +++ b/src/com/android/colorfulos/compat/AccessibilityManagerCompat.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.compat; +package com.android.colorfulos.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.uiuios.testing.TestProtocol; -import com.android.uiuios.Utilities; +import com.android.colorfulos.testing.TestProtocol; +import com.android.colorfulos.Utilities; import java.util.function.Consumer; @@ -53,7 +53,7 @@ public class AccessibilityManagerCompat { } public static void sendStateEventToTest(Context context, int stateOrdinal) { - if (com.android.uiuios.testing.TestProtocol.sDebugTracing) { + if (com.android.colorfulos.testing.TestProtocol.sDebugTracing) { android.util.Log.e(TestProtocol.NO_ALLAPPS_EVENT_TAG, "sendStateEventToTest"); } final AccessibilityManager accessibilityManager = getAccessibilityManagerForTest(context); diff --git a/src/com/android/uiuios/compat/AlphabeticIndexCompat.java b/src/com/android/colorfulos/compat/AlphabeticIndexCompat.java similarity index 98% rename from src/com/android/uiuios/compat/AlphabeticIndexCompat.java rename to src/com/android/colorfulos/compat/AlphabeticIndexCompat.java index 7e9c91f..0b74ba3 100644 --- a/src/com/android/uiuios/compat/AlphabeticIndexCompat.java +++ b/src/com/android/colorfulos/compat/AlphabeticIndexCompat.java @@ -1,11 +1,11 @@ -package com.android.uiuios.compat; +package com.android.colorfulos.compat; import android.content.Context; import android.icu.text.AlphabeticIndex; import android.os.LocaleList; import android.util.Log; -import com.android.uiuios.Utilities; +import com.android.colorfulos.Utilities; import java.util.Locale; diff --git a/src/com/android/uiuios/compat/AppWidgetManagerCompat.java b/src/com/android/colorfulos/compat/AppWidgetManagerCompat.java similarity index 88% rename from src/com/android/uiuios/compat/AppWidgetManagerCompat.java rename to src/com/android/colorfulos/compat/AppWidgetManagerCompat.java index b1c65f3..a0d16d2 100644 --- a/src/com/android/uiuios/compat/AppWidgetManagerCompat.java +++ b/src/com/android/colorfulos/compat/AppWidgetManagerCompat.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.compat; +package com.android.colorfulos.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.uiuios.LauncherAppWidgetInfo; -import com.android.uiuios.LauncherAppWidgetProviderInfo; -import com.android.uiuios.Utilities; -import com.android.uiuios.config.FeatureFlags; -import com.android.uiuios.util.ComponentKey; -import com.android.uiuios.util.PackageUserKey; -import com.android.uiuios.widget.custom.CustomWidgetParser; +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 java.util.HashMap; import java.util.List; diff --git a/src/com/android/uiuios/compat/AppWidgetManagerCompatVL.java b/src/com/android/colorfulos/compat/AppWidgetManagerCompatVL.java similarity index 93% rename from src/com/android/uiuios/compat/AppWidgetManagerCompatVL.java rename to src/com/android/colorfulos/compat/AppWidgetManagerCompatVL.java index ed039e8..d136108 100644 --- a/src/com/android/uiuios/compat/AppWidgetManagerCompatVL.java +++ b/src/com/android/colorfulos/compat/AppWidgetManagerCompatVL.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.compat; +package com.android.colorfulos.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.uiuios.LauncherAppWidgetInfo; -import com.android.uiuios.LauncherAppWidgetProviderInfo; -import com.android.uiuios.config.FeatureFlags; -import com.android.uiuios.util.ComponentKey; -import com.android.uiuios.util.PackageUserKey; -import com.android.uiuios.widget.custom.CustomWidgetParser; +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 java.util.ArrayList; import java.util.Collections; diff --git a/src/com/android/uiuios/compat/AppWidgetManagerCompatVO.java b/src/com/android/colorfulos/compat/AppWidgetManagerCompatVO.java similarity index 90% rename from src/com/android/uiuios/compat/AppWidgetManagerCompatVO.java rename to src/com/android/colorfulos/compat/AppWidgetManagerCompatVO.java index 96c2656..8b09985 100644 --- a/src/com/android/uiuios/compat/AppWidgetManagerCompatVO.java +++ b/src/com/android/colorfulos/compat/AppWidgetManagerCompatVO.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.android.uiuios.compat; +package com.android.colorfulos.compat; import android.appwidget.AppWidgetProviderInfo; import android.content.Context; -import com.android.uiuios.config.FeatureFlags; -import com.android.uiuios.util.PackageUserKey; +import com.android.colorfulos.config.FeatureFlags; +import com.android.colorfulos.util.PackageUserKey; import java.util.Collections; import java.util.List; diff --git a/src/com/android/uiuios/compat/LauncherAppsCompat.java b/src/com/android/colorfulos/compat/LauncherAppsCompat.java similarity index 96% rename from src/com/android/uiuios/compat/LauncherAppsCompat.java rename to src/com/android/colorfulos/compat/LauncherAppsCompat.java index 46d0a93..558da7f 100644 --- a/src/com/android/uiuios/compat/LauncherAppsCompat.java +++ b/src/com/android/colorfulos/compat/LauncherAppsCompat.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.compat; +package com.android.colorfulos.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.uiuios.Utilities; -import com.android.uiuios.util.PackageUserKey; +import com.android.colorfulos.Utilities; +import com.android.colorfulos.util.PackageUserKey; import java.util.List; diff --git a/src/com/android/uiuios/compat/LauncherAppsCompatVL.java b/src/com/android/colorfulos/compat/LauncherAppsCompatVL.java similarity index 97% rename from src/com/android/uiuios/compat/LauncherAppsCompatVL.java rename to src/com/android/colorfulos/compat/LauncherAppsCompatVL.java index e7d21b8..54b5956 100644 --- a/src/com/android/uiuios/compat/LauncherAppsCompatVL.java +++ b/src/com/android/colorfulos/compat/LauncherAppsCompatVL.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.compat; +package com.android.colorfulos.compat; import android.content.ComponentName; import android.content.Context; @@ -32,8 +32,8 @@ import android.os.Process; import android.os.UserHandle; import android.util.ArrayMap; -import com.android.uiuios.compat.ShortcutConfigActivityInfo.ShortcutConfigActivityInfoVL; -import com.android.uiuios.util.PackageUserKey; +import com.android.colorfulos.compat.ShortcutConfigActivityInfo.ShortcutConfigActivityInfoVL; +import com.android.colorfulos.util.PackageUserKey; import java.util.ArrayList; import java.util.List; diff --git a/src/com/android/uiuios/compat/LauncherAppsCompatVO.java b/src/com/android/colorfulos/compat/LauncherAppsCompatVO.java similarity index 93% rename from src/com/android/uiuios/compat/LauncherAppsCompatVO.java rename to src/com/android/colorfulos/compat/LauncherAppsCompatVO.java index fa62df6..ac9da94 100644 --- a/src/com/android/uiuios/compat/LauncherAppsCompatVO.java +++ b/src/com/android/colorfulos/compat/LauncherAppsCompatVO.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.compat; +package com.android.colorfulos.compat; import android.annotation.TargetApi; import android.content.Context; @@ -30,13 +30,13 @@ import android.os.Parcelable; import android.os.Process; import android.os.UserHandle; -import com.android.uiuios.LauncherAppState; -import com.android.uiuios.LauncherModel; -import com.android.uiuios.WorkspaceItemInfo; -import com.android.uiuios.compat.ShortcutConfigActivityInfo.ShortcutConfigActivityInfoVO; -import com.android.uiuios.icons.LauncherIcons; -import com.android.uiuios.util.LooperExecutor; -import com.android.uiuios.util.PackageUserKey; +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 java.util.ArrayList; import java.util.List; diff --git a/src/com/android/uiuios/compat/LauncherAppsCompatVQ.java b/src/com/android/colorfulos/compat/LauncherAppsCompatVQ.java similarity index 94% rename from src/com/android/uiuios/compat/LauncherAppsCompatVQ.java rename to src/com/android/colorfulos/compat/LauncherAppsCompatVQ.java index 97c0599..769ef29 100644 --- a/src/com/android/uiuios/compat/LauncherAppsCompatVQ.java +++ b/src/com/android/colorfulos/compat/LauncherAppsCompatVQ.java @@ -14,11 +14,10 @@ * limitations under the License. */ -package com.android.uiuios.compat; +package com.android.colorfulos.compat; import android.annotation.TargetApi; import android.content.Context; -import android.content.Intent; import android.content.pm.PackageInstaller; import java.util.List; diff --git a/src/com/android/uiuios/compat/PackageInstallerCompat.java b/src/com/android/colorfulos/compat/PackageInstallerCompat.java similarity index 98% rename from src/com/android/uiuios/compat/PackageInstallerCompat.java rename to src/com/android/colorfulos/compat/PackageInstallerCompat.java index 686891b..d08a243 100644 --- a/src/com/android/uiuios/compat/PackageInstallerCompat.java +++ b/src/com/android/colorfulos/compat/PackageInstallerCompat.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.compat; +package com.android.colorfulos.compat; import android.content.ComponentName; import android.content.Context; diff --git a/src/com/android/uiuios/compat/PackageInstallerCompatVL.java b/src/com/android/colorfulos/compat/PackageInstallerCompatVL.java similarity index 95% rename from src/com/android/uiuios/compat/PackageInstallerCompatVL.java rename to src/com/android/colorfulos/compat/PackageInstallerCompatVL.java index d9d96cc..a18dce2 100644 --- a/src/com/android/uiuios/compat/PackageInstallerCompatVL.java +++ b/src/com/android/colorfulos/compat/PackageInstallerCompatVL.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.compat; +package com.android.colorfulos.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.uiuios.Utilities; -import com.android.uiuios.icons.IconCache; -import com.android.uiuios.LauncherAppState; -import com.android.uiuios.LauncherModel; -import com.android.uiuios.config.FeatureFlags; -import com.android.uiuios.util.Thunk; +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 java.util.ArrayList; import java.util.HashMap; diff --git a/src/com/android/uiuios/compat/ShortcutConfigActivityInfo.java b/src/com/android/colorfulos/compat/ShortcutConfigActivityInfo.java similarity index 94% rename from src/com/android/uiuios/compat/ShortcutConfigActivityInfo.java rename to src/com/android/colorfulos/compat/ShortcutConfigActivityInfo.java index e184f3a..143ab8e 100644 --- a/src/com/android/uiuios/compat/ShortcutConfigActivityInfo.java +++ b/src/com/android/colorfulos/compat/ShortcutConfigActivityInfo.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.compat; +package com.android.colorfulos.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.uiuios.WorkspaceItemInfo; -import com.android.uiuios.icons.ComponentWithLabel; -import com.android.uiuios.icons.IconCache; -import com.android.uiuios.LauncherSettings; -import com.android.uiuios.R; +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; /** * Wrapper class for representing a shortcut configure activity. diff --git a/src/com/android/uiuios/compat/UserManagerCompat.java b/src/com/android/colorfulos/compat/UserManagerCompat.java similarity index 96% rename from src/com/android/uiuios/compat/UserManagerCompat.java rename to src/com/android/colorfulos/compat/UserManagerCompat.java index ecf2243..a6e92ba 100644 --- a/src/com/android/uiuios/compat/UserManagerCompat.java +++ b/src/com/android/colorfulos/compat/UserManagerCompat.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.android.uiuios.compat; +package com.android.colorfulos.compat; import android.content.Context; import android.os.UserHandle; -import com.android.uiuios.Utilities; +import com.android.colorfulos.Utilities; import java.util.List; diff --git a/src/com/android/uiuios/compat/UserManagerCompatVNMr1.java b/src/com/android/colorfulos/compat/UserManagerCompatVNMr1.java similarity index 99% rename from src/com/android/uiuios/compat/UserManagerCompatVNMr1.java rename to src/com/android/colorfulos/compat/UserManagerCompatVNMr1.java index c65fb9d..9895481 100644 --- a/src/com/android/uiuios/compat/UserManagerCompatVNMr1.java +++ b/src/com/android/colorfulos/compat/UserManagerCompatVNMr1.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.compat; +package com.android.colorfulos.compat; import android.annotation.TargetApi; import android.content.Context; diff --git a/src/com/android/uiuios/compat/UserManagerCompatVP.java b/src/com/android/colorfulos/compat/UserManagerCompatVP.java similarity index 96% rename from src/com/android/uiuios/compat/UserManagerCompatVP.java rename to src/com/android/colorfulos/compat/UserManagerCompatVP.java index c1a5cc2..833ddf8 100644 --- a/src/com/android/uiuios/compat/UserManagerCompatVP.java +++ b/src/com/android/colorfulos/compat/UserManagerCompatVP.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.compat; +package com.android.colorfulos.compat; import android.annotation.TargetApi; import android.content.Context; diff --git a/src/com/android/uiuios/config/BaseFlags.java b/src/com/android/colorfulos/config/BaseFlags.java similarity index 99% rename from src/com/android/uiuios/config/BaseFlags.java rename to src/com/android/colorfulos/config/BaseFlags.java index 8c130ac..58016b9 100644 --- a/src/com/android/uiuios/config/BaseFlags.java +++ b/src/com/android/colorfulos/config/BaseFlags.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.config; +package com.android.colorfulos.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.uiuios.Utilities; +import com.android.colorfulos.Utilities; import java.util.ArrayList; import java.util.List; diff --git a/src/com/android/uiuios/config/FlagTogglerPrefUi.java b/src/com/android/colorfulos/config/FlagTogglerPrefUi.java similarity index 97% rename from src/com/android/uiuios/config/FlagTogglerPrefUi.java rename to src/com/android/colorfulos/config/FlagTogglerPrefUi.java index fc71e35..918d48f 100644 --- a/src/com/android/uiuios/config/FlagTogglerPrefUi.java +++ b/src/com/android/colorfulos/config/FlagTogglerPrefUi.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.config; +package com.android.colorfulos.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.uiuios.R; -import com.android.uiuios.config.BaseFlags.TogglableFlag; +import com.android.colorfulos.R; +import com.android.colorfulos.config.BaseFlags.TogglableFlag; import androidx.preference.PreferenceDataStore; import androidx.preference.PreferenceFragment; diff --git a/src/com/android/uiuios/dot/DotInfo.java b/src/com/android/colorfulos/dot/DotInfo.java similarity index 94% rename from src/com/android/uiuios/dot/DotInfo.java rename to src/com/android/colorfulos/dot/DotInfo.java index 19c16dd..c4ba5c1 100644 --- a/src/com/android/uiuios/dot/DotInfo.java +++ b/src/com/android/colorfulos/dot/DotInfo.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.android.uiuios.dot; +package com.android.colorfulos.dot; -import com.android.uiuios.notification.NotificationInfo; -import com.android.uiuios.notification.NotificationKeyData; +import com.android.colorfulos.notification.NotificationInfo; +import com.android.colorfulos.notification.NotificationKeyData; import java.util.ArrayList; import java.util.List; diff --git a/src/com/android/uiuios/dot/FolderDotInfo.java b/src/com/android/colorfulos/dot/FolderDotInfo.java similarity index 95% rename from src/com/android/uiuios/dot/FolderDotInfo.java rename to src/com/android/colorfulos/dot/FolderDotInfo.java index f4277f1..4ccb442 100644 --- a/src/com/android/uiuios/dot/FolderDotInfo.java +++ b/src/com/android/colorfulos/dot/FolderDotInfo.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.android.uiuios.dot; +package com.android.colorfulos.dot; import android.view.ViewDebug; -import com.android.uiuios.Utilities; +import com.android.colorfulos.Utilities; /** * Subclass of DotInfo that only contains the dot count, which is diff --git a/src/com/android/uiuios/dragndrop/AddItemActivity.java b/src/com/android/colorfulos/dragndrop/AddItemActivity.java similarity index 88% rename from src/com/android/uiuios/dragndrop/AddItemActivity.java rename to src/com/android/colorfulos/dragndrop/AddItemActivity.java index 200eb70..8026261 100644 --- a/src/com/android/uiuios/dragndrop/AddItemActivity.java +++ b/src/com/android/colorfulos/dragndrop/AddItemActivity.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.android.uiuios.dragndrop; +package com.android.colorfulos.dragndrop; -import static com.android.uiuios.logging.LoggerUtils.newCommandAction; -import static com.android.uiuios.logging.LoggerUtils.newContainerTarget; -import static com.android.uiuios.logging.LoggerUtils.newItemTarget; -import static com.android.uiuios.logging.LoggerUtils.newLauncherEvent; +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 android.annotation.TargetApi; import android.app.ActivityOptions; @@ -41,26 +41,26 @@ import android.view.View.DragShadowBuilder; import android.view.View.OnLongClickListener; import android.view.View.OnTouchListener; -import com.android.uiuios.BaseActivity; -import com.android.uiuios.InstallShortcutReceiver; -import com.android.uiuios.InvariantDeviceProfile; -import com.android.uiuios.LauncherAppState; -import com.android.uiuios.LauncherAppWidgetHost; -import com.android.uiuios.LauncherAppWidgetProviderInfo; -import com.android.uiuios.LauncherModel; -import com.android.uiuios.R; -import com.android.uiuios.compat.AppWidgetManagerCompat; -import com.android.uiuios.compat.LauncherAppsCompatVO; -import com.android.uiuios.model.WidgetItem; -import com.android.uiuios.userevent.nano.LauncherLogProto.Action; -import com.android.uiuios.userevent.nano.LauncherLogProto.ContainerType; -import com.android.uiuios.util.InstantAppResolver; -import com.android.uiuios.util.LooperExecutor; -import com.android.uiuios.views.BaseDragLayer; -import com.android.uiuios.widget.PendingAddShortcutInfo; -import com.android.uiuios.widget.PendingAddWidgetInfo; -import com.android.uiuios.widget.WidgetHostViewLoader; -import com.android.uiuios.widget.WidgetImageView; +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 java.util.function.Supplier; diff --git a/src/com/android/uiuios/dragndrop/BaseItemDragListener.java b/src/com/android/colorfulos/dragndrop/BaseItemDragListener.java similarity index 90% rename from src/com/android/uiuios/dragndrop/BaseItemDragListener.java rename to src/com/android/colorfulos/dragndrop/BaseItemDragListener.java index 4bcd526..97064a2 100644 --- a/src/com/android/uiuios/dragndrop/BaseItemDragListener.java +++ b/src/com/android/colorfulos/dragndrop/BaseItemDragListener.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.android.uiuios.dragndrop; +package com.android.colorfulos.dragndrop; -import static com.android.uiuios.LauncherState.NORMAL; -import static com.android.uiuios.states.RotationHelper.REQUEST_LOCK; -import static com.android.uiuios.states.RotationHelper.REQUEST_NONE; +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 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.uiuios.AbstractFloatingView; -import com.android.uiuios.DragSource; -import com.android.uiuios.DropTarget.DragObject; -import com.android.uiuios.Launcher; -import com.android.uiuios.R; -import com.android.uiuios.states.InternalStateHandler; -import com.android.uiuios.testing.TestProtocol; -import com.android.uiuios.widget.PendingItemDragHelper; +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 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.uiuios.drag_and_drop/"; + private static final String MIME_TYPE_PREFIX = "com.android.colorfulos.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/uiuios/dragndrop/DragController.java b/src/com/android/colorfulos/dragndrop/DragController.java similarity index 95% rename from src/com/android/uiuios/dragndrop/DragController.java rename to src/com/android/colorfulos/dragndrop/DragController.java index 14eeccf..d62fd8e 100644 --- a/src/com/android/uiuios/dragndrop/DragController.java +++ b/src/com/android/colorfulos/dragndrop/DragController.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.android.uiuios.dragndrop; +package com.android.colorfulos.dragndrop; -import static com.android.uiuios.AbstractFloatingView.TYPE_DISCOVERY_BOUNCE; -import static com.android.uiuios.LauncherAnimUtils.SPRING_LOADED_EXIT_DELAY; -import static com.android.uiuios.LauncherState.NORMAL; +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 android.animation.ValueAnimator; import android.content.ComponentName; @@ -34,22 +34,22 @@ import android.view.KeyEvent; import android.view.MotionEvent; import android.view.View; -import com.android.uiuios.AbstractFloatingView; -import com.android.uiuios.DeleteDropTarget; -import com.android.uiuios.DragSource; -import com.android.uiuios.DropTarget; -import com.android.uiuios.ItemInfo; -import com.android.uiuios.Launcher; -import com.android.uiuios.LauncherAppState; -import com.android.uiuios.LauncherSettings; -import com.android.uiuios.R; -import com.android.uiuios.WorkspaceItemInfo; -import com.android.uiuios.accessibility.DragViewStateAnnouncer; -import com.android.uiuios.testing.TestProtocol; -import com.android.uiuios.util.ItemInfoMatcher; -import com.android.uiuios.util.Thunk; -import com.android.uiuios.util.TouchController; -import com.android.uiuios.util.UiThreadHelper; +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 java.util.ArrayList; diff --git a/src/com/android/uiuios/dragndrop/DragDriver.java b/src/com/android/colorfulos/dragndrop/DragDriver.java similarity index 98% rename from src/com/android/uiuios/dragndrop/DragDriver.java rename to src/com/android/colorfulos/dragndrop/DragDriver.java index a0f9939..8712311 100644 --- a/src/com/android/uiuios/dragndrop/DragDriver.java +++ b/src/com/android/colorfulos/dragndrop/DragDriver.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.android.uiuios.dragndrop; +package com.android.colorfulos.dragndrop; import android.content.Context; import android.view.DragEvent; import android.view.MotionEvent; -import com.android.uiuios.DropTarget.DragObject; +import com.android.colorfulos.DropTarget.DragObject; /** * Base class for driving a drag/drop operation. diff --git a/src/com/android/uiuios/dragndrop/DragLayer.java b/src/com/android/colorfulos/dragndrop/DragLayer.java similarity index 96% rename from src/com/android/uiuios/dragndrop/DragLayer.java rename to src/com/android/colorfulos/dragndrop/DragLayer.java index 56697d6..df300cc 100644 --- a/src/com/android/uiuios/dragndrop/DragLayer.java +++ b/src/com/android/colorfulos/dragndrop/DragLayer.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package com.android.uiuios.dragndrop; +package com.android.colorfulos.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.uiuios.compat.AccessibilityManagerCompat.sendCustomAccessibilityEvent; +import static com.android.colorfulos.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.uiuios.AbstractFloatingView; -import com.android.uiuios.CellLayout; -import com.android.uiuios.DropTargetBar; -import com.android.uiuios.Launcher; -import com.android.uiuios.R; -import com.android.uiuios.graphics.RotationMode; -import com.android.uiuios.ShortcutAndWidgetContainer; -import com.android.uiuios.Workspace; -import com.android.uiuios.anim.Interpolators; -import com.android.uiuios.folder.Folder; -import com.android.uiuios.folder.FolderIcon; -import com.android.uiuios.graphics.WorkspaceAndHotseatScrim; -import com.android.uiuios.keyboard.ViewGroupFocusHelper; -import com.android.uiuios.uioverrides.UiFactory; -import com.android.uiuios.util.Thunk; -import com.android.uiuios.views.BaseDragLayer; -import com.android.uiuios.views.Transposable; +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 java.util.ArrayList; diff --git a/src/com/android/uiuios/dragndrop/DragOptions.java b/src/com/android/colorfulos/dragndrop/DragOptions.java similarity index 96% rename from src/com/android/uiuios/dragndrop/DragOptions.java rename to src/com/android/colorfulos/dragndrop/DragOptions.java index 93abdf9..2346300 100644 --- a/src/com/android/uiuios/dragndrop/DragOptions.java +++ b/src/com/android/colorfulos/dragndrop/DragOptions.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.android.uiuios.dragndrop; +package com.android.colorfulos.dragndrop; import android.graphics.Point; -import com.android.uiuios.DropTarget; +import com.android.colorfulos.DropTarget; /** * Set of options to control the drag and drop behavior. diff --git a/src/com/android/uiuios/dragndrop/DragView.java b/src/com/android/colorfulos/dragndrop/DragView.java similarity index 96% rename from src/com/android/uiuios/dragndrop/DragView.java rename to src/com/android/colorfulos/dragndrop/DragView.java index a8f764b..a340c7a 100644 --- a/src/com/android/uiuios/dragndrop/DragView.java +++ b/src/com/android/colorfulos/dragndrop/DragView.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.android.uiuios.dragndrop; +package com.android.colorfulos.dragndrop; -import static com.android.uiuios.Utilities.getBadge; +import static com.android.colorfulos.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.uiuios.FastBitmapDrawable; -import com.android.uiuios.ItemInfo; -import com.android.uiuios.Launcher; -import com.android.uiuios.LauncherModel; -import com.android.uiuios.LauncherSettings; -import com.android.uiuios.LauncherState; -import com.android.uiuios.LauncherStateManager; -import com.android.uiuios.R; -import com.android.uiuios.Utilities; -import com.android.uiuios.FirstFrameAnimatorHelper; -import com.android.uiuios.anim.Interpolators; -import com.android.uiuios.icons.LauncherIcons; -import com.android.uiuios.util.Themes; -import com.android.uiuios.util.Thunk; +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 java.util.Arrays; diff --git a/src/com/android/uiuios/dragndrop/FlingToDeleteHelper.java b/src/com/android/colorfulos/dragndrop/FlingToDeleteHelper.java similarity index 95% rename from src/com/android/uiuios/dragndrop/FlingToDeleteHelper.java rename to src/com/android/colorfulos/dragndrop/FlingToDeleteHelper.java index 54b946c..36586bb 100644 --- a/src/com/android/uiuios/dragndrop/FlingToDeleteHelper.java +++ b/src/com/android/colorfulos/dragndrop/FlingToDeleteHelper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.dragndrop; +package com.android.colorfulos.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.uiuios.ButtonDropTarget; -import com.android.uiuios.DropTarget; -import com.android.uiuios.Launcher; -import com.android.uiuios.R; -import com.android.uiuios.util.FlingAnimation; +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; /** * Utility class to manage fling to delete action during drag and drop. diff --git a/src/com/android/uiuios/dragndrop/FolderAdaptiveIcon.java b/src/com/android/colorfulos/dragndrop/FolderAdaptiveIcon.java similarity index 93% rename from src/com/android/uiuios/dragndrop/FolderAdaptiveIcon.java rename to src/com/android/colorfulos/dragndrop/FolderAdaptiveIcon.java index ba6cc0a..08582bb 100644 --- a/src/com/android/uiuios/dragndrop/FolderAdaptiveIcon.java +++ b/src/com/android/colorfulos/dragndrop/FolderAdaptiveIcon.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.dragndrop; +package com.android.colorfulos.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.uiuios.Launcher; -import com.android.uiuios.MainThreadExecutor; -import com.android.uiuios.R; -import com.android.uiuios.folder.FolderIcon; -import com.android.uiuios.folder.PreviewBackground; -import com.android.uiuios.graphics.ShiftedBitmapDrawable; -import com.android.uiuios.icons.BitmapRenderer; -import com.android.uiuios.util.Preconditions; +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; /** * {@link AdaptiveIconDrawable} representation of a {@link FolderIcon} diff --git a/src/com/android/uiuios/dragndrop/LivePreviewWidgetCell.java b/src/com/android/colorfulos/dragndrop/LivePreviewWidgetCell.java similarity index 90% rename from src/com/android/uiuios/dragndrop/LivePreviewWidgetCell.java rename to src/com/android/colorfulos/dragndrop/LivePreviewWidgetCell.java index cb60536..20c774c 100644 --- a/src/com/android/uiuios/dragndrop/LivePreviewWidgetCell.java +++ b/src/com/android/colorfulos/dragndrop/LivePreviewWidgetCell.java @@ -1,4 +1,4 @@ -package com.android.uiuios.dragndrop; +package com.android.colorfulos.dragndrop; import android.content.Context; import android.graphics.Bitmap; @@ -8,10 +8,10 @@ import android.view.View; import android.widget.FrameLayout; import android.widget.RemoteViews; -import com.android.uiuios.BaseActivity; -import com.android.uiuios.DeviceProfile; -import com.android.uiuios.LauncherAppWidgetProviderInfo; -import com.android.uiuios.widget.WidgetCell; +import com.android.colorfulos.BaseActivity; +import com.android.colorfulos.DeviceProfile; +import com.android.colorfulos.LauncherAppWidgetProviderInfo; +import com.android.colorfulos.widget.WidgetCell; /** * Extension of {@link WidgetCell} which supports generating previews from {@link RemoteViews} @@ -51,7 +51,7 @@ public class LivePreviewWidgetCell extends WidgetCell { /** * Generates a bitmap by inflating {@param views}. - * @see com.android.uiuios.WidgetPreviewLoader#generateWidgetPreview + * @see com.android.colorfulos.WidgetPreviewLoader#generateWidgetPreview * * TODO: Consider moving this to the background thread. */ diff --git a/src/com/android/uiuios/dragndrop/PinItemDragListener.java b/src/com/android/colorfulos/dragndrop/PinItemDragListener.java similarity index 86% rename from src/com/android/uiuios/dragndrop/PinItemDragListener.java rename to src/com/android/colorfulos/dragndrop/PinItemDragListener.java index c71ed18..a850d41 100644 --- a/src/com/android/uiuios/dragndrop/PinItemDragListener.java +++ b/src/com/android/colorfulos/dragndrop/PinItemDragListener.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.dragndrop; +package com.android.colorfulos.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.uiuios.DragSource; -import com.android.uiuios.ItemInfo; -import com.android.uiuios.Launcher; -import com.android.uiuios.LauncherAppWidgetProviderInfo; -import com.android.uiuios.PendingAddItemInfo; -import com.android.uiuios.uioverrides.UiFactory; -import com.android.uiuios.userevent.nano.LauncherLogProto; -import com.android.uiuios.widget.PendingAddShortcutInfo; -import com.android.uiuios.widget.PendingAddWidgetInfo; -import com.android.uiuios.widget.PendingItemDragHelper; -import com.android.uiuios.widget.WidgetAddFlowHandler; +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; /** * {@link DragSource} for handling drop from a different window. This object is initialized diff --git a/src/com/android/uiuios/dragndrop/PinShortcutRequestActivityInfo.java b/src/com/android/colorfulos/dragndrop/PinShortcutRequestActivityInfo.java similarity index 87% rename from src/com/android/uiuios/dragndrop/PinShortcutRequestActivityInfo.java rename to src/com/android/colorfulos/dragndrop/PinShortcutRequestActivityInfo.java index 78aeac8..a1b2bd3 100644 --- a/src/com/android/uiuios/dragndrop/PinShortcutRequestActivityInfo.java +++ b/src/com/android/colorfulos/dragndrop/PinShortcutRequestActivityInfo.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.dragndrop; +package com.android.colorfulos.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.uiuios.FastBitmapDrawable; -import com.android.uiuios.WorkspaceItemInfo; -import com.android.uiuios.icons.IconCache; -import com.android.uiuios.LauncherAnimUtils; -import com.android.uiuios.LauncherAppState; -import com.android.uiuios.LauncherSettings; -import com.android.uiuios.R; -import com.android.uiuios.compat.LauncherAppsCompatVO; -import com.android.uiuios.compat.ShortcutConfigActivityInfo; +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; /** * Extension of ShortcutConfigActivityInfo to be used in the confirmation prompt for pin item diff --git a/src/com/android/uiuios/dragndrop/PinWidgetFlowHandler.java b/src/com/android/colorfulos/dragndrop/PinWidgetFlowHandler.java similarity index 93% rename from src/com/android/uiuios/dragndrop/PinWidgetFlowHandler.java rename to src/com/android/colorfulos/dragndrop/PinWidgetFlowHandler.java index 995f8f9..a6d91a2 100644 --- a/src/com/android/uiuios/dragndrop/PinWidgetFlowHandler.java +++ b/src/com/android/colorfulos/dragndrop/PinWidgetFlowHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.dragndrop; +package com.android.colorfulos.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.uiuios.ItemInfo; -import com.android.uiuios.Launcher; -import com.android.uiuios.widget.WidgetAddFlowHandler; +import com.android.colorfulos.ItemInfo; +import com.android.colorfulos.Launcher; +import com.android.colorfulos.widget.WidgetAddFlowHandler; /** * Extension of WidgetAddFlowHandler to handle pin item request behavior. diff --git a/src/com/android/uiuios/dragndrop/SpringLoadedDragController.java b/src/com/android/colorfulos/dragndrop/SpringLoadedDragController.java similarity index 89% rename from src/com/android/uiuios/dragndrop/SpringLoadedDragController.java rename to src/com/android/colorfulos/dragndrop/SpringLoadedDragController.java index c0b87ee..2818c21 100644 --- a/src/com/android/uiuios/dragndrop/SpringLoadedDragController.java +++ b/src/com/android/colorfulos/dragndrop/SpringLoadedDragController.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.android.uiuios.dragndrop; +package com.android.colorfulos.dragndrop; -import com.android.uiuios.Alarm; -import com.android.uiuios.CellLayout; -import com.android.uiuios.Launcher; -import com.android.uiuios.OnAlarmListener; -import com.android.uiuios.Workspace; +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; public class SpringLoadedDragController implements OnAlarmListener { // how long the user must hover over a mini-screen before it unshrinks diff --git a/src/com/android/uiuios/folder/ClippedFolderIconLayoutRule.java b/src/com/android/colorfulos/folder/ClippedFolderIconLayoutRule.java similarity index 99% rename from src/com/android/uiuios/folder/ClippedFolderIconLayoutRule.java rename to src/com/android/colorfulos/folder/ClippedFolderIconLayoutRule.java index 5ecef7a..2d90bd1 100644 --- a/src/com/android/uiuios/folder/ClippedFolderIconLayoutRule.java +++ b/src/com/android/colorfulos/folder/ClippedFolderIconLayoutRule.java @@ -1,6 +1,4 @@ -package com.android.uiuios.folder; - -import android.util.Log; +package com.android.colorfulos.folder; public class ClippedFolderIconLayoutRule { diff --git a/src/com/android/uiuios/folder/Folder.java b/src/com/android/colorfulos/folder/Folder.java similarity index 96% rename from src/com/android/uiuios/folder/Folder.java rename to src/com/android/colorfulos/folder/Folder.java index 85bd5c7..a780824 100644 --- a/src/com/android/uiuios/folder/Folder.java +++ b/src/com/android/colorfulos/folder/Folder.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.android.uiuios.folder; +package com.android.colorfulos.folder; -import static com.android.uiuios.LauncherAnimUtils.SPRING_LOADED_EXIT_DELAY; -import static com.android.uiuios.LauncherState.NORMAL; -import static com.android.uiuios.compat.AccessibilityManagerCompat.sendCustomAccessibilityEvent; +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 android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -55,40 +55,40 @@ import android.view.animation.AnimationUtils; import android.view.inputmethod.EditorInfo; import android.widget.TextView; -import com.android.uiuios.AbstractFloatingView; -import com.android.uiuios.Alarm; -import com.android.uiuios.AppInfo; -import com.android.uiuios.BubbleTextView; -import com.android.uiuios.CellLayout; -import com.android.uiuios.DeviceProfile; -import com.android.uiuios.DragSource; -import com.android.uiuios.DropTarget; -import com.android.uiuios.ExtendedEditText; -import com.android.uiuios.FolderInfo; -import com.android.uiuios.FolderInfo.FolderListener; -import com.android.uiuios.ItemInfo; -import com.android.uiuios.Launcher; -import com.android.uiuios.LauncherSettings; -import com.android.uiuios.OnAlarmListener; -import com.android.uiuios.PagedView; -import com.android.uiuios.R; -import com.android.uiuios.ShortcutAndWidgetContainer; -import com.android.uiuios.Workspace; -import com.android.uiuios.Workspace.ItemOperator; -import com.android.uiuios.WorkspaceItemInfo; -import com.android.uiuios.accessibility.AccessibleDragListenerAdapter; -import com.android.uiuios.config.FeatureFlags; -import com.android.uiuios.dragndrop.DragController; -import com.android.uiuios.dragndrop.DragController.DragListener; -import com.android.uiuios.dragndrop.DragLayer; -import com.android.uiuios.dragndrop.DragOptions; -import com.android.uiuios.logging.LoggerUtils; -import com.android.uiuios.pageindicators.PageIndicatorDots; -import com.android.uiuios.userevent.nano.LauncherLogProto.ContainerType; -import com.android.uiuios.userevent.nano.LauncherLogProto.Target; -import com.android.uiuios.util.Thunk; -import com.android.uiuios.views.ClipPathView; -import com.android.uiuios.widget.PendingAddShortcutInfo; +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 java.util.ArrayList; import java.util.Collections; diff --git a/src/com/android/uiuios/folder/FolderAnimationManager.java b/src/com/android/colorfulos/folder/FolderAnimationManager.java similarity index 94% rename from src/com/android/uiuios/folder/FolderAnimationManager.java rename to src/com/android/colorfulos/folder/FolderAnimationManager.java index e74ddb9..3062829 100644 --- a/src/com/android/uiuios/folder/FolderAnimationManager.java +++ b/src/com/android/colorfulos/folder/FolderAnimationManager.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.android.uiuios.folder; +package com.android.colorfulos.folder; -import static com.android.uiuios.BubbleTextView.TEXT_ALPHA_PROPERTY; -import static com.android.uiuios.LauncherAnimUtils.SCALE_PROPERTY; -import static com.android.uiuios.folder.ClippedFolderIconLayoutRule.MAX_NUM_ITEMS_IN_PREVIEW; -import static com.android.uiuios.graphics.IconShape.getShape; -import static com.android.uiuios.icons.GraphicsUtils.setColorAlphaBound; +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 android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -37,16 +37,16 @@ import android.view.animation.AnimationUtils; import androidx.core.graphics.ColorUtils; -import com.android.uiuios.BubbleTextView; -import com.android.uiuios.CellLayout; -import com.android.uiuios.Launcher; -import com.android.uiuios.R; -import com.android.uiuios.ResourceUtils; -import com.android.uiuios.ShortcutAndWidgetContainer; -import com.android.uiuios.Utilities; -import com.android.uiuios.anim.PropertyResetListener; -import com.android.uiuios.dragndrop.DragLayer; -import com.android.uiuios.util.Themes; +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 java.util.List; diff --git a/src/com/android/uiuios/folder/FolderIcon.java b/src/com/android/colorfulos/folder/FolderIcon.java similarity index 93% rename from src/com/android/uiuios/folder/FolderIcon.java rename to src/com/android/colorfulos/folder/FolderIcon.java index e4777cd..22bc7a3 100644 --- a/src/com/android/uiuios/folder/FolderIcon.java +++ b/src/com/android/colorfulos/folder/FolderIcon.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.android.uiuios.folder; +package com.android.colorfulos.folder; -import static com.android.uiuios.folder.ClippedFolderIconLayoutRule.MAX_NUM_ITEMS_IN_PREVIEW; -import static com.android.uiuios.folder.PreviewItemManager.INITIAL_ITEM_ANIMATION_DURATION; +import static com.android.colorfulos.folder.ClippedFolderIconLayoutRule.MAX_NUM_ITEMS_IN_PREVIEW; +import static com.android.colorfulos.folder.PreviewItemManager.INITIAL_ITEM_ANIMATION_DURATION; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -38,34 +38,34 @@ import android.widget.FrameLayout; import androidx.annotation.NonNull; -import com.android.uiuios.Alarm; -import com.android.uiuios.AppInfo; -import com.android.uiuios.BubbleTextView; -import com.android.uiuios.CellLayout; -import com.android.uiuios.CheckLongPressHelper; -import com.android.uiuios.DeviceProfile; -import com.android.uiuios.DropTarget.DragObject; -import com.android.uiuios.FolderInfo; -import com.android.uiuios.FolderInfo.FolderListener; -import com.android.uiuios.ItemInfo; -import com.android.uiuios.Launcher; -import com.android.uiuios.LauncherSettings; -import com.android.uiuios.OnAlarmListener; -import com.android.uiuios.R; -import com.android.uiuios.SimpleOnStylusPressListener; -import com.android.uiuios.StylusEventHelper; -import com.android.uiuios.Utilities; -import com.android.uiuios.Workspace; -import com.android.uiuios.WorkspaceItemInfo; -import com.android.uiuios.anim.Interpolators; -import com.android.uiuios.dot.FolderDotInfo; -import com.android.uiuios.dragndrop.BaseItemDragListener; -import com.android.uiuios.dragndrop.DragLayer; -import com.android.uiuios.dragndrop.DragView; -import com.android.uiuios.icons.DotRenderer; -import com.android.uiuios.touch.ItemClickHandler; -import com.android.uiuios.util.Thunk; -import com.android.uiuios.widget.PendingAddShortcutInfo; +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 java.util.ArrayList; import java.util.List; diff --git a/src/com/android/uiuios/folder/FolderIconPreviewVerifier.java b/src/com/android/colorfulos/folder/FolderIconPreviewVerifier.java similarity index 92% rename from src/com/android/uiuios/folder/FolderIconPreviewVerifier.java rename to src/com/android/colorfulos/folder/FolderIconPreviewVerifier.java index 74c28ec..8c42109 100644 --- a/src/com/android/uiuios/folder/FolderIconPreviewVerifier.java +++ b/src/com/android/colorfulos/folder/FolderIconPreviewVerifier.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.android.uiuios.folder; +package com.android.colorfulos.folder; import android.util.Log; -import com.android.uiuios.FolderInfo; -import com.android.uiuios.InvariantDeviceProfile; +import com.android.colorfulos.FolderInfo; +import com.android.colorfulos.InvariantDeviceProfile; -import static com.android.uiuios.folder.ClippedFolderIconLayoutRule.MAX_NUM_ITEMS_IN_PREVIEW; +import static com.android.colorfulos.folder.ClippedFolderIconLayoutRule.MAX_NUM_ITEMS_IN_PREVIEW; /** * Verifies whether an item in a Folder is displayed in the FolderIcon preview. diff --git a/src/com/android/uiuios/folder/FolderPagedView.java b/src/com/android/colorfulos/folder/FolderPagedView.java similarity index 96% rename from src/com/android/uiuios/folder/FolderPagedView.java rename to src/com/android/colorfulos/folder/FolderPagedView.java index 8a40219..eb19374 100644 --- a/src/com/android/uiuios/folder/FolderPagedView.java +++ b/src/com/android/colorfulos/folder/FolderPagedView.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.folder; +package com.android.colorfulos.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.uiuios.BubbleTextView; -import com.android.uiuios.CellLayout; -import com.android.uiuios.DeviceProfile; -import com.android.uiuios.InvariantDeviceProfile; -import com.android.uiuios.ItemInfo; -import com.android.uiuios.Launcher; -import com.android.uiuios.LauncherAppState; -import com.android.uiuios.PagedView; -import com.android.uiuios.R; -import com.android.uiuios.ShortcutAndWidgetContainer; -import com.android.uiuios.WorkspaceItemInfo; -import com.android.uiuios.Utilities; -import com.android.uiuios.Workspace.ItemOperator; -import com.android.uiuios.anim.Interpolators; -import com.android.uiuios.keyboard.ViewGroupFocusHelper; -import com.android.uiuios.pageindicators.PageIndicatorDots; -import com.android.uiuios.touch.ItemClickHandler; -import com.android.uiuios.util.Thunk; +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 java.util.ArrayList; import java.util.Iterator; diff --git a/src/com/android/uiuios/folder/FolderPreviewItemAnim.java b/src/com/android/colorfulos/folder/FolderPreviewItemAnim.java similarity index 99% rename from src/com/android/uiuios/folder/FolderPreviewItemAnim.java rename to src/com/android/colorfulos/folder/FolderPreviewItemAnim.java index 2d132d6..03d8a47 100644 --- a/src/com/android/uiuios/folder/FolderPreviewItemAnim.java +++ b/src/com/android/colorfulos/folder/FolderPreviewItemAnim.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.folder; +package com.android.colorfulos.folder; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; diff --git a/src/com/android/uiuios/folder/PreviewBackground.java b/src/com/android/colorfulos/folder/PreviewBackground.java similarity index 97% rename from src/com/android/uiuios/folder/PreviewBackground.java rename to src/com/android/colorfulos/folder/PreviewBackground.java index f193060..a789fc0 100644 --- a/src/com/android/uiuios/folder/PreviewBackground.java +++ b/src/com/android/colorfulos/folder/PreviewBackground.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.android.uiuios.folder; +package com.android.colorfulos.folder; -import static com.android.uiuios.graphics.IconShape.getShape; -import static com.android.uiuios.icons.GraphicsUtils.setColorAlphaBound; +import static com.android.colorfulos.graphics.IconShape.getShape; +import static com.android.colorfulos.icons.GraphicsUtils.setColorAlphaBound; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -42,10 +42,10 @@ import android.util.Log; import android.util.Property; import android.view.View; -import com.android.uiuios.CellLayout; -import com.android.uiuios.DeviceProfile; -import com.android.uiuios.R; -import com.android.uiuios.views.ActivityContext; +import com.android.colorfulos.CellLayout; +import com.android.colorfulos.DeviceProfile; +import com.android.colorfulos.R; +import com.android.colorfulos.views.ActivityContext; /** * This object represents a FolderIcon preview background. It stores drawing / measurement diff --git a/src/com/android/uiuios/folder/PreviewItemDrawingParams.java b/src/com/android/colorfulos/folder/PreviewItemDrawingParams.java similarity index 97% rename from src/com/android/uiuios/folder/PreviewItemDrawingParams.java rename to src/com/android/colorfulos/folder/PreviewItemDrawingParams.java index 9243fdd..bc93c83 100644 --- a/src/com/android/uiuios/folder/PreviewItemDrawingParams.java +++ b/src/com/android/colorfulos/folder/PreviewItemDrawingParams.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.folder; +package com.android.colorfulos.folder; import android.graphics.drawable.Drawable; diff --git a/src/com/android/uiuios/folder/PreviewItemManager.java b/src/com/android/colorfulos/folder/PreviewItemManager.java similarity index 96% rename from src/com/android/uiuios/folder/PreviewItemManager.java rename to src/com/android/colorfulos/folder/PreviewItemManager.java index 620ae68..40ac450 100644 --- a/src/com/android/uiuios/folder/PreviewItemManager.java +++ b/src/com/android/colorfulos/folder/PreviewItemManager.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.android.uiuios.folder; +package com.android.colorfulos.folder; -import static com.android.uiuios.folder.ClippedFolderIconLayoutRule.ENTER_INDEX; -import static com.android.uiuios.folder.ClippedFolderIconLayoutRule.EXIT_INDEX; -import static com.android.uiuios.folder.ClippedFolderIconLayoutRule.MAX_NUM_ITEMS_IN_PREVIEW; -import static com.android.uiuios.folder.FolderIcon.DROP_IN_ANIMATION_DURATION; +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; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -30,9 +30,9 @@ import android.graphics.drawable.Drawable; import android.view.View; import android.widget.TextView; -import com.android.uiuios.BubbleTextView; -import com.android.uiuios.WorkspaceItemInfo; -import com.android.uiuios.Utilities; +import com.android.colorfulos.BubbleTextView; +import com.android.colorfulos.WorkspaceItemInfo; +import com.android.colorfulos.Utilities; import java.util.ArrayList; import java.util.List; diff --git a/src/com/android/uiuios/graphics/DragPreviewProvider.java b/src/com/android/colorfulos/graphics/DragPreviewProvider.java similarity index 95% rename from src/com/android/uiuios/graphics/DragPreviewProvider.java rename to src/com/android/colorfulos/graphics/DragPreviewProvider.java index 47a2b8d..ef924f7 100644 --- a/src/com/android/uiuios/graphics/DragPreviewProvider.java +++ b/src/com/android/colorfulos/graphics/DragPreviewProvider.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.graphics; +package com.android.colorfulos.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.uiuios.BubbleTextView; -import com.android.uiuios.Launcher; -import com.android.uiuios.R; -import com.android.uiuios.config.FeatureFlags; -import com.android.uiuios.folder.FolderIcon; -import com.android.uiuios.icons.BitmapRenderer; -import com.android.uiuios.util.UiThreadHelper; -import com.android.uiuios.widget.LauncherAppWidgetHostView; -import com.android.uiuios.widget.PendingAppWidgetHostView; +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 java.nio.ByteBuffer; diff --git a/src/com/android/uiuios/graphics/DrawableFactory.java b/src/com/android/colorfulos/graphics/DrawableFactory.java similarity index 90% rename from src/com/android/uiuios/graphics/DrawableFactory.java rename to src/com/android/colorfulos/graphics/DrawableFactory.java index 9779e5e..65361a2 100644 --- a/src/com/android/uiuios/graphics/DrawableFactory.java +++ b/src/com/android/colorfulos/graphics/DrawableFactory.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.android.uiuios.graphics; +package com.android.colorfulos.graphics; -import static com.android.uiuios.graphics.IconShape.getShapePath; +import static com.android.colorfulos.graphics.IconShape.getShapePath; import android.content.Context; import android.content.pm.ActivityInfo; @@ -31,12 +31,12 @@ import android.os.Process; import android.os.UserHandle; import android.util.ArrayMap; -import com.android.uiuios.FastBitmapDrawable; -import com.android.uiuios.ItemInfoWithIcon; -import com.android.uiuios.R; -import com.android.uiuios.icons.BitmapInfo; -import com.android.uiuios.util.MainThreadInitializedObject; -import com.android.uiuios.util.ResourceBasedOverride; +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 androidx.annotation.UiThread; diff --git a/src/com/android/uiuios/graphics/FastScrollThumbDrawable.java b/src/com/android/colorfulos/graphics/FastScrollThumbDrawable.java similarity index 98% rename from src/com/android/uiuios/graphics/FastScrollThumbDrawable.java rename to src/com/android/colorfulos/graphics/FastScrollThumbDrawable.java index 5200973..5f0ddfe 100644 --- a/src/com/android/uiuios/graphics/FastScrollThumbDrawable.java +++ b/src/com/android/colorfulos/graphics/FastScrollThumbDrawable.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.graphics; +package com.android.colorfulos.graphics; import android.graphics.Canvas; import android.graphics.ColorFilter; diff --git a/src/com/android/uiuios/graphics/FragmentWithPreview.java b/src/com/android/colorfulos/graphics/FragmentWithPreview.java similarity index 97% rename from src/com/android/uiuios/graphics/FragmentWithPreview.java rename to src/com/android/colorfulos/graphics/FragmentWithPreview.java index 1ffbf06..17caac7 100644 --- a/src/com/android/uiuios/graphics/FragmentWithPreview.java +++ b/src/com/android/colorfulos/graphics/FragmentWithPreview.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.graphics; +package com.android.colorfulos.graphics; import android.app.Fragment; import android.content.Context; diff --git a/src/com/android/uiuios/graphics/GridOptionsProvider.java b/src/com/android/colorfulos/graphics/GridOptionsProvider.java similarity index 95% rename from src/com/android/uiuios/graphics/GridOptionsProvider.java rename to src/com/android/colorfulos/graphics/GridOptionsProvider.java index 19d89b8..148babd 100644 --- a/src/com/android/uiuios/graphics/GridOptionsProvider.java +++ b/src/com/android/colorfulos/graphics/GridOptionsProvider.java @@ -1,4 +1,4 @@ -package com.android.uiuios.graphics; +package com.android.colorfulos.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.uiuios.InvariantDeviceProfile; -import com.android.uiuios.InvariantDeviceProfile.GridOption; -import com.android.uiuios.R; -import com.android.uiuios.util.LooperExecutor; -import com.android.uiuios.util.UiThreadHelper; +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 org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; diff --git a/src/com/android/uiuios/graphics/IconPalette.java b/src/com/android/colorfulos/graphics/IconPalette.java similarity index 96% rename from src/com/android/uiuios/graphics/IconPalette.java rename to src/com/android/colorfulos/graphics/IconPalette.java index bedb61d..1e7c2db 100644 --- a/src/com/android/uiuios/graphics/IconPalette.java +++ b/src/com/android/colorfulos/graphics/IconPalette.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package com.android.uiuios.graphics; +package com.android.colorfulos.graphics; -import static com.android.uiuios.icons.GraphicsUtils.setColorAlphaBound; +import static com.android.colorfulos.icons.GraphicsUtils.setColorAlphaBound; import android.app.Notification; import android.content.Context; import android.graphics.Color; import android.util.Log; -import com.android.uiuios.R; -import com.android.uiuios.util.Themes; +import com.android.colorfulos.R; +import com.android.colorfulos.util.Themes; import androidx.core.graphics.ColorUtils; diff --git a/src/com/android/uiuios/graphics/IconShape.java b/src/com/android/colorfulos/graphics/IconShape.java similarity index 97% rename from src/com/android/uiuios/graphics/IconShape.java rename to src/com/android/colorfulos/graphics/IconShape.java index 0a2ac04..8bc0cea 100644 --- a/src/com/android/uiuios/graphics/IconShape.java +++ b/src/com/android/colorfulos/graphics/IconShape.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.graphics; +package com.android.colorfulos.graphics; -import static com.android.uiuios.icons.IconNormalizer.ICON_VISIBLE_AREA_FACTOR; +import static com.android.colorfulos.icons.IconNormalizer.ICON_VISIBLE_AREA_FACTOR; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -43,14 +43,14 @@ import android.util.Xml; import android.view.View; import android.view.ViewOutlineProvider; -import com.android.uiuios.R; -import com.android.uiuios.Utilities; -import com.android.uiuios.anim.RoundedRectRevealOutlineProvider; -import com.android.uiuios.icons.GraphicsUtils; -import com.android.uiuios.icons.IconNormalizer; -import com.android.uiuios.util.IntArray; -import com.android.uiuios.util.Themes; -import com.android.uiuios.views.ClipPathView; +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 org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; diff --git a/src/com/android/uiuios/graphics/LauncherPreviewRenderer.java b/src/com/android/colorfulos/graphics/LauncherPreviewRenderer.java similarity index 92% rename from src/com/android/uiuios/graphics/LauncherPreviewRenderer.java rename to src/com/android/colorfulos/graphics/LauncherPreviewRenderer.java index b2ee2da..1d18afd 100644 --- a/src/com/android/uiuios/graphics/LauncherPreviewRenderer.java +++ b/src/com/android/colorfulos/graphics/LauncherPreviewRenderer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.graphics; +package com.android.colorfulos.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.uiuios.BubbleTextView; -import com.android.uiuios.CellLayout; -import com.android.uiuios.DeviceProfile; -import com.android.uiuios.Hotseat; -import com.android.uiuios.InsettableFrameLayout; -import com.android.uiuios.InvariantDeviceProfile; -import com.android.uiuios.LauncherSettings.Favorites; -import com.android.uiuios.R; -import com.android.uiuios.WorkspaceItemInfo; -import com.android.uiuios.Utilities; -import com.android.uiuios.WorkspaceLayoutManager; -import com.android.uiuios.allapps.SearchUiManager; -import com.android.uiuios.config.FeatureFlags; -import com.android.uiuios.icons.BaseIconFactory; -import com.android.uiuios.icons.BitmapInfo; -import com.android.uiuios.icons.BitmapRenderer; -import com.android.uiuios.views.ActivityContext; -import com.android.uiuios.views.BaseDragLayer; +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 java.util.concurrent.Callable; import java.util.concurrent.CountDownLatch; diff --git a/src/com/android/uiuios/graphics/NinePatchDrawHelper.java b/src/com/android/colorfulos/graphics/NinePatchDrawHelper.java similarity index 98% rename from src/com/android/uiuios/graphics/NinePatchDrawHelper.java rename to src/com/android/colorfulos/graphics/NinePatchDrawHelper.java index 387d4d9..2ef9c21 100644 --- a/src/com/android/uiuios/graphics/NinePatchDrawHelper.java +++ b/src/com/android/colorfulos/graphics/NinePatchDrawHelper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.graphics; +package com.android.colorfulos.graphics; import android.graphics.Bitmap; import android.graphics.Canvas; diff --git a/src/com/android/uiuios/graphics/PlaceHolderIconDrawable.java b/src/com/android/colorfulos/graphics/PlaceHolderIconDrawable.java similarity index 88% rename from src/com/android/uiuios/graphics/PlaceHolderIconDrawable.java rename to src/com/android/colorfulos/graphics/PlaceHolderIconDrawable.java index 43e7dca..5a4d869 100644 --- a/src/com/android/uiuios/graphics/PlaceHolderIconDrawable.java +++ b/src/com/android/colorfulos/graphics/PlaceHolderIconDrawable.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.graphics; +package com.android.colorfulos.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.uiuios.FastBitmapDrawable; -import com.android.uiuios.ItemInfoWithIcon; -import com.android.uiuios.R; -import com.android.uiuios.icons.BitmapInfo; -import com.android.uiuios.util.Themes; +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; /** * Subclass which draws a placeholder icon when the actual icon is not yet loaded diff --git a/src/com/android/uiuios/graphics/PreloadIconDrawable.java b/src/com/android/colorfulos/graphics/PreloadIconDrawable.java similarity index 97% rename from src/com/android/uiuios/graphics/PreloadIconDrawable.java rename to src/com/android/colorfulos/graphics/PreloadIconDrawable.java index e137004..1420962 100644 --- a/src/com/android/uiuios/graphics/PreloadIconDrawable.java +++ b/src/com/android/colorfulos/graphics/PreloadIconDrawable.java @@ -15,9 +15,9 @@ */ -package com.android.uiuios.graphics; +package com.android.colorfulos.graphics; -import static com.android.uiuios.graphics.IconShape.DEFAULT_PATH_SIZE; +import static com.android.colorfulos.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.uiuios.FastBitmapDrawable; -import com.android.uiuios.ItemInfoWithIcon; -import com.android.uiuios.anim.Interpolators; +import com.android.colorfulos.FastBitmapDrawable; +import com.android.colorfulos.ItemInfoWithIcon; +import com.android.colorfulos.anim.Interpolators; import java.lang.ref.WeakReference; diff --git a/src/com/android/uiuios/graphics/RotationMode.java b/src/com/android/colorfulos/graphics/RotationMode.java similarity index 97% rename from src/com/android/uiuios/graphics/RotationMode.java rename to src/com/android/colorfulos/graphics/RotationMode.java index 692419b..aeee423 100644 --- a/src/com/android/uiuios/graphics/RotationMode.java +++ b/src/com/android/colorfulos/graphics/RotationMode.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.graphics; +package com.android.colorfulos.graphics; import android.content.Context; import android.graphics.Rect; diff --git a/src/com/android/uiuios/graphics/ShadowDrawable.java b/src/com/android/colorfulos/graphics/ShadowDrawable.java similarity index 98% rename from src/com/android/uiuios/graphics/ShadowDrawable.java rename to src/com/android/colorfulos/graphics/ShadowDrawable.java index 3ec8f6c..66de0e4 100644 --- a/src/com/android/uiuios/graphics/ShadowDrawable.java +++ b/src/com/android/colorfulos/graphics/ShadowDrawable.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.graphics; +package com.android.colorfulos.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.uiuios.R; -import com.android.uiuios.icons.BitmapRenderer; +import com.android.colorfulos.R; +import com.android.colorfulos.icons.BitmapRenderer; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; diff --git a/src/com/android/uiuios/graphics/ShiftedBitmapDrawable.java b/src/com/android/colorfulos/graphics/ShiftedBitmapDrawable.java similarity index 98% rename from src/com/android/uiuios/graphics/ShiftedBitmapDrawable.java rename to src/com/android/colorfulos/graphics/ShiftedBitmapDrawable.java index da46ca9..7ffbc11 100644 --- a/src/com/android/uiuios/graphics/ShiftedBitmapDrawable.java +++ b/src/com/android/colorfulos/graphics/ShiftedBitmapDrawable.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.graphics; +package com.android.colorfulos.graphics; import android.graphics.Bitmap; import android.graphics.Canvas; diff --git a/src/com/android/uiuios/graphics/TintedDrawableSpan.java b/src/com/android/colorfulos/graphics/TintedDrawableSpan.java similarity index 98% rename from src/com/android/uiuios/graphics/TintedDrawableSpan.java rename to src/com/android/colorfulos/graphics/TintedDrawableSpan.java index 220efc1..8323e05 100644 --- a/src/com/android/uiuios/graphics/TintedDrawableSpan.java +++ b/src/com/android/colorfulos/graphics/TintedDrawableSpan.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.graphics; +package com.android.colorfulos.graphics; import android.content.Context; import android.graphics.Canvas; diff --git a/src/com/android/uiuios/graphics/TriangleShape.java b/src/com/android/colorfulos/graphics/TriangleShape.java similarity index 97% rename from src/com/android/uiuios/graphics/TriangleShape.java rename to src/com/android/colorfulos/graphics/TriangleShape.java index 127bad3..0b4d8bc 100644 --- a/src/com/android/uiuios/graphics/TriangleShape.java +++ b/src/com/android/colorfulos/graphics/TriangleShape.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.graphics; +package com.android.colorfulos.graphics; import android.graphics.Outline; import android.graphics.Path; diff --git a/src/com/android/uiuios/graphics/WorkspaceAndHotseatScrim.java b/src/com/android/colorfulos/graphics/WorkspaceAndHotseatScrim.java similarity index 96% rename from src/com/android/uiuios/graphics/WorkspaceAndHotseatScrim.java rename to src/com/android/colorfulos/graphics/WorkspaceAndHotseatScrim.java index 59a7d06..69dca3f 100644 --- a/src/com/android/uiuios/graphics/WorkspaceAndHotseatScrim.java +++ b/src/com/android/colorfulos/graphics/WorkspaceAndHotseatScrim.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.android.uiuios.graphics; +package com.android.colorfulos.graphics; import static android.content.Intent.ACTION_SCREEN_OFF; import static android.content.Intent.ACTION_USER_PRESENT; -import static com.android.uiuios.icons.GraphicsUtils.setColorAlphaBound; +import static com.android.colorfulos.icons.GraphicsUtils.setColorAlphaBound; import android.animation.ObjectAnimator; import android.content.BroadcastReceiver; @@ -40,13 +40,13 @@ import android.util.DisplayMetrics; import android.util.Property; import android.view.View; -import com.android.uiuios.CellLayout; -import com.android.uiuios.Launcher; -import com.android.uiuios.R; -import com.android.uiuios.ResourceUtils; -import com.android.uiuios.Workspace; -import com.android.uiuios.uioverrides.WallpaperColorInfo; -import com.android.uiuios.util.Themes; +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 androidx.core.graphics.ColorUtils; diff --git a/src/com/android/uiuios/icons/ComponentWithLabel.java b/src/com/android/colorfulos/icons/ComponentWithLabel.java similarity index 95% rename from src/com/android/uiuios/icons/ComponentWithLabel.java rename to src/com/android/colorfulos/icons/ComponentWithLabel.java index 2e45b84..f46961b 100644 --- a/src/com/android/uiuios/icons/ComponentWithLabel.java +++ b/src/com/android/colorfulos/icons/ComponentWithLabel.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.icons; +package com.android.colorfulos.icons; import android.content.ComponentName; import android.content.Context; import android.content.pm.PackageManager; import android.os.UserHandle; -import com.android.uiuios.icons.cache.CachingLogic; +import com.android.colorfulos.icons.cache.CachingLogic; public interface ComponentWithLabel { diff --git a/src/com/android/uiuios/icons/IconCache.java b/src/com/android/colorfulos/icons/IconCache.java similarity index 92% rename from src/com/android/uiuios/icons/IconCache.java rename to src/com/android/colorfulos/icons/IconCache.java index 3783788..481c9bc 100644 --- a/src/com/android/uiuios/icons/IconCache.java +++ b/src/com/android/colorfulos/icons/IconCache.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.icons; +package com.android.colorfulos.icons; import android.content.Context; import android.content.Intent; @@ -29,26 +29,26 @@ import android.os.Process; import android.os.UserHandle; import android.util.Log; -import com.android.uiuios.AppInfo; -import com.android.uiuios.IconProvider; -import com.android.uiuios.InvariantDeviceProfile; -import com.android.uiuios.ItemInfoWithIcon; -import com.android.uiuios.LauncherFiles; -import com.android.uiuios.LauncherModel; -import com.android.uiuios.MainThreadExecutor; -import com.android.uiuios.R; -import com.android.uiuios.TTUtils.BitmapUtils; -import com.android.uiuios.WorkspaceItemInfo; -import com.android.uiuios.Utilities; -import com.android.uiuios.compat.LauncherAppsCompat; -import com.android.uiuios.compat.UserManagerCompat; -import com.android.uiuios.icons.ComponentWithLabel.ComponentCachingLogic; -import com.android.uiuios.icons.cache.BaseIconCache; -import com.android.uiuios.icons.cache.CachingLogic; -import com.android.uiuios.icons.cache.HandlerRunnable; -import com.android.uiuios.model.PackageItemInfo; -import com.android.uiuios.util.InstantAppResolver; -import com.android.uiuios.util.Preconditions; +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 java.util.ArrayList; import java.util.List; @@ -306,7 +306,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.uiuios"); + int resID = mContext.getResources().getIdentifier(val, "drawable", "com.android.colorfulos"); if (resID == 0) { icon = mIconProvider.getIcon(info, mIconDpi, flattenDrawable); } else { diff --git a/src/com/android/uiuios/icons/LauncherActivtiyCachingLogic.java b/src/com/android/colorfulos/icons/LauncherActivtiyCachingLogic.java similarity index 94% rename from src/com/android/uiuios/icons/LauncherActivtiyCachingLogic.java rename to src/com/android/colorfulos/icons/LauncherActivtiyCachingLogic.java index 1df0a6b..67bc77b 100644 --- a/src/com/android/uiuios/icons/LauncherActivtiyCachingLogic.java +++ b/src/com/android/colorfulos/icons/LauncherActivtiyCachingLogic.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.icons; +package com.android.colorfulos.icons; import android.content.ComponentName; import android.content.Context; import android.content.pm.LauncherActivityInfo; import android.os.UserHandle; -import com.android.uiuios.icons.cache.CachingLogic; +import com.android.colorfulos.icons.cache.CachingLogic; public class LauncherActivtiyCachingLogic implements CachingLogic { diff --git a/src/com/android/uiuios/icons/LauncherIcons.java b/src/com/android/colorfulos/icons/LauncherIcons.java similarity index 92% rename from src/com/android/uiuios/icons/LauncherIcons.java rename to src/com/android/colorfulos/icons/LauncherIcons.java index f45b952..bdbb590 100644 --- a/src/com/android/uiuios/icons/LauncherIcons.java +++ b/src/com/android/colorfulos/icons/LauncherIcons.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.icons; +package com.android.colorfulos.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.uiuios.AppInfo; -import com.android.uiuios.FastBitmapDrawable; -import com.android.uiuios.InvariantDeviceProfile; -import com.android.uiuios.ItemInfoWithIcon; -import com.android.uiuios.LauncherAppState; -import com.android.uiuios.R; -import com.android.uiuios.graphics.IconShape; -import com.android.uiuios.model.PackageItemInfo; -import com.android.uiuios.shortcuts.DeepShortcutManager; -import com.android.uiuios.util.Themes; +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 java.util.function.Supplier; diff --git a/src/com/android/uiuios/jpush/ExampleApplication.java b/src/com/android/colorfulos/jpush/ExampleApplication.java similarity index 94% rename from src/com/android/uiuios/jpush/ExampleApplication.java rename to src/com/android/colorfulos/jpush/ExampleApplication.java index d80860a..0f74e86 100644 --- a/src/com/android/uiuios/jpush/ExampleApplication.java +++ b/src/com/android/colorfulos/jpush/ExampleApplication.java @@ -1,4 +1,4 @@ -package com.android.uiuios.jpush; +package com.android.colorfulos.jpush; import android.app.Application; import cn.jpush.android.api.JPushInterface; diff --git a/src/com/android/uiuios/jpush/ExampleUtil.java b/src/com/android/colorfulos/jpush/ExampleUtil.java similarity index 97% rename from src/com/android/uiuios/jpush/ExampleUtil.java rename to src/com/android/colorfulos/jpush/ExampleUtil.java index d052cfb..50f1f1a 100644 --- a/src/com/android/uiuios/jpush/ExampleUtil.java +++ b/src/com/android/colorfulos/jpush/ExampleUtil.java @@ -1,4 +1,4 @@ -package com.android.uiuios.jpush; +package com.android.colorfulos.jpush; import android.content.Context; import android.content.pm.ApplicationInfo; @@ -8,10 +8,8 @@ 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; -import android.widget.Toast; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/src/com/android/uiuios/jpush/LocalBroadcastManager.java b/src/com/android/colorfulos/jpush/LocalBroadcastManager.java similarity index 99% rename from src/com/android/uiuios/jpush/LocalBroadcastManager.java rename to src/com/android/colorfulos/jpush/LocalBroadcastManager.java index d462e30..7333527 100644 --- a/src/com/android/uiuios/jpush/LocalBroadcastManager.java +++ b/src/com/android/colorfulos/jpush/LocalBroadcastManager.java @@ -1,4 +1,4 @@ -package com.android.uiuios.jpush; +package com.android.colorfulos.jpush; import android.content.BroadcastReceiver; import android.content.Context; diff --git a/src/com/android/uiuios/jpush/Logger.java b/src/com/android/colorfulos/jpush/Logger.java similarity index 95% rename from src/com/android/uiuios/jpush/Logger.java rename to src/com/android/colorfulos/jpush/Logger.java index cc79a1e..4c4c112 100644 --- a/src/com/android/uiuios/jpush/Logger.java +++ b/src/com/android/colorfulos/jpush/Logger.java @@ -1,4 +1,4 @@ -package com.android.uiuios.jpush; +package com.android.colorfulos.jpush; import android.util.Log; diff --git a/src/com/android/uiuios/jpush/MyReceiver.java b/src/com/android/colorfulos/jpush/MyReceiver.java similarity index 88% rename from src/com/android/uiuios/jpush/MyReceiver.java rename to src/com/android/colorfulos/jpush/MyReceiver.java index b465da8..9c4b636 100644 --- a/src/com/android/uiuios/jpush/MyReceiver.java +++ b/src/com/android/colorfulos/jpush/MyReceiver.java @@ -1,17 +1,16 @@ -package com.android.uiuios.jpush; +package com.android.colorfulos.jpush; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.os.Bundle; import android.text.TextUtils; +import android.util.Log; -import com.android.uiuios.Launcher; -import com.android.uiuios.MyApplication; -import com.android.uiuios.TTUtils.APKUtils; -import com.android.uiuios.network.BaseResponse; -import com.android.uiuios.network.NetWorkManager; -import com.google.gson.Gson; +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.google.gson.JsonObject; import org.json.JSONException; @@ -151,31 +150,31 @@ public class MyReceiver extends BroadcastReceiver { private void sendRunningApp(Context context) { String packageName = MyApplication.getInstance().getAppPackageName(); long time = MyApplication.getInstance().getOnClickTime(); - JsonObject jsonObject = new JsonObject(); - jsonObject.addProperty("app_package", packageName); - jsonObject.addProperty("version_name", APKUtils.getAPPVersionName(context,packageName)); - jsonObject.addProperty("start_time", time); - String jsonString = jsonObject.toString(); + JsonObject jsonObject = new JsonObject(); + jsonObject.addProperty("app_package", packageName); + jsonObject.addProperty("version_name", APKUtils.getAPPVersionName(context, packageName)); + jsonObject.addProperty("start_time", time / 1000); + String jsonString = jsonObject.toString(); NetWorkManager.getInstance().getRunningAppObservable(jsonString) .subscribe(new Observer() { @Override public void onSubscribe(Disposable d) { - + Log.e(TAG, "onSubscribe: "); } @Override public void onNext(BaseResponse baseResponse) { - + Log.e(TAG, "onSubscribe: " + baseResponse); } @Override public void onError(Throwable e) { - + Log.e(TAG, "onError: " + e.getMessage()); } @Override public void onComplete() { - + Log.e(TAG, "onComplete: "); } }); } diff --git a/src/com/android/uiuios/jpush/PushMessageReceiver.java b/src/com/android/colorfulos/jpush/PushMessageReceiver.java similarity index 98% rename from src/com/android/uiuios/jpush/PushMessageReceiver.java rename to src/com/android/colorfulos/jpush/PushMessageReceiver.java index 0d36417..a9bb5df 100644 --- a/src/com/android/uiuios/jpush/PushMessageReceiver.java +++ b/src/com/android/colorfulos/jpush/PushMessageReceiver.java @@ -1,11 +1,11 @@ -package com.android.uiuios.jpush; +package com.android.colorfulos.jpush; import android.content.Context; import android.content.Intent; import android.os.Bundle; import android.util.Log; -import com.android.uiuios.Launcher; +import com.android.colorfulos.Launcher; import org.json.JSONException; import org.json.JSONObject; diff --git a/src/com/android/uiuios/jpush/PushService.java b/src/com/android/colorfulos/jpush/PushService.java similarity index 73% rename from src/com/android/uiuios/jpush/PushService.java rename to src/com/android/colorfulos/jpush/PushService.java index 3722aea..dc5c4ed 100644 --- a/src/com/android/uiuios/jpush/PushService.java +++ b/src/com/android/colorfulos/jpush/PushService.java @@ -1,4 +1,4 @@ -package com.android.uiuios.jpush; +package com.android.colorfulos.jpush; import cn.jpush.android.service.JCommonService; diff --git a/src/com/android/uiuios/jpush/TagAliasOperatorHelper.java b/src/com/android/colorfulos/jpush/TagAliasOperatorHelper.java similarity index 99% rename from src/com/android/uiuios/jpush/TagAliasOperatorHelper.java rename to src/com/android/colorfulos/jpush/TagAliasOperatorHelper.java index fd4eefc..5435664 100644 --- a/src/com/android/uiuios/jpush/TagAliasOperatorHelper.java +++ b/src/com/android/colorfulos/jpush/TagAliasOperatorHelper.java @@ -1,4 +1,4 @@ -package com.android.uiuios.jpush; +package com.android.colorfulos.jpush; import android.content.Context; import android.os.Handler; diff --git a/src/com/android/uiuios/jpush/TestActivity.java b/src/com/android/colorfulos/jpush/TestActivity.java similarity index 96% rename from src/com/android/uiuios/jpush/TestActivity.java rename to src/com/android/colorfulos/jpush/TestActivity.java index c1781a5..1c3cdd3 100644 --- a/src/com/android/uiuios/jpush/TestActivity.java +++ b/src/com/android/colorfulos/jpush/TestActivity.java @@ -1,4 +1,4 @@ -package com.android.uiuios.jpush; +package com.android.colorfulos.jpush; import android.app.Activity; import android.content.Intent; diff --git a/src/com/android/uiuios/keyboard/CustomActionsPopup.java b/src/com/android/colorfulos/keyboard/CustomActionsPopup.java similarity index 92% rename from src/com/android/uiuios/keyboard/CustomActionsPopup.java rename to src/com/android/colorfulos/keyboard/CustomActionsPopup.java index b977ec4..346889e 100644 --- a/src/com/android/uiuios/keyboard/CustomActionsPopup.java +++ b/src/com/android/colorfulos/keyboard/CustomActionsPopup.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.keyboard; +package com.android.colorfulos.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.uiuios.ItemInfo; -import com.android.uiuios.Launcher; -import com.android.uiuios.accessibility.LauncherAccessibilityDelegate; -import com.android.uiuios.popup.PopupContainerWithArrow; +import com.android.colorfulos.ItemInfo; +import com.android.colorfulos.Launcher; +import com.android.colorfulos.accessibility.LauncherAccessibilityDelegate; +import com.android.colorfulos.popup.PopupContainerWithArrow; import java.util.ArrayList; import java.util.Collections; diff --git a/src/com/android/uiuios/keyboard/FocusIndicatorHelper.java b/src/com/android/colorfulos/keyboard/FocusIndicatorHelper.java similarity index 99% rename from src/com/android/uiuios/keyboard/FocusIndicatorHelper.java rename to src/com/android/colorfulos/keyboard/FocusIndicatorHelper.java index 030817a..fa31ee0 100644 --- a/src/com/android/uiuios/keyboard/FocusIndicatorHelper.java +++ b/src/com/android/colorfulos/keyboard/FocusIndicatorHelper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.keyboard; +package com.android.colorfulos.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.uiuios.R; +import com.android.colorfulos.R; /** * A helper class to draw background of a focused view. diff --git a/src/com/android/uiuios/keyboard/FocusedItemDecorator.java b/src/com/android/colorfulos/keyboard/FocusedItemDecorator.java similarity index 91% rename from src/com/android/uiuios/keyboard/FocusedItemDecorator.java rename to src/com/android/colorfulos/keyboard/FocusedItemDecorator.java index 86af103..d394f76 100644 --- a/src/com/android/uiuios/keyboard/FocusedItemDecorator.java +++ b/src/com/android/colorfulos/keyboard/FocusedItemDecorator.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.android.uiuios.keyboard; +package com.android.colorfulos.keyboard; import android.graphics.Canvas; import android.view.View; import android.view.View.OnFocusChangeListener; -import com.android.uiuios.keyboard.FocusIndicatorHelper.SimpleFocusIndicatorHelper; +import com.android.colorfulos.keyboard.FocusIndicatorHelper.SimpleFocusIndicatorHelper; import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView.ItemDecoration; diff --git a/src/com/android/uiuios/keyboard/ViewGroupFocusHelper.java b/src/com/android/colorfulos/keyboard/ViewGroupFocusHelper.java similarity index 96% rename from src/com/android/uiuios/keyboard/ViewGroupFocusHelper.java rename to src/com/android/colorfulos/keyboard/ViewGroupFocusHelper.java index 09773a4..67509ff 100644 --- a/src/com/android/uiuios/keyboard/ViewGroupFocusHelper.java +++ b/src/com/android/colorfulos/keyboard/ViewGroupFocusHelper.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.android.uiuios.keyboard; +package com.android.colorfulos.keyboard; import android.graphics.Rect; import android.view.View; -import com.android.uiuios.PagedView; +import com.android.colorfulos.PagedView; /** * {@link FocusIndicatorHelper} for a generic view group. diff --git a/src/com/android/uiuios/logging/DumpTargetWrapper.java b/src/com/android/colorfulos/logging/DumpTargetWrapper.java similarity index 90% rename from src/com/android/uiuios/logging/DumpTargetWrapper.java rename to src/com/android/colorfulos/logging/DumpTargetWrapper.java index 233d523..f103e0a 100644 --- a/src/com/android/uiuios/logging/DumpTargetWrapper.java +++ b/src/com/android/colorfulos/logging/DumpTargetWrapper.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.logging; +package com.android.colorfulos.logging; import android.os.Process; import android.text.TextUtils; -import com.android.uiuios.ItemInfo; -import com.android.uiuios.LauncherAppWidgetInfo; -import com.android.uiuios.LauncherSettings; -import com.android.uiuios.model.nano.LauncherDumpProto; -import com.android.uiuios.model.nano.LauncherDumpProto.ContainerType; -import com.android.uiuios.model.nano.LauncherDumpProto.DumpTarget; -import com.android.uiuios.model.nano.LauncherDumpProto.ItemType; -import com.android.uiuios.model.nano.LauncherDumpProto.UserType; +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 java.util.ArrayList; import java.util.List; diff --git a/src/com/android/uiuios/logging/EventLogArray.java b/src/com/android/colorfulos/logging/EventLogArray.java similarity index 99% rename from src/com/android/uiuios/logging/EventLogArray.java rename to src/com/android/colorfulos/logging/EventLogArray.java index b63823b..6a177dc 100644 --- a/src/com/android/uiuios/logging/EventLogArray.java +++ b/src/com/android/colorfulos/logging/EventLogArray.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.logging; +package com.android.colorfulos.logging; import java.io.PrintWriter; diff --git a/src/com/android/uiuios/logging/FileLog.java b/src/com/android/colorfulos/logging/FileLog.java similarity index 98% rename from src/com/android/uiuios/logging/FileLog.java rename to src/com/android/colorfulos/logging/FileLog.java index 40ac7ce..6e4443b 100644 --- a/src/com/android/uiuios/logging/FileLog.java +++ b/src/com/android/colorfulos/logging/FileLog.java @@ -1,4 +1,4 @@ -package com.android.uiuios.logging; +package com.android.colorfulos.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.uiuios.Utilities; -import com.android.uiuios.config.FeatureFlags; +import com.android.colorfulos.Utilities; +import com.android.colorfulos.config.FeatureFlags; import java.io.BufferedReader; import java.io.File; diff --git a/src/com/android/uiuios/logging/LoggerUtils.java b/src/com/android/colorfulos/logging/LoggerUtils.java similarity index 89% rename from src/com/android/uiuios/logging/LoggerUtils.java rename to src/com/android/colorfulos/logging/LoggerUtils.java index 6b62136..6f2a5c6 100644 --- a/src/com/android/uiuios/logging/LoggerUtils.java +++ b/src/com/android/colorfulos/logging/LoggerUtils.java @@ -13,27 +13,27 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.logging; +package com.android.colorfulos.logging; -import static com.android.uiuios.userevent.nano.LauncherLogProto.ContainerType.NAVBAR; +import static com.android.colorfulos.userevent.nano.LauncherLogProto.ContainerType.NAVBAR; import android.util.ArrayMap; import android.util.SparseArray; import android.view.View; -import com.android.uiuios.AppInfo; -import com.android.uiuios.ButtonDropTarget; -import com.android.uiuios.ItemInfo; -import com.android.uiuios.LauncherSettings; -import com.android.uiuios.userevent.nano.LauncherLogExtensions.TargetExtension; -import com.android.uiuios.userevent.nano.LauncherLogProto.Action; -import com.android.uiuios.userevent.nano.LauncherLogProto.ContainerType; -import com.android.uiuios.userevent.nano.LauncherLogProto.ControlType; -import com.android.uiuios.userevent.nano.LauncherLogProto.ItemType; -import com.android.uiuios.userevent.nano.LauncherLogProto.LauncherEvent; -import com.android.uiuios.userevent.nano.LauncherLogProto.Target; -import com.android.uiuios.userevent.nano.LauncherLogProto.TipType; -import com.android.uiuios.util.InstantAppResolver; +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 java.lang.reflect.Field; import java.lang.reflect.Modifier; diff --git a/src/com/android/uiuios/logging/StatsLogManager.java b/src/com/android/colorfulos/logging/StatsLogManager.java similarity index 84% rename from src/com/android/uiuios/logging/StatsLogManager.java rename to src/com/android/colorfulos/logging/StatsLogManager.java index 2031737..b651ab5 100644 --- a/src/com/android/uiuios/logging/StatsLogManager.java +++ b/src/com/android/colorfulos/logging/StatsLogManager.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.logging; +package com.android.colorfulos.logging; import android.content.Context; import android.content.Intent; import android.view.View; -import com.android.uiuios.R; -import com.android.uiuios.util.ComponentKey; -import com.android.uiuios.util.ResourceBasedOverride; -import com.android.uiuios.logging.StatsLogUtils.LogStateProvider; +import com.android.colorfulos.R; +import com.android.colorfulos.util.ComponentKey; +import com.android.colorfulos.util.ResourceBasedOverride; +import com.android.colorfulos.logging.StatsLogUtils.LogStateProvider; /** * Handles the user event logging in Q. diff --git a/src/com/android/uiuios/logging/StatsLogUtils.java b/src/com/android/colorfulos/logging/StatsLogUtils.java similarity index 92% rename from src/com/android/uiuios/logging/StatsLogUtils.java rename to src/com/android/colorfulos/logging/StatsLogUtils.java index 890805f..f9db38f 100644 --- a/src/com/android/uiuios/logging/StatsLogUtils.java +++ b/src/com/android/colorfulos/logging/StatsLogUtils.java @@ -1,10 +1,10 @@ -package com.android.uiuios.logging; +package com.android.colorfulos.logging; import android.view.View; import android.view.ViewParent; -import com.android.uiuios.ItemInfo; -import com.android.uiuios.userevent.nano.LauncherLogProto.Target; +import com.android.colorfulos.ItemInfo; +import com.android.colorfulos.userevent.nano.LauncherLogProto.Target; import androidx.annotation.Nullable; diff --git a/src/com/android/uiuios/logging/UserEventDispatcher.java b/src/com/android/colorfulos/logging/UserEventDispatcher.java similarity index 92% rename from src/com/android/uiuios/logging/UserEventDispatcher.java rename to src/com/android/colorfulos/logging/UserEventDispatcher.java index 1b503f5..1b26ec8 100644 --- a/src/com/android/uiuios/logging/UserEventDispatcher.java +++ b/src/com/android/colorfulos/logging/UserEventDispatcher.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package com.android.uiuios.logging; +package com.android.colorfulos.logging; -import static com.android.uiuios.logging.LoggerUtils.newAction; -import static com.android.uiuios.logging.LoggerUtils.newCommandAction; -import static com.android.uiuios.logging.LoggerUtils.newContainerTarget; -import static com.android.uiuios.logging.LoggerUtils.newControlTarget; -import static com.android.uiuios.logging.LoggerUtils.newDropTarget; -import static com.android.uiuios.logging.LoggerUtils.newItemTarget; -import static com.android.uiuios.logging.LoggerUtils.newLauncherEvent; -import static com.android.uiuios.logging.LoggerUtils.newTarget; -import static com.android.uiuios.logging.LoggerUtils.newTouchAction; +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 android.app.PendingIntent; import android.content.ComponentName; @@ -37,20 +37,20 @@ import android.view.View; import androidx.annotation.Nullable; -import com.android.uiuios.DropTarget; -import com.android.uiuios.ItemInfo; -import com.android.uiuios.R; -import com.android.uiuios.Utilities; -import com.android.uiuios.config.FeatureFlags; -import com.android.uiuios.logging.StatsLogUtils.LogContainerProvider; -import com.android.uiuios.userevent.nano.LauncherLogProto; -import com.android.uiuios.userevent.nano.LauncherLogProto.Action; -import com.android.uiuios.userevent.nano.LauncherLogProto.LauncherEvent; -import com.android.uiuios.userevent.nano.LauncherLogProto.Target; -import com.android.uiuios.util.ComponentKey; -import com.android.uiuios.util.InstantAppResolver; -import com.android.uiuios.util.LogConfig; -import com.android.uiuios.util.ResourceBasedOverride; +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 java.util.Locale; import java.util.UUID; diff --git a/src/com/android/uiuios/model/AddWorkspaceItemsTask.java b/src/com/android/colorfulos/model/AddWorkspaceItemsTask.java similarity index 94% rename from src/com/android/uiuios/model/AddWorkspaceItemsTask.java rename to src/com/android/colorfulos/model/AddWorkspaceItemsTask.java index 78a82a2..b1ef5f0 100644 --- a/src/com/android/uiuios/model/AddWorkspaceItemsTask.java +++ b/src/com/android/colorfulos/model/AddWorkspaceItemsTask.java @@ -13,27 +13,27 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.model; +package com.android.colorfulos.model; import android.content.Intent; import android.os.UserHandle; import android.util.LongSparseArray; import android.util.Pair; -import com.android.uiuios.AllAppsList; -import com.android.uiuios.AppInfo; -import com.android.uiuios.FolderInfo; -import com.android.uiuios.InvariantDeviceProfile; -import com.android.uiuios.ItemInfo; -import com.android.uiuios.LauncherAppState; -import com.android.uiuios.LauncherAppWidgetInfo; -import com.android.uiuios.LauncherModel.CallbackTask; -import com.android.uiuios.LauncherModel.Callbacks; -import com.android.uiuios.LauncherSettings; -import com.android.uiuios.WorkspaceItemInfo; -import com.android.uiuios.Utilities; -import com.android.uiuios.util.GridOccupancy; -import com.android.uiuios.util.IntArray; +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 java.util.ArrayList; import java.util.List; diff --git a/src/com/android/uiuios/model/AppLaunchTracker.java b/src/com/android/colorfulos/model/AppLaunchTracker.java similarity index 83% rename from src/com/android/uiuios/model/AppLaunchTracker.java rename to src/com/android/colorfulos/model/AppLaunchTracker.java index 23e6594..3507277 100644 --- a/src/com/android/uiuios/model/AppLaunchTracker.java +++ b/src/com/android/colorfulos/model/AppLaunchTracker.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.model; +package com.android.colorfulos.model; -import static com.android.uiuios.util.ResourceBasedOverride.Overrides.getObject; +import static com.android.colorfulos.util.ResourceBasedOverride.Overrides.getObject; import android.content.ComponentName; import android.os.UserHandle; -import com.android.uiuios.R; -import com.android.uiuios.userevent.nano.LauncherLogProto.ContainerType; -import com.android.uiuios.util.MainThreadInitializedObject; -import com.android.uiuios.util.ResourceBasedOverride; +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 androidx.annotation.Nullable; diff --git a/src/com/android/uiuios/model/BaseLoaderResults.java b/src/com/android/colorfulos/model/BaseLoaderResults.java similarity index 93% rename from src/com/android/uiuios/model/BaseLoaderResults.java rename to src/com/android/colorfulos/model/BaseLoaderResults.java index a47f916..2440ab3 100644 --- a/src/com/android/uiuios/model/BaseLoaderResults.java +++ b/src/com/android/colorfulos/model/BaseLoaderResults.java @@ -14,27 +14,27 @@ * limitations under the License. */ -package com.android.uiuios.model; +package com.android.colorfulos.model; import android.os.Looper; import android.util.Log; -import com.android.uiuios.AllAppsList; -import com.android.uiuios.AppInfo; -import com.android.uiuios.InvariantDeviceProfile; -import com.android.uiuios.ItemInfo; -import com.android.uiuios.LauncherAppState; -import com.android.uiuios.LauncherAppWidgetInfo; -import com.android.uiuios.LauncherModel.CallbackTask; -import com.android.uiuios.LauncherModel.Callbacks; -import com.android.uiuios.LauncherSettings; -import com.android.uiuios.MainThreadExecutor; -import com.android.uiuios.PagedView; -import com.android.uiuios.config.FeatureFlags; -import com.android.uiuios.util.IntArray; -import com.android.uiuios.util.IntSet; -import com.android.uiuios.util.LooperIdleLock; -import com.android.uiuios.util.ViewOnDrawExecutor; +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 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.uiuios.model.LoaderTask}. + * Base Helper class to handle results of {@link com.android.colorfulos.model.LoaderTask}. */ public abstract class BaseLoaderResults { diff --git a/src/com/android/uiuios/model/BaseModelUpdateTask.java b/src/com/android/colorfulos/model/BaseModelUpdateTask.java similarity index 88% rename from src/com/android/uiuios/model/BaseModelUpdateTask.java rename to src/com/android/colorfulos/model/BaseModelUpdateTask.java index 151e10f..074aa5f 100644 --- a/src/com/android/uiuios/model/BaseModelUpdateTask.java +++ b/src/com/android/colorfulos/model/BaseModelUpdateTask.java @@ -13,20 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.model; +package com.android.colorfulos.model; import android.util.Log; -import com.android.uiuios.AllAppsList; -import com.android.uiuios.LauncherAppState; -import com.android.uiuios.LauncherModel; -import com.android.uiuios.LauncherModel.ModelUpdateTask; -import com.android.uiuios.LauncherModel.CallbackTask; -import com.android.uiuios.LauncherModel.Callbacks; -import com.android.uiuios.WorkspaceItemInfo; -import com.android.uiuios.util.ComponentKey; -import com.android.uiuios.util.ItemInfoMatcher; -import com.android.uiuios.widget.WidgetListRowEntry; +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 java.util.ArrayList; import java.util.HashMap; diff --git a/src/com/android/uiuios/model/BgDataModel.java b/src/com/android/colorfulos/model/BgDataModel.java similarity index 93% rename from src/com/android/uiuios/model/BgDataModel.java rename to src/com/android/colorfulos/model/BgDataModel.java index 9accc9d..36033e7 100644 --- a/src/com/android/uiuios/model/BgDataModel.java +++ b/src/com/android/colorfulos/model/BgDataModel.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.model; +package com.android.colorfulos.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.uiuios.FolderInfo; -import com.android.uiuios.InstallShortcutReceiver; -import com.android.uiuios.ItemInfo; -import com.android.uiuios.LauncherAppWidgetInfo; -import com.android.uiuios.LauncherSettings; -import com.android.uiuios.WorkspaceItemInfo; -import com.android.uiuios.Workspace; -import com.android.uiuios.config.FeatureFlags; -import com.android.uiuios.logging.DumpTargetWrapper; -import com.android.uiuios.model.nano.LauncherDumpProto; -import com.android.uiuios.model.nano.LauncherDumpProto.ContainerType; -import com.android.uiuios.model.nano.LauncherDumpProto.DumpTarget; -import com.android.uiuios.shortcuts.DeepShortcutManager; -import com.android.uiuios.shortcuts.ShortcutKey; -import com.android.uiuios.util.ComponentKey; -import com.android.uiuios.util.IntArray; -import com.android.uiuios.util.IntSet; -import com.android.uiuios.util.IntSparseArrayMap; +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.google.protobuf.nano.MessageNano; import java.io.FileDescriptor; diff --git a/src/com/android/uiuios/model/CacheDataUpdatedTask.java b/src/com/android/colorfulos/model/CacheDataUpdatedTask.java similarity index 86% rename from src/com/android/uiuios/model/CacheDataUpdatedTask.java rename to src/com/android/colorfulos/model/CacheDataUpdatedTask.java index 886d32d..e955669 100644 --- a/src/com/android/uiuios/model/CacheDataUpdatedTask.java +++ b/src/com/android/colorfulos/model/CacheDataUpdatedTask.java @@ -13,20 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.model; +package com.android.colorfulos.model; import android.content.ComponentName; import android.os.UserHandle; -import com.android.uiuios.AllAppsList; -import com.android.uiuios.AppInfo; -import com.android.uiuios.WorkspaceItemInfo; -import com.android.uiuios.icons.IconCache; -import com.android.uiuios.ItemInfo; -import com.android.uiuios.LauncherAppState; -import com.android.uiuios.LauncherModel.CallbackTask; -import com.android.uiuios.LauncherModel.Callbacks; -import com.android.uiuios.LauncherSettings; +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 java.util.ArrayList; import java.util.HashSet; diff --git a/src/com/android/uiuios/model/DbDowngradeHelper.java b/src/com/android/colorfulos/model/DbDowngradeHelper.java similarity index 95% rename from src/com/android/uiuios/model/DbDowngradeHelper.java rename to src/com/android/colorfulos/model/DbDowngradeHelper.java index 3fe6009..611a2d7 100644 --- a/src/com/android/uiuios/model/DbDowngradeHelper.java +++ b/src/com/android/colorfulos/model/DbDowngradeHelper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.model; +package com.android.colorfulos.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.uiuios.R; -import com.android.uiuios.provider.LauncherDbUtils.SQLiteTransaction; -import com.android.uiuios.util.IOUtils; +import com.android.colorfulos.R; +import com.android.colorfulos.provider.LauncherDbUtils.SQLiteTransaction; +import com.android.colorfulos.util.IOUtils; import org.json.JSONArray; import org.json.JSONException; diff --git a/src/com/android/uiuios/model/FirstScreenBroadcast.java b/src/com/android/colorfulos/model/FirstScreenBroadcast.java similarity index 95% rename from src/com/android/uiuios/model/FirstScreenBroadcast.java rename to src/com/android/colorfulos/model/FirstScreenBroadcast.java index 16c86d4..57d3536 100644 --- a/src/com/android/uiuios/model/FirstScreenBroadcast.java +++ b/src/com/android/colorfulos/model/FirstScreenBroadcast.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.model; +package com.android.colorfulos.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.uiuios.FolderInfo; -import com.android.uiuios.ItemInfo; -import com.android.uiuios.LauncherAppWidgetInfo; -import com.android.uiuios.LauncherSettings; -import com.android.uiuios.util.MultiHashMap; +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 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.uiuios.action.FIRST_SCREEN_ACTIVE_INSTALLS"; + = "com.android.colorfulos.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/uiuios/model/GridBackupTable.java b/src/com/android/colorfulos/model/GridBackupTable.java similarity index 90% rename from src/com/android/uiuios/model/GridBackupTable.java rename to src/com/android/colorfulos/model/GridBackupTable.java index 7edfc10..c8b9329 100644 --- a/src/com/android/uiuios/model/GridBackupTable.java +++ b/src/com/android/colorfulos/model/GridBackupTable.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.model; +package com.android.colorfulos.model; -import static com.android.uiuios.LauncherSettings.Favorites.BACKUP_TABLE_NAME; -import static com.android.uiuios.provider.LauncherDbUtils.dropTable; -import static com.android.uiuios.provider.LauncherDbUtils.tableExists; +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 android.content.ContentValues; import android.content.Context; @@ -27,9 +27,9 @@ import android.graphics.Point; import android.os.Process; import android.util.Log; -import com.android.uiuios.LauncherSettings.Favorites; -import com.android.uiuios.LauncherSettings.Settings; -import com.android.uiuios.compat.UserManagerCompat; +import com.android.colorfulos.LauncherSettings.Favorites; +import com.android.colorfulos.LauncherSettings.Settings; +import com.android.colorfulos.compat.UserManagerCompat; /** * Helper class to backup and restore Favorites table into a separate table diff --git a/src/com/android/uiuios/model/GridSizeMigrationTask.java b/src/com/android/colorfulos/model/GridSizeMigrationTask.java similarity index 97% rename from src/com/android/uiuios/model/GridSizeMigrationTask.java rename to src/com/android/colorfulos/model/GridSizeMigrationTask.java index 092b8dd..faee9c1 100644 --- a/src/com/android/uiuios/model/GridSizeMigrationTask.java +++ b/src/com/android/colorfulos/model/GridSizeMigrationTask.java @@ -1,8 +1,8 @@ -package com.android.uiuios.model; +package com.android.colorfulos.model; -import static com.android.uiuios.LauncherSettings.Settings.EXTRA_VALUE; -import static com.android.uiuios.Utilities.getPointString; -import static com.android.uiuios.Utilities.parsePoint; +import static com.android.colorfulos.LauncherSettings.Settings.EXTRA_VALUE; +import static com.android.colorfulos.Utilities.getPointString; +import static com.android.colorfulos.Utilities.parsePoint; import android.content.ComponentName; import android.content.ContentValues; @@ -17,23 +17,23 @@ import android.graphics.Point; import android.util.Log; import android.util.SparseArray; -import com.android.uiuios.InvariantDeviceProfile; -import com.android.uiuios.ItemInfo; -import com.android.uiuios.LauncherAppState; -import com.android.uiuios.LauncherAppWidgetProviderInfo; -import com.android.uiuios.LauncherSettings; -import com.android.uiuios.LauncherSettings.Favorites; -import com.android.uiuios.LauncherSettings.Settings; -import com.android.uiuios.Utilities; -import com.android.uiuios.Workspace; -import com.android.uiuios.compat.AppWidgetManagerCompat; -import com.android.uiuios.compat.PackageInstallerCompat; -import com.android.uiuios.config.FeatureFlags; -import com.android.uiuios.provider.LauncherDbUtils; -import com.android.uiuios.provider.LauncherDbUtils.SQLiteTransaction; -import com.android.uiuios.util.GridOccupancy; -import com.android.uiuios.util.IntArray; -import com.android.uiuios.util.IntSparseArrayMap; +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 java.util.ArrayList; import java.util.Collections; diff --git a/src/com/android/uiuios/model/LoaderCursor.java b/src/com/android/colorfulos/model/LoaderCursor.java similarity index 94% rename from src/com/android/uiuios/model/LoaderCursor.java rename to src/com/android/colorfulos/model/LoaderCursor.java index 7aa4f38..d0c2b84 100644 --- a/src/com/android/uiuios/model/LoaderCursor.java +++ b/src/com/android/colorfulos/model/LoaderCursor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.model; +package com.android.colorfulos.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.uiuios.AppInfo; -import com.android.uiuios.WorkspaceItemInfo; -import com.android.uiuios.icons.IconCache; -import com.android.uiuios.InvariantDeviceProfile; -import com.android.uiuios.ItemInfo; -import com.android.uiuios.LauncherAppState; -import com.android.uiuios.LauncherSettings; -import com.android.uiuios.Utilities; -import com.android.uiuios.Workspace; -import com.android.uiuios.compat.LauncherAppsCompat; -import com.android.uiuios.config.FeatureFlags; -import com.android.uiuios.icons.BitmapInfo; -import com.android.uiuios.icons.LauncherIcons; -import com.android.uiuios.logging.FileLog; -import com.android.uiuios.util.ContentWriter; -import com.android.uiuios.util.GridOccupancy; -import com.android.uiuios.util.IntArray; -import com.android.uiuios.util.IntSparseArrayMap; +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 java.net.URISyntaxException; import java.security.InvalidParameterException; diff --git a/src/com/android/uiuios/model/LoaderTask.java b/src/com/android/colorfulos/model/LoaderTask.java similarity index 95% rename from src/com/android/uiuios/model/LoaderTask.java rename to src/com/android/colorfulos/model/LoaderTask.java index 7ff7fc4..10edef3 100644 --- a/src/com/android/uiuios/model/LoaderTask.java +++ b/src/com/android/colorfulos/model/LoaderTask.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.android.uiuios.model; +package com.android.colorfulos.model; -import static com.android.uiuios.ItemInfoWithIcon.FLAG_DISABLED_LOCKED_USER; -import static com.android.uiuios.ItemInfoWithIcon.FLAG_DISABLED_SAFEMODE; -import static com.android.uiuios.ItemInfoWithIcon.FLAG_DISABLED_SUSPENDED; -import static com.android.uiuios.model.LoaderResults.filterCurrentWorkspaceItems; +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 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.uiuios.AllAppsList; -import com.android.uiuios.AppInfo; -import com.android.uiuios.BuildConfig; -import com.android.uiuios.FolderInfo; -import com.android.uiuios.InstallShortcutReceiver; -import com.android.uiuios.ItemInfo; -import com.android.uiuios.ItemInfoWithIcon; -import com.android.uiuios.LauncherAppState; -import com.android.uiuios.LauncherAppWidgetInfo; -import com.android.uiuios.LauncherModel; -import com.android.uiuios.LauncherSettings; -import com.android.uiuios.WorkspaceItemInfo; -import com.android.uiuios.Utilities; -import com.android.uiuios.compat.AppWidgetManagerCompat; -import com.android.uiuios.compat.LauncherAppsCompat; -import com.android.uiuios.compat.PackageInstallerCompat; -import com.android.uiuios.compat.UserManagerCompat; -import com.android.uiuios.config.FeatureFlags; -import com.android.uiuios.folder.Folder; -import com.android.uiuios.folder.FolderIconPreviewVerifier; -import com.android.uiuios.icons.ComponentWithLabel; -import com.android.uiuios.icons.ComponentWithLabel.ComponentCachingLogic; -import com.android.uiuios.icons.IconCache; -import com.android.uiuios.icons.LauncherActivtiyCachingLogic; -import com.android.uiuios.icons.LauncherIcons; -import com.android.uiuios.icons.cache.IconCacheUpdateHandler; -import com.android.uiuios.logging.FileLog; -import com.android.uiuios.provider.ImportDataTask; -import com.android.uiuios.shortcuts.DeepShortcutManager; -import com.android.uiuios.shortcuts.ShortcutKey; -import com.android.uiuios.util.ComponentKey; -import com.android.uiuios.util.LooperIdleLock; -import com.android.uiuios.util.MultiHashMap; -import com.android.uiuios.util.PackageManagerHelper; -import com.android.uiuios.util.TraceHelper; +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 java.util.ArrayList; import java.util.Collections; @@ -246,9 +246,16 @@ public class LoaderTask implements Runnable { TraceHelper.endSection(TAG); } + + /** + * 需要隐藏的图标 + */ private List hideApp = new ArrayList() {{ this.add(BuildConfig.APPLICATION_ID); this.add("com.android.quicksearchbox"); + this.add("com.st.nfc.dta.mobile"); + this.add("com.mediatek.ygps"); + this.add("com.mediatek.factorymode"); }}; //add for load all app on workspace diff --git a/src/com/android/uiuios/model/ModelPreload.java b/src/com/android/colorfulos/model/ModelPreload.java similarity index 89% rename from src/com/android/uiuios/model/ModelPreload.java rename to src/com/android/colorfulos/model/ModelPreload.java index ed2d74d..846c414 100644 --- a/src/com/android/uiuios/model/ModelPreload.java +++ b/src/com/android/colorfulos/model/ModelPreload.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.model; +package com.android.colorfulos.model; import android.content.Context; import android.util.Log; -import com.android.uiuios.AllAppsList; -import com.android.uiuios.LauncherAppState; -import com.android.uiuios.LauncherModel; -import com.android.uiuios.LauncherModel.ModelUpdateTask; +import com.android.colorfulos.AllAppsList; +import com.android.colorfulos.LauncherAppState; +import com.android.colorfulos.LauncherModel; +import com.android.colorfulos.LauncherModel.ModelUpdateTask; import java.util.concurrent.Executor; diff --git a/src/com/android/uiuios/model/ModelWriter.java b/src/com/android/colorfulos/model/ModelWriter.java similarity index 95% rename from src/com/android/uiuios/model/ModelWriter.java rename to src/com/android/colorfulos/model/ModelWriter.java index 9d4c1dc..5455029 100644 --- a/src/com/android/uiuios/model/ModelWriter.java +++ b/src/com/android/colorfulos/model/ModelWriter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.model; +package com.android.colorfulos.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.uiuios.FolderInfo; -import com.android.uiuios.ItemInfo; -import com.android.uiuios.LauncherAppState; -import com.android.uiuios.LauncherAppWidgetHost; -import com.android.uiuios.LauncherAppWidgetInfo; -import com.android.uiuios.LauncherModel; -import com.android.uiuios.LauncherModel.Callbacks; -import com.android.uiuios.LauncherProvider; -import com.android.uiuios.LauncherSettings; -import com.android.uiuios.LauncherSettings.Favorites; -import com.android.uiuios.LauncherSettings.Settings; -import com.android.uiuios.WorkspaceItemInfo; -import com.android.uiuios.Utilities; -import com.android.uiuios.config.FeatureFlags; -import com.android.uiuios.util.ContentWriter; -import com.android.uiuios.util.ItemInfoMatcher; -import com.android.uiuios.util.LooperExecutor; +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 java.util.ArrayList; import java.util.Arrays; diff --git a/src/com/android/uiuios/model/PackageInstallStateChangedTask.java b/src/com/android/colorfulos/model/PackageInstallStateChangedTask.java similarity index 89% rename from src/com/android/uiuios/model/PackageInstallStateChangedTask.java rename to src/com/android/colorfulos/model/PackageInstallStateChangedTask.java index 6335c8d..3ae5a18 100644 --- a/src/com/android/uiuios/model/PackageInstallStateChangedTask.java +++ b/src/com/android/colorfulos/model/PackageInstallStateChangedTask.java @@ -13,25 +13,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.model; +package com.android.colorfulos.model; import android.content.ComponentName; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.os.Process; -import com.android.uiuios.AllAppsList; -import com.android.uiuios.AppInfo; -import com.android.uiuios.ItemInfo; -import com.android.uiuios.LauncherAppState; -import com.android.uiuios.LauncherAppWidgetInfo; -import com.android.uiuios.LauncherModel.CallbackTask; -import com.android.uiuios.LauncherModel.Callbacks; -import com.android.uiuios.PromiseAppInfo; -import com.android.uiuios.WorkspaceItemInfo; -import com.android.uiuios.compat.PackageInstallerCompat; -import com.android.uiuios.compat.PackageInstallerCompat.PackageInstallInfo; -import com.android.uiuios.util.InstantAppResolver; +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 java.util.ArrayList; import java.util.HashSet; diff --git a/src/com/android/uiuios/model/PackageItemInfo.java b/src/com/android/colorfulos/model/PackageItemInfo.java similarity index 92% rename from src/com/android/uiuios/model/PackageItemInfo.java rename to src/com/android/colorfulos/model/PackageItemInfo.java index dd674b9..87de960 100644 --- a/src/com/android/uiuios/model/PackageItemInfo.java +++ b/src/com/android/colorfulos/model/PackageItemInfo.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.android.uiuios.model; +package com.android.colorfulos.model; -import com.android.uiuios.ItemInfoWithIcon; +import com.android.colorfulos.ItemInfoWithIcon; /** * Represents a {@link Package} in the widget tray section. diff --git a/src/com/android/uiuios/model/PackageUpdatedTask.java b/src/com/android/colorfulos/model/PackageUpdatedTask.java similarity index 93% rename from src/com/android/uiuios/model/PackageUpdatedTask.java rename to src/com/android/colorfulos/model/PackageUpdatedTask.java index 316674f..4288201 100644 --- a/src/com/android/uiuios/model/PackageUpdatedTask.java +++ b/src/com/android/colorfulos/model/PackageUpdatedTask.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.model; +package com.android.colorfulos.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.uiuios.AllAppsList; -import com.android.uiuios.AppInfo; -import com.android.uiuios.WorkspaceItemInfo; -import com.android.uiuios.icons.IconCache; -import com.android.uiuios.InstallShortcutReceiver; -import com.android.uiuios.ItemInfo; -import com.android.uiuios.LauncherAppState; -import com.android.uiuios.LauncherAppWidgetInfo; -import com.android.uiuios.LauncherModel.CallbackTask; -import com.android.uiuios.LauncherModel.Callbacks; -import com.android.uiuios.LauncherSettings.Favorites; -import com.android.uiuios.SessionCommitReceiver; -import com.android.uiuios.Utilities; -import com.android.uiuios.compat.LauncherAppsCompat; -import com.android.uiuios.compat.UserManagerCompat; -import com.android.uiuios.config.FeatureFlags; -import com.android.uiuios.icons.BitmapInfo; -import com.android.uiuios.icons.LauncherIcons; -import com.android.uiuios.logging.FileLog; -import com.android.uiuios.shortcuts.DeepShortcutManager; -import com.android.uiuios.util.FlagOp; -import com.android.uiuios.util.IntSparseArrayMap; -import com.android.uiuios.util.ItemInfoMatcher; -import com.android.uiuios.util.PackageManagerHelper; -import com.android.uiuios.util.PackageUserKey; +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 java.util.ArrayList; import java.util.Arrays; diff --git a/src/com/android/uiuios/model/SdCardAvailableReceiver.java b/src/com/android/colorfulos/model/SdCardAvailableReceiver.java similarity index 91% rename from src/com/android/uiuios/model/SdCardAvailableReceiver.java rename to src/com/android/colorfulos/model/SdCardAvailableReceiver.java index 4872bb5..e20a65e 100644 --- a/src/com/android/uiuios/model/SdCardAvailableReceiver.java +++ b/src/com/android/colorfulos/model/SdCardAvailableReceiver.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package com.android.uiuios.model; +package com.android.colorfulos.model; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.os.UserHandle; -import com.android.uiuios.LauncherAppState; -import com.android.uiuios.LauncherModel; -import com.android.uiuios.compat.LauncherAppsCompat; -import com.android.uiuios.util.MultiHashMap; -import com.android.uiuios.util.PackageManagerHelper; +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 java.util.ArrayList; import java.util.HashSet; diff --git a/src/com/android/uiuios/model/ShortcutsChangedTask.java b/src/com/android/colorfulos/model/ShortcutsChangedTask.java similarity index 90% rename from src/com/android/uiuios/model/ShortcutsChangedTask.java rename to src/com/android/colorfulos/model/ShortcutsChangedTask.java index 35ad5eb..8ab5783 100644 --- a/src/com/android/uiuios/model/ShortcutsChangedTask.java +++ b/src/com/android/colorfulos/model/ShortcutsChangedTask.java @@ -13,22 +13,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.model; +package com.android.colorfulos.model; import android.content.Context; import android.content.pm.ShortcutInfo; import android.os.UserHandle; -import com.android.uiuios.AllAppsList; -import com.android.uiuios.ItemInfo; -import com.android.uiuios.LauncherAppState; -import com.android.uiuios.LauncherSettings; -import com.android.uiuios.WorkspaceItemInfo; -import com.android.uiuios.icons.LauncherIcons; -import com.android.uiuios.shortcuts.DeepShortcutManager; -import com.android.uiuios.shortcuts.ShortcutKey; -import com.android.uiuios.util.ItemInfoMatcher; -import com.android.uiuios.util.MultiHashMap; +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 java.util.ArrayList; import java.util.HashSet; diff --git a/src/com/android/uiuios/model/UserLockStateChangedTask.java b/src/com/android/colorfulos/model/UserLockStateChangedTask.java similarity index 87% rename from src/com/android/uiuios/model/UserLockStateChangedTask.java rename to src/com/android/colorfulos/model/UserLockStateChangedTask.java index 7e0bce0..ae7a06a 100644 --- a/src/com/android/uiuios/model/UserLockStateChangedTask.java +++ b/src/com/android/colorfulos/model/UserLockStateChangedTask.java @@ -13,25 +13,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.model; +package com.android.colorfulos.model; -import static com.android.uiuios.ItemInfoWithIcon.FLAG_DISABLED_LOCKED_USER; +import static com.android.colorfulos.ItemInfoWithIcon.FLAG_DISABLED_LOCKED_USER; import android.content.Context; import android.content.pm.ShortcutInfo; import android.os.UserHandle; -import com.android.uiuios.AllAppsList; -import com.android.uiuios.ItemInfo; -import com.android.uiuios.LauncherAppState; -import com.android.uiuios.LauncherSettings; -import com.android.uiuios.WorkspaceItemInfo; -import com.android.uiuios.compat.UserManagerCompat; -import com.android.uiuios.icons.LauncherIcons; -import com.android.uiuios.shortcuts.DeepShortcutManager; -import com.android.uiuios.shortcuts.ShortcutKey; -import com.android.uiuios.util.ComponentKey; -import com.android.uiuios.util.ItemInfoMatcher; +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 java.util.ArrayList; import java.util.HashMap; diff --git a/src/com/android/uiuios/model/WidgetItem.java b/src/com/android/colorfulos/model/WidgetItem.java similarity index 88% rename from src/com/android/uiuios/model/WidgetItem.java rename to src/com/android/colorfulos/model/WidgetItem.java index 4dda0e3..ce1cc27 100644 --- a/src/com/android/uiuios/model/WidgetItem.java +++ b/src/com/android/colorfulos/model/WidgetItem.java @@ -1,16 +1,16 @@ -package com.android.uiuios.model; +package com.android.colorfulos.model; import android.content.pm.ActivityInfo; import android.content.pm.PackageManager; import android.os.Process; import android.os.UserHandle; -import com.android.uiuios.InvariantDeviceProfile; -import com.android.uiuios.LauncherAppWidgetProviderInfo; -import com.android.uiuios.Utilities; -import com.android.uiuios.compat.ShortcutConfigActivityInfo; -import com.android.uiuios.icons.IconCache; -import com.android.uiuios.util.ComponentKey; +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 java.text.Collator; diff --git a/src/com/android/uiuios/network/BaseResponse.java b/src/com/android/colorfulos/network/BaseResponse.java similarity index 51% rename from src/com/android/uiuios/network/BaseResponse.java rename to src/com/android/colorfulos/network/BaseResponse.java index 76ff69d..de7860d 100644 --- a/src/com/android/uiuios/network/BaseResponse.java +++ b/src/com/android/colorfulos/network/BaseResponse.java @@ -1,7 +1,11 @@ -package com.android.uiuios.network; +package com.android.colorfulos.network; import androidx.annotation.NonNull; +import com.google.gson.Gson; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; + import java.io.Serializable; @@ -17,6 +21,8 @@ public class BaseResponse implements Serializable { @NonNull @Override public String toString() { - return "{" + "code:" + code + "," + "msg:" + msg + "," + "data:" + data + "," + '}'; + Gson gson = new Gson(); + JsonObject jsonObject = JsonParser.parseString(gson.toJson(this)).getAsJsonObject(); + return jsonObject.toString(); } } \ No newline at end of file diff --git a/src/com/android/uiuios/network/NetWorkManager.java b/src/com/android/colorfulos/network/NetWorkManager.java similarity index 89% rename from src/com/android/uiuios/network/NetWorkManager.java rename to src/com/android/colorfulos/network/NetWorkManager.java index c65f98e..af7efcb 100644 --- a/src/com/android/uiuios/network/NetWorkManager.java +++ b/src/com/android/colorfulos/network/NetWorkManager.java @@ -1,11 +1,12 @@ -package com.android.uiuios.network; +package com.android.colorfulos.network; import android.content.Context; import android.os.Environment; -import com.android.uiuios.TTUtils.Utils; -import com.android.uiuios.network.api.AddAppLog; -import com.android.uiuios.network.api.RunningApp; +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 java.io.File; import java.util.concurrent.TimeUnit; @@ -86,5 +87,9 @@ public class NetWorkManager { .observeOn(AndroidSchedulers.mainThread()); } + public CheckUpdate getCheckUpdateObservable() { + return mRetrofit.create(CheckUpdate.class); + } + } diff --git a/src/com/android/colorfulos/network/NewestAppUpdateResult.java b/src/com/android/colorfulos/network/NewestAppUpdateResult.java new file mode 100644 index 0000000..eed016e --- /dev/null +++ b/src/com/android/colorfulos/network/NewestAppUpdateResult.java @@ -0,0 +1,88 @@ +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 new file mode 100644 index 0000000..f2162dd --- /dev/null +++ b/src/com/android/colorfulos/network/URLPath.java @@ -0,0 +1,9 @@ +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/uiuios/network/api/AddAppLog.java b/src/com/android/colorfulos/network/api/AddAppLog.java similarity index 77% rename from src/com/android/uiuios/network/api/AddAppLog.java rename to src/com/android/colorfulos/network/api/AddAppLog.java index 873e7bd..b32b948 100644 --- a/src/com/android/uiuios/network/api/AddAppLog.java +++ b/src/com/android/colorfulos/network/api/AddAppLog.java @@ -1,7 +1,7 @@ -package com.android.uiuios.network.api; +package com.android.colorfulos.network.api; -import com.android.uiuios.network.BaseResponse; -import com.android.uiuios.network.URLPath; +import com.android.colorfulos.network.BaseResponse; +import com.android.colorfulos.network.URLPath; import io.reactivex.Observable; import retrofit2.http.Field; diff --git a/src/com/android/colorfulos/network/api/CheckUpdate.java b/src/com/android/colorfulos/network/api/CheckUpdate.java new file mode 100644 index 0000000..a8fac9c --- /dev/null +++ b/src/com/android/colorfulos/network/api/CheckUpdate.java @@ -0,0 +1,22 @@ +package com.android.colorfulos.network.api; + +import com.android.colorfulos.network.BaseResponse; +import com.android.colorfulos.network.NewestAppUpdateResult; +import com.android.colorfulos.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 + @POST(URLPath.GET_NEWESTAPPUPDATE) + Observable> getCheckUpdate( + @Field("package")String packageName, + @Field("versionCode")int versionCode, + @Field("type")int type + ); +} diff --git a/src/com/android/uiuios/network/api/RunningApp.java b/src/com/android/colorfulos/network/api/RunningApp.java similarity index 70% rename from src/com/android/uiuios/network/api/RunningApp.java rename to src/com/android/colorfulos/network/api/RunningApp.java index 9a174e9..b7c83d3 100644 --- a/src/com/android/uiuios/network/api/RunningApp.java +++ b/src/com/android/colorfulos/network/api/RunningApp.java @@ -1,7 +1,7 @@ -package com.android.uiuios.network.api; +package com.android.colorfulos.network.api; -import com.android.uiuios.network.BaseResponse; -import com.android.uiuios.network.URLPath; +import com.android.colorfulos.network.BaseResponse; +import com.android.colorfulos.network.URLPath; import io.reactivex.Observable; import retrofit2.http.Field; diff --git a/src/com/android/uiuios/notification/NotificationFooterLayout.java b/src/com/android/colorfulos/notification/NotificationFooterLayout.java similarity index 96% rename from src/com/android/uiuios/notification/NotificationFooterLayout.java rename to src/com/android/colorfulos/notification/NotificationFooterLayout.java index 348f342..950992c 100644 --- a/src/com/android/uiuios/notification/NotificationFooterLayout.java +++ b/src/com/android/colorfulos/notification/NotificationFooterLayout.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.notification; +package com.android.colorfulos.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.uiuios.R; -import com.android.uiuios.Utilities; -import com.android.uiuios.anim.PropertyListBuilder; -import com.android.uiuios.anim.PropertyResetListener; -import com.android.uiuios.util.Themes; +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 java.util.ArrayList; import java.util.Iterator; diff --git a/src/com/android/uiuios/notification/NotificationGroup.java b/src/com/android/colorfulos/notification/NotificationGroup.java similarity index 96% rename from src/com/android/uiuios/notification/NotificationGroup.java rename to src/com/android/colorfulos/notification/NotificationGroup.java index 9393f93..c0e6305 100644 --- a/src/com/android/uiuios/notification/NotificationGroup.java +++ b/src/com/android/colorfulos/notification/NotificationGroup.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.notification; +package com.android.colorfulos.notification; import java.util.HashSet; import java.util.Set; diff --git a/src/com/android/uiuios/notification/NotificationInfo.java b/src/com/android/colorfulos/notification/NotificationInfo.java similarity index 93% rename from src/com/android/uiuios/notification/NotificationInfo.java rename to src/com/android/colorfulos/notification/NotificationInfo.java index 30ebede..656a9dd 100644 --- a/src/com/android/uiuios/notification/NotificationInfo.java +++ b/src/com/android/colorfulos/notification/NotificationInfo.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.notification; +package com.android.colorfulos.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.uiuios.AbstractFloatingView; -import com.android.uiuios.Launcher; -import com.android.uiuios.LauncherAppState; -import com.android.uiuios.dot.DotInfo; -import com.android.uiuios.graphics.IconPalette; -import com.android.uiuios.util.PackageUserKey; +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; /** * An object that contains relevant information from a {@link StatusBarNotification}. This should diff --git a/src/com/android/uiuios/notification/NotificationItemView.java b/src/com/android/colorfulos/notification/NotificationItemView.java similarity index 95% rename from src/com/android/uiuios/notification/NotificationItemView.java rename to src/com/android/colorfulos/notification/NotificationItemView.java index dd31e08..0a0c4fa 100644 --- a/src/com/android/uiuios/notification/NotificationItemView.java +++ b/src/com/android/colorfulos/notification/NotificationItemView.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.notification; +package com.android.colorfulos.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.uiuios.R; -import com.android.uiuios.graphics.IconPalette; -import com.android.uiuios.popup.PopupContainerWithArrow; -import com.android.uiuios.touch.SwipeDetector; -import com.android.uiuios.util.Themes; +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 java.util.List; -import static com.android.uiuios.touch.SwipeDetector.HORIZONTAL; +import static com.android.colorfulos.touch.SwipeDetector.HORIZONTAL; /** * Utility class to manage notification UI diff --git a/src/com/android/uiuios/notification/NotificationKeyData.java b/src/com/android/colorfulos/notification/NotificationKeyData.java similarity index 98% rename from src/com/android/uiuios/notification/NotificationKeyData.java rename to src/com/android/colorfulos/notification/NotificationKeyData.java index 397a65a..0a1d577 100644 --- a/src/com/android/uiuios/notification/NotificationKeyData.java +++ b/src/com/android/colorfulos/notification/NotificationKeyData.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.notification; +package com.android.colorfulos.notification; import android.app.Notification; import android.service.notification.StatusBarNotification; diff --git a/src/com/android/uiuios/notification/NotificationListener.java b/src/com/android/colorfulos/notification/NotificationListener.java similarity index 97% rename from src/com/android/uiuios/notification/NotificationListener.java rename to src/com/android/colorfulos/notification/NotificationListener.java index 0e9000a..9839636 100644 --- a/src/com/android/uiuios/notification/NotificationListener.java +++ b/src/com/android/colorfulos/notification/NotificationListener.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.android.uiuios.notification; +package com.android.colorfulos.notification; -import static com.android.uiuios.util.SecureSettingsObserver.newNotificationSettingsObserver; +import static com.android.colorfulos.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.uiuios.LauncherModel; -import com.android.uiuios.util.IntSet; -import com.android.uiuios.util.PackageUserKey; -import com.android.uiuios.util.SecureSettingsObserver; +import com.android.colorfulos.LauncherModel; +import com.android.colorfulos.util.IntSet; +import com.android.colorfulos.util.PackageUserKey; +import com.android.colorfulos.util.SecureSettingsObserver; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/com/android/uiuios/notification/NotificationMainView.java b/src/com/android/colorfulos/notification/NotificationMainView.java similarity index 94% rename from src/com/android/uiuios/notification/NotificationMainView.java rename to src/com/android/colorfulos/notification/NotificationMainView.java index de50416..a644a8a 100644 --- a/src/com/android/uiuios/notification/NotificationMainView.java +++ b/src/com/android/colorfulos/notification/NotificationMainView.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.android.uiuios.notification; +package com.android.colorfulos.notification; -import static com.android.uiuios.anim.Interpolators.scrollInterpolatorForVelocity; +import static com.android.colorfulos.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.uiuios.ItemInfo; -import com.android.uiuios.Launcher; -import com.android.uiuios.R; -import com.android.uiuios.anim.AnimationSuccessListener; -import com.android.uiuios.touch.OverScroll; -import com.android.uiuios.touch.SwipeDetector; -import com.android.uiuios.userevent.nano.LauncherLogProto; -import com.android.uiuios.util.Themes; +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; /** * A {@link android.widget.FrameLayout} that contains a single notification, diff --git a/src/com/android/uiuios/pageindicators/PageIndicator.java b/src/com/android/colorfulos/pageindicators/PageIndicator.java similarity index 94% rename from src/com/android/uiuios/pageindicators/PageIndicator.java rename to src/com/android/colorfulos/pageindicators/PageIndicator.java index 65ffa35..a5574e4 100644 --- a/src/com/android/uiuios/pageindicators/PageIndicator.java +++ b/src/com/android/colorfulos/pageindicators/PageIndicator.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.pageindicators; +package com.android.colorfulos.pageindicators; /** * Base class for a page indicator. diff --git a/src/com/android/uiuios/pageindicators/PageIndicatorDots.java b/src/com/android/colorfulos/pageindicators/PageIndicatorDots.java similarity index 97% rename from src/com/android/uiuios/pageindicators/PageIndicatorDots.java rename to src/com/android/colorfulos/pageindicators/PageIndicatorDots.java index 7abfac2..f62db67 100644 --- a/src/com/android/uiuios/pageindicators/PageIndicatorDots.java +++ b/src/com/android/colorfulos/pageindicators/PageIndicatorDots.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.pageindicators; +package com.android.colorfulos.pageindicators; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -39,12 +39,11 @@ import android.view.animation.Interpolator; import android.view.animation.OvershootInterpolator; import android.widget.FrameLayout; -import com.android.uiuios.DeviceProfile; -import com.android.uiuios.Insettable; -import com.android.uiuios.Launcher; -import com.android.uiuios.R; -import com.android.uiuios.Utilities; -import com.android.uiuios.util.Themes; +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; /** * {@link PageIndicator} which shows dots per page. The active page is shown with the current @@ -125,7 +124,8 @@ public class PageIndicatorDots extends View implements PageIndicator , Insettabl // mActiveColor = Themes.getColorAccent(context); // mInActiveColor = Themes.getAttrColor(context, android.R.attr.colorControlHighlight); mActiveColor = Color.WHITE; - mInActiveColor = Color.LTGRAY; +// mInActiveColor = Color.LTGRAY; + mInActiveColor = getResources().getColor(R.color.IndicatorInColor); //点的颜色 mIsRtl = Utilities.isRtl(getResources()); } diff --git a/src/com/android/uiuios/pageindicators/WorkspacePageIndicator.java b/src/com/android/colorfulos/pageindicators/WorkspacePageIndicator.java similarity index 96% rename from src/com/android/uiuios/pageindicators/WorkspacePageIndicator.java rename to src/com/android/colorfulos/pageindicators/WorkspacePageIndicator.java index 4784386..a81364c 100644 --- a/src/com/android/uiuios/pageindicators/WorkspacePageIndicator.java +++ b/src/com/android/colorfulos/pageindicators/WorkspacePageIndicator.java @@ -1,4 +1,4 @@ -package com.android.uiuios.pageindicators; +package com.android.colorfulos.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.uiuios.DeviceProfile; -import com.android.uiuios.Insettable; -import com.android.uiuios.Launcher; -import com.android.uiuios.R; -import com.android.uiuios.Utilities; -import com.android.uiuios.uioverrides.WallpaperColorInfo; +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; /** * A PageIndicator that briefly shows a fraction of a line when moving between pages diff --git a/src/com/android/uiuios/popup/ArrowPopup.java b/src/com/android/colorfulos/popup/ArrowPopup.java similarity index 96% rename from src/com/android/uiuios/popup/ArrowPopup.java rename to src/com/android/colorfulos/popup/ArrowPopup.java index ccb72b9..2829b51 100644 --- a/src/com/android/uiuios/popup/ArrowPopup.java +++ b/src/com/android/colorfulos/popup/ArrowPopup.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.android.uiuios.popup; +package com.android.colorfulos.popup; -import static com.android.uiuios.anim.Interpolators.ACCEL_DEACCEL; +import static com.android.colorfulos.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.uiuios.AbstractFloatingView; -import com.android.uiuios.InsettableFrameLayout; -import com.android.uiuios.Launcher; -import com.android.uiuios.LauncherAnimUtils; -import com.android.uiuios.R; -import com.android.uiuios.Utilities; -import com.android.uiuios.anim.RevealOutlineAnimation; -import com.android.uiuios.anim.RoundedRectRevealOutlineProvider; -import com.android.uiuios.dragndrop.DragLayer; -import com.android.uiuios.graphics.TriangleShape; -import com.android.uiuios.util.Themes; -import com.android.uiuios.views.BaseDragLayer; +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 java.util.ArrayList; import java.util.Collections; diff --git a/src/com/android/uiuios/popup/PopupContainerWithArrow.java b/src/com/android/colorfulos/popup/PopupContainerWithArrow.java similarity index 91% rename from src/com/android/uiuios/popup/PopupContainerWithArrow.java rename to src/com/android/colorfulos/popup/PopupContainerWithArrow.java index 0ae71a7..45f46dd 100644 --- a/src/com/android/uiuios/popup/PopupContainerWithArrow.java +++ b/src/com/android/colorfulos/popup/PopupContainerWithArrow.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package com.android.uiuios.popup; +package com.android.colorfulos.popup; -import static com.android.uiuios.Utilities.squaredHypot; -import static com.android.uiuios.Utilities.squaredTouchSlop; -import static com.android.uiuios.notification.NotificationMainView.NOTIFICATION_ITEM_INFO; -import static com.android.uiuios.popup.PopupPopulator.MAX_SHORTCUTS; -import static com.android.uiuios.popup.PopupPopulator.MAX_SHORTCUTS_IF_NOTIFICATIONS; -import static com.android.uiuios.userevent.nano.LauncherLogProto.ContainerType; -import static com.android.uiuios.userevent.nano.LauncherLogProto.ItemType; -import static com.android.uiuios.userevent.nano.LauncherLogProto.Target; +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 android.animation.AnimatorSet; import android.animation.LayoutTransition; @@ -43,36 +43,35 @@ import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; -import com.android.uiuios.AbstractFloatingView; -import com.android.uiuios.BubbleTextView; -import com.android.uiuios.DragSource; -import com.android.uiuios.DropTarget; -import com.android.uiuios.DropTarget.DragObject; -import com.android.uiuios.ItemInfo; -import com.android.uiuios.ItemInfoWithIcon; -import com.android.uiuios.Launcher; -import com.android.uiuios.LauncherModel; -import com.android.uiuios.R; -import com.android.uiuios.Utilities; -import com.android.uiuios.accessibility.LauncherAccessibilityDelegate; -import com.android.uiuios.accessibility.ShortcutMenuAccessibilityDelegate; -import com.android.uiuios.dot.DotInfo; -import com.android.uiuios.dragndrop.DragController; -import com.android.uiuios.dragndrop.DragOptions; -import com.android.uiuios.dragndrop.DragView; -import com.android.uiuios.logging.LoggerUtils; -import com.android.uiuios.notification.NotificationInfo; -import com.android.uiuios.notification.NotificationItemView; -import com.android.uiuios.notification.NotificationKeyData; -import com.android.uiuios.popup.PopupDataProvider.PopupDataChangeListener; -import com.android.uiuios.shortcuts.DeepShortcutManager; -import com.android.uiuios.shortcuts.DeepShortcutView; -import com.android.uiuios.shortcuts.ShortcutDragPreviewProvider; -import com.android.uiuios.testing.TestProtocol; -import com.android.uiuios.touch.ItemClickHandler; -import com.android.uiuios.touch.ItemLongClickListener; -import com.android.uiuios.util.PackageUserKey; -import com.android.uiuios.views.BaseDragLayer; +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 java.util.ArrayList; import java.util.List; diff --git a/src/com/android/uiuios/popup/PopupDataProvider.java b/src/com/android/colorfulos/popup/PopupDataProvider.java similarity index 94% rename from src/com/android/uiuios/popup/PopupDataProvider.java rename to src/com/android/colorfulos/popup/PopupDataProvider.java index 2060e94..cba11b1 100644 --- a/src/com/android/uiuios/popup/PopupDataProvider.java +++ b/src/com/android/colorfulos/popup/PopupDataProvider.java @@ -14,22 +14,22 @@ * limitations under the License. */ -package com.android.uiuios.popup; +package com.android.colorfulos.popup; import android.content.ComponentName; import android.service.notification.StatusBarNotification; import android.util.Log; -import com.android.uiuios.ItemInfo; -import com.android.uiuios.Launcher; -import com.android.uiuios.dot.DotInfo; -import com.android.uiuios.model.WidgetItem; -import com.android.uiuios.notification.NotificationKeyData; -import com.android.uiuios.notification.NotificationListener; -import com.android.uiuios.shortcuts.DeepShortcutManager; -import com.android.uiuios.util.ComponentKey; -import com.android.uiuios.util.PackageUserKey; -import com.android.uiuios.widget.WidgetListRowEntry; +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 java.util.ArrayList; import java.util.Collections; diff --git a/src/com/android/uiuios/popup/PopupPopulator.java b/src/com/android/colorfulos/popup/PopupPopulator.java similarity index 93% rename from src/com/android/uiuios/popup/PopupPopulator.java rename to src/com/android/colorfulos/popup/PopupPopulator.java index efefcc9..4abf717 100644 --- a/src/com/android/uiuios/popup/PopupPopulator.java +++ b/src/com/android/colorfulos/popup/PopupPopulator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.popup; +package com.android.colorfulos.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.uiuios.ItemInfo; -import com.android.uiuios.Launcher; -import com.android.uiuios.WorkspaceItemInfo; -import com.android.uiuios.icons.LauncherIcons; -import com.android.uiuios.notification.NotificationInfo; -import com.android.uiuios.notification.NotificationKeyData; -import com.android.uiuios.shortcuts.DeepShortcutManager; -import com.android.uiuios.shortcuts.DeepShortcutView; -import com.android.uiuios.util.PackageUserKey; +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 java.util.ArrayList; import java.util.Collections; diff --git a/src/com/android/uiuios/popup/RemoteActionShortcut.java b/src/com/android/colorfulos/popup/RemoteActionShortcut.java similarity index 92% rename from src/com/android/uiuios/popup/RemoteActionShortcut.java rename to src/com/android/colorfulos/popup/RemoteActionShortcut.java index fa9185e..905e3a5 100644 --- a/src/com/android/uiuios/popup/RemoteActionShortcut.java +++ b/src/com/android/colorfulos/popup/RemoteActionShortcut.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.popup; +package com.android.colorfulos.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.uiuios.AbstractFloatingView; -import com.android.uiuios.BaseDraggingActivity; -import com.android.uiuios.ItemInfo; -import com.android.uiuios.R; -import com.android.uiuios.userevent.nano.LauncherLogProto; +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; public class RemoteActionShortcut extends SystemShortcut { private static final String TAG = "RemoteActionShortcut"; diff --git a/src/com/android/uiuios/popup/SystemShortcut.java b/src/com/android/colorfulos/popup/SystemShortcut.java similarity index 88% rename from src/com/android/uiuios/popup/SystemShortcut.java rename to src/com/android/colorfulos/popup/SystemShortcut.java index 3886379..4d1392e 100644 --- a/src/com/android/uiuios/popup/SystemShortcut.java +++ b/src/com/android/colorfulos/popup/SystemShortcut.java @@ -1,14 +1,13 @@ -package com.android.uiuios.popup; +package com.android.colorfulos.popup; -import static com.android.uiuios.userevent.nano.LauncherLogProto.Action; -import static com.android.uiuios.userevent.nano.LauncherLogProto.ControlType; +import static com.android.colorfulos.userevent.nano.LauncherLogProto.Action; +import static com.android.colorfulos.userevent.nano.LauncherLogProto.ControlType; import android.app.ActivityOptions; import android.content.Context; import android.content.Intent; import android.graphics.Rect; import android.graphics.drawable.Icon; -import android.os.Bundle; import android.os.Handler; import android.os.Looper; import android.view.View; @@ -16,17 +15,17 @@ import android.view.accessibility.AccessibilityNodeInfo; import android.widget.ImageView; import android.widget.TextView; -import com.android.uiuios.AbstractFloatingView; -import com.android.uiuios.BaseDraggingActivity; -import com.android.uiuios.ItemInfo; -import com.android.uiuios.Launcher; -import com.android.uiuios.R; -import com.android.uiuios.WorkspaceItemInfo; -import com.android.uiuios.model.WidgetItem; -import com.android.uiuios.util.InstantAppResolver; -import com.android.uiuios.util.PackageManagerHelper; -import com.android.uiuios.util.PackageUserKey; -import com.android.uiuios.widget.WidgetsBottomSheet; +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 java.util.List; @@ -179,8 +178,8 @@ public abstract class SystemShortcut extends Ite boolean supportsWebUI = (itemInfo instanceof WorkspaceItemInfo) && ((WorkspaceItemInfo) itemInfo).hasStatusFlag(WorkspaceItemInfo.FLAG_SUPPORTS_WEB_UI); boolean isInstantApp = false; - if (itemInfo instanceof com.android.uiuios.AppInfo) { - com.android.uiuios.AppInfo appInfo = (com.android.uiuios.AppInfo) itemInfo; + if (itemInfo instanceof com.android.colorfulos.AppInfo) { + com.android.colorfulos.AppInfo appInfo = (com.android.colorfulos.AppInfo) itemInfo; isInstantApp = InstantAppResolver.newInstance(activity).isInstantApp(appInfo); } boolean enabled = supportsWebUI || isInstantApp; diff --git a/src/com/android/uiuios/popup/SystemShortcutFactory.java b/src/com/android/colorfulos/popup/SystemShortcutFactory.java similarity index 87% rename from src/com/android/uiuios/popup/SystemShortcutFactory.java rename to src/com/android/colorfulos/popup/SystemShortcutFactory.java index 5472ba3..39a74f3 100644 --- a/src/com/android/uiuios/popup/SystemShortcutFactory.java +++ b/src/com/android/colorfulos/popup/SystemShortcutFactory.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.popup; +package com.android.colorfulos.popup; -import com.android.uiuios.ItemInfo; -import com.android.uiuios.Launcher; -import com.android.uiuios.R; -import com.android.uiuios.util.MainThreadInitializedObject; -import com.android.uiuios.util.ResourceBasedOverride; +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 java.util.ArrayList; import java.util.List; diff --git a/src/com/android/uiuios/provider/ImportDataTask.java b/src/com/android/colorfulos/provider/ImportDataTask.java similarity index 95% rename from src/com/android/uiuios/provider/ImportDataTask.java rename to src/com/android/colorfulos/provider/ImportDataTask.java index 6c535c5..3550111 100644 --- a/src/com/android/uiuios/provider/ImportDataTask.java +++ b/src/com/android/colorfulos/provider/ImportDataTask.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.android.uiuios.provider; +package com.android.colorfulos.provider; -import static com.android.uiuios.Utilities.getDevicePrefs; +import static com.android.colorfulos.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.uiuios.AutoInstallsLayout.LayoutParserCallback; -import com.android.uiuios.DefaultLayoutParser; -import com.android.uiuios.LauncherAppState; -import com.android.uiuios.LauncherAppWidgetInfo; -import com.android.uiuios.LauncherProvider; -import com.android.uiuios.LauncherSettings; -import com.android.uiuios.LauncherSettings.Favorites; -import com.android.uiuios.LauncherSettings.Settings; -import com.android.uiuios.Utilities; -import com.android.uiuios.Workspace; -import com.android.uiuios.compat.UserManagerCompat; -import com.android.uiuios.config.FeatureFlags; -import com.android.uiuios.logging.FileLog; -import com.android.uiuios.model.GridSizeMigrationTask; -import com.android.uiuios.util.IntArray; -import com.android.uiuios.util.IntSparseArrayMap; +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 java.net.URISyntaxException; import java.util.ArrayList; diff --git a/src/com/android/uiuios/provider/LauncherDbUtils.java b/src/com/android/colorfulos/provider/LauncherDbUtils.java similarity index 96% rename from src/com/android/uiuios/provider/LauncherDbUtils.java rename to src/com/android/colorfulos/provider/LauncherDbUtils.java index 6e36018..d1f81ce 100644 --- a/src/com/android/uiuios/provider/LauncherDbUtils.java +++ b/src/com/android/colorfulos/provider/LauncherDbUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.provider; +package com.android.colorfulos.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.uiuios.LauncherAppState; -import com.android.uiuios.LauncherSettings.Favorites; -import com.android.uiuios.util.IntArray; +import com.android.colorfulos.LauncherAppState; +import com.android.colorfulos.LauncherSettings.Favorites; +import com.android.colorfulos.util.IntArray; import java.util.Locale; diff --git a/src/com/android/uiuios/provider/LossyScreenMigrationTask.java b/src/com/android/colorfulos/provider/LossyScreenMigrationTask.java similarity index 89% rename from src/com/android/uiuios/provider/LossyScreenMigrationTask.java rename to src/com/android/colorfulos/provider/LossyScreenMigrationTask.java index 6720b0d..c1d8eaa 100644 --- a/src/com/android/uiuios/provider/LossyScreenMigrationTask.java +++ b/src/com/android/colorfulos/provider/LossyScreenMigrationTask.java @@ -14,20 +14,19 @@ * limitations under the License. */ -package com.android.uiuios.provider; +package com.android.colorfulos.provider; import android.content.ContentValues; import android.content.Context; -import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; import android.graphics.Point; -import com.android.uiuios.InvariantDeviceProfile; -import com.android.uiuios.LauncherSettings.Favorites; -import com.android.uiuios.Utilities; -import com.android.uiuios.Workspace; -import com.android.uiuios.model.GridSizeMigrationTask; -import com.android.uiuios.util.IntSparseArrayMap; +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 java.util.ArrayList; diff --git a/src/com/android/uiuios/provider/RestoreDbTask.java b/src/com/android/colorfulos/provider/RestoreDbTask.java similarity index 94% rename from src/com/android/uiuios/provider/RestoreDbTask.java rename to src/com/android/colorfulos/provider/RestoreDbTask.java index 1f99683..961807d 100644 --- a/src/com/android/uiuios/provider/RestoreDbTask.java +++ b/src/com/android/colorfulos/provider/RestoreDbTask.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.android.uiuios.provider; +package com.android.colorfulos.provider; -import static com.android.uiuios.Utilities.getIntArrayFromString; -import static com.android.uiuios.Utilities.getStringFromIntArray; -import static com.android.uiuios.provider.LauncherDbUtils.dropTable; +import static com.android.colorfulos.Utilities.getIntArrayFromString; +import static com.android.colorfulos.Utilities.getStringFromIntArray; +import static com.android.colorfulos.provider.LauncherDbUtils.dropTable; import android.app.backup.BackupManager; import android.content.ContentValues; @@ -32,15 +32,15 @@ import android.util.SparseLongArray; import androidx.annotation.NonNull; -import com.android.uiuios.AppWidgetsRestoredReceiver; -import com.android.uiuios.LauncherAppWidgetInfo; -import com.android.uiuios.LauncherProvider.DatabaseHelper; -import com.android.uiuios.LauncherSettings.Favorites; -import com.android.uiuios.WorkspaceItemInfo; -import com.android.uiuios.Utilities; -import com.android.uiuios.logging.FileLog; -import com.android.uiuios.provider.LauncherDbUtils.SQLiteTransaction; -import com.android.uiuios.util.LogConfig; +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 java.io.InvalidObjectException; diff --git a/src/com/android/uiuios/qsb/QsbContainerView.java b/src/com/android/colorfulos/qsb/QsbContainerView.java similarity index 96% rename from src/com/android/uiuios/qsb/QsbContainerView.java rename to src/com/android/colorfulos/qsb/QsbContainerView.java index f556451..314f394 100644 --- a/src/com/android/uiuios/qsb/QsbContainerView.java +++ b/src/com/android/colorfulos/qsb/QsbContainerView.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.qsb; +package com.android.colorfulos.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.uiuios.AppWidgetResizeFrame; -import com.android.uiuios.InvariantDeviceProfile; -import com.android.uiuios.LauncherAppState; -import com.android.uiuios.R; -import com.android.uiuios.Utilities; -import com.android.uiuios.config.FeatureFlags; -import com.android.uiuios.graphics.FragmentWithPreview; +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; /** * A frame layout which contains a QSB. This internally uses fragment to bind the view, which diff --git a/src/com/android/uiuios/qsb/QsbWidgetHostView.java b/src/com/android/colorfulos/qsb/QsbWidgetHostView.java similarity index 94% rename from src/com/android/uiuios/qsb/QsbWidgetHostView.java rename to src/com/android/colorfulos/qsb/QsbWidgetHostView.java index 2dee507..ef7d7e2 100644 --- a/src/com/android/uiuios/qsb/QsbWidgetHostView.java +++ b/src/com/android/colorfulos/qsb/QsbWidgetHostView.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.qsb; +package com.android.colorfulos.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.uiuios.Launcher; -import com.android.uiuios.R; -import com.android.uiuios.widget.NavigableAppWidgetHostView; +import com.android.colorfulos.Launcher; +import com.android.colorfulos.R; +import com.android.colorfulos.widget.NavigableAppWidgetHostView; /** * Appwidget host view with QSB specific logic. diff --git a/src/com/android/colorfulos/receiver/InstallResultReceiver.java b/src/com/android/colorfulos/receiver/InstallResultReceiver.java new file mode 100644 index 0000000..ffb2c8d --- /dev/null +++ b/src/com/android/colorfulos/receiver/InstallResultReceiver.java @@ -0,0 +1,57 @@ +package com.android.colorfulos.receiver; + +import android.content.BroadcastReceiver; +import android.content.Context; +import android.content.Intent; +import android.content.pm.PackageInstaller; +import android.os.Build; +import android.util.Log; + +import androidx.annotation.RequiresApi; + +public class InstallResultReceiver extends BroadcastReceiver { + private static final String TAG = "InstallResultReceiver"; + + @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP) + @Override + public void onReceive(Context context, Intent intent) { + // TODO: This method is called when the BroadcastReceiver is receiving + // an Intent broadcast. + //throw new UnsupportedOperationException("Not yet implemented"); + + + if (intent != null) { + final int status = intent.getIntExtra(PackageInstaller.EXTRA_STATUS, + PackageInstaller.STATUS_FAILURE); + if (status == PackageInstaller.STATUS_SUCCESS) { + // success + String PACKAGE_NAME = intent.getStringExtra("android.content.pm.extra.PACKAGE_NAME"); + + Log.e(TAG, "APP Install Success!"); + } else { + String msg = intent.getStringExtra(PackageInstaller.EXTRA_STATUS_MESSAGE); + } + } +// String s = intent.getAction(); +// Log.e("fht", s); +// Bundle extras = intent.getExtras(); +// Set ks = extras.keySet(); +// Iterator iterator = ks.iterator(); +// while (iterator.hasNext()) { +// Log.d("KEY", iterator.next()); +// } + String STATUS = intent.getStringExtra(PackageInstaller.EXTRA_STATUS); + String PACKAGE_NAME = intent.getStringExtra(PackageInstaller.EXTRA_PACKAGE_NAME); + String SESSION_ID = intent.getStringExtra(PackageInstaller.EXTRA_SESSION_ID); + String STATUS_MESSAGE = intent.getStringExtra(PackageInstaller.EXTRA_STATUS_MESSAGE); + String LEGACY_STATUS = intent.getStringExtra("android.content.pm.extra.LEGACY_STATUS"); +// Log.e("fht", STATUS); +// Log.e("fht", PACKAGE_NAME); +// Log.e("fht", SESSION_ID); +// Log.e("fht", LEGACY_STATUS); +// Log.e("fht", STATUS_MESSAGE); + if (STATUS_MESSAGE != null && STATUS_MESSAGE.equals("INSTALL_SUCCEEDED")) { +// ToastUtil.show(PACKAGE_NAME + "安装成功"); + } + } +} diff --git a/src/com/android/colorfulos/service/MainService.java b/src/com/android/colorfulos/service/MainService.java new file mode 100644 index 0000000..f06ab15 --- /dev/null +++ b/src/com/android/colorfulos/service/MainService.java @@ -0,0 +1,51 @@ +package com.android.colorfulos.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.arialyy.annotations.Download; +import com.arialyy.aria.core.Aria; +import com.arialyy.aria.core.task.DownloadTask; + +public class MainService extends Service { + private String TAG = MainService.class.getSimpleName(); + + public MainService() { + } + + @Override + public IBinder onBind(Intent intent) { + return null; + } + + @Override + public void onCreate() { + Log.e(TAG, "onCreate: "); + Aria.download(this).register(); + super.onCreate(); + } + + @Override + public int onStartCommand(Intent intent, int flags, int startId) { + return START_STICKY; + } + + @Download.onTaskRunning + void taskRunning(DownloadTask task) { + Log.e("aria running", "正在下载:" + task.getState() + "--" + task.getPercent() + "--" + task.getExtendField()); + } + + @Download.onTaskComplete + void taskComplete(DownloadTask task) { + APKUtils.installApp(MainService.this, task.getFilePath()); + Aria.download(this).load(task.getDownloadEntity().getId()).cancel(); + } + + @Download.onTaskFail + void taskFail(DownloadTask task) { + Log.e(TAG, "taskFail: " + task.getDownloadEntity().getUrl()); + } +} diff --git a/src/com/android/uiuios/settings/DeveloperOptionsFragment.java b/src/com/android/colorfulos/settings/DeveloperOptionsFragment.java similarity index 95% rename from src/com/android/uiuios/settings/DeveloperOptionsFragment.java rename to src/com/android/colorfulos/settings/DeveloperOptionsFragment.java index 23a024d..f144a17 100644 --- a/src/com/android/uiuios/settings/DeveloperOptionsFragment.java +++ b/src/com/android/colorfulos/settings/DeveloperOptionsFragment.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.settings; +package com.android.colorfulos.settings; -import static com.android.uiuios.uioverrides.plugins.PluginManagerWrapper.PLUGIN_CHANGED; -import static com.android.uiuios.uioverrides.plugins.PluginManagerWrapper.pluginEnabledKey; +import static com.android.colorfulos.uioverrides.plugins.PluginManagerWrapper.PLUGIN_CHANGED; +import static com.android.colorfulos.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.uiuios.R; -import com.android.uiuios.config.FeatureFlags; -import com.android.uiuios.config.FlagTogglerPrefUi; -import com.android.uiuios.uioverrides.plugins.PluginManagerWrapper; +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 java.util.List; import java.util.Set; diff --git a/src/com/android/uiuios/settings/NotificationDotsPreference.java b/src/com/android/colorfulos/settings/NotificationDotsPreference.java similarity index 93% rename from src/com/android/uiuios/settings/NotificationDotsPreference.java rename to src/com/android/colorfulos/settings/NotificationDotsPreference.java index 1afa07a..b89d429 100644 --- a/src/com/android/uiuios/settings/NotificationDotsPreference.java +++ b/src/com/android/colorfulos/settings/NotificationDotsPreference.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.settings; +package com.android.colorfulos.settings; -import static com.android.uiuios.settings.SettingsActivity.EXTRA_FRAGMENT_ARG_KEY; -import static com.android.uiuios.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGS; +import static com.android.colorfulos.settings.SettingsActivity.EXTRA_FRAGMENT_ARG_KEY; +import static com.android.colorfulos.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGS; import android.app.AlertDialog; import android.app.Dialog; @@ -30,9 +30,9 @@ import android.provider.Settings; import android.util.AttributeSet; import android.view.View; -import com.android.uiuios.R; -import com.android.uiuios.notification.NotificationListener; -import com.android.uiuios.util.SecureSettingsObserver; +import com.android.colorfulos.R; +import com.android.colorfulos.notification.NotificationListener; +import com.android.colorfulos.util.SecureSettingsObserver; import androidx.preference.Preference; import androidx.preference.PreferenceViewHolder; diff --git a/src/com/android/uiuios/settings/PreferenceHighlighter.java b/src/com/android/colorfulos/settings/PreferenceHighlighter.java similarity index 96% rename from src/com/android/uiuios/settings/PreferenceHighlighter.java rename to src/com/android/colorfulos/settings/PreferenceHighlighter.java index b9073a1..4d40b7c 100644 --- a/src/com/android/uiuios/settings/PreferenceHighlighter.java +++ b/src/com/android/colorfulos/settings/PreferenceHighlighter.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.settings; +package com.android.colorfulos.settings; -import static com.android.uiuios.icons.GraphicsUtils.setColorAlphaBound; +import static com.android.colorfulos.icons.GraphicsUtils.setColorAlphaBound; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -27,7 +27,7 @@ import android.graphics.Paint; import android.util.Property; import android.view.View; -import com.android.uiuios.util.Themes; +import com.android.colorfulos.util.Themes; import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView.ItemDecoration; diff --git a/src/com/android/uiuios/settings/SettingsActivity.java b/src/com/android/colorfulos/settings/SettingsActivity.java similarity index 93% rename from src/com/android/uiuios/settings/SettingsActivity.java rename to src/com/android/colorfulos/settings/SettingsActivity.java index 4d29948..d42c081 100644 --- a/src/com/android/uiuios/settings/SettingsActivity.java +++ b/src/com/android/colorfulos/settings/SettingsActivity.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.android.uiuios.settings; +package com.android.colorfulos.settings; -import static com.android.uiuios.SessionCommitReceiver.ADD_ICON_PREFERENCE_KEY; -import static com.android.uiuios.states.RotationHelper.ALLOW_ROTATION_PREFERENCE_KEY; -import static com.android.uiuios.states.RotationHelper.getAllowRotationDefaultValue; -import static com.android.uiuios.util.SecureSettingsObserver.newNotificationSettingsObserver; +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 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.uiuios.LauncherFiles; -import com.android.uiuios.R; -import com.android.uiuios.Utilities; -import com.android.uiuios.config.FeatureFlags; -import com.android.uiuios.graphics.GridOptionsProvider; -import com.android.uiuios.uioverrides.plugins.PluginManagerWrapper; -import com.android.uiuios.util.SecureSettingsObserver; +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 androidx.preference.Preference; import androidx.preference.PreferenceFragment; diff --git a/src/com/android/uiuios/shortcuts/DeepShortcutTextView.java b/src/com/android/colorfulos/shortcuts/DeepShortcutTextView.java similarity index 96% rename from src/com/android/uiuios/shortcuts/DeepShortcutTextView.java rename to src/com/android/colorfulos/shortcuts/DeepShortcutTextView.java index 872eb8c..f1d007b 100644 --- a/src/com/android/uiuios/shortcuts/DeepShortcutTextView.java +++ b/src/com/android/colorfulos/shortcuts/DeepShortcutTextView.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.shortcuts; +package com.android.colorfulos.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.uiuios.BubbleTextView; -import com.android.uiuios.R; -import com.android.uiuios.Utilities; +import com.android.colorfulos.BubbleTextView; +import com.android.colorfulos.R; +import com.android.colorfulos.Utilities; /** * A {@link BubbleTextView} that has the shortcut icon on the left and drag handle on the right. diff --git a/src/com/android/uiuios/shortcuts/DeepShortcutView.java b/src/com/android/colorfulos/shortcuts/DeepShortcutView.java similarity index 93% rename from src/com/android/uiuios/shortcuts/DeepShortcutView.java rename to src/com/android/colorfulos/shortcuts/DeepShortcutView.java index 06b2595..3d47ee6 100644 --- a/src/com/android/uiuios/shortcuts/DeepShortcutView.java +++ b/src/com/android/colorfulos/shortcuts/DeepShortcutView.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.shortcuts; +package com.android.colorfulos.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.uiuios.BubbleTextView; -import com.android.uiuios.Launcher; -import com.android.uiuios.R; -import com.android.uiuios.WorkspaceItemInfo; -import com.android.uiuios.Utilities; -import com.android.uiuios.popup.PopupContainerWithArrow; +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; /** * A {@link android.widget.FrameLayout} that contains a {@link DeepShortcutView}. diff --git a/src/com/android/uiuios/shortcuts/ShortcutDragPreviewProvider.java b/src/com/android/colorfulos/shortcuts/ShortcutDragPreviewProvider.java similarity index 93% rename from src/com/android/uiuios/shortcuts/ShortcutDragPreviewProvider.java rename to src/com/android/colorfulos/shortcuts/ShortcutDragPreviewProvider.java index 9045271..76ef186 100644 --- a/src/com/android/uiuios/shortcuts/ShortcutDragPreviewProvider.java +++ b/src/com/android/colorfulos/shortcuts/ShortcutDragPreviewProvider.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.shortcuts; +package com.android.colorfulos.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.uiuios.Launcher; -import com.android.uiuios.Utilities; -import com.android.uiuios.graphics.DragPreviewProvider; +import com.android.colorfulos.Launcher; +import com.android.colorfulos.Utilities; +import com.android.colorfulos.graphics.DragPreviewProvider; /** * Extension of {@link DragPreviewProvider} which generates bitmaps scaled to the default icon size. diff --git a/src/com/android/uiuios/shortcuts/ShortcutKey.java b/src/com/android/colorfulos/shortcuts/ShortcutKey.java similarity index 88% rename from src/com/android/uiuios/shortcuts/ShortcutKey.java rename to src/com/android/colorfulos/shortcuts/ShortcutKey.java index edbbc09..9bd4fcb 100644 --- a/src/com/android/uiuios/shortcuts/ShortcutKey.java +++ b/src/com/android/colorfulos/shortcuts/ShortcutKey.java @@ -1,12 +1,12 @@ -package com.android.uiuios.shortcuts; +package com.android.colorfulos.shortcuts; import android.content.ComponentName; import android.content.Intent; import android.content.pm.ShortcutInfo; import android.os.UserHandle; -import com.android.uiuios.ItemInfo; -import com.android.uiuios.util.ComponentKey; +import com.android.colorfulos.ItemInfo; +import com.android.colorfulos.util.ComponentKey; /** * A key that uniquely identifies a shortcut using its package, id, and user handle. @@ -14,7 +14,7 @@ import com.android.uiuios.util.ComponentKey; public class ShortcutKey extends ComponentKey { public static final String EXTRA_SHORTCUT_ID = "shortcut_id"; - private static final String INTENT_CATEGORY = "com.android.uiuios.DEEP_SHORTCUT"; + private static final String INTENT_CATEGORY = "com.android.colorfulos.DEEP_SHORTCUT"; public ShortcutKey(String packageName, UserHandle user, String id) { // Use the id as the class name. diff --git a/src/com/android/uiuios/states/InternalStateHandler.java b/src/com/android/colorfulos/states/InternalStateHandler.java similarity index 95% rename from src/com/android/uiuios/states/InternalStateHandler.java rename to src/com/android/colorfulos/states/InternalStateHandler.java index 04f1272..5a86a1a 100644 --- a/src/com/android/uiuios/states/InternalStateHandler.java +++ b/src/com/android/colorfulos/states/InternalStateHandler.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.states; +package com.android.colorfulos.states; import android.content.Intent; import android.os.Binder; import android.os.Bundle; import android.os.IBinder; -import com.android.uiuios.Launcher; -import com.android.uiuios.LauncherAppState; -import com.android.uiuios.LauncherModel.Callbacks; -import com.android.uiuios.MainThreadExecutor; +import com.android.colorfulos.Launcher; +import com.android.colorfulos.LauncherAppState; +import com.android.colorfulos.LauncherModel.Callbacks; +import com.android.colorfulos.MainThreadExecutor; import java.lang.ref.WeakReference; diff --git a/src/com/android/uiuios/states/RotationHelper.java b/src/com/android/colorfulos/states/RotationHelper.java similarity index 96% rename from src/com/android/uiuios/states/RotationHelper.java rename to src/com/android/colorfulos/states/RotationHelper.java index 285a5dd..462cda6 100644 --- a/src/com/android/uiuios/states/RotationHelper.java +++ b/src/com/android/colorfulos/states/RotationHelper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.states; +package com.android.colorfulos.states; import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_LOCKED; import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_NOSENSOR; @@ -24,13 +24,12 @@ import android.content.SharedPreferences; import android.content.SharedPreferences.OnSharedPreferenceChangeListener; import android.content.res.Resources; import android.view.WindowManager; -import android.view.WindowManager.LayoutParams; -import com.android.uiuios.Launcher; -import com.android.uiuios.R; -import com.android.uiuios.Utilities; -import com.android.uiuios.config.FeatureFlags; -import com.android.uiuios.util.UiThreadHelper; +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; /** * Utility class to manage launcher rotation diff --git a/src/com/android/uiuios/states/SpringLoadedState.java b/src/com/android/colorfulos/states/SpringLoadedState.java similarity index 88% rename from src/com/android/uiuios/states/SpringLoadedState.java rename to src/com/android/colorfulos/states/SpringLoadedState.java index ffaa92f..619686e 100644 --- a/src/com/android/uiuios/states/SpringLoadedState.java +++ b/src/com/android/colorfulos/states/SpringLoadedState.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.states; +package com.android.colorfulos.states; -import static com.android.uiuios.LauncherAnimUtils.SPRING_LOADED_TRANSITION_MS; -import static com.android.uiuios.states.RotationHelper.REQUEST_LOCK; +import static com.android.colorfulos.LauncherAnimUtils.SPRING_LOADED_TRANSITION_MS; +import static com.android.colorfulos.states.RotationHelper.REQUEST_LOCK; import android.graphics.Rect; -import com.android.uiuios.DeviceProfile; -import com.android.uiuios.InstallShortcutReceiver; -import com.android.uiuios.Launcher; -import com.android.uiuios.LauncherState; -import com.android.uiuios.Workspace; -import com.android.uiuios.userevent.nano.LauncherLogProto.ContainerType; +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; /** * Definition for spring loaded state used during drag and drop. diff --git a/src/com/android/uiuios/testing/TestInformationHandler.java b/src/com/android/colorfulos/testing/TestInformationHandler.java similarity index 90% rename from src/com/android/uiuios/testing/TestInformationHandler.java rename to src/com/android/colorfulos/testing/TestInformationHandler.java index c856c2f..e6d664b 100644 --- a/src/com/android/uiuios/testing/TestInformationHandler.java +++ b/src/com/android/colorfulos/testing/TestInformationHandler.java @@ -13,20 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.testing; +package com.android.colorfulos.testing; import android.content.Context; import android.os.Bundle; -import com.android.uiuios.DeviceProfile; -import com.android.uiuios.InvariantDeviceProfile; -import com.android.uiuios.Launcher; -import com.android.uiuios.LauncherAppState; -import com.android.uiuios.LauncherState; -import com.android.uiuios.MainThreadExecutor; -import com.android.uiuios.R; -import com.android.uiuios.allapps.AllAppsStore; -import com.android.uiuios.util.ResourceBasedOverride; +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 java.util.concurrent.ExecutionException; diff --git a/src/com/android/uiuios/testing/TestInformationProvider.java b/src/com/android/colorfulos/testing/TestInformationProvider.java similarity index 95% rename from src/com/android/uiuios/testing/TestInformationProvider.java rename to src/com/android/colorfulos/testing/TestInformationProvider.java index 545fd40..d17de97 100644 --- a/src/com/android/uiuios/testing/TestInformationProvider.java +++ b/src/com/android/colorfulos/testing/TestInformationProvider.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.testing; +package com.android.colorfulos.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.uiuios.Utilities; +import com.android.colorfulos.Utilities; public class TestInformationProvider extends ContentProvider { @Override diff --git a/src/com/android/uiuios/testing/TestProtocol.java b/src/com/android/colorfulos/testing/TestProtocol.java similarity index 98% rename from src/com/android/uiuios/testing/TestProtocol.java rename to src/com/android/colorfulos/testing/TestProtocol.java index 88f27df..4484055 100644 --- a/src/com/android/uiuios/testing/TestProtocol.java +++ b/src/com/android/colorfulos/testing/TestProtocol.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.testing; +package com.android.colorfulos.testing; /** * Protocol for custom accessibility events for communication with UI Automation tests. diff --git a/src/com/android/uiuios/touch/AbstractStateChangeTouchController.java b/src/com/android/colorfulos/touch/AbstractStateChangeTouchController.java similarity index 92% rename from src/com/android/uiuios/touch/AbstractStateChangeTouchController.java rename to src/com/android/colorfulos/touch/AbstractStateChangeTouchController.java index a316bd0..1731962 100644 --- a/src/com/android/uiuios/touch/AbstractStateChangeTouchController.java +++ b/src/com/android/colorfulos/touch/AbstractStateChangeTouchController.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.touch; +package com.android.colorfulos.touch; -import static com.android.uiuios.LauncherAnimUtils.MIN_PROGRESS_TO_ALL_APPS; -import static com.android.uiuios.LauncherState.ALL_APPS; -import static com.android.uiuios.LauncherState.NORMAL; -import static com.android.uiuios.LauncherState.OVERVIEW; -import static com.android.uiuios.LauncherStateManager.ANIM_ALL; -import static com.android.uiuios.LauncherStateManager.ATOMIC_OVERVIEW_SCALE_COMPONENT; -import static com.android.uiuios.LauncherStateManager.NON_ATOMIC_COMPONENT; -import static com.android.uiuios.Utilities.SINGLE_FRAME_MS; -import static com.android.uiuios.anim.Interpolators.scrollInterpolatorForVelocity; -import static com.android.uiuios.config.FeatureFlags.QUICKSTEP_SPRINGS; +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 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.uiuios.Launcher; -import com.android.uiuios.LauncherAnimUtils; -import com.android.uiuios.LauncherState; -import com.android.uiuios.LauncherStateManager.AnimationComponents; -import com.android.uiuios.Utilities; -import com.android.uiuios.anim.AnimationSuccessListener; -import com.android.uiuios.anim.AnimatorPlaybackController; -import com.android.uiuios.anim.AnimatorSetBuilder; -import com.android.uiuios.testing.TestProtocol; -import com.android.uiuios.userevent.nano.LauncherLogProto; -import com.android.uiuios.userevent.nano.LauncherLogProto.Action.Direction; -import com.android.uiuios.userevent.nano.LauncherLogProto.Action.Touch; -import com.android.uiuios.util.FlingBlockCheck; -import com.android.uiuios.util.PendingAnimation; -import com.android.uiuios.util.TouchController; +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; /** * TouchController for handling state changes @@ -376,7 +376,7 @@ public abstract class AbstractStateChangeTouchController @Override public void onDragEnd(float velocity, boolean fling) { - if (com.android.uiuios.testing.TestProtocol.sDebugTracing) { + if (com.android.colorfulos.testing.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.uiuios.testing.TestProtocol.sDebugTracing) { + if (com.android.colorfulos.testing.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.uiuios.testing.TestProtocol.sDebugTracing) { + if (com.android.colorfulos.testing.TestProtocol.sDebugTracing) { android.util.Log.e( TestProtocol.NO_ALLAPPS_EVENT_TAG, "onSwipeInteractionCompleted 2"); } diff --git a/src/com/android/uiuios/touch/ItemClickHandler.java b/src/com/android/colorfulos/touch/ItemClickHandler.java similarity index 84% rename from src/com/android/uiuios/touch/ItemClickHandler.java rename to src/com/android/colorfulos/touch/ItemClickHandler.java index 47f3e15..d0cfb3f 100644 --- a/src/com/android/uiuios/touch/ItemClickHandler.java +++ b/src/com/android/colorfulos/touch/ItemClickHandler.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.touch; +package com.android.colorfulos.touch; -import static com.android.uiuios.ItemInfoWithIcon.FLAG_DISABLED_BY_PUBLISHER; -import static com.android.uiuios.ItemInfoWithIcon.FLAG_DISABLED_LOCKED_USER; -import static com.android.uiuios.ItemInfoWithIcon.FLAG_DISABLED_QUIET_USER; -import static com.android.uiuios.ItemInfoWithIcon.FLAG_DISABLED_SAFEMODE; -import static com.android.uiuios.ItemInfoWithIcon.FLAG_DISABLED_SUSPENDED; -import static com.android.uiuios.Launcher.REQUEST_BIND_PENDING_APPWIDGET; -import static com.android.uiuios.Launcher.REQUEST_RECONFIGURE_APPWIDGET; -import static com.android.uiuios.model.AppLaunchTracker.CONTAINER_ALL_APPS; +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 android.app.AlertDialog; import android.content.Context; @@ -31,6 +31,7 @@ import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.os.Build; import android.os.Process; +import android.provider.Settings; import android.text.TextUtils; import android.text.format.DateUtils; import android.util.Log; @@ -40,32 +41,32 @@ import android.widget.Toast; import androidx.annotation.Nullable; -import com.android.uiuios.AppInfo; -import com.android.uiuios.BubbleTextView; -import com.android.uiuios.FolderInfo; -import com.android.uiuios.ItemInfo; -import com.android.uiuios.Launcher; -import com.android.uiuios.LauncherAppWidgetInfo; -import com.android.uiuios.LauncherAppWidgetProviderInfo; -import com.android.uiuios.MyApplication; -import com.android.uiuios.PromiseAppInfo; -import com.android.uiuios.R; -import com.android.uiuios.Statistics.AppInformation; -import com.android.uiuios.Statistics.StatisticsInfo; -import com.android.uiuios.TTUtils.APKUtils; -import com.android.uiuios.TTUtils.Utils; -import com.android.uiuios.WorkspaceItemInfo; -import com.android.uiuios.compat.AppWidgetManagerCompat; -import com.android.uiuios.folder.Folder; -import com.android.uiuios.folder.FolderIcon; -import com.android.uiuios.network.BaseResponse; -import com.android.uiuios.network.NetWorkManager; -import com.android.uiuios.network.api.AddAppLog; -import com.android.uiuios.testing.TestProtocol; -import com.android.uiuios.util.PackageManagerHelper; -import com.android.uiuios.views.FloatingIconView; -import com.android.uiuios.widget.PendingAppWidgetHostView; -import com.android.uiuios.widget.WidgetAddFlowHandler; +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 java.util.Arrays; import java.util.List; @@ -115,9 +116,13 @@ public class ItemClickHandler { Object tag = v.getTag(); if (tag instanceof WorkspaceItemInfo) { - onClickAppShortcut(v, (WorkspaceItemInfo) tag, launcher, sourceContainer); 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); @@ -159,6 +164,18 @@ public class ItemClickHandler { } } + private static boolean cameraClosed(Context context, String pkg) { + if ("com.mediatek.camera".equalsIgnoreCase(pkg)) { + if (Settings.System.getInt(context.getContentResolver(), "qch_app_camera", 0) == 1) { + Toast.makeText(context, "摄像头已禁止使用", Toast.LENGTH_SHORT).show(); + return true; + } else { + return false; + } + } else { + return false; + } + } public static String[] packages = { "com.appstore.uiui", @@ -214,9 +231,9 @@ public class ItemClickHandler { public void onNext(BaseResponse baseResponse) { int code = baseResponse.code; if (code == 200) { - Log.e("SendOpenApp", "onNext:" + code + baseResponse.data); + Log.e("SendOpenApp", "onNext: " + code + baseResponse.data); } else { - Log.e("SendOpenApp", "onNext:" + code + baseResponse.msg); + Log.e("SendOpenApp", "onNext: " + code + baseResponse.msg); } } diff --git a/src/com/android/uiuios/touch/ItemLongClickListener.java b/src/com/android/colorfulos/touch/ItemLongClickListener.java similarity index 87% rename from src/com/android/uiuios/touch/ItemLongClickListener.java rename to src/com/android/colorfulos/touch/ItemLongClickListener.java index f3d7b03..de6f58f 100644 --- a/src/com/android/uiuios/touch/ItemLongClickListener.java +++ b/src/com/android/colorfulos/touch/ItemLongClickListener.java @@ -13,25 +13,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.touch; +package com.android.colorfulos.touch; import static android.view.View.INVISIBLE; import static android.view.View.VISIBLE; -import static com.android.uiuios.LauncherState.ALL_APPS; -import static com.android.uiuios.LauncherState.NORMAL; -import static com.android.uiuios.LauncherState.OVERVIEW; +import static com.android.colorfulos.LauncherState.ALL_APPS; +import static com.android.colorfulos.LauncherState.NORMAL; +import static com.android.colorfulos.LauncherState.OVERVIEW; import android.view.View; import android.view.View.OnLongClickListener; -import com.android.uiuios.CellLayout; -import com.android.uiuios.DeviceProfile; -import com.android.uiuios.DropTarget; -import com.android.uiuios.ItemInfo; -import com.android.uiuios.Launcher; -import com.android.uiuios.dragndrop.DragController; -import com.android.uiuios.dragndrop.DragOptions; -import com.android.uiuios.folder.Folder; +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; /** * Class to handle long-clicks on workspace items and start drag as a result. diff --git a/src/com/android/uiuios/touch/OverScroll.java b/src/com/android/colorfulos/touch/OverScroll.java similarity index 97% rename from src/com/android/uiuios/touch/OverScroll.java rename to src/com/android/colorfulos/touch/OverScroll.java index 7ff78d3..b2a8a38 100644 --- a/src/com/android/uiuios/touch/OverScroll.java +++ b/src/com/android/colorfulos/touch/OverScroll.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.touch; +package com.android.colorfulos.touch; /** * Utility methods for overscroll damping and related effect. diff --git a/src/com/android/uiuios/touch/SwipeDetector.java b/src/com/android/colorfulos/touch/SwipeDetector.java similarity index 98% rename from src/com/android/uiuios/touch/SwipeDetector.java rename to src/com/android/colorfulos/touch/SwipeDetector.java index 182564b..20e40ce 100644 --- a/src/com/android/uiuios/touch/SwipeDetector.java +++ b/src/com/android/colorfulos/touch/SwipeDetector.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.touch; +package com.android.colorfulos.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.uiuios.Utilities; -import com.android.uiuios.testing.TestProtocol; +import com.android.colorfulos.Utilities; +import com.android.colorfulos.testing.TestProtocol; import androidx.annotation.NonNull; import androidx.annotation.VisibleForTesting; @@ -181,7 +181,7 @@ public class SwipeDetector { } mState = newState; - if (com.android.uiuios.testing.TestProtocol.sDebugTracing) { + if (com.android.colorfulos.testing.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/uiuios/touch/TouchEventTranslator.java b/src/com/android/colorfulos/touch/TouchEventTranslator.java similarity index 99% rename from src/com/android/uiuios/touch/TouchEventTranslator.java rename to src/com/android/colorfulos/touch/TouchEventTranslator.java index 0652a9e..0ac0886 100644 --- a/src/com/android/uiuios/touch/TouchEventTranslator.java +++ b/src/com/android/colorfulos/touch/TouchEventTranslator.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.touch; +package com.android.colorfulos.touch; import android.graphics.PointF; import android.util.Log; diff --git a/src/com/android/uiuios/touch/WorkspaceTouchListener.java b/src/com/android/colorfulos/touch/WorkspaceTouchListener.java similarity index 92% rename from src/com/android/uiuios/touch/WorkspaceTouchListener.java rename to src/com/android/colorfulos/touch/WorkspaceTouchListener.java index 4cebd56..b4f35d6 100644 --- a/src/com/android/uiuios/touch/WorkspaceTouchListener.java +++ b/src/com/android/colorfulos/touch/WorkspaceTouchListener.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.touch; +package com.android.colorfulos.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.uiuios.LauncherState.NORMAL; +import static com.android.colorfulos.LauncherState.NORMAL; import android.graphics.PointF; import android.graphics.Rect; @@ -32,15 +32,14 @@ import android.view.View; import android.view.View.OnTouchListener; import android.view.ViewConfiguration; -import com.android.uiuios.AbstractFloatingView; -import com.android.uiuios.CellLayout; -import com.android.uiuios.DeviceProfile; -import com.android.uiuios.Launcher; -import com.android.uiuios.Workspace; -import com.android.uiuios.dragndrop.DragLayer; -import com.android.uiuios.views.OptionsPopupView; -import com.android.uiuios.userevent.nano.LauncherLogProto.Action; -import com.android.uiuios.userevent.nano.LauncherLogProto.ContainerType; +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; /** * 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/android/colorfulos/uiuiutils/JGYUtils.java new file mode 100644 index 0000000..0a7adb3 --- /dev/null +++ b/src/com/android/colorfulos/uiuiutils/JGYUtils.java @@ -0,0 +1,163 @@ +package com.android.colorfulos.uiuiutils; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.content.pm.ApplicationInfo; +import android.content.pm.PackageManager; +import android.util.Log; + +import com.android.colorfulos.BuildConfig; + +import java.lang.reflect.Method; + + +public class JGYUtils { + private static final String TAG = JGYUtils.class.getSimpleName(); + + @SuppressLint("StaticFieldLeak") + private static JGYUtils sInstance; + private Context mContext; + public static int MTKPlatform = 1; + public static int ZhanruiPlatform = 2; + public static int UnknowPlatform = 0; + public static String MTKTag = "MTK"; + public static String ZhanruiTag = "展锐"; + + + private JGYUtils(Context context) { + this.mContext = context; + } + + public static void init(Context context) { + if (sInstance == null) { + sInstance = new JGYUtils(context); + } + } + + public static JGYUtils getInstance() { + if (sInstance == null) { + throw new IllegalStateException("You must be init JGYUtils first"); + } + return sInstance; + } + + public static boolean isOfficialVersion() { + String channelValue = JGYUtils.getInstance().getStringMetaData(); + return "official".equals(channelValue); + } + + public static boolean isNewlyVersion() { + String channelValue = JGYUtils.getInstance().getStringMetaData(); + return "beta".equals(channelValue); + } + + public static boolean isBetaVersion() { + String channelValue = JGYUtils.getInstance().getStringMetaData(); + return "beta".equals(channelValue); + } + + /** + * 从Manifest中获取meta-data值 + * https://blog.csdn.net/yue_233/article/details/91453451 + * + * @return + */ + public String getStringMetaData() { + ApplicationInfo appInfo = null; + try { + appInfo = mContext.getPackageManager().getApplicationInfo(mContext.getPackageName(), PackageManager.GET_META_DATA); + } catch (PackageManager.NameNotFoundException e) { + e.printStackTrace(); + } + String value = appInfo.metaData.getString("CHANNEL_VALUE"); + return value; + } + + public int checkSNPlatform(String sn) { + String secondChars = sn.substring(1, 2); + if ("N".equalsIgnoreCase(secondChars)) {//MTK平台 + return MTKPlatform; + } else if ("R".equalsIgnoreCase(secondChars)) {//展锐平台 + return ZhanruiPlatform; + } else { + Log.e(TAG, "checkSNPlatform: " + "sn: " + sn + "没有对应平台"); + return UnknowPlatform; + } + } + + public int checkAppPlatform() { + String platform = BuildConfig.platform; + if ("MTK".equalsIgnoreCase(platform)) { + Log.i(TAG, "checkAppPlatform: " + "MTK平台"); + return MTKPlatform; + } else if ("ZhanRui".equalsIgnoreCase(platform)) { + Log.i(TAG, "checkAppPlatform: " + "展锐平台"); + return ZhanruiPlatform; + } else { + Log.i(TAG, "checkAppPlatform: " + "没有数据"); + return UnknowPlatform; + } + } + + public boolean isSamePlatform(String platform) { + String AppPlatform = BuildConfig.platform; + if ("ZhanRui".equals(AppPlatform)) { + return ZhanruiTag.equals(platform); + } else { + return AppPlatform.equals(platform); + } + } + + public interface GetAppPlatformCallback { + void AppPlatform(int platform); + } + + public void getAppPlatform(GetAppPlatformCallback getAppPlatformCallback) { + String platform = BuildConfig.platform; + if ("MTK".equalsIgnoreCase(platform)) { + getAppPlatformCallback.AppPlatform(MTKPlatform); + } else if ("ZhanRui".equalsIgnoreCase(platform)) { + getAppPlatformCallback.AppPlatform(ZhanruiPlatform); + } else { + getAppPlatformCallback.AppPlatform(UnknowPlatform); + } + } + + public static String getCustomVersion() { + if (JGYUtils.getInstance().checkAppPlatform() == JGYUtils.ZhanruiPlatform) { + return getProperty("ro.build.display.id", "获取失败"); + } else { + return getProperty("ro.custom.build.version", "获取失败"); + } + } + + public static String getRomVersion() { + if (JGYUtils.getInstance().checkAppPlatform() == JGYUtils.ZhanruiPlatform) { + return getProperty("ro.build.id", "获取失败"); + } else { + return getProperty("ro.build.display.id", "获取失败"); + } + } + + + /** + * 获取系统配置信息 + * + * @param key + * @param defaultValue + * @return + */ + public static String getProperty(String key, String defaultValue) { + String value = defaultValue; + try { + Class c = Class.forName("android.os.SystemProperties"); + Method get = c.getMethod("get", String.class, String.class); + value = (String) (get.invoke(c, key, "unknown")); + } catch (Exception e) { + e.printStackTrace(); + } finally { + return value; + } + } +} + diff --git a/src/com/android/uiuios/util/ActivityResultInfo.java b/src/com/android/colorfulos/util/ActivityResultInfo.java similarity index 98% rename from src/com/android/uiuios/util/ActivityResultInfo.java rename to src/com/android/colorfulos/util/ActivityResultInfo.java index cc41978..3be37ce 100644 --- a/src/com/android/uiuios/util/ActivityResultInfo.java +++ b/src/com/android/colorfulos/util/ActivityResultInfo.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.util; +package com.android.colorfulos.util; import android.content.Intent; import android.os.Parcel; diff --git a/src/com/android/uiuios/util/CellAndSpan.java b/src/com/android/colorfulos/util/CellAndSpan.java similarity index 96% rename from src/com/android/uiuios/util/CellAndSpan.java rename to src/com/android/colorfulos/util/CellAndSpan.java index 7b33ed0..5038d28 100644 --- a/src/com/android/uiuios/util/CellAndSpan.java +++ b/src/com/android/colorfulos/util/CellAndSpan.java @@ -1,4 +1,4 @@ -package com.android.uiuios.util; +package com.android.colorfulos.util; /** * Base class which represents an area on the grid. diff --git a/src/com/android/uiuios/util/ConfigMonitor.java b/src/com/android/colorfulos/util/ConfigMonitor.java similarity index 98% rename from src/com/android/uiuios/util/ConfigMonitor.java rename to src/com/android/colorfulos/util/ConfigMonitor.java index b316796..ba234b1 100644 --- a/src/com/android/uiuios/util/ConfigMonitor.java +++ b/src/com/android/colorfulos/util/ConfigMonitor.java @@ -1,4 +1,4 @@ -package com.android.uiuios.util; +package com.android.colorfulos.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.uiuios.MainThreadExecutor; +import com.android.colorfulos.MainThreadExecutor; import java.util.function.Consumer; diff --git a/src/com/android/uiuios/util/ContentWriter.java b/src/com/android/colorfulos/util/ContentWriter.java similarity index 93% rename from src/com/android/uiuios/util/ContentWriter.java rename to src/com/android/colorfulos/util/ContentWriter.java index 48e5844..2d474a9 100644 --- a/src/com/android/uiuios/util/ContentWriter.java +++ b/src/com/android/colorfulos/util/ContentWriter.java @@ -1,4 +1,4 @@ -package com.android.uiuios.util; +package com.android.colorfulos.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.uiuios.LauncherAppState; -import com.android.uiuios.LauncherSettings; -import com.android.uiuios.compat.UserManagerCompat; -import com.android.uiuios.icons.GraphicsUtils; +import com.android.colorfulos.LauncherAppState; +import com.android.colorfulos.LauncherSettings; +import com.android.colorfulos.compat.UserManagerCompat; +import com.android.colorfulos.icons.GraphicsUtils; /** * A wrapper around {@link ContentValues} with some utility methods. diff --git a/src/com/android/uiuios/util/FlagOp.java b/src/com/android/colorfulos/util/FlagOp.java similarity index 86% rename from src/com/android/uiuios/util/FlagOp.java rename to src/com/android/colorfulos/util/FlagOp.java index 51dcc2e..a753589 100644 --- a/src/com/android/uiuios/util/FlagOp.java +++ b/src/com/android/colorfulos/util/FlagOp.java @@ -1,4 +1,4 @@ -package com.android.uiuios.util; +package com.android.colorfulos.util; public interface FlagOp { diff --git a/src/com/android/uiuios/util/FlingAnimation.java b/src/com/android/colorfulos/util/FlingAnimation.java similarity index 94% rename from src/com/android/uiuios/util/FlingAnimation.java rename to src/com/android/colorfulos/util/FlingAnimation.java index 9e647df..51c9334 100644 --- a/src/com/android/uiuios/util/FlingAnimation.java +++ b/src/com/android/colorfulos/util/FlingAnimation.java @@ -1,6 +1,6 @@ -package com.android.uiuios.util; +package com.android.colorfulos.util; -import static com.android.uiuios.LauncherState.NORMAL; +import static com.android.colorfulos.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.uiuios.ButtonDropTarget; -import com.android.uiuios.DropTarget.DragObject; -import com.android.uiuios.Launcher; -import com.android.uiuios.dragndrop.DragLayer; -import com.android.uiuios.dragndrop.DragOptions; -import com.android.uiuios.dragndrop.DragView; +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; public class FlingAnimation implements AnimatorUpdateListener, Runnable { diff --git a/src/com/android/uiuios/util/FlingBlockCheck.java b/src/com/android/colorfulos/util/FlingBlockCheck.java similarity index 97% rename from src/com/android/uiuios/util/FlingBlockCheck.java rename to src/com/android/colorfulos/util/FlingBlockCheck.java index 59fcf3f..e68011f 100644 --- a/src/com/android/uiuios/util/FlingBlockCheck.java +++ b/src/com/android/colorfulos/util/FlingBlockCheck.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.util; +package com.android.colorfulos.util; import android.os.SystemClock; diff --git a/src/com/android/uiuios/util/FocusLogic.java b/src/com/android/colorfulos/util/FocusLogic.java similarity index 98% rename from src/com/android/uiuios/util/FocusLogic.java rename to src/com/android/colorfulos/util/FocusLogic.java index 8bf3c74..b349d86 100644 --- a/src/com/android/uiuios/util/FocusLogic.java +++ b/src/com/android/colorfulos/util/FocusLogic.java @@ -14,17 +14,16 @@ * limitations under the License. */ -package com.android.uiuios.util; +package com.android.colorfulos.util; import android.util.Log; import android.view.KeyEvent; import android.view.View; import android.view.ViewGroup; -import com.android.uiuios.CellLayout; -import com.android.uiuios.DeviceProfile; -import com.android.uiuios.ShortcutAndWidgetContainer; -import com.android.uiuios.config.FeatureFlags; +import com.android.colorfulos.CellLayout; +import com.android.colorfulos.DeviceProfile; +import com.android.colorfulos.ShortcutAndWidgetContainer; import java.util.Arrays; diff --git a/src/com/android/uiuios/util/GridOccupancy.java b/src/com/android/colorfulos/util/GridOccupancy.java similarity index 97% rename from src/com/android/uiuios/util/GridOccupancy.java rename to src/com/android/colorfulos/util/GridOccupancy.java index 2a52315..a7219cd 100644 --- a/src/com/android/uiuios/util/GridOccupancy.java +++ b/src/com/android/colorfulos/util/GridOccupancy.java @@ -1,8 +1,8 @@ -package com.android.uiuios.util; +package com.android.colorfulos.util; import android.graphics.Rect; -import com.android.uiuios.ItemInfo; +import com.android.colorfulos.ItemInfo; /** * Utility object to manage the occupancy in a grid. diff --git a/src/com/android/uiuios/util/IOUtils.java b/src/com/android/colorfulos/util/IOUtils.java similarity index 96% rename from src/com/android/uiuios/util/IOUtils.java rename to src/com/android/colorfulos/util/IOUtils.java index 4285b40..5fc4e32 100644 --- a/src/com/android/uiuios/util/IOUtils.java +++ b/src/com/android/colorfulos/util/IOUtils.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.android.uiuios.util; +package com.android.colorfulos.util; import android.content.Context; -import com.android.uiuios.config.FeatureFlags; +import com.android.colorfulos.config.FeatureFlags; import java.io.ByteArrayOutputStream; import java.io.File; diff --git a/src/com/android/uiuios/util/InstantAppResolver.java b/src/com/android/colorfulos/util/InstantAppResolver.java similarity index 94% rename from src/com/android/uiuios/util/InstantAppResolver.java rename to src/com/android/colorfulos/util/InstantAppResolver.java index 3ad25a4..9b7452e 100644 --- a/src/com/android/uiuios/util/InstantAppResolver.java +++ b/src/com/android/colorfulos/util/InstantAppResolver.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package com.android.uiuios.util; +package com.android.colorfulos.util; import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.util.Log; -import com.android.uiuios.AppInfo; -import com.android.uiuios.R; +import com.android.colorfulos.AppInfo; +import com.android.colorfulos.R; /** * A wrapper class to access instant app related APIs. diff --git a/src/com/android/uiuios/util/IntArray.java b/src/com/android/colorfulos/util/IntArray.java similarity index 99% rename from src/com/android/uiuios/util/IntArray.java rename to src/com/android/colorfulos/util/IntArray.java index b18cd56..7aaf4ee 100644 --- a/src/com/android/uiuios/util/IntArray.java +++ b/src/com/android/colorfulos/util/IntArray.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.util; +package com.android.colorfulos.util; import java.util.Arrays; diff --git a/src/com/android/uiuios/util/IntSet.java b/src/com/android/colorfulos/util/IntSet.java similarity index 98% rename from src/com/android/uiuios/util/IntSet.java rename to src/com/android/colorfulos/util/IntSet.java index 150a18b..935b0cd 100644 --- a/src/com/android/uiuios/util/IntSet.java +++ b/src/com/android/colorfulos/util/IntSet.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.util; +package com.android.colorfulos.util; import java.util.Arrays; diff --git a/src/com/android/uiuios/util/IntSparseArrayMap.java b/src/com/android/colorfulos/util/IntSparseArrayMap.java similarity index 97% rename from src/com/android/uiuios/util/IntSparseArrayMap.java rename to src/com/android/colorfulos/util/IntSparseArrayMap.java index eff7e31..1016107 100644 --- a/src/com/android/uiuios/util/IntSparseArrayMap.java +++ b/src/com/android/colorfulos/util/IntSparseArrayMap.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.util; +package com.android.colorfulos.util; import android.util.SparseArray; diff --git a/src/com/android/uiuios/util/ItemInfoMatcher.java b/src/com/android/colorfulos/util/ItemInfoMatcher.java similarity index 91% rename from src/com/android/uiuios/util/ItemInfoMatcher.java rename to src/com/android/colorfulos/util/ItemInfoMatcher.java index c626d74..a9a7692 100644 --- a/src/com/android/uiuios/util/ItemInfoMatcher.java +++ b/src/com/android/colorfulos/util/ItemInfoMatcher.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package com.android.uiuios.util; +package com.android.colorfulos.util; import android.content.ComponentName; import android.os.UserHandle; -import com.android.uiuios.FolderInfo; -import com.android.uiuios.ItemInfo; -import com.android.uiuios.LauncherAppWidgetInfo; -import com.android.uiuios.LauncherSettings.Favorites; -import com.android.uiuios.WorkspaceItemInfo; -import com.android.uiuios.shortcuts.ShortcutKey; +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 java.util.HashSet; diff --git a/src/com/android/uiuios/util/LabelComparator.java b/src/com/android/colorfulos/util/LabelComparator.java similarity index 97% rename from src/com/android/uiuios/util/LabelComparator.java rename to src/com/android/colorfulos/util/LabelComparator.java index 448fea6..3eaccba 100644 --- a/src/com/android/uiuios/util/LabelComparator.java +++ b/src/com/android/colorfulos/util/LabelComparator.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.util; +package com.android.colorfulos.util; import java.text.Collator; import java.util.Comparator; diff --git a/src/com/android/uiuios/util/LogConfig.java b/src/com/android/colorfulos/util/LogConfig.java similarity index 96% rename from src/com/android/uiuios/util/LogConfig.java rename to src/com/android/colorfulos/util/LogConfig.java index 4c4e3d0..765bde9 100644 --- a/src/com/android/uiuios/util/LogConfig.java +++ b/src/com/android/colorfulos/util/LogConfig.java @@ -1,4 +1,4 @@ -package com.android.uiuios.util; +package com.android.colorfulos.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/uiuios/util/LooperExecutor.java b/src/com/android/colorfulos/util/LooperExecutor.java similarity index 98% rename from src/com/android/uiuios/util/LooperExecutor.java rename to src/com/android/colorfulos/util/LooperExecutor.java index 2abe87a..c3ccb01 100644 --- a/src/com/android/uiuios/util/LooperExecutor.java +++ b/src/com/android/colorfulos/util/LooperExecutor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License */ -package com.android.uiuios.util; +package com.android.colorfulos.util; import android.os.Handler; import android.os.Looper; diff --git a/src/com/android/uiuios/util/LooperIdleLock.java b/src/com/android/colorfulos/util/LooperIdleLock.java similarity index 97% rename from src/com/android/uiuios/util/LooperIdleLock.java rename to src/com/android/colorfulos/util/LooperIdleLock.java index 8927621..ec7a55d 100644 --- a/src/com/android/uiuios/util/LooperIdleLock.java +++ b/src/com/android/colorfulos/util/LooperIdleLock.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.util; +package com.android.colorfulos.util; import android.os.Looper; import android.os.MessageQueue; diff --git a/src/com/android/uiuios/util/MainThreadInitializedObject.java b/src/com/android/colorfulos/util/MainThreadInitializedObject.java similarity index 95% rename from src/com/android/uiuios/util/MainThreadInitializedObject.java rename to src/com/android/colorfulos/util/MainThreadInitializedObject.java index 757cc0f..30bb519 100644 --- a/src/com/android/uiuios/util/MainThreadInitializedObject.java +++ b/src/com/android/colorfulos/util/MainThreadInitializedObject.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.util; +package com.android.colorfulos.util; import android.content.Context; import android.os.Looper; -import com.android.uiuios.MainThreadExecutor; +import com.android.colorfulos.MainThreadExecutor; import java.util.concurrent.ExecutionException; diff --git a/src/com/android/uiuios/util/MultiHashMap.java b/src/com/android/colorfulos/util/MultiHashMap.java similarity index 97% rename from src/com/android/uiuios/util/MultiHashMap.java rename to src/com/android/colorfulos/util/MultiHashMap.java index 0ce4d1d..a3930e2 100644 --- a/src/com/android/uiuios/util/MultiHashMap.java +++ b/src/com/android/colorfulos/util/MultiHashMap.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.util; +package com.android.colorfulos.util; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/com/android/uiuios/util/MultiValueAlpha.java b/src/com/android/colorfulos/util/MultiValueAlpha.java similarity index 98% rename from src/com/android/uiuios/util/MultiValueAlpha.java rename to src/com/android/colorfulos/util/MultiValueAlpha.java index 3f06834..22fdd82 100644 --- a/src/com/android/uiuios/util/MultiValueAlpha.java +++ b/src/com/android/colorfulos/util/MultiValueAlpha.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.util; +package com.android.colorfulos.util; import android.util.Property; import android.view.View; diff --git a/src/com/android/uiuios/util/OverScroller.java b/src/com/android/colorfulos/util/OverScroller.java similarity index 99% rename from src/com/android/uiuios/util/OverScroller.java rename to src/com/android/colorfulos/util/OverScroller.java index b4c580c..e8db46b 100644 --- a/src/com/android/uiuios/util/OverScroller.java +++ b/src/com/android/colorfulos/util/OverScroller.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.android.uiuios.util; +package com.android.colorfulos.util; -import static com.android.uiuios.anim.Interpolators.SCROLL; +import static com.android.colorfulos.anim.Interpolators.SCROLL; import android.animation.TimeInterpolator; import android.content.Context; @@ -26,7 +26,6 @@ import android.view.ViewConfiguration; import android.view.animation.AnimationUtils; import android.view.animation.Interpolator; -import androidx.dynamicanimation.animation.DynamicAnimation; import androidx.dynamicanimation.animation.FloatPropertyCompat; import androidx.dynamicanimation.animation.SpringAnimation; import androidx.dynamicanimation.animation.SpringForce; diff --git a/src/com/android/uiuios/util/PackageManagerHelper.java b/src/com/android/colorfulos/util/PackageManagerHelper.java similarity index 95% rename from src/com/android/uiuios/util/PackageManagerHelper.java rename to src/com/android/colorfulos/util/PackageManagerHelper.java index ebb7a6d..ee8dc6c 100644 --- a/src/com/android/uiuios/util/PackageManagerHelper.java +++ b/src/com/android/colorfulos/util/PackageManagerHelper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.util; +package com.android.colorfulos.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.uiuios.AppInfo; -import com.android.uiuios.ItemInfo; -import com.android.uiuios.LauncherAppWidgetInfo; -import com.android.uiuios.PendingAddItemInfo; -import com.android.uiuios.PromiseAppInfo; -import com.android.uiuios.R; -import com.android.uiuios.WorkspaceItemInfo; -import com.android.uiuios.compat.LauncherAppsCompat; +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 java.net.URISyntaxException; import java.util.List; diff --git a/src/com/android/uiuios/util/PackageUserKey.java b/src/com/android/colorfulos/util/PackageUserKey.java similarity index 92% rename from src/com/android/uiuios/util/PackageUserKey.java rename to src/com/android/colorfulos/util/PackageUserKey.java index c2c0a92..515ddc9 100644 --- a/src/com/android/uiuios/util/PackageUserKey.java +++ b/src/com/android/colorfulos/util/PackageUserKey.java @@ -1,10 +1,10 @@ -package com.android.uiuios.util; +package com.android.colorfulos.util; import android.os.UserHandle; import android.service.notification.StatusBarNotification; -import com.android.uiuios.ItemInfo; -import com.android.uiuios.shortcuts.DeepShortcutManager; +import com.android.colorfulos.ItemInfo; +import com.android.colorfulos.shortcuts.DeepShortcutManager; import java.util.Arrays; diff --git a/src/com/android/uiuios/util/ParcelableSparseArray.java b/src/com/android/colorfulos/util/ParcelableSparseArray.java similarity index 98% rename from src/com/android/uiuios/util/ParcelableSparseArray.java rename to src/com/android/colorfulos/util/ParcelableSparseArray.java index 4d3fb43..44ab786 100644 --- a/src/com/android/uiuios/util/ParcelableSparseArray.java +++ b/src/com/android/colorfulos/util/ParcelableSparseArray.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.util; +package com.android.colorfulos.util; import android.os.Parcel; import android.os.Parcelable; diff --git a/src/com/android/uiuios/util/PendingAnimation.java b/src/com/android/colorfulos/util/PendingAnimation.java similarity index 93% rename from src/com/android/uiuios/util/PendingAnimation.java rename to src/com/android/colorfulos/util/PendingAnimation.java index 0ee8ca3..6c2ea3f 100644 --- a/src/com/android/uiuios/util/PendingAnimation.java +++ b/src/com/android/colorfulos/util/PendingAnimation.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.util; +package com.android.colorfulos.util; import android.animation.AnimatorSet; import android.annotation.TargetApi; @@ -26,7 +26,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.uiuios.anim.AnimatorPlaybackController}, since in that case + * {@link com.android.colorfulos.anim.AnimatorPlaybackController}, since in that case * AnimationListeners are not properly dispatched. */ @TargetApi(Build.VERSION_CODES.O) diff --git a/src/com/android/uiuios/util/PendingRequestArgs.java b/src/com/android/colorfulos/util/PendingRequestArgs.java similarity index 96% rename from src/com/android/uiuios/util/PendingRequestArgs.java rename to src/com/android/colorfulos/util/PendingRequestArgs.java index dce9c76..cee804a 100644 --- a/src/com/android/uiuios/util/PendingRequestArgs.java +++ b/src/com/android/colorfulos/util/PendingRequestArgs.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.util; +package com.android.colorfulos.util; import android.content.ContentValues; import android.content.Intent; import android.os.Parcel; import android.os.Parcelable; -import com.android.uiuios.ItemInfo; -import com.android.uiuios.widget.WidgetAddFlowHandler; +import com.android.colorfulos.ItemInfo; +import com.android.colorfulos.widget.WidgetAddFlowHandler; /** * Utility class to store information regarding a pending request made by launcher. This information diff --git a/src/com/android/uiuios/util/Preconditions.java b/src/com/android/colorfulos/util/Preconditions.java similarity index 92% rename from src/com/android/uiuios/util/Preconditions.java rename to src/com/android/colorfulos/util/Preconditions.java index cb842ab..437a832 100644 --- a/src/com/android/uiuios/util/Preconditions.java +++ b/src/com/android/colorfulos/util/Preconditions.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.android.uiuios.util; +package com.android.colorfulos.util; import android.os.Looper; -import com.android.uiuios.LauncherModel; -import com.android.uiuios.config.FeatureFlags; +import com.android.colorfulos.LauncherModel; +import com.android.colorfulos.config.FeatureFlags; /** * A set of utility methods for thread verification. diff --git a/src/com/android/uiuios/util/RaceConditionTracker.java b/src/com/android/colorfulos/util/RaceConditionTracker.java similarity index 98% rename from src/com/android/uiuios/util/RaceConditionTracker.java rename to src/com/android/colorfulos/util/RaceConditionTracker.java index 8f3b55e..20a8b13 100644 --- a/src/com/android/uiuios/util/RaceConditionTracker.java +++ b/src/com/android/colorfulos/util/RaceConditionTracker.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.util; +package com.android.colorfulos.util; /** * Event tracker for reliably reproducing race conditions in tests. diff --git a/src/com/android/uiuios/util/ResourceBasedOverride.java b/src/com/android/colorfulos/util/ResourceBasedOverride.java similarity index 98% rename from src/com/android/uiuios/util/ResourceBasedOverride.java rename to src/com/android/colorfulos/util/ResourceBasedOverride.java index 6215952..e5e785b 100644 --- a/src/com/android/uiuios/util/ResourceBasedOverride.java +++ b/src/com/android/colorfulos/util/ResourceBasedOverride.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.util; +package com.android.colorfulos.util; import android.content.Context; import android.text.TextUtils; diff --git a/src/com/android/uiuios/util/SecureSettingsObserver.java b/src/com/android/colorfulos/util/SecureSettingsObserver.java similarity index 98% rename from src/com/android/uiuios/util/SecureSettingsObserver.java rename to src/com/android/colorfulos/util/SecureSettingsObserver.java index 3688822..18d147a 100644 --- a/src/com/android/uiuios/util/SecureSettingsObserver.java +++ b/src/com/android/colorfulos/util/SecureSettingsObserver.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.util; +package com.android.colorfulos.util; import android.content.ContentResolver; import android.content.Context; diff --git a/src/com/android/uiuios/util/SystemUiController.java b/src/com/android/colorfulos/util/SystemUiController.java similarity index 96% rename from src/com/android/uiuios/util/SystemUiController.java rename to src/com/android/colorfulos/util/SystemUiController.java index eb6a5ec..2b7a6a7 100644 --- a/src/com/android/uiuios/util/SystemUiController.java +++ b/src/com/android/colorfulos/util/SystemUiController.java @@ -14,13 +14,12 @@ * limitations under the License. */ -package com.android.uiuios.util; +package com.android.colorfulos.util; -import android.text.TextUtils; import android.view.View; import android.view.Window; -import com.android.uiuios.Utilities; +import com.android.colorfulos.Utilities; import java.util.Arrays; diff --git a/src/com/android/uiuios/util/Themes.java b/src/com/android/colorfulos/util/Themes.java similarity index 97% rename from src/com/android/uiuios/util/Themes.java rename to src/com/android/colorfulos/util/Themes.java index 63c5e01..539b7a7 100644 --- a/src/com/android/uiuios/util/Themes.java +++ b/src/com/android/colorfulos/util/Themes.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.util; +package com.android.colorfulos.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.uiuios.R; -import com.android.uiuios.Utilities; -import com.android.uiuios.uioverrides.WallpaperColorInfo; +import com.android.colorfulos.R; +import com.android.colorfulos.Utilities; +import com.android.colorfulos.uioverrides.WallpaperColorInfo; /** * Various utility methods associated with theming. diff --git a/src/com/android/uiuios/util/Thunk.java b/src/com/android/colorfulos/util/Thunk.java similarity index 97% rename from src/com/android/uiuios/util/Thunk.java rename to src/com/android/colorfulos/util/Thunk.java index 88230cb..729891a 100644 --- a/src/com/android/uiuios/util/Thunk.java +++ b/src/com/android/colorfulos/util/Thunk.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.util; +package com.android.colorfulos.util; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/com/android/uiuios/util/TouchController.java b/src/com/android/colorfulos/util/TouchController.java similarity index 96% rename from src/com/android/uiuios/util/TouchController.java rename to src/com/android/colorfulos/util/TouchController.java index fe36aad..904adcf 100644 --- a/src/com/android/uiuios/util/TouchController.java +++ b/src/com/android/colorfulos/util/TouchController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.util; +package com.android.colorfulos.util; import android.view.MotionEvent; diff --git a/src/com/android/uiuios/util/TraceHelper.java b/src/com/android/colorfulos/util/TraceHelper.java similarity index 97% rename from src/com/android/uiuios/util/TraceHelper.java rename to src/com/android/colorfulos/util/TraceHelper.java index 264dcd4..b22dc7b 100644 --- a/src/com/android/uiuios/util/TraceHelper.java +++ b/src/com/android/colorfulos/util/TraceHelper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.util; +package com.android.colorfulos.util; import static android.util.Log.VERBOSE; import static android.util.Log.isLoggable; @@ -24,8 +24,6 @@ import android.util.ArrayMap; import android.util.Log; import android.util.MutableLong; -import com.android.uiuios.config.FeatureFlags; - /** * A wrapper around {@link Trace} with some utility information. * diff --git a/src/com/android/uiuios/util/TransformingTouchDelegate.java b/src/com/android/colorfulos/util/TransformingTouchDelegate.java similarity index 99% rename from src/com/android/uiuios/util/TransformingTouchDelegate.java rename to src/com/android/colorfulos/util/TransformingTouchDelegate.java index e9b351f..b9df566 100644 --- a/src/com/android/uiuios/util/TransformingTouchDelegate.java +++ b/src/com/android/colorfulos/util/TransformingTouchDelegate.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.util; +package com.android.colorfulos.util; import android.graphics.Rect; import android.graphics.RectF; diff --git a/src/com/android/uiuios/util/UiThreadHelper.java b/src/com/android/colorfulos/util/UiThreadHelper.java similarity index 98% rename from src/com/android/uiuios/util/UiThreadHelper.java rename to src/com/android/colorfulos/util/UiThreadHelper.java index 99673ca..577ee9d 100644 --- a/src/com/android/uiuios/util/UiThreadHelper.java +++ b/src/com/android/colorfulos/util/UiThreadHelper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.util; +package com.android.colorfulos.util; import android.app.Activity; import android.content.Context; diff --git a/src/com/android/uiuios/util/ViewCache.java b/src/com/android/colorfulos/util/ViewCache.java similarity index 98% rename from src/com/android/uiuios/util/ViewCache.java rename to src/com/android/colorfulos/util/ViewCache.java index b672623..db48c08 100644 --- a/src/com/android/uiuios/util/ViewCache.java +++ b/src/com/android/colorfulos/util/ViewCache.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.util; +package com.android.colorfulos.util; import android.content.Context; import android.util.SparseArray; diff --git a/src/com/android/uiuios/util/ViewOnDrawExecutor.java b/src/com/android/colorfulos/util/ViewOnDrawExecutor.java similarity index 96% rename from src/com/android/uiuios/util/ViewOnDrawExecutor.java rename to src/com/android/colorfulos/util/ViewOnDrawExecutor.java index 45c81b7..29701c6 100644 --- a/src/com/android/uiuios/util/ViewOnDrawExecutor.java +++ b/src/com/android/colorfulos/util/ViewOnDrawExecutor.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package com.android.uiuios.util; +package com.android.colorfulos.util; import android.os.Process; import android.view.View; import android.view.View.OnAttachStateChangeListener; import android.view.ViewTreeObserver.OnDrawListener; -import com.android.uiuios.Launcher; -import com.android.uiuios.LauncherModel; +import com.android.colorfulos.Launcher; +import com.android.colorfulos.LauncherModel; import java.util.ArrayList; import java.util.concurrent.Executor; diff --git a/src/com/android/uiuios/util/ViewPool.java b/src/com/android/colorfulos/util/ViewPool.java similarity index 97% rename from src/com/android/uiuios/util/ViewPool.java rename to src/com/android/colorfulos/util/ViewPool.java index 21ac492..b70dc78 100644 --- a/src/com/android/uiuios/util/ViewPool.java +++ b/src/com/android/colorfulos/util/ViewPool.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.util; +package com.android.colorfulos.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.uiuios.util.ViewPool.Reusable; +import com.android.colorfulos.util.ViewPool.Reusable; import androidx.annotation.AnyThread; import androidx.annotation.Nullable; diff --git a/src/com/android/uiuios/util/WallpaperOffsetInterpolator.java b/src/com/android/colorfulos/util/WallpaperOffsetInterpolator.java similarity index 98% rename from src/com/android/uiuios/util/WallpaperOffsetInterpolator.java rename to src/com/android/colorfulos/util/WallpaperOffsetInterpolator.java index 7a5a876..712e8e6 100644 --- a/src/com/android/uiuios/util/WallpaperOffsetInterpolator.java +++ b/src/com/android/colorfulos/util/WallpaperOffsetInterpolator.java @@ -1,4 +1,4 @@ -package com.android.uiuios.util; +package com.android.colorfulos.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.uiuios.Utilities; -import com.android.uiuios.Workspace; -import com.android.uiuios.anim.Interpolators; +import com.android.colorfulos.Utilities; +import com.android.colorfulos.Workspace; +import com.android.colorfulos.anim.Interpolators; /** * Utility class to handle wallpaper scrolling along with workspace. diff --git a/src/com/android/uiuios/views/AbstractSlideInView.java b/src/com/android/colorfulos/views/AbstractSlideInView.java similarity index 94% rename from src/com/android/uiuios/views/AbstractSlideInView.java rename to src/com/android/colorfulos/views/AbstractSlideInView.java index 7d7ed0a..7089143 100644 --- a/src/com/android/uiuios/views/AbstractSlideInView.java +++ b/src/com/android/colorfulos/views/AbstractSlideInView.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.views; +package com.android.colorfulos.views; -import static com.android.uiuios.anim.Interpolators.scrollInterpolatorForVelocity; +import static com.android.colorfulos.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.uiuios.AbstractFloatingView; -import com.android.uiuios.Launcher; -import com.android.uiuios.Utilities; -import com.android.uiuios.anim.Interpolators; -import com.android.uiuios.touch.SwipeDetector; +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; /** * Extension of AbstractFloatingView with common methods for sliding in from bottom diff --git a/src/com/android/uiuios/views/ActivityContext.java b/src/com/android/colorfulos/views/ActivityContext.java similarity index 91% rename from src/com/android/uiuios/views/ActivityContext.java rename to src/com/android/colorfulos/views/ActivityContext.java index 6a5c759..4dbcbde 100644 --- a/src/com/android/uiuios/views/ActivityContext.java +++ b/src/com/android/colorfulos/views/ActivityContext.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.views; +package com.android.colorfulos.views; import android.content.Context; import android.content.ContextWrapper; import android.view.ContextThemeWrapper; import android.view.View.AccessibilityDelegate; -import com.android.uiuios.DeviceProfile; -import com.android.uiuios.ItemInfo; -import com.android.uiuios.graphics.RotationMode; -import com.android.uiuios.dot.DotInfo; +import com.android.colorfulos.DeviceProfile; +import com.android.colorfulos.ItemInfo; +import com.android.colorfulos.graphics.RotationMode; +import com.android.colorfulos.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/uiuios/views/BaseDragLayer.java b/src/com/android/colorfulos/views/BaseDragLayer.java similarity index 97% rename from src/com/android/uiuios/views/BaseDragLayer.java rename to src/com/android/colorfulos/views/BaseDragLayer.java index cd02aac..4887ffd 100644 --- a/src/com/android/uiuios/views/BaseDragLayer.java +++ b/src/com/android/colorfulos/views/BaseDragLayer.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.android.uiuios.views; +package com.android.colorfulos.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.uiuios.Utilities.SINGLE_FRAME_MS; -import static com.android.uiuios.Utilities.shouldDisableGestures; +import static com.android.colorfulos.Utilities.SINGLE_FRAME_MS; +import static com.android.colorfulos.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.uiuios.AbstractFloatingView; -import com.android.uiuios.InsettableFrameLayout; -import com.android.uiuios.Utilities; -import com.android.uiuios.testing.TestProtocol; -import com.android.uiuios.util.MultiValueAlpha; -import com.android.uiuios.util.MultiValueAlpha.AlphaProperty; -import com.android.uiuios.util.TouchController; +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 java.io.PrintWriter; import java.util.ArrayList; diff --git a/src/com/android/uiuios/views/BottomUserEducationView.java b/src/com/android/colorfulos/views/BottomUserEducationView.java similarity index 93% rename from src/com/android/uiuios/views/BottomUserEducationView.java rename to src/com/android/colorfulos/views/BottomUserEducationView.java index be88a05..8d4fe19 100644 --- a/src/com/android/uiuios/views/BottomUserEducationView.java +++ b/src/com/android/colorfulos/views/BottomUserEducationView.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.views; +package com.android.colorfulos.views; -import static com.android.uiuios.compat.AccessibilityManagerCompat.sendCustomAccessibilityEvent; +import static com.android.colorfulos.compat.AccessibilityManagerCompat.sendCustomAccessibilityEvent; import android.animation.PropertyValuesHolder; import android.content.Context; @@ -26,11 +26,11 @@ import android.view.TouchDelegate; import android.view.View; import android.view.accessibility.AccessibilityEvent; -import com.android.uiuios.Insettable; -import com.android.uiuios.Launcher; -import com.android.uiuios.R; -import com.android.uiuios.anim.Interpolators; -import com.android.uiuios.userevent.nano.LauncherLogProto.ContainerType; +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; public class BottomUserEducationView extends AbstractSlideInView implements Insettable { diff --git a/src/com/android/uiuios/views/ClipPathView.java b/src/com/android/colorfulos/views/ClipPathView.java similarity index 95% rename from src/com/android/uiuios/views/ClipPathView.java rename to src/com/android/colorfulos/views/ClipPathView.java index 5722d61..7d6b8fa 100644 --- a/src/com/android/uiuios/views/ClipPathView.java +++ b/src/com/android/colorfulos/views/ClipPathView.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.views; +package com.android.colorfulos.views; import android.graphics.Path; import android.view.View; diff --git a/src/com/android/uiuios/views/DoubleShadowBubbleTextView.java b/src/com/android/colorfulos/views/DoubleShadowBubbleTextView.java similarity index 95% rename from src/com/android/uiuios/views/DoubleShadowBubbleTextView.java rename to src/com/android/colorfulos/views/DoubleShadowBubbleTextView.java index 8d29176..547d8e5 100644 --- a/src/com/android/uiuios/views/DoubleShadowBubbleTextView.java +++ b/src/com/android/colorfulos/views/DoubleShadowBubbleTextView.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.android.uiuios.views; +package com.android.colorfulos.views; -import static com.android.uiuios.icons.GraphicsUtils.setColorAlphaBound; +import static com.android.colorfulos.icons.GraphicsUtils.setColorAlphaBound; import android.content.Context; import android.content.res.TypedArray; @@ -25,8 +25,8 @@ import android.graphics.Color; import android.util.AttributeSet; import android.widget.TextView; -import com.android.uiuios.BubbleTextView; -import com.android.uiuios.R; +import com.android.colorfulos.BubbleTextView; +import com.android.colorfulos.R; /** * Extension of {@link BubbleTextView} which draws two shadows on the text (ambient and key shadows} diff --git a/src/com/android/uiuios/views/FloatingIconView.java b/src/com/android/colorfulos/views/FloatingIconView.java similarity index 96% rename from src/com/android/uiuios/views/FloatingIconView.java rename to src/com/android/colorfulos/views/FloatingIconView.java index 2cedf3a..6c9e79a 100644 --- a/src/com/android/uiuios/views/FloatingIconView.java +++ b/src/com/android/colorfulos/views/FloatingIconView.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.views; +package com.android.colorfulos.views; -import static com.android.uiuios.LauncherAnimUtils.DRAWABLE_ALPHA; -import static com.android.uiuios.Utilities.getBadge; -import static com.android.uiuios.Utilities.getFullDrawable; -import static com.android.uiuios.Utilities.mapToRange; -import static com.android.uiuios.anim.Interpolators.LINEAR; -import static com.android.uiuios.config.FeatureFlags.ADAPTIVE_ICON_WINDOW_ANIM; -import static com.android.uiuios.states.RotationHelper.REQUEST_LOCK; +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 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.uiuios.BubbleTextView; -import com.android.uiuios.InsettableFrameLayout.LayoutParams; -import com.android.uiuios.ItemInfo; -import com.android.uiuios.Launcher; -import com.android.uiuios.LauncherModel; -import com.android.uiuios.R; -import com.android.uiuios.Utilities; -import com.android.uiuios.dragndrop.DragLayer; -import com.android.uiuios.dragndrop.FolderAdaptiveIcon; -import com.android.uiuios.folder.FolderIcon; -import com.android.uiuios.graphics.IconShape; -import com.android.uiuios.graphics.ShiftedBitmapDrawable; -import com.android.uiuios.icons.LauncherIcons; -import com.android.uiuios.popup.SystemShortcut; -import com.android.uiuios.shortcuts.DeepShortcutView; +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 androidx.annotation.Nullable; import androidx.annotation.UiThread; diff --git a/src/com/android/uiuios/views/ListenerView.java b/src/com/android/colorfulos/views/ListenerView.java similarity index 96% rename from src/com/android/uiuios/views/ListenerView.java rename to src/com/android/colorfulos/views/ListenerView.java index 0e001b2..597c9d1 100644 --- a/src/com/android/uiuios/views/ListenerView.java +++ b/src/com/android/colorfulos/views/ListenerView.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.views; +package com.android.colorfulos.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.uiuios.AbstractFloatingView; +import com.android.colorfulos.AbstractFloatingView; /** * An invisible AbstractFloatingView that can run a callback when it is being closed. diff --git a/src/com/android/uiuios/views/OptionsPopupView.java b/src/com/android/colorfulos/views/OptionsPopupView.java similarity index 92% rename from src/com/android/uiuios/views/OptionsPopupView.java rename to src/com/android/colorfulos/views/OptionsPopupView.java index 3959533..fde5f7f 100644 --- a/src/com/android/uiuios/views/OptionsPopupView.java +++ b/src/com/android/colorfulos/views/OptionsPopupView.java @@ -13,15 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.views; +package com.android.colorfulos.views; -import static com.android.uiuios.Utilities.EXTRA_WALLPAPER_FLAVOR; -import static com.android.uiuios.Utilities.EXTRA_WALLPAPER_OFFSET; +import static com.android.colorfulos.Utilities.EXTRA_WALLPAPER_FLAVOR; +import static com.android.colorfulos.Utilities.EXTRA_WALLPAPER_OFFSET; -import android.content.ComponentName; import android.content.Context; import android.content.Intent; -import android.content.pm.ResolveInfo; import android.graphics.Rect; import android.graphics.RectF; import android.text.TextUtils; @@ -33,15 +31,15 @@ import android.view.View.OnClickListener; import android.view.View.OnLongClickListener; import android.widget.Toast; -import com.android.uiuios.Launcher; -import com.android.uiuios.R; -import com.android.uiuios.Utilities; -import com.android.uiuios.config.FeatureFlags; -import com.android.uiuios.popup.ArrowPopup; -import com.android.uiuios.shortcuts.DeepShortcutView; -import com.android.uiuios.userevent.nano.LauncherLogProto.Action; -import com.android.uiuios.userevent.nano.LauncherLogProto.ControlType; -import com.android.uiuios.widget.WidgetsFullSheet; +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 java.util.ArrayList; import java.util.List; diff --git a/src/com/android/uiuios/views/RecyclerViewFastScroller.java b/src/com/android/colorfulos/views/RecyclerViewFastScroller.java similarity index 98% rename from src/com/android/uiuios/views/RecyclerViewFastScroller.java rename to src/com/android/colorfulos/views/RecyclerViewFastScroller.java index 827db0c..40f1c3e 100644 --- a/src/com/android/uiuios/views/RecyclerViewFastScroller.java +++ b/src/com/android/colorfulos/views/RecyclerViewFastScroller.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.views; +package com.android.colorfulos.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.uiuios.BaseRecyclerView; -import com.android.uiuios.R; -import com.android.uiuios.Utilities; -import com.android.uiuios.graphics.FastScrollThumbDrawable; -import com.android.uiuios.util.Themes; +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 java.util.Collections; import java.util.List; diff --git a/src/com/android/uiuios/views/ScrimView.java b/src/com/android/colorfulos/views/ScrimView.java similarity index 92% rename from src/com/android/uiuios/views/ScrimView.java rename to src/com/android/colorfulos/views/ScrimView.java index f2d46da..78f071e 100644 --- a/src/com/android/uiuios/views/ScrimView.java +++ b/src/com/android/colorfulos/views/ScrimView.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.views; +package com.android.colorfulos.views; import static android.content.Context.ACCESSIBILITY_SERVICE; import static android.view.MotionEvent.ACTION_DOWN; -import static com.android.uiuios.LauncherState.ALL_APPS; -import static com.android.uiuios.LauncherState.NORMAL; -import static com.android.uiuios.anim.Interpolators.ACCEL; -import static com.android.uiuios.anim.Interpolators.DEACCEL; -import static com.android.uiuios.icons.GraphicsUtils.setColorAlphaBound; +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 androidx.core.graphics.ColorUtils.compositeColors; @@ -47,21 +47,21 @@ import android.view.View; import android.view.accessibility.AccessibilityManager; import android.view.accessibility.AccessibilityManager.AccessibilityStateChangeListener; -import com.android.uiuios.DeviceProfile; -import com.android.uiuios.Insettable; -import com.android.uiuios.Launcher; -import com.android.uiuios.LauncherState; -import com.android.uiuios.LauncherStateManager; -import com.android.uiuios.LauncherStateManager.StateListener; -import com.android.uiuios.R; -import com.android.uiuios.Utilities; -import com.android.uiuios.uioverrides.WallpaperColorInfo; -import com.android.uiuios.uioverrides.WallpaperColorInfo.OnChangeListener; -import com.android.uiuios.userevent.nano.LauncherLogProto.Action; -import com.android.uiuios.userevent.nano.LauncherLogProto.ControlType; -import com.android.uiuios.util.MultiValueAlpha; -import com.android.uiuios.util.MultiValueAlpha.AlphaProperty; -import com.android.uiuios.util.Themes; +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 java.util.List; diff --git a/src/com/android/uiuios/views/Snackbar.java b/src/com/android/colorfulos/views/Snackbar.java similarity index 95% rename from src/com/android/uiuios/views/Snackbar.java rename to src/com/android/colorfulos/views/Snackbar.java index 084f54a..e7f9079 100644 --- a/src/com/android/uiuios/views/Snackbar.java +++ b/src/com/android/colorfulos/views/Snackbar.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.views; +package com.android.colorfulos.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.uiuios.AbstractFloatingView; -import com.android.uiuios.Launcher; -import com.android.uiuios.R; -import com.android.uiuios.anim.Interpolators; -import com.android.uiuios.compat.AccessibilityManagerCompat; -import com.android.uiuios.dragndrop.DragLayer; +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; /** * A toast-like UI at the bottom of the screen with a label, button action, and dismiss action. diff --git a/src/com/android/uiuios/views/SpringRelativeLayout.java b/src/com/android/colorfulos/views/SpringRelativeLayout.java similarity index 99% rename from src/com/android/uiuios/views/SpringRelativeLayout.java rename to src/com/android/colorfulos/views/SpringRelativeLayout.java index 166dac8..6f0714e 100644 --- a/src/com/android/uiuios/views/SpringRelativeLayout.java +++ b/src/com/android/colorfulos/views/SpringRelativeLayout.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.views; +package com.android.colorfulos.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/uiuios/views/TopRoundedCornerView.java b/src/com/android/colorfulos/views/TopRoundedCornerView.java similarity index 94% rename from src/com/android/uiuios/views/TopRoundedCornerView.java rename to src/com/android/colorfulos/views/TopRoundedCornerView.java index 3f4c0f7..9140a78 100644 --- a/src/com/android/uiuios/views/TopRoundedCornerView.java +++ b/src/com/android/colorfulos/views/TopRoundedCornerView.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.views; +package com.android.colorfulos.views; import android.content.Context; import android.graphics.Canvas; @@ -21,10 +21,9 @@ import android.graphics.Paint; import android.graphics.Path; import android.graphics.RectF; import android.util.AttributeSet; -import android.widget.FrameLayout; -import com.android.uiuios.R; -import com.android.uiuios.util.Themes; +import com.android.colorfulos.R; +import com.android.colorfulos.util.Themes; /** * View with top rounded corners. diff --git a/src/com/android/uiuios/views/Transposable.java b/src/com/android/colorfulos/views/Transposable.java similarity index 89% rename from src/com/android/uiuios/views/Transposable.java rename to src/com/android/colorfulos/views/Transposable.java index c9aa4dc..370820f 100644 --- a/src/com/android/uiuios/views/Transposable.java +++ b/src/com/android/colorfulos/views/Transposable.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.views; +package com.android.colorfulos.views; -import com.android.uiuios.graphics.RotationMode; +import com.android.colorfulos.graphics.RotationMode; /** * Indicates that a view can be transposed. diff --git a/src/com/android/uiuios/views/WorkFooterContainer.java b/src/com/android/colorfulos/views/WorkFooterContainer.java similarity index 97% rename from src/com/android/uiuios/views/WorkFooterContainer.java rename to src/com/android/colorfulos/views/WorkFooterContainer.java index f219377..f841167 100644 --- a/src/com/android/uiuios/views/WorkFooterContainer.java +++ b/src/com/android/colorfulos/views/WorkFooterContainer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.views; +package com.android.colorfulos.views; import android.content.Context; import android.util.AttributeSet; diff --git a/src/com/android/uiuios/widget/BaseWidgetSheet.java b/src/com/android/colorfulos/widget/BaseWidgetSheet.java similarity index 85% rename from src/com/android/uiuios/widget/BaseWidgetSheet.java rename to src/com/android/colorfulos/widget/BaseWidgetSheet.java index 24889a4..ec2cb20 100644 --- a/src/com/android/uiuios/widget/BaseWidgetSheet.java +++ b/src/com/android/colorfulos/widget/BaseWidgetSheet.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.widget; +package com.android.colorfulos.widget; import static android.view.ViewGroup.LayoutParams.MATCH_PARENT; -import static com.android.uiuios.icons.GraphicsUtils.setColorAlphaBound; -import static com.android.uiuios.logging.LoggerUtils.newContainerTarget; +import static com.android.colorfulos.icons.GraphicsUtils.setColorAlphaBound; +import static com.android.colorfulos.logging.LoggerUtils.newContainerTarget; import android.content.Context; import android.graphics.Point; @@ -28,21 +28,21 @@ import android.view.View.OnClickListener; import android.view.View.OnLongClickListener; import android.widget.Toast; -import com.android.uiuios.DragSource; -import com.android.uiuios.DropTarget.DragObject; -import com.android.uiuios.ItemInfo; -import com.android.uiuios.R; -import com.android.uiuios.Utilities; -import com.android.uiuios.dragndrop.DragOptions; -import com.android.uiuios.popup.PopupDataProvider; -import com.android.uiuios.touch.ItemLongClickListener; -import com.android.uiuios.uioverrides.WallpaperColorInfo; -import com.android.uiuios.userevent.nano.LauncherLogProto.ContainerType; -import com.android.uiuios.userevent.nano.LauncherLogProto.Target; -import com.android.uiuios.util.SystemUiController; -import com.android.uiuios.util.Themes; -import com.android.uiuios.views.AbstractSlideInView; -import com.android.uiuios.views.BaseDragLayer; +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; /** * Base class for various widgets popup diff --git a/src/com/android/uiuios/widget/DeferredAppWidgetHostView.java b/src/com/android/colorfulos/widget/DeferredAppWidgetHostView.java similarity index 97% rename from src/com/android/uiuios/widget/DeferredAppWidgetHostView.java rename to src/com/android/colorfulos/widget/DeferredAppWidgetHostView.java index 53dd5cd..baa2f1d 100644 --- a/src/com/android/uiuios/widget/DeferredAppWidgetHostView.java +++ b/src/com/android/colorfulos/widget/DeferredAppWidgetHostView.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.widget; +package com.android.colorfulos.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.uiuios.R; +import com.android.colorfulos.R; /** * A widget host views created while the host has not bind to the system service. diff --git a/src/com/android/uiuios/widget/LauncherAppWidgetHostView.java b/src/com/android/colorfulos/widget/LauncherAppWidgetHostView.java similarity index 95% rename from src/com/android/uiuios/widget/LauncherAppWidgetHostView.java rename to src/com/android/colorfulos/widget/LauncherAppWidgetHostView.java index 380ec60..f1c9863 100644 --- a/src/com/android/uiuios/widget/LauncherAppWidgetHostView.java +++ b/src/com/android/colorfulos/widget/LauncherAppWidgetHostView.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.widget; +package com.android.colorfulos.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.uiuios.CheckLongPressHelper; -import com.android.uiuios.ItemInfo; -import com.android.uiuios.Launcher; -import com.android.uiuios.LauncherAppWidgetInfo; -import com.android.uiuios.LauncherAppWidgetProviderInfo; -import com.android.uiuios.R; -import com.android.uiuios.SimpleOnStylusPressListener; -import com.android.uiuios.StylusEventHelper; -import com.android.uiuios.Utilities; -import com.android.uiuios.dragndrop.DragLayer; -import com.android.uiuios.util.Themes; -import com.android.uiuios.views.BaseDragLayer.TouchCompleteListener; +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; /** * {@inheritDoc} diff --git a/src/com/android/uiuios/widget/NavigableAppWidgetHostView.java b/src/com/android/colorfulos/widget/NavigableAppWidgetHostView.java similarity index 99% rename from src/com/android/uiuios/widget/NavigableAppWidgetHostView.java rename to src/com/android/colorfulos/widget/NavigableAppWidgetHostView.java index d08b1d4..c9318f8 100644 --- a/src/com/android/uiuios/widget/NavigableAppWidgetHostView.java +++ b/src/com/android/colorfulos/widget/NavigableAppWidgetHostView.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.widget; +package com.android.colorfulos.widget; import android.appwidget.AppWidgetHostView; import android.content.Context; diff --git a/src/com/android/uiuios/widget/PendingAddShortcutInfo.java b/src/com/android/colorfulos/widget/PendingAddShortcutInfo.java similarity index 87% rename from src/com/android/uiuios/widget/PendingAddShortcutInfo.java rename to src/com/android/colorfulos/widget/PendingAddShortcutInfo.java index 1a5e86a..e5044f2 100644 --- a/src/com/android/uiuios/widget/PendingAddShortcutInfo.java +++ b/src/com/android/colorfulos/widget/PendingAddShortcutInfo.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.widget; +package com.android.colorfulos.widget; -import com.android.uiuios.PendingAddItemInfo; -import com.android.uiuios.compat.ShortcutConfigActivityInfo; +import com.android.colorfulos.PendingAddItemInfo; +import com.android.colorfulos.compat.ShortcutConfigActivityInfo; /** * Meta data used for late binding of the short cuts. diff --git a/src/com/android/uiuios/widget/PendingAddWidgetInfo.java b/src/com/android/colorfulos/widget/PendingAddWidgetInfo.java similarity index 89% rename from src/com/android/uiuios/widget/PendingAddWidgetInfo.java rename to src/com/android/colorfulos/widget/PendingAddWidgetInfo.java index e256b4b..d5e8ae9 100644 --- a/src/com/android/uiuios/widget/PendingAddWidgetInfo.java +++ b/src/com/android/colorfulos/widget/PendingAddWidgetInfo.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.widget; +package com.android.colorfulos.widget; import android.appwidget.AppWidgetHostView; import android.os.Bundle; -import com.android.uiuios.LauncherAppWidgetProviderInfo; -import com.android.uiuios.LauncherSettings; -import com.android.uiuios.PendingAddItemInfo; +import com.android.colorfulos.LauncherAppWidgetProviderInfo; +import com.android.colorfulos.LauncherSettings; +import com.android.colorfulos.PendingAddItemInfo; /** * Meta data used for late binding of {@link LauncherAppWidgetProviderInfo}. diff --git a/src/com/android/uiuios/widget/PendingAppWidgetHostView.java b/src/com/android/colorfulos/widget/PendingAppWidgetHostView.java similarity index 95% rename from src/com/android/uiuios/widget/PendingAppWidgetHostView.java rename to src/com/android/colorfulos/widget/PendingAppWidgetHostView.java index 89d4caa..a892d76 100644 --- a/src/com/android/uiuios/widget/PendingAppWidgetHostView.java +++ b/src/com/android/colorfulos/widget/PendingAppWidgetHostView.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.widget; +package com.android.colorfulos.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.uiuios.DeviceProfile; -import com.android.uiuios.FastBitmapDrawable; -import com.android.uiuios.icons.IconCache; -import com.android.uiuios.icons.IconCache.ItemInfoUpdateReceiver; -import com.android.uiuios.ItemInfoWithIcon; -import com.android.uiuios.LauncherAppWidgetInfo; -import com.android.uiuios.R; -import com.android.uiuios.graphics.DrawableFactory; -import com.android.uiuios.model.PackageItemInfo; -import com.android.uiuios.touch.ItemClickHandler; -import com.android.uiuios.util.Themes; +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; public class PendingAppWidgetHostView extends LauncherAppWidgetHostView implements OnClickListener, ItemInfoUpdateReceiver { diff --git a/src/com/android/uiuios/widget/PendingItemDragHelper.java b/src/com/android/colorfulos/widget/PendingItemDragHelper.java similarity index 93% rename from src/com/android/uiuios/widget/PendingItemDragHelper.java rename to src/com/android/colorfulos/widget/PendingItemDragHelper.java index fd152d7..be405a6 100644 --- a/src/com/android/uiuios/widget/PendingItemDragHelper.java +++ b/src/com/android/colorfulos/widget/PendingItemDragHelper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.widget; +package com.android.colorfulos.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.uiuios.DeviceProfile; -import com.android.uiuios.DragSource; -import com.android.uiuios.Launcher; -import com.android.uiuios.LauncherAppState; -import com.android.uiuios.PendingAddItemInfo; -import com.android.uiuios.R; -import com.android.uiuios.dragndrop.DragOptions; -import com.android.uiuios.dragndrop.LivePreviewWidgetCell; -import com.android.uiuios.graphics.DragPreviewProvider; -import com.android.uiuios.icons.LauncherIcons; +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; /** * Extension of {@link DragPreviewProvider} with logic specific to pending widgets/shortcuts diff --git a/src/com/android/uiuios/widget/WidgetAddFlowHandler.java b/src/com/android/colorfulos/widget/WidgetAddFlowHandler.java similarity index 91% rename from src/com/android/uiuios/widget/WidgetAddFlowHandler.java rename to src/com/android/colorfulos/widget/WidgetAddFlowHandler.java index f5eea7b..2136268 100644 --- a/src/com/android/uiuios/widget/WidgetAddFlowHandler.java +++ b/src/com/android/colorfulos/widget/WidgetAddFlowHandler.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.widget; +package com.android.colorfulos.widget; import android.appwidget.AppWidgetProviderInfo; import android.content.Context; import android.os.Parcel; import android.os.Parcelable; -import com.android.uiuios.ItemInfo; -import com.android.uiuios.Launcher; -import com.android.uiuios.LauncherAppWidgetInfo; -import com.android.uiuios.LauncherAppWidgetProviderInfo; -import com.android.uiuios.util.PendingRequestArgs; +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; /** * Utility class to handle app widget add flow. diff --git a/src/com/android/uiuios/widget/WidgetCell.java b/src/com/android/colorfulos/widget/WidgetCell.java similarity index 94% rename from src/com/android/uiuios/widget/WidgetCell.java rename to src/com/android/colorfulos/widget/WidgetCell.java index b7c4e94..3a41124 100644 --- a/src/com/android/uiuios/widget/WidgetCell.java +++ b/src/com/android/colorfulos/widget/WidgetCell.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.widget; +package com.android.colorfulos.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.uiuios.BaseActivity; -import com.android.uiuios.DeviceProfile; -import com.android.uiuios.R; -import com.android.uiuios.SimpleOnStylusPressListener; -import com.android.uiuios.StylusEventHelper; -import com.android.uiuios.WidgetPreviewLoader; -import com.android.uiuios.graphics.DrawableFactory; -import com.android.uiuios.model.WidgetItem; +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; /** * Represents the individual cell of the widget inside the widget tray. The preview is drawn diff --git a/src/com/android/uiuios/widget/WidgetHostViewLoader.java b/src/com/android/colorfulos/widget/WidgetHostViewLoader.java similarity index 92% rename from src/com/android/uiuios/widget/WidgetHostViewLoader.java rename to src/com/android/colorfulos/widget/WidgetHostViewLoader.java index c45937d..9e8ad4d 100644 --- a/src/com/android/uiuios/widget/WidgetHostViewLoader.java +++ b/src/com/android/colorfulos/widget/WidgetHostViewLoader.java @@ -1,4 +1,4 @@ -package com.android.uiuios.widget; +package com.android.colorfulos.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.uiuios.AppWidgetResizeFrame; -import com.android.uiuios.DropTarget; -import com.android.uiuios.Launcher; -import com.android.uiuios.LauncherAppWidgetProviderInfo; -import com.android.uiuios.compat.AppWidgetManagerCompat; -import com.android.uiuios.dragndrop.DragController; -import com.android.uiuios.dragndrop.DragLayer; -import com.android.uiuios.dragndrop.DragOptions; -import com.android.uiuios.util.Thunk; +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; public class WidgetHostViewLoader implements DragController.DragListener { private static final String TAG = "WidgetHostViewLoader"; diff --git a/src/com/android/uiuios/widget/WidgetImageView.java b/src/com/android/colorfulos/widget/WidgetImageView.java similarity index 97% rename from src/com/android/uiuios/widget/WidgetImageView.java rename to src/com/android/colorfulos/widget/WidgetImageView.java index daf50d1..bd8cdbe 100644 --- a/src/com/android/uiuios/widget/WidgetImageView.java +++ b/src/com/android/colorfulos/widget/WidgetImageView.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.widget; +package com.android.colorfulos.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.uiuios.R; -import com.android.uiuios.Utilities; +import com.android.colorfulos.R; +import com.android.colorfulos.Utilities; /** * View that draws a bitmap horizontally centered. If the image width is greater than the view diff --git a/src/com/android/uiuios/widget/WidgetItemComparator.java b/src/com/android/colorfulos/widget/WidgetItemComparator.java similarity index 95% rename from src/com/android/uiuios/widget/WidgetItemComparator.java rename to src/com/android/colorfulos/widget/WidgetItemComparator.java index 7d1a6ab..76b138c 100644 --- a/src/com/android/uiuios/widget/WidgetItemComparator.java +++ b/src/com/android/colorfulos/widget/WidgetItemComparator.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.widget; +package com.android.colorfulos.widget; import android.os.Process; import android.os.UserHandle; -import com.android.uiuios.model.WidgetItem; +import com.android.colorfulos.model.WidgetItem; import java.text.Collator; import java.util.Comparator; diff --git a/src/com/android/uiuios/widget/WidgetListRowEntry.java b/src/com/android/colorfulos/widget/WidgetListRowEntry.java similarity index 88% rename from src/com/android/uiuios/widget/WidgetListRowEntry.java rename to src/com/android/colorfulos/widget/WidgetListRowEntry.java index 6f9e203..701d215 100644 --- a/src/com/android/uiuios/widget/WidgetListRowEntry.java +++ b/src/com/android/colorfulos/widget/WidgetListRowEntry.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.widget; +package com.android.colorfulos.widget; -import com.android.uiuios.ItemInfo; -import com.android.uiuios.model.PackageItemInfo; -import com.android.uiuios.model.WidgetItem; +import com.android.colorfulos.ItemInfo; +import com.android.colorfulos.model.PackageItemInfo; +import com.android.colorfulos.model.WidgetItem; import java.util.ArrayList; diff --git a/src/com/android/uiuios/widget/WidgetsBottomSheet.java b/src/com/android/colorfulos/widget/WidgetsBottomSheet.java similarity index 94% rename from src/com/android/uiuios/widget/WidgetsBottomSheet.java rename to src/com/android/colorfulos/widget/WidgetsBottomSheet.java index 88d06f6..2d908e6 100644 --- a/src/com/android/uiuios/widget/WidgetsBottomSheet.java +++ b/src/com/android/colorfulos/widget/WidgetsBottomSheet.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.widget; +package com.android.colorfulos.widget; import android.animation.Animator; import android.animation.ObjectAnimator; @@ -32,14 +32,14 @@ import android.widget.TextView; import androidx.annotation.Nullable; -import com.android.uiuios.Insettable; -import com.android.uiuios.ItemInfo; -import com.android.uiuios.LauncherAppState; -import com.android.uiuios.R; -import com.android.uiuios.ResourceUtils; -import com.android.uiuios.anim.Interpolators; -import com.android.uiuios.model.WidgetItem; -import com.android.uiuios.util.PackageUserKey; +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 java.util.List; diff --git a/src/com/android/uiuios/widget/WidgetsDiffReporter.java b/src/com/android/colorfulos/widget/WidgetsDiffReporter.java similarity index 96% rename from src/com/android/uiuios/widget/WidgetsDiffReporter.java rename to src/com/android/colorfulos/widget/WidgetsDiffReporter.java index bc6c361..73b21ab 100644 --- a/src/com/android/uiuios/widget/WidgetsDiffReporter.java +++ b/src/com/android/colorfulos/widget/WidgetsDiffReporter.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.android.uiuios.widget; +package com.android.colorfulos.widget; import android.util.Log; -import com.android.uiuios.icons.IconCache; -import com.android.uiuios.model.PackageItemInfo; -import com.android.uiuios.widget.WidgetsListAdapter.WidgetListRowEntryComparator; +import com.android.colorfulos.icons.IconCache; +import com.android.colorfulos.model.PackageItemInfo; +import com.android.colorfulos.widget.WidgetsListAdapter.WidgetListRowEntryComparator; import java.util.ArrayList; import java.util.Iterator; diff --git a/src/com/android/uiuios/widget/WidgetsFullSheet.java b/src/com/android/colorfulos/widget/WidgetsFullSheet.java similarity index 95% rename from src/com/android/uiuios/widget/WidgetsFullSheet.java rename to src/com/android/colorfulos/widget/WidgetsFullSheet.java index e98a8c1..24f75b6 100644 --- a/src/com/android/uiuios/widget/WidgetsFullSheet.java +++ b/src/com/android/colorfulos/widget/WidgetsFullSheet.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.widget; +package com.android.colorfulos.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.uiuios.Insettable; -import com.android.uiuios.Launcher; -import com.android.uiuios.LauncherAppState; -import com.android.uiuios.LauncherAppWidgetHost.ProviderChangedListener; -import com.android.uiuios.R; -import com.android.uiuios.views.RecyclerViewFastScroller; -import com.android.uiuios.views.TopRoundedCornerView; +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; /** * Popup for showing the full list of available widgets diff --git a/src/com/android/uiuios/widget/WidgetsListAdapter.java b/src/com/android/colorfulos/widget/WidgetsListAdapter.java similarity index 96% rename from src/com/android/uiuios/widget/WidgetsListAdapter.java rename to src/com/android/colorfulos/widget/WidgetsListAdapter.java index b3237f5..6fc9559 100644 --- a/src/com/android/uiuios/widget/WidgetsListAdapter.java +++ b/src/com/android/colorfulos/widget/WidgetsListAdapter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.widget; +package com.android.colorfulos.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.uiuios.icons.IconCache; -import com.android.uiuios.R; -import com.android.uiuios.WidgetPreviewLoader; -import com.android.uiuios.model.WidgetItem; -import com.android.uiuios.util.LabelComparator; +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 java.util.ArrayList; import java.util.Collections; diff --git a/src/com/android/uiuios/widget/WidgetsRecyclerView.java b/src/com/android/colorfulos/widget/WidgetsRecyclerView.java similarity index 97% rename from src/com/android/uiuios/widget/WidgetsRecyclerView.java rename to src/com/android/colorfulos/widget/WidgetsRecyclerView.java index de82916..8560c49 100644 --- a/src/com/android/uiuios/widget/WidgetsRecyclerView.java +++ b/src/com/android/colorfulos/widget/WidgetsRecyclerView.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.widget; +package com.android.colorfulos.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.uiuios.BaseRecyclerView; -import com.android.uiuios.R; +import com.android.colorfulos.BaseRecyclerView; +import com.android.colorfulos.R; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; diff --git a/src/com/android/uiuios/widget/WidgetsRowViewHolder.java b/src/com/android/colorfulos/widget/WidgetsRowViewHolder.java similarity index 90% rename from src/com/android/uiuios/widget/WidgetsRowViewHolder.java rename to src/com/android/colorfulos/widget/WidgetsRowViewHolder.java index a739fd9..8eda6a1 100644 --- a/src/com/android/uiuios/widget/WidgetsRowViewHolder.java +++ b/src/com/android/colorfulos/widget/WidgetsRowViewHolder.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.widget; +package com.android.colorfulos.widget; import android.view.ViewGroup; -import com.android.uiuios.BubbleTextView; -import com.android.uiuios.R; +import com.android.colorfulos.BubbleTextView; +import com.android.colorfulos.R; import androidx.recyclerview.widget.RecyclerView.ViewHolder; diff --git a/src/com/android/uiuios/widget/custom/CustomAppWidgetProviderInfo.java b/src/com/android/colorfulos/widget/custom/CustomAppWidgetProviderInfo.java similarity index 95% rename from src/com/android/uiuios/widget/custom/CustomAppWidgetProviderInfo.java rename to src/com/android/colorfulos/widget/custom/CustomAppWidgetProviderInfo.java index e5c29bd..f185c9a 100644 --- a/src/com/android/uiuios/widget/custom/CustomAppWidgetProviderInfo.java +++ b/src/com/android/colorfulos/widget/custom/CustomAppWidgetProviderInfo.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.widget.custom; +package com.android.colorfulos.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.uiuios.LauncherAppWidgetProviderInfo; -import com.android.uiuios.Utilities; +import com.android.colorfulos.LauncherAppWidgetProviderInfo; +import com.android.colorfulos.Utilities; /** * Custom app widget provider info that can be used as a widget, but provide extra functionality diff --git a/src/com/android/uiuios/widget/custom/CustomWidgetParser.java b/src/com/android/colorfulos/widget/custom/CustomWidgetParser.java similarity index 95% rename from src/com/android/uiuios/widget/custom/CustomWidgetParser.java rename to src/com/android/colorfulos/widget/custom/CustomWidgetParser.java index 4af7ca3..1b011ff 100644 --- a/src/com/android/uiuios/widget/custom/CustomWidgetParser.java +++ b/src/com/android/colorfulos/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.uiuios.widget.custom; +package com.android.colorfulos.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.uiuios.LauncherAppWidgetInfo; -import com.android.uiuios.LauncherAppWidgetProviderInfo; -import com.android.uiuios.R; +import com.android.colorfulos.LauncherAppWidgetInfo; +import com.android.colorfulos.LauncherAppWidgetProviderInfo; +import com.android.colorfulos.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.uiuios.LauncherAppWidgetProviderInfo.CLS_CUSTOM_WIDGET_PREFIX; +import static com.android.colorfulos.LauncherAppWidgetProviderInfo.CLS_CUSTOM_WIDGET_PREFIX; /** * Utility class to parse {@ink CustomAppWidgetProviderInfo} definitions from xml diff --git a/src/com/android/uiuios/TTUtils/APKUtils.java b/src/com/android/uiuios/TTUtils/APKUtils.java deleted file mode 100644 index 64d2556..0000000 --- a/src/com/android/uiuios/TTUtils/APKUtils.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.android.uiuios.TTUtils; - -import android.content.Context; -import android.content.pm.ApplicationInfo; -import android.content.pm.PackageInfo; -import android.content.pm.PackageManager; -import android.text.TextUtils; -import android.util.Log; - -public class APKUtils { - //判断是否为系统应用 - public static boolean isSystemApp(Context context, String pkgName) { - boolean isSystemApp = false; - PackageInfo pi = null; - try { - PackageManager pm = context.getPackageManager(); - pi = pm.getPackageInfo(pkgName, 0); - } catch (PackageManager.NameNotFoundException e) { - e.printStackTrace(); - Log.e("isSystemApp", e.getMessage(), e); - - } - - // 是系统中已安装的应用 - if (pi != null) { - boolean isSysApp = (pi.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) == 1; - boolean isSysUpd = (pi.applicationInfo.flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) == 1; - isSystemApp = isSysApp || isSysUpd; - } - return isSystemApp; - } - - //获取教管易版本号 - public static String getAPPVersionName(Context context, String packageName) { - String versionName = "0"; - - if (TextUtils.isEmpty(packageName)) { - return versionName; - } - PackageManager pm = context.getPackageManager(); - try { - PackageInfo packageInfo = pm.getPackageInfo(packageName, 0); - versionName = packageInfo.versionName; - } catch (PackageManager.NameNotFoundException e) { - e.printStackTrace(); - } - return versionName; - } - - -} diff --git a/src/com/android/uiuios/network/URLPath.java b/src/com/android/uiuios/network/URLPath.java deleted file mode 100644 index d143ccd..0000000 --- a/src/com/android/uiuios/network/URLPath.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.android.uiuios.network; - -public class URLPath { - public static final String ROOT_URL = "http://homework.uiuios.com/android/"; - public static final String APP_LOG = "app/addAppLog"; - public static final String RUN_NEW_APP = "app/runNewApp"; -} diff --git a/src/doc/zhanxun.keystore b/src/doc/zhanxun.keystore new file mode 100644 index 0000000..7c46fbc Binary files /dev/null and b/src/doc/zhanxun.keystore differ diff --git a/src_build_config/BuildConfig.java b/src_build_config/BuildConfig.java index aa01667..5a677fa 100644 --- a/src_build_config/BuildConfig.java +++ b/src_build_config/BuildConfig.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios; +package com.android.colorfulos; 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/android/launcher3/config/FeatureFlags.java index d4eb2d9..886d649 100644 --- a/src_flags/com/android/launcher3/config/FeatureFlags.java +++ b/src_flags/com/android/launcher3/config/FeatureFlags.java @@ -14,9 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.config; - -import android.content.Context; +package com.android.colorfulos.config; /** * Defines a set of flags used to control various launcher behaviors diff --git a/src_shortcuts_overrides/com/android/launcher3/model/LoaderResults.java b/src_shortcuts_overrides/com/android/launcher3/model/LoaderResults.java index a0c8e0a..972a822 100644 --- a/src_shortcuts_overrides/com/android/launcher3/model/LoaderResults.java +++ b/src_shortcuts_overrides/com/android/launcher3/model/LoaderResults.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package com.android.uiuios.model; +package com.android.colorfulos.model; -import com.android.uiuios.AllAppsList; -import com.android.uiuios.LauncherAppState; -import com.android.uiuios.LauncherModel.Callbacks; -import com.android.uiuios.util.ComponentKey; -import com.android.uiuios.widget.WidgetListRowEntry; +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 java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.HashMap; /** - * Helper class to handle results of {@link com.android.uiuios.model.LoaderTask}. + * Helper class to handle results of {@link com.android.colorfulos.model.LoaderTask}. */ public class LoaderResults extends BaseLoaderResults { diff --git a/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java b/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java index ff32948..530baca 100644 --- a/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java +++ b/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java @@ -1,5 +1,5 @@ -package com.android.uiuios.model; +package com.android.colorfulos.model; import static android.appwidget.AppWidgetProviderInfo.WIDGET_FEATURE_HIDE_FROM_PICKER; @@ -10,23 +10,23 @@ import android.os.Process; import android.os.UserHandle; import android.util.Log; -import com.android.uiuios.AppFilter; -import com.android.uiuios.icons.ComponentWithLabel; -import com.android.uiuios.icons.IconCache; -import com.android.uiuios.InvariantDeviceProfile; -import com.android.uiuios.LauncherAppState; -import com.android.uiuios.LauncherAppWidgetProviderInfo; -import com.android.uiuios.Utilities; -import com.android.uiuios.compat.AlphabeticIndexCompat; -import com.android.uiuios.compat.AppWidgetManagerCompat; -import com.android.uiuios.compat.LauncherAppsCompat; -import com.android.uiuios.compat.ShortcutConfigActivityInfo; -import com.android.uiuios.config.FeatureFlags; -import com.android.uiuios.util.MultiHashMap; -import com.android.uiuios.util.PackageUserKey; -import com.android.uiuios.util.Preconditions; -import com.android.uiuios.widget.WidgetItemComparator; -import com.android.uiuios.widget.WidgetListRowEntry; +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 java.util.ArrayList; import java.util.Collections; @@ -58,9 +58,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.uiuios.widget.WidgetsDiffReporter} + * {@link com.android.colorfulos.widget.WidgetsDiffReporter} * - * @see com.android.uiuios.widget.WidgetsListAdapter#setWidgets(ArrayList) + * @see com.android.colorfulos.widget.WidgetsListAdapter#setWidgets(ArrayList) */ public synchronized ArrayList getWidgetsList(Context context) { ArrayList result = new ArrayList<>(); diff --git a/src_shortcuts_overrides/com/android/launcher3/shortcuts/DeepShortcutManager.java b/src_shortcuts_overrides/com/android/launcher3/shortcuts/DeepShortcutManager.java index 76c0651..0bf3595 100644 --- a/src_shortcuts_overrides/com/android/launcher3/shortcuts/DeepShortcutManager.java +++ b/src_shortcuts_overrides/com/android/launcher3/shortcuts/DeepShortcutManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.shortcuts; +package com.android.colorfulos.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.uiuios.ItemInfo; -import com.android.uiuios.LauncherSettings; -import com.android.uiuios.WorkspaceItemInfo; +import com.android.colorfulos.ItemInfo; +import com.android.colorfulos.LauncherSettings; +import com.android.colorfulos.WorkspaceItemInfo; import java.util.ArrayList; import java.util.Collections; diff --git a/src_ui_overrides/com/android/uiuios/uioverrides/AllAppsSwipeController.java b/src_ui_overrides/com/android/colorfulos/uioverrides/AllAppsSwipeController.java similarity index 81% rename from src_ui_overrides/com/android/uiuios/uioverrides/AllAppsSwipeController.java rename to src_ui_overrides/com/android/colorfulos/uioverrides/AllAppsSwipeController.java index a625125..bee0e35 100644 --- a/src_ui_overrides/com/android/uiuios/uioverrides/AllAppsSwipeController.java +++ b/src_ui_overrides/com/android/colorfulos/uioverrides/AllAppsSwipeController.java @@ -1,17 +1,16 @@ -package com.android.uiuios.uioverrides; +package com.android.colorfulos.uioverrides; -import static com.android.uiuios.LauncherState.ALL_APPS; -import static com.android.uiuios.LauncherState.NORMAL; +import static com.android.colorfulos.LauncherState.ALL_APPS; +import static com.android.colorfulos.LauncherState.NORMAL; import android.view.MotionEvent; -import com.android.uiuios.AbstractFloatingView; -import com.android.uiuios.Launcher; -import com.android.uiuios.LauncherState; -import com.android.uiuios.LauncherStateManager.AnimationComponents; -import com.android.uiuios.touch.AbstractStateChangeTouchController; -import com.android.uiuios.touch.SwipeDetector; -import com.android.uiuios.userevent.nano.LauncherLogProto.ContainerType; +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; /** * TouchController to switch between NORMAL and ALL_APPS state. diff --git a/src_ui_overrides/com/android/uiuios/uioverrides/DisplayRotationListener.java b/src_ui_overrides/com/android/colorfulos/uioverrides/DisplayRotationListener.java similarity index 96% rename from src_ui_overrides/com/android/uiuios/uioverrides/DisplayRotationListener.java rename to src_ui_overrides/com/android/colorfulos/uioverrides/DisplayRotationListener.java index a1513f0..d4ec90e 100644 --- a/src_ui_overrides/com/android/uiuios/uioverrides/DisplayRotationListener.java +++ b/src_ui_overrides/com/android/colorfulos/uioverrides/DisplayRotationListener.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.uioverrides; +package com.android.colorfulos.uioverrides; import android.content.Context; import android.view.OrientationEventListener; diff --git a/src_ui_overrides/com/android/uiuios/uioverrides/UiFactory.java b/src_ui_overrides/com/android/colorfulos/uioverrides/UiFactory.java similarity index 89% rename from src_ui_overrides/com/android/uiuios/uioverrides/UiFactory.java rename to src_ui_overrides/com/android/colorfulos/uioverrides/UiFactory.java index 83b9f55..e6b4564 100644 --- a/src_ui_overrides/com/android/uiuios/uioverrides/UiFactory.java +++ b/src_ui_overrides/com/android/colorfulos/uioverrides/UiFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.uioverrides; +package com.android.colorfulos.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.uiuios.DeviceProfile; -import com.android.uiuios.Launcher; -import com.android.uiuios.LauncherState.ScaleAndTranslation; -import com.android.uiuios.LauncherStateManager.StateHandler; -import com.android.uiuios.graphics.RotationMode; -import com.android.uiuios.util.TouchController; +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 java.io.PrintWriter; diff --git a/src_ui_overrides/com/android/uiuios/uioverrides/WallpaperColorInfo.java b/src_ui_overrides/com/android/colorfulos/uioverrides/WallpaperColorInfo.java similarity index 94% rename from src_ui_overrides/com/android/uiuios/uioverrides/WallpaperColorInfo.java rename to src_ui_overrides/com/android/colorfulos/uioverrides/WallpaperColorInfo.java index 4720cab..ad566cf 100644 --- a/src_ui_overrides/com/android/uiuios/uioverrides/WallpaperColorInfo.java +++ b/src_ui_overrides/com/android/colorfulos/uioverrides/WallpaperColorInfo.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package com.android.uiuios.uioverrides; +package com.android.colorfulos.uioverrides; import android.content.Context; import android.graphics.Color; import android.util.Pair; -import com.android.uiuios.uioverrides.dynamicui.WallpaperColorsCompat; -import com.android.uiuios.uioverrides.dynamicui.WallpaperManagerCompat; -import com.android.uiuios.uioverrides.dynamicui.ColorExtractionAlgorithm; +import com.android.colorfulos.uioverrides.dynamicui.WallpaperColorsCompat; +import com.android.colorfulos.uioverrides.dynamicui.WallpaperManagerCompat; +import com.android.colorfulos.uioverrides.dynamicui.ColorExtractionAlgorithm; import java.util.ArrayList; diff --git a/src_ui_overrides/com/android/uiuios/uioverrides/dynamicui/ColorExtractionAlgorithm.java b/src_ui_overrides/com/android/colorfulos/uioverrides/dynamicui/ColorExtractionAlgorithm.java similarity index 99% rename from src_ui_overrides/com/android/uiuios/uioverrides/dynamicui/ColorExtractionAlgorithm.java rename to src_ui_overrides/com/android/colorfulos/uioverrides/dynamicui/ColorExtractionAlgorithm.java index 4160270..047f6e3 100644 --- a/src_ui_overrides/com/android/uiuios/uioverrides/dynamicui/ColorExtractionAlgorithm.java +++ b/src_ui_overrides/com/android/colorfulos/uioverrides/dynamicui/ColorExtractionAlgorithm.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.android.uiuios.uioverrides.dynamicui; +package com.android.colorfulos.uioverrides.dynamicui; import android.graphics.Color; import android.util.Log; import android.util.Pair; import android.util.Range; -import com.android.uiuios.Utilities; +import com.android.colorfulos.Utilities; import java.util.Arrays; import java.util.LinkedList; diff --git a/src_ui_overrides/com/android/uiuios/uioverrides/dynamicui/WallpaperColorsCompat.java b/src_ui_overrides/com/android/colorfulos/uioverrides/dynamicui/WallpaperColorsCompat.java similarity index 96% rename from src_ui_overrides/com/android/uiuios/uioverrides/dynamicui/WallpaperColorsCompat.java rename to src_ui_overrides/com/android/colorfulos/uioverrides/dynamicui/WallpaperColorsCompat.java index 878f80a..0be4d1d 100644 --- a/src_ui_overrides/com/android/uiuios/uioverrides/dynamicui/WallpaperColorsCompat.java +++ b/src_ui_overrides/com/android/colorfulos/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.uiuios.uioverrides.dynamicui; +package com.android.colorfulos.uioverrides.dynamicui; /** * A compatibility layer around platform implementation of WallpaperColors diff --git a/src_ui_overrides/com/android/uiuios/uioverrides/dynamicui/WallpaperManagerCompat.java b/src_ui_overrides/com/android/colorfulos/uioverrides/dynamicui/WallpaperManagerCompat.java similarity index 95% rename from src_ui_overrides/com/android/uiuios/uioverrides/dynamicui/WallpaperManagerCompat.java rename to src_ui_overrides/com/android/colorfulos/uioverrides/dynamicui/WallpaperManagerCompat.java index e63a3d0..5b0dd0d 100644 --- a/src_ui_overrides/com/android/uiuios/uioverrides/dynamicui/WallpaperManagerCompat.java +++ b/src_ui_overrides/com/android/colorfulos/uioverrides/dynamicui/WallpaperManagerCompat.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.android.uiuios.uioverrides.dynamicui; +package com.android.colorfulos.uioverrides.dynamicui; import android.content.Context; -import com.android.uiuios.Utilities; +import com.android.colorfulos.Utilities; import androidx.annotation.Nullable; diff --git a/src_ui_overrides/com/android/uiuios/uioverrides/dynamicui/WallpaperManagerCompatVL.java b/src_ui_overrides/com/android/colorfulos/uioverrides/dynamicui/WallpaperManagerCompatVL.java similarity index 97% rename from src_ui_overrides/com/android/uiuios/uioverrides/dynamicui/WallpaperManagerCompatVL.java rename to src_ui_overrides/com/android/colorfulos/uioverrides/dynamicui/WallpaperManagerCompatVL.java index a8cc0a8..831f679 100644 --- a/src_ui_overrides/com/android/uiuios/uioverrides/dynamicui/WallpaperManagerCompatVL.java +++ b/src_ui_overrides/com/android/colorfulos/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.uiuios.uioverrides.dynamicui; +package com.android.colorfulos.uioverrides.dynamicui; import static android.app.WallpaperManager.FLAG_SYSTEM; -import static com.android.uiuios.Utilities.getDevicePrefs; +import static com.android.colorfulos.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.uiuios.icons.ColorExtractor; +import com.android.colorfulos.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.uiuios.uioverrides.dynamicui.WallpaperManagerCompatVL.EXTRACTION_COMPLETE"; + "com.android.colorfulos.uioverrides.dynamicui.WallpaperManagerCompatVL.EXTRACTION_COMPLETE"; public static final int WALLPAPER_COMPAT_JOB_ID = 1; diff --git a/src_ui_overrides/com/android/uiuios/uioverrides/dynamicui/WallpaperManagerCompatVOMR1.java b/src_ui_overrides/com/android/colorfulos/uioverrides/dynamicui/WallpaperManagerCompatVOMR1.java similarity index 98% rename from src_ui_overrides/com/android/uiuios/uioverrides/dynamicui/WallpaperManagerCompatVOMR1.java rename to src_ui_overrides/com/android/colorfulos/uioverrides/dynamicui/WallpaperManagerCompatVOMR1.java index 78adf6a..5285ade 100644 --- a/src_ui_overrides/com/android/uiuios/uioverrides/dynamicui/WallpaperManagerCompatVOMR1.java +++ b/src_ui_overrides/com/android/colorfulos/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.uiuios.uioverrides.dynamicui; +package com.android.colorfulos.uioverrides.dynamicui; import android.annotation.TargetApi; import android.app.WallpaperColors; diff --git a/src_ui_overrides/com/android/uiuios/uioverrides/plugins/PluginManagerWrapper.java b/src_ui_overrides/com/android/colorfulos/uioverrides/plugins/PluginManagerWrapper.java similarity index 94% rename from src_ui_overrides/com/android/uiuios/uioverrides/plugins/PluginManagerWrapper.java rename to src_ui_overrides/com/android/colorfulos/uioverrides/plugins/PluginManagerWrapper.java index cef9fea..8bcbb98 100644 --- a/src_ui_overrides/com/android/uiuios/uioverrides/plugins/PluginManagerWrapper.java +++ b/src_ui_overrides/com/android/colorfulos/uioverrides/plugins/PluginManagerWrapper.java @@ -12,12 +12,12 @@ * permissions and limitations under the License. */ -package com.android.uiuios.uioverrides.plugins; +package com.android.colorfulos.uioverrides.plugins; import android.content.ComponentName; import android.content.Context; -import com.android.uiuios.util.MainThreadInitializedObject; +import com.android.colorfulos.util.MainThreadInitializedObject; import com.android.systemui.plugins.Plugin; import com.android.systemui.plugins.PluginListener; diff --git a/src_ui_overrides/com/android/uiuios/uioverrides/states/AllAppsState.java b/src_ui_overrides/com/android/colorfulos/uioverrides/states/AllAppsState.java similarity index 81% rename from src_ui_overrides/com/android/uiuios/uioverrides/states/AllAppsState.java rename to src_ui_overrides/com/android/colorfulos/uioverrides/states/AllAppsState.java index e4edb8f..0e74e2d 100644 --- a/src_ui_overrides/com/android/uiuios/uioverrides/states/AllAppsState.java +++ b/src_ui_overrides/com/android/colorfulos/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.uiuios.uioverrides.states; +package com.android.colorfulos.uioverrides.states; -import static com.android.uiuios.LauncherAnimUtils.ALL_APPS_TRANSITION_MS; -import static com.android.uiuios.allapps.DiscoveryBounce.HOME_BOUNCE_SEEN; -import static com.android.uiuios.anim.Interpolators.DEACCEL_2; +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 com.android.uiuios.AbstractFloatingView; -import com.android.uiuios.Launcher; -import com.android.uiuios.LauncherState; -import com.android.uiuios.R; -import com.android.uiuios.userevent.nano.LauncherLogProto.ContainerType; +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; /** * Definition for AllApps state diff --git a/src_ui_overrides/com/android/uiuios/uioverrides/states/OverviewState.java b/src_ui_overrides/com/android/colorfulos/uioverrides/states/OverviewState.java similarity index 82% rename from src_ui_overrides/com/android/uiuios/uioverrides/states/OverviewState.java rename to src_ui_overrides/com/android/colorfulos/uioverrides/states/OverviewState.java index 3d7db2c..a0c9ac5 100644 --- a/src_ui_overrides/com/android/uiuios/uioverrides/states/OverviewState.java +++ b/src_ui_overrides/com/android/colorfulos/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.uiuios.uioverrides.states; +package com.android.colorfulos.uioverrides.states; -import static com.android.uiuios.LauncherAnimUtils.OVERVIEW_TRANSITION_MS; +import static com.android.colorfulos.LauncherAnimUtils.OVERVIEW_TRANSITION_MS; -import com.android.uiuios.LauncherState; -import com.android.uiuios.userevent.nano.LauncherLogProto.ContainerType; +import com.android.colorfulos.LauncherState; +import com.android.colorfulos.userevent.nano.LauncherLogProto.ContainerType; /** * Definition for overview state diff --git a/tests/AndroidManifest-common.xml b/tests/AndroidManifest-common.xml index e9dd054..a21766b 100644 --- a/tests/AndroidManifest-common.xml +++ b/tests/AndroidManifest-common.xml @@ -16,7 +16,7 @@ + package="com.android.colorfulos.tests"> @@ -24,7 +24,7 @@ @@ -34,7 +34,7 @@ @@ -44,7 +44,7 @@ @@ -54,13 +54,13 @@ + android:name="com.android.colorfulos.testcomponent.WidgetConfigActivity"> @@ -71,12 +71,12 @@ + android:taskAffinity="com.android.colorfulos.testcomponent.Affinity1"> - + + android:targetActivity="com.android.colorfulos.testcomponent.BaseTestingActivity"> @@ -122,7 +122,7 @@ + android:targetActivity="com.android.colorfulos.testcomponent.BaseTestingActivity"> @@ -130,7 +130,7 @@ + android:targetActivity="com.android.colorfulos.testcomponent.BaseTestingActivity"> @@ -138,7 +138,7 @@ + android:targetActivity="com.android.colorfulos.testcomponent.BaseTestingActivity"> @@ -146,7 +146,7 @@ + android:targetActivity="com.android.colorfulos.testcomponent.BaseTestingActivity"> @@ -154,7 +154,7 @@ + android:targetActivity="com.android.colorfulos.testcomponent.BaseTestingActivity"> @@ -162,7 +162,7 @@ + android:targetActivity="com.android.colorfulos.testcomponent.BaseTestingActivity"> @@ -170,7 +170,7 @@ + android:targetActivity="com.android.colorfulos.testcomponent.BaseTestingActivity"> @@ -178,7 +178,7 @@ + android:targetActivity="com.android.colorfulos.testcomponent.BaseTestingActivity"> @@ -186,7 +186,7 @@ + android:targetActivity="com.android.colorfulos.testcomponent.BaseTestingActivity"> diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml index cba54b7..8992ee1 100644 --- a/tests/AndroidManifest.xml +++ b/tests/AndroidManifest.xml @@ -16,7 +16,7 @@ + package="com.android.colorfulos.tests"> @@ -29,6 +29,6 @@ android:functionalTest="false" android:handleProfiling="false" android:name="androidx.test.runner.AndroidJUnitRunner" - android:targetPackage="com.android.uiuios" > + android:targetPackage="com.android.colorfulos" > diff --git a/tests/res/xml/appwidget_with_config.xml b/tests/res/xml/appwidget_with_config.xml index fba8f65..68caf9a 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.uiuios.testcomponent.WidgetConfigActivity" + android:configure="com.android.colorfulos.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 e83e7cb..af789f3 100644 --- a/tests/res/xml/shortcuts.xml +++ b/tests/res/xml/shortcuts.xml @@ -3,16 +3,16 @@ - + - + - + diff --git a/tests/src/com/android/uiuios/allapps/search/DefaultAppSearchAlgorithmTest.java b/tests/src/com/android/colorfulos/allapps/search/DefaultAppSearchAlgorithmTest.java similarity index 98% rename from tests/src/com/android/uiuios/allapps/search/DefaultAppSearchAlgorithmTest.java rename to tests/src/com/android/colorfulos/allapps/search/DefaultAppSearchAlgorithmTest.java index dc83f86..22666be 100644 --- a/tests/src/com/android/uiuios/allapps/search/DefaultAppSearchAlgorithmTest.java +++ b/tests/src/com/android/colorfulos/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.uiuios.allapps.search; +package com.android.colorfulos.allapps.search; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import android.content.ComponentName; -import com.android.uiuios.AppInfo; +import com.android.colorfulos.AppInfo; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/src/com/android/uiuios/model/LoaderCursorTest.java b/tests/src/com/android/colorfulos/model/LoaderCursorTest.java similarity index 79% rename from tests/src/com/android/uiuios/model/LoaderCursorTest.java rename to tests/src/com/android/colorfulos/model/LoaderCursorTest.java index 32769de..f23be78 100644 --- a/tests/src/com/android/uiuios/model/LoaderCursorTest.java +++ b/tests/src/com/android/colorfulos/model/LoaderCursorTest.java @@ -1,4 +1,4 @@ -package com.android.uiuios.model; +package com.android.colorfulos.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.uiuios.WorkspaceItemInfo; -import com.android.uiuios.icons.IconCache; -import com.android.uiuios.InvariantDeviceProfile; -import com.android.uiuios.ItemInfo; -import com.android.uiuios.LauncherAppState; -import com.android.uiuios.Utilities; -import com.android.uiuios.compat.LauncherAppsCompat; -import com.android.uiuios.icons.BitmapInfo; +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 org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import static com.android.uiuios.LauncherSettings.Favorites.INTENT; -import static com.android.uiuios.LauncherSettings.Favorites.CELLX; -import static com.android.uiuios.LauncherSettings.Favorites.CELLY; -import static com.android.uiuios.LauncherSettings.Favorites.CONTAINER; -import static com.android.uiuios.LauncherSettings.Favorites.CONTAINER_DESKTOP; -import static com.android.uiuios.LauncherSettings.Favorites.CONTAINER_HOTSEAT; -import static com.android.uiuios.LauncherSettings.Favorites.ICON; -import static com.android.uiuios.LauncherSettings.Favorites.ICON_PACKAGE; -import static com.android.uiuios.LauncherSettings.Favorites.ICON_RESOURCE; -import static com.android.uiuios.LauncherSettings.Favorites.ITEM_TYPE; -import static com.android.uiuios.LauncherSettings.Favorites.ITEM_TYPE_APPLICATION; -import static com.android.uiuios.LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT; -import static com.android.uiuios.LauncherSettings.Favorites.PROFILE_ID; -import static com.android.uiuios.LauncherSettings.Favorites.RESTORED; -import static com.android.uiuios.LauncherSettings.Favorites.SCREEN; -import static com.android.uiuios.LauncherSettings.Favorites.TITLE; -import static com.android.uiuios.LauncherSettings.Favorites._ID; +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 junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertNotNull; diff --git a/tests/src/com/android/uiuios/provider/RestoreDbTaskTest.java b/tests/src/com/android/colorfulos/provider/RestoreDbTaskTest.java similarity index 95% rename from tests/src/com/android/uiuios/provider/RestoreDbTaskTest.java rename to tests/src/com/android/colorfulos/provider/RestoreDbTaskTest.java index b62069b..888c6fb 100644 --- a/tests/src/com/android/uiuios/provider/RestoreDbTaskTest.java +++ b/tests/src/com/android/colorfulos/provider/RestoreDbTaskTest.java @@ -1,4 +1,4 @@ -package com.android.uiuios.provider; +package com.android.colorfulos.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.uiuios.LauncherProvider.DatabaseHelper; -import com.android.uiuios.LauncherSettings.Favorites; +import com.android.colorfulos.LauncherProvider.DatabaseHelper; +import com.android.colorfulos.LauncherSettings.Favorites; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/src/com/android/uiuios/testcomponent/AppWidgetHidden.java b/tests/src/com/android/colorfulos/testcomponent/AppWidgetHidden.java similarity index 94% rename from tests/src/com/android/uiuios/testcomponent/AppWidgetHidden.java rename to tests/src/com/android/colorfulos/testcomponent/AppWidgetHidden.java index 5a578da..02d350f 100644 --- a/tests/src/com/android/uiuios/testcomponent/AppWidgetHidden.java +++ b/tests/src/com/android/colorfulos/testcomponent/AppWidgetHidden.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.android.uiuios.testcomponent; +package com.android.colorfulos.testcomponent; import android.appwidget.AppWidgetProvider; diff --git a/tests/src/com/android/uiuios/testcomponent/AppWidgetNoConfig.java b/tests/src/com/android/colorfulos/testcomponent/AppWidgetNoConfig.java similarity index 94% rename from tests/src/com/android/uiuios/testcomponent/AppWidgetNoConfig.java rename to tests/src/com/android/colorfulos/testcomponent/AppWidgetNoConfig.java index 346600a..78bcd50 100644 --- a/tests/src/com/android/uiuios/testcomponent/AppWidgetNoConfig.java +++ b/tests/src/com/android/colorfulos/testcomponent/AppWidgetNoConfig.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.android.uiuios.testcomponent; +package com.android.colorfulos.testcomponent; import android.appwidget.AppWidgetProvider; diff --git a/tests/src/com/android/uiuios/testcomponent/AppWidgetWithConfig.java b/tests/src/com/android/colorfulos/testcomponent/AppWidgetWithConfig.java similarity index 94% rename from tests/src/com/android/uiuios/testcomponent/AppWidgetWithConfig.java rename to tests/src/com/android/colorfulos/testcomponent/AppWidgetWithConfig.java index e9e5ca9..88e9abd 100644 --- a/tests/src/com/android/uiuios/testcomponent/AppWidgetWithConfig.java +++ b/tests/src/com/android/colorfulos/testcomponent/AppWidgetWithConfig.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.android.uiuios.testcomponent; +package com.android.colorfulos.testcomponent; /** * A simple app widget with configuration sceen. diff --git a/tests/src/com/android/uiuios/testcomponent/BaseTestingActivity.java b/tests/src/com/android/colorfulos/testcomponent/BaseTestingActivity.java similarity index 98% rename from tests/src/com/android/uiuios/testcomponent/BaseTestingActivity.java rename to tests/src/com/android/colorfulos/testcomponent/BaseTestingActivity.java index 12aef0b..c10bb32 100644 --- a/tests/src/com/android/uiuios/testcomponent/BaseTestingActivity.java +++ b/tests/src/com/android/colorfulos/testcomponent/BaseTestingActivity.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.android.uiuios.testcomponent; +package com.android.colorfulos.testcomponent; import android.app.Activity; import android.content.BroadcastReceiver; diff --git a/tests/src/com/android/uiuios/testcomponent/RequestPinItemActivity.java b/tests/src/com/android/colorfulos/testcomponent/RequestPinItemActivity.java similarity index 98% rename from tests/src/com/android/uiuios/testcomponent/RequestPinItemActivity.java rename to tests/src/com/android/colorfulos/testcomponent/RequestPinItemActivity.java index 5722baa..63c5ea1 100644 --- a/tests/src/com/android/uiuios/testcomponent/RequestPinItemActivity.java +++ b/tests/src/com/android/colorfulos/testcomponent/RequestPinItemActivity.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.android.uiuios.testcomponent; +package com.android.colorfulos.testcomponent; import android.annotation.TargetApi; import android.app.PendingIntent; diff --git a/tests/src/com/android/uiuios/testcomponent/TestCommandReceiver.java b/tests/src/com/android/colorfulos/testcomponent/TestCommandReceiver.java similarity index 98% rename from tests/src/com/android/uiuios/testcomponent/TestCommandReceiver.java rename to tests/src/com/android/colorfulos/testcomponent/TestCommandReceiver.java index f991356..931d06f 100644 --- a/tests/src/com/android/uiuios/testcomponent/TestCommandReceiver.java +++ b/tests/src/com/android/colorfulos/testcomponent/TestCommandReceiver.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.android.uiuios.testcomponent; +package com.android.colorfulos.testcomponent; import static android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_DISABLED; import static android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_ENABLED; @@ -34,7 +34,6 @@ import android.util.Base64; import java.io.File; import java.io.FileNotFoundException; -import java.io.FileOutputStream; import java.io.IOException; import androidx.test.InstrumentationRegistry; diff --git a/tests/src/com/android/uiuios/testcomponent/TestLauncherActivity.java b/tests/src/com/android/colorfulos/testcomponent/TestLauncherActivity.java similarity index 96% rename from tests/src/com/android/uiuios/testcomponent/TestLauncherActivity.java rename to tests/src/com/android/colorfulos/testcomponent/TestLauncherActivity.java index 6c56043..b1e4533 100644 --- a/tests/src/com/android/uiuios/testcomponent/TestLauncherActivity.java +++ b/tests/src/com/android/colorfulos/testcomponent/TestLauncherActivity.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.android.uiuios.testcomponent; +package com.android.colorfulos.testcomponent; import static android.content.Intent.ACTION_MAIN; import static android.content.Intent.CATEGORY_LAUNCHER; diff --git a/tests/src/com/android/uiuios/testcomponent/TouchEventGenerator.java b/tests/src/com/android/colorfulos/testcomponent/TouchEventGenerator.java similarity index 99% rename from tests/src/com/android/uiuios/testcomponent/TouchEventGenerator.java rename to tests/src/com/android/colorfulos/testcomponent/TouchEventGenerator.java index 37a6b7d..cfbcea0 100644 --- a/tests/src/com/android/uiuios/testcomponent/TouchEventGenerator.java +++ b/tests/src/com/android/colorfulos/testcomponent/TouchEventGenerator.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.testcomponent; +package com.android.colorfulos.testcomponent; import android.graphics.Point; import android.util.Pair; diff --git a/tests/src/com/android/uiuios/testcomponent/WidgetConfigActivity.java b/tests/src/com/android/colorfulos/testcomponent/WidgetConfigActivity.java similarity index 96% rename from tests/src/com/android/uiuios/testcomponent/WidgetConfigActivity.java rename to tests/src/com/android/colorfulos/testcomponent/WidgetConfigActivity.java index e21933f..b41460d 100644 --- a/tests/src/com/android/uiuios/testcomponent/WidgetConfigActivity.java +++ b/tests/src/com/android/colorfulos/testcomponent/WidgetConfigActivity.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.android.uiuios.testcomponent; +package com.android.colorfulos.testcomponent; import android.os.Bundle; diff --git a/tests/src/com/android/uiuios/touch/SwipeDetectorTest.java b/tests/src/com/android/colorfulos/touch/SwipeDetectorTest.java similarity index 98% rename from tests/src/com/android/uiuios/touch/SwipeDetectorTest.java rename to tests/src/com/android/colorfulos/touch/SwipeDetectorTest.java index 2754426..8d9db48 100644 --- a/tests/src/com/android/uiuios/touch/SwipeDetectorTest.java +++ b/tests/src/com/android/colorfulos/touch/SwipeDetectorTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.touch; +package com.android.colorfulos.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.uiuios.testcomponent.TouchEventGenerator; +import com.android.colorfulos.testcomponent.TouchEventGenerator; import org.junit.Before; import org.junit.Test; diff --git a/tests/src/com/android/uiuios/ui/AbstractLauncherUiTest.java b/tests/src/com/android/colorfulos/ui/AbstractLauncherUiTest.java similarity index 93% rename from tests/src/com/android/uiuios/ui/AbstractLauncherUiTest.java rename to tests/src/com/android/colorfulos/ui/AbstractLauncherUiTest.java index f9a63e2..5de1663 100644 --- a/tests/src/com/android/uiuios/ui/AbstractLauncherUiTest.java +++ b/tests/src/com/android/colorfulos/ui/AbstractLauncherUiTest.java @@ -13,11 +13,11 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.android.uiuios.ui; +package com.android.colorfulos.ui; import static androidx.test.InstrumentationRegistry.getInstrumentation; -import static com.android.uiuios.ui.TaplTestsLauncher3.getAppPackageName; +import static com.android.colorfulos.ui.TaplTestsLauncher3.getAppPackageName; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -44,22 +44,22 @@ import androidx.test.uiautomator.UiDevice; import androidx.test.uiautomator.UiObject2; import androidx.test.uiautomator.Until; -import com.android.uiuios.Launcher; -import com.android.uiuios.LauncherAppState; -import com.android.uiuios.LauncherModel; -import com.android.uiuios.LauncherSettings; -import com.android.uiuios.LauncherState; -import com.android.uiuios.MainThreadExecutor; -import com.android.uiuios.ResourceUtils; -import com.android.uiuios.Utilities; -import com.android.uiuios.compat.LauncherAppsCompat; -import com.android.uiuios.model.AppLaunchTracker; -import com.android.uiuios.tapl.LauncherInstrumentation; -import com.android.uiuios.tapl.TestHelpers; -import com.android.uiuios.util.Wait; -import com.android.uiuios.util.rule.FailureWatcher; -import com.android.uiuios.util.rule.LauncherActivityRule; -import com.android.uiuios.util.rule.ShellCommandRule; +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 org.junit.After; import org.junit.Before; @@ -349,7 +349,7 @@ public abstract class AbstractLauncherUiTest { intent.addCategory(Intent.CATEGORY_LAUNCHER); intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); intent.setComponent(new ComponentName(packageName, - "com.android.uiuios.tests.Activity" + activityNumber)); + "com.android.colorfulos.tests.Activity" + activityNumber)); instrumentation.getTargetContext().startActivity(intent); assertTrue(packageName + " didn't start", mDevice.wait( diff --git a/tests/src/com/android/uiuios/ui/DefaultLayoutProviderTest.java b/tests/src/com/android/colorfulos/ui/DefaultLayoutProviderTest.java similarity index 94% rename from tests/src/com/android/uiuios/ui/DefaultLayoutProviderTest.java rename to tests/src/com/android/colorfulos/ui/DefaultLayoutProviderTest.java index 9b6e4db..4db007f 100644 --- a/tests/src/com/android/uiuios/ui/DefaultLayoutProviderTest.java +++ b/tests/src/com/android/colorfulos/ui/DefaultLayoutProviderTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.android.uiuios.ui; +package com.android.colorfulos.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.uiuios.LauncherAppWidgetProviderInfo; -import com.android.uiuios.testcomponent.TestCommandReceiver; -import com.android.uiuios.util.LauncherLayoutBuilder; -import com.android.uiuios.util.rule.ShellCommandRule; +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 org.junit.After; import org.junit.Before; diff --git a/tests/src/com/android/uiuios/ui/PortraitLandscapeRunner.java b/tests/src/com/android/colorfulos/ui/PortraitLandscapeRunner.java similarity index 96% rename from tests/src/com/android/uiuios/ui/PortraitLandscapeRunner.java rename to tests/src/com/android/colorfulos/ui/PortraitLandscapeRunner.java index fd8ad94..b357e27 100644 --- a/tests/src/com/android/uiuios/ui/PortraitLandscapeRunner.java +++ b/tests/src/com/android/colorfulos/ui/PortraitLandscapeRunner.java @@ -1,8 +1,8 @@ -package com.android.uiuios.ui; +package com.android.colorfulos.ui; import android.view.Surface; -import com.android.uiuios.tapl.TestHelpers; +import com.android.colorfulos.tapl.TestHelpers; import org.junit.rules.TestRule; import org.junit.runner.Description; diff --git a/tests/src/com/android/uiuios/ui/TaplTestsLauncher3.java b/tests/src/com/android/colorfulos/ui/TaplTestsLauncher3.java similarity index 95% rename from tests/src/com/android/uiuios/ui/TaplTestsLauncher3.java rename to tests/src/com/android/colorfulos/ui/TaplTestsLauncher3.java index 0631373..4b33929 100644 --- a/tests/src/com/android/uiuios/ui/TaplTestsLauncher3.java +++ b/tests/src/com/android/colorfulos/ui/TaplTestsLauncher3.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.ui; +package com.android.colorfulos.ui; import static androidx.test.InstrumentationRegistry.getInstrumentation; @@ -27,19 +27,18 @@ import static org.junit.Assert.assertTrue; import androidx.test.filters.LargeTest; import androidx.test.runner.AndroidJUnit4; -import com.android.uiuios.Launcher; -import com.android.uiuios.LauncherState; -import com.android.uiuios.popup.ArrowPopup; -import com.android.uiuios.tapl.AllApps; -import com.android.uiuios.tapl.AppIcon; -import com.android.uiuios.tapl.AppIconMenu; -import com.android.uiuios.tapl.AppIconMenuItem; -import com.android.uiuios.tapl.TestHelpers; -import com.android.uiuios.tapl.Widgets; -import com.android.uiuios.tapl.Workspace; -import com.android.uiuios.views.OptionsPopupView; -import com.android.uiuios.widget.WidgetsFullSheet; -import com.android.uiuios.widget.WidgetsRecyclerView; +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 org.junit.Before; import org.junit.Ignore; diff --git a/tests/src/com/android/uiuios/ui/TestViewHelpers.java b/tests/src/com/android/colorfulos/ui/TestViewHelpers.java similarity index 95% rename from tests/src/com/android/uiuios/ui/TestViewHelpers.java rename to tests/src/com/android/colorfulos/ui/TestViewHelpers.java index 9c532d7..ba20403 100644 --- a/tests/src/com/android/uiuios/ui/TestViewHelpers.java +++ b/tests/src/com/android/colorfulos/ui/TestViewHelpers.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.android.uiuios.ui; +package com.android.colorfulos.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.uiuios.LauncherAppWidgetProviderInfo; -import com.android.uiuios.R; -import com.android.uiuios.compat.AppWidgetManagerCompat; -import com.android.uiuios.testcomponent.AppWidgetNoConfig; -import com.android.uiuios.testcomponent.AppWidgetWithConfig; +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 java.util.concurrent.Callable; import java.util.function.Function; diff --git a/tests/src/com/android/uiuios/ui/WorkTabTest.java b/tests/src/com/android/colorfulos/ui/WorkTabTest.java similarity index 95% rename from tests/src/com/android/uiuios/ui/WorkTabTest.java rename to tests/src/com/android/colorfulos/ui/WorkTabTest.java index 0d9c7d6..f657189 100644 --- a/tests/src/com/android/uiuios/ui/WorkTabTest.java +++ b/tests/src/com/android/colorfulos/ui/WorkTabTest.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.ui; +package com.android.colorfulos.ui; -import static com.android.uiuios.LauncherState.ALL_APPS; +import static com.android.colorfulos.LauncherState.ALL_APPS; import static org.junit.Assert.assertTrue; diff --git a/tests/src/com/android/uiuios/ui/widget/AddConfigWidgetTest.java b/tests/src/com/android/colorfulos/ui/widget/AddConfigWidgetTest.java similarity index 90% rename from tests/src/com/android/uiuios/ui/widget/AddConfigWidgetTest.java rename to tests/src/com/android/colorfulos/ui/widget/AddConfigWidgetTest.java index 905ba78..e16b10b 100644 --- a/tests/src/com/android/uiuios/ui/widget/AddConfigWidgetTest.java +++ b/tests/src/com/android/colorfulos/ui/widget/AddConfigWidgetTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.android.uiuios.ui.widget; +package com.android.colorfulos.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.uiuios.ItemInfo; -import com.android.uiuios.LauncherAppWidgetInfo; -import com.android.uiuios.LauncherAppWidgetProviderInfo; -import com.android.uiuios.Workspace; -import com.android.uiuios.testcomponent.WidgetConfigActivity; -import com.android.uiuios.ui.AbstractLauncherUiTest; -import com.android.uiuios.ui.TestViewHelpers; -import com.android.uiuios.util.Condition; -import com.android.uiuios.util.Wait; -import com.android.uiuios.util.rule.ShellCommandRule; -import com.android.uiuios.widget.WidgetCell; +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 org.junit.Before; import org.junit.Ignore; diff --git a/tests/src/com/android/uiuios/ui/widget/AddWidgetTest.java b/tests/src/com/android/colorfulos/ui/widget/AddWidgetTest.java similarity index 83% rename from tests/src/com/android/uiuios/ui/widget/AddWidgetTest.java rename to tests/src/com/android/colorfulos/ui/widget/AddWidgetTest.java index 01bb96a..a120d37 100644 --- a/tests/src/com/android/uiuios/ui/widget/AddWidgetTest.java +++ b/tests/src/com/android/colorfulos/ui/widget/AddWidgetTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.android.uiuios.ui.widget; +package com.android.colorfulos.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.uiuios.ItemInfo; -import com.android.uiuios.LauncherAppWidgetInfo; -import com.android.uiuios.LauncherAppWidgetProviderInfo; -import com.android.uiuios.Workspace.ItemOperator; -import com.android.uiuios.ui.AbstractLauncherUiTest; -import com.android.uiuios.ui.TestViewHelpers; -import com.android.uiuios.util.Condition; -import com.android.uiuios.util.Wait; -import com.android.uiuios.util.rule.ShellCommandRule; -import com.android.uiuios.widget.WidgetCell; +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 org.junit.Ignore; import org.junit.Rule; diff --git a/tests/src/com/android/uiuios/ui/widget/BindWidgetTest.java b/tests/src/com/android/colorfulos/ui/widget/BindWidgetTest.java similarity index 93% rename from tests/src/com/android/uiuios/ui/widget/BindWidgetTest.java rename to tests/src/com/android/colorfulos/ui/widget/BindWidgetTest.java index 33843e6..6bcaf1d 100644 --- a/tests/src/com/android/uiuios/ui/widget/BindWidgetTest.java +++ b/tests/src/com/android/colorfulos/ui/widget/BindWidgetTest.java @@ -13,9 +13,9 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.android.uiuios.ui.widget; +package com.android.colorfulos.ui.widget; -import static com.android.uiuios.WorkspaceLayoutManager.FIRST_SCREEN_ID; +import static com.android.colorfulos.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.uiuios.LauncherAppWidgetHost; -import com.android.uiuios.LauncherAppWidgetInfo; -import com.android.uiuios.LauncherAppWidgetProviderInfo; -import com.android.uiuios.LauncherSettings; -import com.android.uiuios.compat.AppWidgetManagerCompat; -import com.android.uiuios.compat.PackageInstallerCompat; -import com.android.uiuios.tapl.Workspace; -import com.android.uiuios.ui.AbstractLauncherUiTest; -import com.android.uiuios.ui.TestViewHelpers; -import com.android.uiuios.util.ContentWriter; -import com.android.uiuios.util.rule.ShellCommandRule; -import com.android.uiuios.widget.PendingAddWidgetInfo; -import com.android.uiuios.widget.WidgetHostViewLoader; +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 org.junit.After; import org.junit.Before; diff --git a/tests/src/com/android/uiuios/ui/widget/RequestPinItemTest.java b/tests/src/com/android/colorfulos/ui/widget/RequestPinItemTest.java similarity index 88% rename from tests/src/com/android/uiuios/ui/widget/RequestPinItemTest.java rename to tests/src/com/android/colorfulos/ui/widget/RequestPinItemTest.java index b56d18c..cd979b8 100644 --- a/tests/src/com/android/uiuios/ui/widget/RequestPinItemTest.java +++ b/tests/src/com/android/colorfulos/ui/widget/RequestPinItemTest.java @@ -13,9 +13,9 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.android.uiuios.ui.widget; +package com.android.colorfulos.ui.widget; -import static com.android.uiuios.ui.TaplTestsLauncher3.getAppPackageName; +import static com.android.colorfulos.ui.TaplTestsLauncher3.getAppPackageName; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotSame; @@ -29,21 +29,21 @@ import android.view.View; import androidx.test.filters.LargeTest; import androidx.test.runner.AndroidJUnit4; -import com.android.uiuios.ItemInfo; -import com.android.uiuios.LauncherAppWidgetInfo; -import com.android.uiuios.LauncherSettings.Favorites; -import com.android.uiuios.Utilities; -import com.android.uiuios.Workspace.ItemOperator; -import com.android.uiuios.WorkspaceItemInfo; -import com.android.uiuios.shortcuts.ShortcutKey; -import com.android.uiuios.tapl.AddToHomeScreenPrompt; -import com.android.uiuios.testcomponent.AppWidgetNoConfig; -import com.android.uiuios.testcomponent.AppWidgetWithConfig; -import com.android.uiuios.testcomponent.RequestPinItemActivity; -import com.android.uiuios.ui.AbstractLauncherUiTest; -import com.android.uiuios.util.Condition; -import com.android.uiuios.util.Wait; -import com.android.uiuios.util.rule.ShellCommandRule; +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 org.junit.Before; import org.junit.Rule; diff --git a/tests/src/com/android/uiuios/util/Condition.java b/tests/src/com/android/colorfulos/util/Condition.java similarity index 93% rename from tests/src/com/android/uiuios/util/Condition.java rename to tests/src/com/android/colorfulos/util/Condition.java index c8b1b1f..0a84564 100644 --- a/tests/src/com/android/uiuios/util/Condition.java +++ b/tests/src/com/android/colorfulos/util/Condition.java @@ -1,8 +1,8 @@ -package com.android.uiuios.util; +package com.android.colorfulos.util; import androidx.test.uiautomator.UiObject2; -import com.android.uiuios.MainThreadExecutor; +import com.android.colorfulos.MainThreadExecutor; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; diff --git a/tests/src/com/android/uiuios/util/LauncherLayoutBuilder.java b/tests/src/com/android/colorfulos/util/LauncherLayoutBuilder.java similarity index 99% rename from tests/src/com/android/uiuios/util/LauncherLayoutBuilder.java rename to tests/src/com/android/colorfulos/util/LauncherLayoutBuilder.java index df8fbce..05979ec 100644 --- a/tests/src/com/android/uiuios/util/LauncherLayoutBuilder.java +++ b/tests/src/com/android/colorfulos/util/LauncherLayoutBuilder.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.android.uiuios.util; +package com.android.colorfulos.util; import android.text.TextUtils; diff --git a/tests/src/com/android/uiuios/util/RaceConditionReproducer.java b/tests/src/com/android/colorfulos/util/RaceConditionReproducer.java similarity index 99% rename from tests/src/com/android/uiuios/util/RaceConditionReproducer.java rename to tests/src/com/android/colorfulos/util/RaceConditionReproducer.java index 54a909d..7ba9dbc 100644 --- a/tests/src/com/android/uiuios/util/RaceConditionReproducer.java +++ b/tests/src/com/android/colorfulos/util/RaceConditionReproducer.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.android.uiuios.util; +package com.android.colorfulos.util; -import static com.android.uiuios.util.RaceConditionTracker.ENTER_POSTFIX; -import static com.android.uiuios.util.RaceConditionTracker.EXIT_POSTFIX; +import static com.android.colorfulos.util.RaceConditionTracker.ENTER_POSTFIX; +import static com.android.colorfulos.util.RaceConditionTracker.EXIT_POSTFIX; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; diff --git a/tests/src/com/android/uiuios/util/RaceConditionReproducerTest.java b/tests/src/com/android/colorfulos/util/RaceConditionReproducerTest.java similarity index 99% rename from tests/src/com/android/uiuios/util/RaceConditionReproducerTest.java rename to tests/src/com/android/colorfulos/util/RaceConditionReproducerTest.java index e32581a..83ea29c 100644 --- a/tests/src/com/android/uiuios/util/RaceConditionReproducerTest.java +++ b/tests/src/com/android/colorfulos/util/RaceConditionReproducerTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.util; +package com.android.colorfulos.util; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/tests/src/com/android/uiuios/util/TestUtil.java b/tests/src/com/android/colorfulos/util/TestUtil.java similarity index 98% rename from tests/src/com/android/uiuios/util/TestUtil.java rename to tests/src/com/android/colorfulos/util/TestUtil.java index 667f0d2..e610448 100644 --- a/tests/src/com/android/uiuios/util/TestUtil.java +++ b/tests/src/com/android/colorfulos/util/TestUtil.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.util; +package com.android.colorfulos.util; import static androidx.test.InstrumentationRegistry.getContext; import static androidx.test.InstrumentationRegistry.getInstrumentation; diff --git a/tests/src/com/android/uiuios/util/Wait.java b/tests/src/com/android/colorfulos/util/Wait.java similarity index 96% rename from tests/src/com/android/uiuios/util/Wait.java rename to tests/src/com/android/colorfulos/util/Wait.java index 8bcec41..f3d56ce 100644 --- a/tests/src/com/android/uiuios/util/Wait.java +++ b/tests/src/com/android/colorfulos/util/Wait.java @@ -1,4 +1,4 @@ -package com.android.uiuios.util; +package com.android.colorfulos.util; import android.os.SystemClock; diff --git a/tests/src/com/android/uiuios/util/rule/FailureWatcher.java b/tests/src/com/android/colorfulos/util/rule/FailureWatcher.java similarity index 97% rename from tests/src/com/android/uiuios/util/rule/FailureWatcher.java rename to tests/src/com/android/colorfulos/util/rule/FailureWatcher.java index b6736fe..b8fd793 100644 --- a/tests/src/com/android/uiuios/util/rule/FailureWatcher.java +++ b/tests/src/com/android/colorfulos/util/rule/FailureWatcher.java @@ -1,4 +1,4 @@ -package com.android.uiuios.util.rule; +package com.android.colorfulos.util.rule; import static androidx.test.InstrumentationRegistry.getInstrumentation; diff --git a/tests/src/com/android/uiuios/util/rule/LauncherActivityRule.java b/tests/src/com/android/colorfulos/util/rule/LauncherActivityRule.java similarity index 94% rename from tests/src/com/android/uiuios/util/rule/LauncherActivityRule.java rename to tests/src/com/android/colorfulos/util/rule/LauncherActivityRule.java index 882cb8c..134cfdc 100644 --- a/tests/src/com/android/uiuios/util/rule/LauncherActivityRule.java +++ b/tests/src/com/android/colorfulos/util/rule/LauncherActivityRule.java @@ -13,9 +13,9 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.android.uiuios.util.rule; +package com.android.colorfulos.util.rule; -import static com.android.uiuios.tapl.TestHelpers.getHomeIntentInPackage; +import static com.android.colorfulos.tapl.TestHelpers.getHomeIntentInPackage; import static androidx.test.InstrumentationRegistry.getInstrumentation; import static androidx.test.InstrumentationRegistry.getTargetContext; @@ -26,8 +26,8 @@ import android.app.Application.ActivityLifecycleCallbacks; import android.os.Bundle; import androidx.test.InstrumentationRegistry; -import com.android.uiuios.Launcher; -import com.android.uiuios.Workspace.ItemOperator; +import com.android.colorfulos.Launcher; +import com.android.colorfulos.Workspace.ItemOperator; import org.junit.rules.TestRule; import org.junit.runner.Description; diff --git a/tests/src/com/android/uiuios/util/rule/ShellCommandRule.java b/tests/src/com/android/colorfulos/util/rule/ShellCommandRule.java similarity index 96% rename from tests/src/com/android/uiuios/util/rule/ShellCommandRule.java rename to tests/src/com/android/colorfulos/util/rule/ShellCommandRule.java index b7e3036..9bb2c31 100644 --- a/tests/src/com/android/uiuios/util/rule/ShellCommandRule.java +++ b/tests/src/com/android/colorfulos/util/rule/ShellCommandRule.java @@ -13,9 +13,9 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.android.uiuios.util.rule; +package com.android.colorfulos.util.rule; -import static com.android.uiuios.tapl.TestHelpers.getLauncherInMyProcess; +import static com.android.colorfulos.tapl.TestHelpers.getLauncherInMyProcess; import static androidx.test.InstrumentationRegistry.getInstrumentation; diff --git a/tests/src/com/android/uiuios/widget/WidgetsListAdapterTest.java b/tests/src/com/android/colorfulos/widget/WidgetsListAdapterTest.java similarity index 91% rename from tests/src/com/android/uiuios/widget/WidgetsListAdapterTest.java rename to tests/src/com/android/colorfulos/widget/WidgetsListAdapterTest.java index 1bbf25d..590038e 100644 --- a/tests/src/com/android/uiuios/widget/WidgetsListAdapterTest.java +++ b/tests/src/com/android/colorfulos/widget/WidgetsListAdapterTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.uiuios.widget; +package com.android.colorfulos.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.uiuios.icons.IconCache; -import com.android.uiuios.InvariantDeviceProfile; -import com.android.uiuios.LauncherAppWidgetProviderInfo; -import com.android.uiuios.WidgetPreviewLoader; -import com.android.uiuios.compat.AppWidgetManagerCompat; -import com.android.uiuios.model.PackageItemInfo; -import com.android.uiuios.model.WidgetItem; -import com.android.uiuios.util.MultiHashMap; +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 org.junit.Before; import org.junit.Test; diff --git a/tests/tapl/AndroidManifest.xml b/tests/tapl/AndroidManifest.xml index 0e13fbc..31a5a91 100644 --- a/tests/tapl/AndroidManifest.xml +++ b/tests/tapl/AndroidManifest.xml @@ -19,7 +19,7 @@ --> diff --git a/tests/tapl/com/android/uiuios/tapl/AddToHomeScreenPrompt.java b/tests/tapl/com/android/colorfulos/tapl/AddToHomeScreenPrompt.java similarity index 93% rename from tests/tapl/com/android/uiuios/tapl/AddToHomeScreenPrompt.java rename to tests/tapl/com/android/colorfulos/tapl/AddToHomeScreenPrompt.java index ee6cf5f..1c58a01 100644 --- a/tests/tapl/com/android/uiuios/tapl/AddToHomeScreenPrompt.java +++ b/tests/tapl/com/android/colorfulos/tapl/AddToHomeScreenPrompt.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.tapl; +package com.android.colorfulos.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.uiuios.widget.WidgetCell")); + "com.android.colorfulos.widget.WidgetCell")); mLauncher.assertNotNull("Can't find widget cell object", mWidgetCell); } diff --git a/tests/tapl/com/android/uiuios/tapl/AllApps.java b/tests/tapl/com/android/colorfulos/tapl/AllApps.java similarity index 98% rename from tests/tapl/com/android/uiuios/tapl/AllApps.java rename to tests/tapl/com/android/colorfulos/tapl/AllApps.java index cf0a870..df77a2f 100644 --- a/tests/tapl/com/android/uiuios/tapl/AllApps.java +++ b/tests/tapl/com/android/colorfulos/tapl/AllApps.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.tapl; +package com.android.colorfulos.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.uiuios.ResourceUtils; -import com.android.uiuios.testing.TestProtocol; +import com.android.colorfulos.ResourceUtils; +import com.android.colorfulos.testing.TestProtocol; /** * Operations on AllApps opened from Home. Also a parent for All Apps opened from Overview. diff --git a/tests/tapl/com/android/uiuios/tapl/AllAppsFromOverview.java b/tests/tapl/com/android/colorfulos/tapl/AllAppsFromOverview.java similarity index 92% rename from tests/tapl/com/android/uiuios/tapl/AllAppsFromOverview.java rename to tests/tapl/com/android/colorfulos/tapl/AllAppsFromOverview.java index 1c8c6f6..60bf691 100644 --- a/tests/tapl/com/android/uiuios/tapl/AllAppsFromOverview.java +++ b/tests/tapl/com/android/colorfulos/tapl/AllAppsFromOverview.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package com.android.uiuios.tapl; +package com.android.colorfulos.tapl; -import static com.android.uiuios.testing.TestProtocol.OVERVIEW_STATE_ORDINAL; +import static com.android.colorfulos.testing.TestProtocol.OVERVIEW_STATE_ORDINAL; import android.graphics.Point; import androidx.annotation.NonNull; import androidx.test.uiautomator.UiObject2; -import com.android.uiuios.testing.TestProtocol; +import com.android.colorfulos.testing.TestProtocol; /** * Operations on AllApps opened from Overview. diff --git a/tests/tapl/com/android/uiuios/tapl/AppIcon.java b/tests/tapl/com/android/colorfulos/tapl/AppIcon.java similarity index 98% rename from tests/tapl/com/android/uiuios/tapl/AppIcon.java rename to tests/tapl/com/android/colorfulos/tapl/AppIcon.java index 2bb22e4..e269d95 100644 --- a/tests/tapl/com/android/uiuios/tapl/AppIcon.java +++ b/tests/tapl/com/android/colorfulos/tapl/AppIcon.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.tapl; +package com.android.colorfulos.tapl; import android.graphics.Point; import android.os.SystemClock; diff --git a/tests/tapl/com/android/uiuios/tapl/AppIconMenu.java b/tests/tapl/com/android/colorfulos/tapl/AppIconMenu.java similarity index 97% rename from tests/tapl/com/android/uiuios/tapl/AppIconMenu.java rename to tests/tapl/com/android/colorfulos/tapl/AppIconMenu.java index 30d3d1f..80a183f 100644 --- a/tests/tapl/com/android/uiuios/tapl/AppIconMenu.java +++ b/tests/tapl/com/android/colorfulos/tapl/AppIconMenu.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.tapl; +package com.android.colorfulos.tapl; import static org.junit.Assert.assertTrue; diff --git a/tests/tapl/com/android/uiuios/tapl/AppIconMenuItem.java b/tests/tapl/com/android/colorfulos/tapl/AppIconMenuItem.java similarity index 96% rename from tests/tapl/com/android/uiuios/tapl/AppIconMenuItem.java rename to tests/tapl/com/android/colorfulos/tapl/AppIconMenuItem.java index 9577883..bb2dbde 100644 --- a/tests/tapl/com/android/uiuios/tapl/AppIconMenuItem.java +++ b/tests/tapl/com/android/colorfulos/tapl/AppIconMenuItem.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.tapl; +package com.android.colorfulos.tapl; import androidx.test.uiautomator.UiObject2; diff --git a/tests/tapl/com/android/uiuios/tapl/Background.java b/tests/tapl/com/android/colorfulos/tapl/Background.java similarity index 96% rename from tests/tapl/com/android/uiuios/tapl/Background.java rename to tests/tapl/com/android/colorfulos/tapl/Background.java index 232ab26..9c930cd 100644 --- a/tests/tapl/com/android/uiuios/tapl/Background.java +++ b/tests/tapl/com/android/colorfulos/tapl/Background.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.android.uiuios.tapl; +package com.android.colorfulos.tapl; -import static com.android.uiuios.testing.TestProtocol.BACKGROUND_APP_STATE_ORDINAL; +import static com.android.colorfulos.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.uiuios.testing.TestProtocol; +import com.android.colorfulos.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/uiuios/tapl/BaseOverview.java b/tests/tapl/com/android/colorfulos/tapl/BaseOverview.java similarity index 99% rename from tests/tapl/com/android/uiuios/tapl/BaseOverview.java rename to tests/tapl/com/android/colorfulos/tapl/BaseOverview.java index 6543128..170c075 100644 --- a/tests/tapl/com/android/uiuios/tapl/BaseOverview.java +++ b/tests/tapl/com/android/colorfulos/tapl/BaseOverview.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.tapl; +package com.android.colorfulos.tapl; import androidx.annotation.NonNull; import androidx.test.uiautomator.BySelector; diff --git a/tests/tapl/com/android/uiuios/tapl/Folder.java b/tests/tapl/com/android/colorfulos/tapl/Folder.java similarity index 96% rename from tests/tapl/com/android/uiuios/tapl/Folder.java rename to tests/tapl/com/android/colorfulos/tapl/Folder.java index 1cd5adf..28b85ac 100644 --- a/tests/tapl/com/android/uiuios/tapl/Folder.java +++ b/tests/tapl/com/android/colorfulos/tapl/Folder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.tapl; +package com.android.colorfulos.tapl; import android.widget.FrameLayout; diff --git a/tests/tapl/com/android/uiuios/tapl/Home.java b/tests/tapl/com/android/colorfulos/tapl/Home.java similarity index 94% rename from tests/tapl/com/android/uiuios/tapl/Home.java rename to tests/tapl/com/android/colorfulos/tapl/Home.java index 0eb417b..9f5a768 100644 --- a/tests/tapl/com/android/uiuios/tapl/Home.java +++ b/tests/tapl/com/android/colorfulos/tapl/Home.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.android.uiuios.tapl; +package com.android.colorfulos.tapl; -import static com.android.uiuios.testing.TestProtocol.OVERVIEW_STATE_ORDINAL; +import static com.android.colorfulos.testing.TestProtocol.OVERVIEW_STATE_ORDINAL; import androidx.annotation.NonNull; diff --git a/tests/tapl/com/android/uiuios/tapl/Launchable.java b/tests/tapl/com/android/colorfulos/tapl/Launchable.java similarity index 97% rename from tests/tapl/com/android/uiuios/tapl/Launchable.java rename to tests/tapl/com/android/colorfulos/tapl/Launchable.java index c456511..fd6e018 100644 --- a/tests/tapl/com/android/uiuios/tapl/Launchable.java +++ b/tests/tapl/com/android/colorfulos/tapl/Launchable.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.tapl; +package com.android.colorfulos.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.uiuios.testing.TestProtocol; +import com.android.colorfulos.testing.TestProtocol; /** * Ancestor for AppIcon and AppMenuItem. diff --git a/tests/tapl/com/android/uiuios/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/colorfulos/tapl/LauncherInstrumentation.java similarity index 98% rename from tests/tapl/com/android/uiuios/tapl/LauncherInstrumentation.java rename to tests/tapl/com/android/colorfulos/tapl/LauncherInstrumentation.java index 82acf22..dae733b 100644 --- a/tests/tapl/com/android/uiuios/tapl/LauncherInstrumentation.java +++ b/tests/tapl/com/android/colorfulos/tapl/LauncherInstrumentation.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package com.android.uiuios.tapl; +package com.android.colorfulos.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.uiuios.tapl.TestHelpers.getOverviewPackageName; -import static com.android.uiuios.testing.TestProtocol.BACKGROUND_APP_STATE_ORDINAL; -import static com.android.uiuios.testing.TestProtocol.NORMAL_STATE_ORDINAL; +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 android.app.ActivityManager; import android.app.Instrumentation; @@ -60,7 +60,7 @@ import androidx.test.uiautomator.UiDevice; import androidx.test.uiautomator.UiObject2; import androidx.test.uiautomator.Until; -import com.android.uiuios.testing.TestProtocol; +import com.android.colorfulos.testing.TestProtocol; import com.android.systemui.shared.system.QuickStepContract; import org.junit.Assert; diff --git a/tests/tapl/com/android/uiuios/tapl/Overview.java b/tests/tapl/com/android/colorfulos/tapl/Overview.java similarity index 91% rename from tests/tapl/com/android/uiuios/tapl/Overview.java rename to tests/tapl/com/android/colorfulos/tapl/Overview.java index 65ccb3a..b2e292d 100644 --- a/tests/tapl/com/android/uiuios/tapl/Overview.java +++ b/tests/tapl/com/android/colorfulos/tapl/Overview.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.android.uiuios.tapl; +package com.android.colorfulos.tapl; -import static com.android.uiuios.testing.TestProtocol.ALL_APPS_STATE_ORDINAL; +import static com.android.colorfulos.testing.TestProtocol.ALL_APPS_STATE_ORDINAL; import androidx.annotation.NonNull; import androidx.test.uiautomator.UiObject2; -import com.android.uiuios.tapl.LauncherInstrumentation.ContainerType; +import com.android.colorfulos.tapl.LauncherInstrumentation.ContainerType; /** * Overview pane. diff --git a/tests/tapl/com/android/uiuios/tapl/OverviewTask.java b/tests/tapl/com/android/colorfulos/tapl/OverviewTask.java similarity index 96% rename from tests/tapl/com/android/uiuios/tapl/OverviewTask.java rename to tests/tapl/com/android/colorfulos/tapl/OverviewTask.java index 7f30cc3..ebd3b76 100644 --- a/tests/tapl/com/android/uiuios/tapl/OverviewTask.java +++ b/tests/tapl/com/android/colorfulos/tapl/OverviewTask.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.android.uiuios.tapl; +package com.android.colorfulos.tapl; import android.graphics.Rect; import androidx.test.uiautomator.UiObject2; import androidx.test.uiautomator.Until; -import com.android.uiuios.testing.TestProtocol; +import com.android.colorfulos.testing.TestProtocol; /** * A recent task in the overview panel carousel. diff --git a/tests/tapl/com/android/uiuios/tapl/TestHelpers.java b/tests/tapl/com/android/colorfulos/tapl/TestHelpers.java similarity index 95% rename from tests/tapl/com/android/uiuios/tapl/TestHelpers.java rename to tests/tapl/com/android/colorfulos/tapl/TestHelpers.java index 404616f..5ac07aa 100644 --- a/tests/tapl/com/android/uiuios/tapl/TestHelpers.java +++ b/tests/tapl/com/android/colorfulos/tapl/TestHelpers.java @@ -14,7 +14,7 @@ * the License. */ -package com.android.uiuios.tapl; +package com.android.colorfulos.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.uiuios.Launcher"); + Class launcherClazz = Class.forName("com.android.colorfulos.Launcher"); return launcherClazz.isAssignableFrom(Class.forName(info.name)); } catch (Exception e) { return false; diff --git a/tests/tapl/com/android/uiuios/tapl/Widget.java b/tests/tapl/com/android/colorfulos/tapl/Widget.java similarity index 95% rename from tests/tapl/com/android/uiuios/tapl/Widget.java rename to tests/tapl/com/android/colorfulos/tapl/Widget.java index 113d659..25dab7b 100644 --- a/tests/tapl/com/android/uiuios/tapl/Widget.java +++ b/tests/tapl/com/android/colorfulos/tapl/Widget.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.uiuios.tapl; +package com.android.colorfulos.tapl; import androidx.test.uiautomator.UiObject2; diff --git a/tests/tapl/com/android/uiuios/tapl/Widgets.java b/tests/tapl/com/android/colorfulos/tapl/Widgets.java similarity index 97% rename from tests/tapl/com/android/uiuios/tapl/Widgets.java rename to tests/tapl/com/android/colorfulos/tapl/Widgets.java index 8862cd5..87ca9c4 100644 --- a/tests/tapl/com/android/uiuios/tapl/Widgets.java +++ b/tests/tapl/com/android/colorfulos/tapl/Widgets.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.android.uiuios.tapl; +package com.android.colorfulos.tapl; import androidx.test.uiautomator.Direction; import androidx.test.uiautomator.UiObject2; -import com.android.uiuios.ResourceUtils; +import com.android.colorfulos.ResourceUtils; /** * All widgets container. diff --git a/tests/tapl/com/android/uiuios/tapl/Workspace.java b/tests/tapl/com/android/colorfulos/tapl/Workspace.java similarity index 96% rename from tests/tapl/com/android/uiuios/tapl/Workspace.java rename to tests/tapl/com/android/colorfulos/tapl/Workspace.java index 5fb4dc0..741083a 100644 --- a/tests/tapl/com/android/uiuios/tapl/Workspace.java +++ b/tests/tapl/com/android/colorfulos/tapl/Workspace.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.android.uiuios.tapl; +package com.android.colorfulos.tapl; -import static com.android.uiuios.testing.TestProtocol.ALL_APPS_STATE_ORDINAL; +import static com.android.colorfulos.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.uiuios.testing.TestProtocol; +import com.android.colorfulos.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.uiuios.widget.LauncherAppWidgetHostView").desc(label), + By.clazz("com.android.colorfulos.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.uiuios.widget.PendingAppWidgetHostView"), timeout); + By.clazz("com.android.colorfulos.widget.PendingAppWidgetHostView"), timeout); return widget != null ? new Widget(mLauncher, widget) : null; } } \ No newline at end of file