diff --git a/lawnchair/res/values/strings.xml b/lawnchair/res/values/strings.xml index 7149ccd335..d32bb524ae 100644 --- a/lawnchair/res/values/strings.xml +++ b/lawnchair/res/values/strings.xml @@ -674,5 +674,6 @@ To search for contacts, grant contacts and phone permissions to Lawnchair To search your files, grant storage permissions to Lawnchair Grant permissions + Lawnchair (compose) diff --git a/lawnchair/src/app/lawnchair/LawnchairProcessInitializer.kt b/lawnchair/src/app/lawnchair/LawnchairProcessInitializer.kt index 14936e0606..aefce0d5a8 100644 --- a/lawnchair/src/app/lawnchair/LawnchairProcessInitializer.kt +++ b/lawnchair/src/app/lawnchair/LawnchairProcessInitializer.kt @@ -4,7 +4,7 @@ import android.content.Context import androidx.annotation.Keep import androidx.arch.core.util.Function import app.lawnchair.bugreport.LawnchairBugReporter -import app.lawnchair.theme.color.ColorTokens +import app.lawnchair.theme.color.tokens.ColorTokens import com.android.launcher3.Utilities import com.android.launcher3.icons.ThemedIconDrawable import com.android.quickstep.QuickstepProcessInitializer diff --git a/lawnchair/src/app/lawnchair/allapps/FallbackSearchInputView.kt b/lawnchair/src/app/lawnchair/allapps/FallbackSearchInputView.kt index 6b0d413852..a507ea38cf 100644 --- a/lawnchair/src/app/lawnchair/allapps/FallbackSearchInputView.kt +++ b/lawnchair/src/app/lawnchair/allapps/FallbackSearchInputView.kt @@ -5,7 +5,7 @@ import android.content.Context import android.util.AttributeSet import android.view.Gravity import androidx.core.graphics.ColorUtils -import app.lawnchair.theme.color.ColorTokens +import app.lawnchair.theme.color.tokens.ColorTokens import app.lawnchair.util.EditTextExtensions.setCursorColor import app.lawnchair.util.EditTextExtensions.setTextSelectHandleColor import com.android.launcher3.ExtendedEditText diff --git a/lawnchair/src/app/lawnchair/allapps/views/SearchItemBackground.kt b/lawnchair/src/app/lawnchair/allapps/views/SearchItemBackground.kt index 1520225e5c..e3ff68a645 100644 --- a/lawnchair/src/app/lawnchair/allapps/views/SearchItemBackground.kt +++ b/lawnchair/src/app/lawnchair/allapps/views/SearchItemBackground.kt @@ -6,7 +6,7 @@ import android.graphics.Paint import android.graphics.Path import android.graphics.RectF import android.view.View -import app.lawnchair.theme.color.ColorTokens +import app.lawnchair.theme.color.tokens.ColorTokens import com.android.launcher3.R class SearchItemBackground( diff --git a/lawnchair/src/app/lawnchair/allapps/views/SearchResultText.kt b/lawnchair/src/app/lawnchair/allapps/views/SearchResultText.kt index fe4e1148b3..d0bf29a886 100644 --- a/lawnchair/src/app/lawnchair/allapps/views/SearchResultText.kt +++ b/lawnchair/src/app/lawnchair/allapps/views/SearchResultText.kt @@ -15,7 +15,7 @@ import app.lawnchair.search.adapter.SPACE import app.lawnchair.search.adapter.SPACE_MINI import app.lawnchair.search.adapter.SearchResultActionCallBack import app.lawnchair.search.adapter.SearchTargetCompat -import app.lawnchair.theme.color.ColorTokens +import app.lawnchair.theme.color.tokens.ColorTokens import com.android.launcher3.R class SearchResultText(context: Context, attrs: AttributeSet?) : diff --git a/lawnchair/src/app/lawnchair/qsb/QsbIconUtil.kt b/lawnchair/src/app/lawnchair/qsb/QsbIconUtil.kt index 565e1211d5..af9cae16b2 100644 --- a/lawnchair/src/app/lawnchair/qsb/QsbIconUtil.kt +++ b/lawnchair/src/app/lawnchair/qsb/QsbIconUtil.kt @@ -4,7 +4,7 @@ import android.graphics.drawable.LayerDrawable import android.widget.ImageView import androidx.annotation.DrawableRes import androidx.core.content.res.ResourcesCompat -import app.lawnchair.theme.color.ColorTokens +import app.lawnchair.theme.color.tokens.ColorTokens import com.android.launcher3.R fun ImageView.setThemedIconResource( diff --git a/lawnchair/src/app/lawnchair/search/adapter/GenerateSearchTarget.kt b/lawnchair/src/app/lawnchair/search/adapter/GenerateSearchTarget.kt index 217fc0d07a..164486cbd1 100644 --- a/lawnchair/src/app/lawnchair/search/adapter/GenerateSearchTarget.kt +++ b/lawnchair/src/app/lawnchair/search/adapter/GenerateSearchTarget.kt @@ -21,7 +21,7 @@ import app.lawnchair.search.algorithms.data.FolderInfo import app.lawnchair.search.algorithms.data.IFileInfo import app.lawnchair.search.algorithms.data.RecentKeyword import app.lawnchair.search.algorithms.data.SettingInfo -import app.lawnchair.theme.color.ColorTokens +import app.lawnchair.theme.color.tokens.ColorTokens import app.lawnchair.util.createTextBitmap import app.lawnchair.util.file2Uri import app.lawnchair.util.mimeCompat diff --git a/lawnchair/src/app/lawnchair/theme/color/ColorUtils.kt b/lawnchair/src/app/lawnchair/theme/color/ColorUtils.kt index 41d58693f0..8ccf27216e 100644 --- a/lawnchair/src/app/lawnchair/theme/color/ColorUtils.kt +++ b/lawnchair/src/app/lawnchair/theme/color/ColorUtils.kt @@ -1,6 +1,7 @@ package app.lawnchair.theme.color import android.content.Context +import app.lawnchair.theme.color.tokens.ColorTokens fun generateColor(context: Context): Int { val accentColors = listOf( diff --git a/lawnchair/src/app/lawnchair/theme/color/ColorStateListToken.kt b/lawnchair/src/app/lawnchair/theme/color/tokens/ColorStateListToken.kt similarity index 96% rename from lawnchair/src/app/lawnchair/theme/color/ColorStateListToken.kt rename to lawnchair/src/app/lawnchair/theme/color/tokens/ColorStateListToken.kt index b9120a96f5..a33aef09ac 100644 --- a/lawnchair/src/app/lawnchair/theme/color/ColorStateListToken.kt +++ b/lawnchair/src/app/lawnchair/theme/color/tokens/ColorStateListToken.kt @@ -1,4 +1,4 @@ -package app.lawnchair.theme.color +package app.lawnchair.theme.color.tokens import android.content.Context import android.content.res.ColorStateList diff --git a/lawnchair/src/app/lawnchair/theme/color/ColorStateListTokens.kt b/lawnchair/src/app/lawnchair/theme/color/tokens/ColorStateListTokens.kt similarity index 86% rename from lawnchair/src/app/lawnchair/theme/color/ColorStateListTokens.kt rename to lawnchair/src/app/lawnchair/theme/color/tokens/ColorStateListTokens.kt index bebd10ab76..ffb3ba9d70 100644 --- a/lawnchair/src/app/lawnchair/theme/color/ColorStateListTokens.kt +++ b/lawnchair/src/app/lawnchair/theme/color/tokens/ColorStateListTokens.kt @@ -1,12 +1,13 @@ -package app.lawnchair.theme.color +package app.lawnchair.theme.color.tokens +import android.R import android.content.res.ColorStateList object ColorStateListTokens { val AllAppsTabTextLight = NewColorStateList { context, scheme, uiColorMode -> val states = arrayOf( - intArrayOf(android.R.attr.state_selected), + intArrayOf(R.attr.state_selected), intArrayOf(), ) val colors = intArrayOf( @@ -18,7 +19,7 @@ object ColorStateListTokens { val AllAppsTabTextDark = NewColorStateList { context, scheme, uiColorMode -> val states = arrayOf( - intArrayOf(android.R.attr.state_selected), + intArrayOf(R.attr.state_selected), intArrayOf(), ) val colors = intArrayOf( diff --git a/lawnchair/src/app/lawnchair/theme/color/ColorToken.kt b/lawnchair/src/app/lawnchair/theme/color/tokens/ColorToken.kt similarity index 98% rename from lawnchair/src/app/lawnchair/theme/color/ColorToken.kt rename to lawnchair/src/app/lawnchair/theme/color/tokens/ColorToken.kt index 5fe7824119..6610b9f265 100644 --- a/lawnchair/src/app/lawnchair/theme/color/ColorToken.kt +++ b/lawnchair/src/app/lawnchair/theme/color/tokens/ColorToken.kt @@ -1,4 +1,4 @@ -package app.lawnchair.theme.color +package app.lawnchair.theme.color.tokens import android.content.Context import android.util.Log @@ -6,6 +6,7 @@ import androidx.core.graphics.ColorUtils import app.lawnchair.theme.ResourceToken import app.lawnchair.theme.ThemeProvider import app.lawnchair.theme.UiColorMode +import app.lawnchair.theme.color.AndroidColor import app.lawnchair.theme.toAndroidColor import com.android.launcher3.R import com.android.launcher3.util.Themes diff --git a/lawnchair/src/app/lawnchair/theme/color/ColorTokenUtils.kt b/lawnchair/src/app/lawnchair/theme/color/tokens/ColorTokenUtils.kt similarity index 93% rename from lawnchair/src/app/lawnchair/theme/color/ColorTokenUtils.kt rename to lawnchair/src/app/lawnchair/theme/color/tokens/ColorTokenUtils.kt index 3bb97a33ec..12e8dcfdee 100644 --- a/lawnchair/src/app/lawnchair/theme/color/ColorTokenUtils.kt +++ b/lawnchair/src/app/lawnchair/theme/color/tokens/ColorTokenUtils.kt @@ -1,4 +1,4 @@ -package app.lawnchair.theme.color +package app.lawnchair.theme.color.tokens import android.content.Context import app.lawnchair.preferences.PreferenceManager diff --git a/lawnchair/src/app/lawnchair/theme/color/ColorTokens.kt b/lawnchair/src/app/lawnchair/theme/color/tokens/ColorTokens.kt similarity index 99% rename from lawnchair/src/app/lawnchair/theme/color/ColorTokens.kt rename to lawnchair/src/app/lawnchair/theme/color/tokens/ColorTokens.kt index 6e17f5d08f..921557cb18 100644 --- a/lawnchair/src/app/lawnchair/theme/color/ColorTokens.kt +++ b/lawnchair/src/app/lawnchair/theme/color/tokens/ColorTokens.kt @@ -1,4 +1,4 @@ -package app.lawnchair.theme.color +package app.lawnchair.theme.color.tokens import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.Color diff --git a/lawnchair/src/app/lawnchair/theme/drawable/DrawableToken.kt b/lawnchair/src/app/lawnchair/theme/drawable/DrawableToken.kt index 48182945f7..12ee52800c 100644 --- a/lawnchair/src/app/lawnchair/theme/drawable/DrawableToken.kt +++ b/lawnchair/src/app/lawnchair/theme/drawable/DrawableToken.kt @@ -10,7 +10,7 @@ import androidx.annotation.DrawableRes import androidx.appcompat.content.res.AppCompatResources import app.lawnchair.theme.ResourceToken import app.lawnchair.theme.UiColorMode -import app.lawnchair.theme.color.ColorToken +import app.lawnchair.theme.color.tokens.ColorToken import com.android.launcher3.util.Themes import dev.kdrag0n.monet.theme.ColorScheme diff --git a/lawnchair/src/app/lawnchair/theme/drawable/DrawableTokens.kt b/lawnchair/src/app/lawnchair/theme/drawable/DrawableTokens.kt index aaa0439b57..473ce365d5 100644 --- a/lawnchair/src/app/lawnchair/theme/drawable/DrawableTokens.kt +++ b/lawnchair/src/app/lawnchair/theme/drawable/DrawableTokens.kt @@ -7,7 +7,7 @@ import android.graphics.drawable.LayerDrawable import android.graphics.drawable.RippleDrawable import android.graphics.drawable.StateListDrawable import androidx.appcompat.content.res.AppCompatResources -import app.lawnchair.theme.color.ColorTokens +import app.lawnchair.theme.color.tokens.ColorTokens import com.android.launcher3.R object DrawableTokens { diff --git a/lawnchair/src/app/lawnchair/ui/theme/Color.kt b/lawnchair/src/app/lawnchair/ui/theme/Color.kt index a53ad6fba0..13b319f4d7 100644 --- a/lawnchair/src/app/lawnchair/ui/theme/Color.kt +++ b/lawnchair/src/app/lawnchair/ui/theme/Color.kt @@ -9,7 +9,7 @@ import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.core.graphics.ColorUtils import app.lawnchair.theme.UiColorMode -import app.lawnchair.theme.color.ColorTokens +import app.lawnchair.theme.color.tokens.ColorTokens import com.android.launcher3.R import com.android.launcher3.Utilities import com.android.launcher3.util.Themes diff --git a/lawnchair/src/app/lawnchair/util/ImageViewWrapper.kt b/lawnchair/src/app/lawnchair/util/ImageViewWrapper.kt index 2b369890fd..415671d906 100644 --- a/lawnchair/src/app/lawnchair/util/ImageViewWrapper.kt +++ b/lawnchair/src/app/lawnchair/util/ImageViewWrapper.kt @@ -7,7 +7,7 @@ import android.graphics.Path import android.graphics.RectF import android.util.AttributeSet import androidx.appcompat.widget.AppCompatImageView -import app.lawnchair.theme.color.ColorTokens +import app.lawnchair.theme.color.tokens.ColorTokens import com.android.launcher3.R class ImageViewWrapper(context: Context, attrs: AttributeSet?) : AppCompatImageView(context, attrs) { diff --git a/lawnchair/src/app/lawnchair/util/LawnchairUtils.kt b/lawnchair/src/app/lawnchair/util/LawnchairUtils.kt index fc682b4f0c..f4bd917e2c 100644 --- a/lawnchair/src/app/lawnchair/util/LawnchairUtils.kt +++ b/lawnchair/src/app/lawnchair/util/LawnchairUtils.kt @@ -39,7 +39,7 @@ import androidx.core.graphics.ColorUtils import androidx.core.os.UserManagerCompat import app.lawnchair.preferences.PreferenceManager import app.lawnchair.preferences2.PreferenceManager2 -import app.lawnchair.theme.color.ColorTokens +import app.lawnchair.theme.color.tokens.ColorTokens import com.android.launcher3.R import com.android.launcher3.Utilities import com.android.launcher3.util.Executors.MAIN_EXECUTOR diff --git a/lawnchair/src/app/lawnchair/views/ComposeBottomSheet.kt b/lawnchair/src/app/lawnchair/views/ComposeBottomSheet.kt index 067bb69fc0..385ed68528 100644 --- a/lawnchair/src/app/lawnchair/views/ComposeBottomSheet.kt +++ b/lawnchair/src/app/lawnchair/views/ComposeBottomSheet.kt @@ -29,7 +29,7 @@ import androidx.compose.ui.graphics.graphicsLayer import androidx.compose.ui.platform.ComposeView import androidx.compose.ui.platform.LocalDensity import androidx.compose.ui.unit.dp -import app.lawnchair.theme.color.ColorTokens +import app.lawnchair.theme.color.tokens.ColorTokens import app.lawnchair.ui.theme.LawnchairTheme import app.lawnchair.util.ProvideLifecycleState import app.lawnchair.util.minus diff --git a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java index 526922e840..475e319d6e 100644 --- a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java +++ b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java @@ -166,7 +166,7 @@ import java.util.List; import app.lawnchair.LawnchairApp; import app.lawnchair.compat.LawnchairQuickstepCompat; import app.lawnchair.icons.shape.IconShapeManager; -import app.lawnchair.theme.color.ColorTokens; +import app.lawnchair.theme.color.tokens.ColorTokens; /** * Manages the opening and closing app transitions from Launcher diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java index 2f3608f4b8..8311cf6fcc 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java +++ b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java @@ -27,13 +27,12 @@ import com.android.launcher3.Launcher; import com.android.launcher3.LauncherState; import com.android.launcher3.R; import com.android.launcher3.util.DisplayController; -import com.android.launcher3.util.Themes; import com.android.quickstep.util.LayoutUtils; import com.android.quickstep.views.RecentsView; import com.android.quickstep.views.TaskView; import app.lawnchair.preferences.PreferenceManager; -import app.lawnchair.theme.color.ColorTokens; +import app.lawnchair.theme.color.tokens.ColorTokens; /** * Definition for overview state diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/QuickSwitchState.java b/quickstep/src/com/android/launcher3/uioverrides/states/QuickSwitchState.java index 10d5257e9c..1c9298d69e 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/states/QuickSwitchState.java +++ b/quickstep/src/com/android/launcher3/uioverrides/states/QuickSwitchState.java @@ -23,8 +23,8 @@ import com.android.launcher3.DeviceProfile; import com.android.launcher3.Launcher; import com.android.launcher3.R; -import app.lawnchair.theme.color.ColorTokens; -import com.android.launcher3.util.Themes; +import app.lawnchair.theme.color.tokens.ColorTokens; + import com.android.quickstep.views.DesktopTaskView; /** diff --git a/quickstep/src/com/android/quickstep/fallback/RecentsState.java b/quickstep/src/com/android/quickstep/fallback/RecentsState.java index 82935dfb47..9e854f1f45 100644 --- a/quickstep/src/com/android/quickstep/fallback/RecentsState.java +++ b/quickstep/src/com/android/quickstep/fallback/RecentsState.java @@ -26,7 +26,7 @@ import com.android.launcher3.DeviceProfile; import com.android.launcher3.statemanager.BaseState; import com.android.quickstep.RecentsActivity; -import app.lawnchair.theme.color.ColorTokens; +import app.lawnchair.theme.color.tokens.ColorTokens; /** * State definition for Fallback recents diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java index 9c8e970015..a77a8daf38 100644 --- a/quickstep/src/com/android/quickstep/views/RecentsView.java +++ b/quickstep/src/com/android/quickstep/views/RecentsView.java @@ -222,7 +222,7 @@ import java.util.stream.Collectors; import app.lawnchair.LawnchairApp; import app.lawnchair.compat.LawnchairQuickstepCompat; -import app.lawnchair.theme.color.ColorTokens; +import app.lawnchair.theme.color.tokens.ColorTokens; import app.lawnchair.util.OverScrollerCompat; import app.lawnchair.util.RecentHelper; diff --git a/src/com/android/launcher3/AppWidgetResizeFrame.java b/src/com/android/launcher3/AppWidgetResizeFrame.java index 74ed8f7b98..db0031ec44 100644 --- a/src/com/android/launcher3/AppWidgetResizeFrame.java +++ b/src/com/android/launcher3/AppWidgetResizeFrame.java @@ -48,7 +48,7 @@ import java.util.ArrayList; import java.util.List; import app.lawnchair.preferences2.PreferenceManager2; -import app.lawnchair.theme.color.ColorTokens; +import app.lawnchair.theme.color.tokens.ColorTokens; import app.lawnchair.theme.drawable.DrawableTokens; public class AppWidgetResizeFrame extends AbstractFloatingView implements View.OnKeyListener { diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java index b5206aa08e..7c96b7615b 100644 --- a/src/com/android/launcher3/BubbleTextView.java +++ b/src/com/android/launcher3/BubbleTextView.java @@ -18,12 +18,9 @@ package com.android.launcher3; -import static com.android.launcher3.config.FeatureFlags.ENABLE_CURSOR_HOVER_STATES; import static com.android.launcher3.config.FeatureFlags.ENABLE_DOWNLOAD_APP_UX_V2; import static com.android.launcher3.config.FeatureFlags.ENABLE_ICON_LABEL_AUTO_SCALING; import static com.android.launcher3.graphics.PreloadIconDrawable.newPendingIcon; -import static com.android.launcher3.icons.BitmapInfo.FLAG_NO_BADGE; -import static com.android.launcher3.icons.BitmapInfo.FLAG_THEMED; import static com.android.launcher3.icons.GraphicsUtils.setColorAlphaBound; import static com.android.launcher3.model.data.ItemInfoWithIcon.FLAG_INCREMENTAL_DOWNLOAD_ACTIVE; import static com.android.launcher3.model.data.ItemInfoWithIcon.FLAG_INSTALL_SESSION_ACTIVE; @@ -81,7 +78,6 @@ import com.android.launcher3.util.IntArray; import com.android.launcher3.util.MultiTranslateDelegate; import com.android.launcher3.util.SafeCloseable; import com.android.launcher3.util.ShortcutUtil; -import com.android.launcher3.util.Themes; import com.android.launcher3.views.ActivityContext; import com.android.launcher3.views.IconLabelDotView; @@ -91,7 +87,6 @@ import java.util.Locale; import app.lawnchair.font.FontManager; import app.lawnchair.preferences.PreferenceManager; -import app.lawnchair.theme.color.ColorTokens; import app.lawnchair.util.LawnchairUtilsKt; /** diff --git a/src/com/android/launcher3/ButtonDropTarget.java b/src/com/android/launcher3/ButtonDropTarget.java index 41d563ba1a..66a00b18d5 100644 --- a/src/com/android/launcher3/ButtonDropTarget.java +++ b/src/com/android/launcher3/ButtonDropTarget.java @@ -43,8 +43,7 @@ import com.android.launcher3.dragndrop.DragOptions; import com.android.launcher3.dragndrop.DragView; import com.android.launcher3.model.data.ItemInfo; import com.android.launcher3.util.Themes; -import app.lawnchair.theme.color.ColorTokens; -import app.lawnchair.theme.drawable.DrawableToken; +import app.lawnchair.theme.color.tokens.ColorTokens; import app.lawnchair.theme.drawable.DrawableTokens; import com.android.launcher3.views.ActivityContext; diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java index 9a55ad1e10..49b4309571 100644 --- a/src/com/android/launcher3/CellLayout.java +++ b/src/com/android/launcher3/CellLayout.java @@ -75,7 +75,6 @@ import com.android.launcher3.util.CellAndSpan; import com.android.launcher3.util.GridOccupancy; import com.android.launcher3.util.MultiTranslateDelegate; import com.android.launcher3.util.ParcelableSparseArray; -import com.android.launcher3.util.Themes; import com.android.launcher3.util.Thunk; import com.android.launcher3.views.ActivityContext; import com.android.launcher3.widget.LauncherAppWidgetHostView; @@ -92,7 +91,7 @@ import java.util.Stack; import java.util.stream.Collectors; import app.lawnchair.preferences2.PreferenceManager2; -import app.lawnchair.theme.color.ColorTokens; +import app.lawnchair.theme.color.tokens.ColorTokens; import app.lawnchair.theme.drawable.DrawableTokens; public class CellLayout extends ViewGroup { diff --git a/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java b/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java index 6c660df61e..2ec410457d 100644 --- a/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java +++ b/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java @@ -64,14 +64,12 @@ import androidx.annotation.VisibleForTesting; import androidx.core.graphics.ColorUtils; import androidx.recyclerview.widget.RecyclerView; -import com.android.launcher3.BaseDraggingActivity; import com.android.launcher3.DeviceProfile; import com.android.launcher3.DeviceProfile.OnDeviceProfileChangeListener; import com.android.launcher3.DragSource; import com.android.launcher3.DropTarget.DragObject; import com.android.launcher3.Insettable; import com.android.launcher3.InsettableFrameLayout; -import com.android.launcher3.Launcher; import com.android.launcher3.R; import com.android.launcher3.Utilities; import com.android.launcher3.allapps.BaseAllAppsAdapter.AdapterItem; @@ -88,7 +86,6 @@ import com.android.launcher3.views.ActivityContext; import com.android.launcher3.views.BaseDragLayer; import com.android.launcher3.views.RecyclerViewFastScroller; import com.android.launcher3.views.ScrimView; -import com.android.launcher3.views.SpringRelativeLayout; import com.android.launcher3.workprofile.PersonalWorkSlidingTabStrip; import com.patrykmichalik.opto.core.PreferenceExtensionsKt; @@ -101,7 +98,7 @@ import java.util.stream.Stream; import app.lawnchair.allapps.LawnchairAlphabeticalAppsList; import app.lawnchair.font.FontManager; import app.lawnchair.preferences2.PreferenceManager2; -import app.lawnchair.theme.color.ColorTokens; +import app.lawnchair.theme.color.tokens.ColorTokens; import app.lawnchair.ui.StretchRecyclerViewContainer; /** diff --git a/src/com/android/launcher3/allapps/WorkEduCard.java b/src/com/android/launcher3/allapps/WorkEduCard.java index e703d49613..283c9f086a 100644 --- a/src/com/android/launcher3/allapps/WorkEduCard.java +++ b/src/com/android/launcher3/allapps/WorkEduCard.java @@ -24,12 +24,7 @@ import android.view.View; import android.view.ViewGroup; import android.view.animation.Animation; import android.view.animation.AnimationUtils; -import android.widget.Button; import android.widget.FrameLayout; -import android.widget.LinearLayout; -import android.widget.TextView; - -import androidx.core.view.ViewCompat; import android.widget.TextView; import com.android.launcher3.LauncherPrefs; @@ -37,8 +32,7 @@ import com.android.launcher3.R; import com.android.launcher3.model.StringCache; import com.android.launcher3.views.ActivityContext; -import app.lawnchair.font.FontManager; -import app.lawnchair.theme.color.ColorTokens; +import app.lawnchair.theme.color.tokens.ColorTokens; import app.lawnchair.theme.drawable.DrawableTokens; /** diff --git a/src/com/android/launcher3/allapps/WorkModeSwitch.java b/src/com/android/launcher3/allapps/WorkModeSwitch.java index ef363333b5..cdc067207e 100644 --- a/src/com/android/launcher3/allapps/WorkModeSwitch.java +++ b/src/com/android/launcher3/allapps/WorkModeSwitch.java @@ -32,18 +32,16 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.core.view.WindowInsetsCompat; -import com.android.launcher3.BaseDraggingActivity; import com.android.launcher3.DeviceProfile; import com.android.launcher3.Insettable; import com.android.launcher3.R; import com.android.launcher3.Utilities; import com.android.launcher3.anim.KeyboardInsetAnimationCallback; -import com.android.launcher3.logging.StatsLogManager; import com.android.launcher3.model.StringCache; import com.android.launcher3.views.ActivityContext; import app.lawnchair.font.FontManager; -import app.lawnchair.theme.color.ColorTokens; +import app.lawnchair.theme.color.tokens.ColorTokens; import app.lawnchair.theme.drawable.DrawableTokens; /** diff --git a/src/com/android/launcher3/allapps/WorkPausedCard.java b/src/com/android/launcher3/allapps/WorkPausedCard.java index a8c52351bf..e5c4aa42be 100644 --- a/src/com/android/launcher3/allapps/WorkPausedCard.java +++ b/src/com/android/launcher3/allapps/WorkPausedCard.java @@ -25,15 +25,12 @@ import android.widget.Button; import android.widget.LinearLayout; import android.widget.TextView; -import androidx.core.view.ViewCompat; - import com.android.launcher3.R; import com.android.launcher3.Utilities; -import com.android.launcher3.model.StringCache; import com.android.launcher3.views.ActivityContext; import app.lawnchair.font.FontManager; -import app.lawnchair.theme.color.ColorTokens; +import app.lawnchair.theme.color.tokens.ColorTokens; /** * Work profile toggle switch shown at the bottom of AllApps work tab diff --git a/src/com/android/launcher3/folder/FolderAnimationManager.java b/src/com/android/launcher3/folder/FolderAnimationManager.java index a8337911f4..a1f3125f85 100644 --- a/src/com/android/launcher3/folder/FolderAnimationManager.java +++ b/src/com/android/launcher3/folder/FolderAnimationManager.java @@ -48,12 +48,11 @@ import com.android.launcher3.ShortcutAndWidgetContainer; import com.android.launcher3.Utilities; import com.android.launcher3.anim.PropertyResetListener; import com.android.launcher3.celllayout.CellLayoutLayoutParams; -import com.android.launcher3.util.Themes; import com.android.launcher3.views.BaseDragLayer; import java.util.List; -import app.lawnchair.theme.color.ColorTokens; +import app.lawnchair.theme.color.tokens.ColorTokens; import app.lawnchair.util.LawnchairUtilsKt; /** diff --git a/src/com/android/launcher3/folder/PreviewBackground.java b/src/com/android/launcher3/folder/PreviewBackground.java index aa05676c01..35652f0ac4 100644 --- a/src/com/android/launcher3/folder/PreviewBackground.java +++ b/src/com/android/launcher3/folder/PreviewBackground.java @@ -50,13 +50,12 @@ import androidx.core.graphics.ColorUtils; import com.android.launcher3.CellLayout; import com.android.launcher3.DeviceProfile; import com.android.launcher3.R; -import com.android.launcher3.util.Themes; import com.android.launcher3.views.ActivityContext; import com.patrykmichalik.opto.core.PreferenceExtensionsKt; import app.lawnchair.preferences2.PreferenceManager2; import app.lawnchair.theme.color.ColorOption; -import app.lawnchair.theme.color.ColorTokens; +import app.lawnchair.theme.color.tokens.ColorTokens; import app.lawnchair.util.LawnchairUtilsKt; /** diff --git a/src/com/android/launcher3/graphics/Scrim.java b/src/com/android/launcher3/graphics/Scrim.java index db5856a88f..8c5bf741e6 100644 --- a/src/com/android/launcher3/graphics/Scrim.java +++ b/src/com/android/launcher3/graphics/Scrim.java @@ -22,7 +22,7 @@ import android.graphics.Canvas; import android.util.FloatProperty; import android.view.View; -import app.lawnchair.theme.color.ColorTokens; +import app.lawnchair.theme.color.tokens.ColorTokens; /** * Contains general scrim properties such as wallpaper-extracted color that subclasses can use. diff --git a/src/com/android/launcher3/pageindicators/PageIndicatorDots.java b/src/com/android/launcher3/pageindicators/PageIndicatorDots.java index 8e0b5a7300..3a2433ad06 100644 --- a/src/com/android/launcher3/pageindicators/PageIndicatorDots.java +++ b/src/com/android/launcher3/pageindicators/PageIndicatorDots.java @@ -16,8 +16,6 @@ package com.android.launcher3.pageindicators; -import static com.android.launcher3.config.FeatureFlags.SHOW_DOT_PAGINATION; - import android.animation.Animator; import android.animation.AnimatorListenerAdapter; import android.animation.AnimatorSet; @@ -48,9 +46,8 @@ import com.android.launcher3.Insettable; import com.android.launcher3.R; import com.android.launcher3.Utilities; import com.android.launcher3.config.FeatureFlags; -import com.android.launcher3.util.Themes; -import app.lawnchair.theme.color.ColorTokens; +import app.lawnchair.theme.color.tokens.ColorTokens; /** * {@link PageIndicator} which shows dots per page. The active page is shown diff --git a/src/com/android/launcher3/popup/ArrowPopup.java b/src/com/android/launcher3/popup/ArrowPopup.java index 02d81faade..fb0e86dea5 100644 --- a/src/com/android/launcher3/popup/ArrowPopup.java +++ b/src/com/android/launcher3/popup/ArrowPopup.java @@ -23,7 +23,6 @@ import static com.android.app.animation.Interpolators.DECELERATED_EASE; import static com.android.app.animation.Interpolators.EMPHASIZED_ACCELERATE; import static com.android.app.animation.Interpolators.EMPHASIZED_DECELERATE; import static com.android.app.animation.Interpolators.LINEAR; -import static com.android.launcher3.config.FeatureFlags.ENABLE_MATERIAL_U_POPUP; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -60,9 +59,7 @@ import com.android.launcher3.util.Themes; import com.android.launcher3.views.ActivityContext; import com.android.launcher3.views.BaseDragLayer; -import java.util.Arrays; - -import app.lawnchair.theme.color.ColorTokens; +import app.lawnchair.theme.color.tokens.ColorTokens; import app.lawnchair.theme.drawable.DrawableTokens; /** diff --git a/src/com/android/launcher3/shortcuts/DeepShortcutView.java b/src/com/android/launcher3/shortcuts/DeepShortcutView.java index 8df1fd7327..d0bf556068 100644 --- a/src/com/android/launcher3/shortcuts/DeepShortcutView.java +++ b/src/com/android/launcher3/shortcuts/DeepShortcutView.java @@ -36,10 +36,9 @@ import com.android.launcher3.R; import com.android.launcher3.Utilities; import com.android.launcher3.model.data.WorkspaceItemInfo; import com.android.launcher3.popup.PopupContainerWithArrow; -import com.android.launcher3.util.Themes; import com.android.launcher3.views.BubbleTextHolder; -import app.lawnchair.theme.color.ColorTokens; +import app.lawnchair.theme.color.tokens.ColorTokens; import app.lawnchair.util.DrawableUtilsKt; /** diff --git a/src/com/android/launcher3/states/HintState.java b/src/com/android/launcher3/states/HintState.java index db8af8a81f..770ecfe0fe 100644 --- a/src/com/android/launcher3/states/HintState.java +++ b/src/com/android/launcher3/states/HintState.java @@ -24,7 +24,7 @@ import androidx.core.graphics.ColorUtils; import com.android.launcher3.Launcher; import com.android.launcher3.LauncherState; -import app.lawnchair.theme.color.ColorTokens; +import app.lawnchair.theme.color.tokens.ColorTokens; /** * Scale down workspace/hotseat to hint at going to either overview (on pause) or first home screen. diff --git a/src/com/android/launcher3/util/Themes.java b/src/com/android/launcher3/util/Themes.java index f69fd76bc8..e172d3e74d 100644 --- a/src/com/android/launcher3/util/Themes.java +++ b/src/com/android/launcher3/util/Themes.java @@ -33,10 +33,6 @@ import android.view.ContextThemeWrapper; import androidx.annotation.ColorInt; -import androidx.annotation.ColorInt; - -import androidx.annotation.ColorInt; - import com.android.launcher3.LauncherPrefs; import com.android.launcher3.R; import com.android.launcher3.Utilities; @@ -44,7 +40,7 @@ import com.android.launcher3.icons.GraphicsUtils; import com.patrykmichalik.opto.core.PreferenceExtensionsKt; import app.lawnchair.preferences2.PreferenceManager2; import app.lawnchair.theme.color.ColorMode; -import app.lawnchair.theme.color.ColorTokens; +import app.lawnchair.theme.color.tokens.ColorTokens; import app.lawnchair.wallpaper.WallpaperColorsCompat; import app.lawnchair.wallpaper.WallpaperManagerCompat; import app.lawnchair.ui.theme.ColorKt; diff --git a/src/com/android/launcher3/views/Snackbar.java b/src/com/android/launcher3/views/Snackbar.java index 3805231c66..ce15e5b77b 100644 --- a/src/com/android/launcher3/views/Snackbar.java +++ b/src/com/android/launcher3/views/Snackbar.java @@ -37,7 +37,7 @@ import com.android.launcher3.R; import com.android.launcher3.compat.AccessibilityManagerCompat; import com.android.launcher3.dragndrop.DragLayer; -import app.lawnchair.theme.color.ColorTokens; +import app.lawnchair.theme.color.tokens.ColorTokens; import app.lawnchair.theme.drawable.DrawableTokens; /** diff --git a/src/com/android/launcher3/views/WidgetsEduView.java b/src/com/android/launcher3/views/WidgetsEduView.java index b12528bfda..f34a393026 100644 --- a/src/com/android/launcher3/views/WidgetsEduView.java +++ b/src/com/android/launcher3/views/WidgetsEduView.java @@ -25,7 +25,7 @@ import com.android.launcher3.Insettable; import com.android.launcher3.Launcher; import com.android.launcher3.R; -import app.lawnchair.theme.color.ColorTokens; +import app.lawnchair.theme.color.tokens.ColorTokens; /** * Education view about widgets. diff --git a/src/com/android/launcher3/widget/AddItemWidgetsBottomSheet.java b/src/com/android/launcher3/widget/AddItemWidgetsBottomSheet.java index bfefaa70af..cc3b850eab 100644 --- a/src/com/android/launcher3/widget/AddItemWidgetsBottomSheet.java +++ b/src/com/android/launcher3/widget/AddItemWidgetsBottomSheet.java @@ -35,7 +35,7 @@ import com.android.launcher3.R; import com.android.launcher3.dragndrop.AddItemActivity; import com.android.launcher3.views.AbstractSlideInView; -import app.lawnchair.theme.color.ColorTokens; +import app.lawnchair.theme.color.tokens.ColorTokens; /** * Bottom sheet for the pin widget. diff --git a/src/com/android/launcher3/widget/BaseWidgetSheet.java b/src/com/android/launcher3/widget/BaseWidgetSheet.java index 743d5d3302..2df15950c6 100644 --- a/src/com/android/launcher3/widget/BaseWidgetSheet.java +++ b/src/com/android/launcher3/widget/BaseWidgetSheet.java @@ -55,7 +55,7 @@ import com.android.launcher3.views.AbstractSlideInView; import com.android.launcher3.views.ActivityContext; import com.android.launcher3.views.ArrowTipView; -import app.lawnchair.theme.color.ColorTokens; +import app.lawnchair.theme.color.tokens.ColorTokens; /** * Base class for various widgets popup diff --git a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java index ecf3ebd74c..bd4201fd22 100644 --- a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java +++ b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java @@ -40,15 +40,12 @@ import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; import android.view.Window; -import android.view.ViewOutlineProvider; import android.view.WindowInsets; import android.view.animation.AnimationUtils; import android.view.animation.Interpolator; import android.widget.Button; import android.widget.TextView; -import android.window.BackEvent; -import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.Px; import androidx.annotation.RequiresApi; @@ -87,7 +84,7 @@ import java.util.function.Predicate; import java.util.stream.IntStream; import app.lawnchair.font.FontManager; -import app.lawnchair.theme.color.ColorTokens; +import app.lawnchair.theme.color.tokens.ColorTokens; import app.lawnchair.theme.drawable.DrawableTokens; /** diff --git a/src/com/android/launcher3/widget/picker/WidgetsListHeader.java b/src/com/android/launcher3/widget/picker/WidgetsListHeader.java index 62d55f8453..7bb0cfb1ae 100644 --- a/src/com/android/launcher3/widget/picker/WidgetsListHeader.java +++ b/src/com/android/launcher3/widget/picker/WidgetsListHeader.java @@ -43,7 +43,6 @@ import com.android.launcher3.views.ActivityContext; import com.android.launcher3.widget.model.WidgetsListHeaderEntry; import app.lawnchair.font.FontManager; -import app.lawnchair.theme.color.ColorTokens; import app.lawnchair.theme.drawable.DrawableTokens; /** diff --git a/src/com/android/launcher3/widget/picker/search/LauncherWidgetsSearchBar.java b/src/com/android/launcher3/widget/picker/search/LauncherWidgetsSearchBar.java index 3b4b604bd0..3eff95e6f3 100644 --- a/src/com/android/launcher3/widget/picker/search/LauncherWidgetsSearchBar.java +++ b/src/com/android/launcher3/widget/picker/search/LauncherWidgetsSearchBar.java @@ -29,7 +29,6 @@ import com.android.launcher3.R; import com.android.launcher3.popup.PopupDataProvider; import app.lawnchair.font.FontManager; -import app.lawnchair.theme.color.ColorTokens; import app.lawnchair.theme.drawable.DrawableTokens; /** diff --git a/src/com/android/launcher3/workprofile/PersonalWorkSlidingTabStrip.java b/src/com/android/launcher3/workprofile/PersonalWorkSlidingTabStrip.java index 34ac561301..6819623eb4 100644 --- a/src/com/android/launcher3/workprofile/PersonalWorkSlidingTabStrip.java +++ b/src/com/android/launcher3/workprofile/PersonalWorkSlidingTabStrip.java @@ -16,7 +16,6 @@ package com.android.launcher3.workprofile; import android.content.Context; -import android.graphics.drawable.Drawable; import android.content.res.TypedArray; import android.graphics.drawable.RippleDrawable; import android.util.AttributeSet; @@ -32,7 +31,7 @@ import com.android.launcher3.pageindicators.PageIndicator; import com.android.launcher3.views.ActivityContext; import app.lawnchair.font.FontManager; -import app.lawnchair.theme.color.ColorStateListTokens; +import app.lawnchair.theme.color.tokens.ColorStateListTokens; import app.lawnchair.theme.drawable.DrawableTokens; /**