Bind clock edit icon color (2/2)
Flag: com.android.systemui.shared.new_customization_picker_ui
Test: manually verified
Bug: 363018910
Change-Id: Ic2c3ededfa3bc798ddd86003a64273467f9e4796
diff --git a/res/drawable/edit_icon.xml b/res/drawable/edit_icon.xml
deleted file mode 100644
index 9690d17..0000000
--- a/res/drawable/edit_icon.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="48dp"
- android:height="48dp"
- android:viewportWidth="48"
- android:viewportHeight="48">
- <group>
- <clip-path
- android:pathData="M8,24C8,15.163 15.163,8 24,8C32.837,8 40,15.163 40,24C40,32.837 32.837,40 24,40C15.163,40 8,32.837 8,24Z"/>
- <path
- android:pathData="M8,24C8,15.163 15.163,8 24,8C32.837,8 40,15.163 40,24C40,32.837 32.837,40 24,40C15.163,40 8,32.837 8,24Z"
- android:fillColor="@color/system_on_primary_fixed_variant"/>
- <group>
- <clip-path
- android:pathData="M14,14h20v20h-20z"/>
- <path
- android:pathData="M17,31V27.813L27.375,17.438C27.528,17.285 27.694,17.174 27.875,17.104C28.056,17.035 28.243,17 28.438,17C28.632,17 28.819,17.035 29,17.104C29.181,17.174 29.347,17.285 29.5,17.438L30.563,18.5C30.715,18.653 30.826,18.819 30.896,19C30.965,19.181 31,19.368 31,19.563C31,19.757 30.965,19.944 30.896,20.125C30.826,20.306 30.715,20.472 30.563,20.625L20.188,31H17ZM28.438,20.625L29.5,19.563L28.438,18.5L27.375,19.563L28.438,20.625Z"
- android:fillColor="#ffffff"/>
- </group>
- </group>
-</vector>
diff --git a/res/drawable/edit_icon_background.xml b/res/drawable/edit_icon_background.xml
new file mode 100644
index 0000000..920e57b
--- /dev/null
+++ b/res/drawable/edit_icon_background.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="48dp"
+ android:height="48dp"
+ android:viewportWidth="48"
+ android:viewportHeight="48">
+ <clip-path
+ android:pathData="M8,24C8,15.163 15.163,8 24,8C32.837,8 40,15.163 40,24C40,32.837 32.837,40 24,40C15.163,40 8,32.837 8,24Z"/>
+ <path
+ android:pathData="M8,24C8,15.163 15.163,8 24,8C32.837,8 40,15.163 40,24C40,32.837 32.837,40 24,40C15.163,40 8,32.837 8,24Z"
+ android:fillColor="@color/system_on_primary_fixed_variant"/>
+</vector>
diff --git a/res/drawable/edit_icon_foreground.xml b/res/drawable/edit_icon_foreground.xml
new file mode 100644
index 0000000..f98ab93
--- /dev/null
+++ b/res/drawable/edit_icon_foreground.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="48dp"
+ android:height="48dp"
+ android:viewportWidth="48"
+ android:viewportHeight="48">
+ <clip-path
+ android:pathData="M14,14h20v20h-20z"/>
+ <path
+ android:pathData="M17,31V27.813L27.375,17.438C27.528,17.285 27.694,17.174 27.875,17.104C28.056,17.035 28.243,17 28.438,17C28.632,17 28.819,17.035 29,17.104C29.181,17.174 29.347,17.285 29.5,17.438L30.563,18.5C30.715,18.653 30.826,18.819 30.896,19C30.965,19.181 31,19.368 31,19.563C31,19.757 30.965,19.944 30.896,20.125C30.826,20.306 30.715,20.472 30.563,20.625L20.188,31H17ZM28.438,20.625L29.5,19.563L28.438,18.5L27.375,19.563L28.438,20.625Z"
+ android:fillColor="#ffffff"/>
+</vector>
diff --git a/res/layout/clock_style_option.xml b/res/layout/clock_style_option.xml
index e251c4a..fa20706 100644
--- a/res/layout/clock_style_option.xml
+++ b/res/layout/clock_style_option.xml
@@ -42,15 +42,29 @@
app:layout_constraintBottom_toBottomOf="parent"
android:src="@drawable/ic_clock_24px" />
- <ImageView
+ <FrameLayout
android:id="@+id/edit_icon"
android:layout_width="@dimen/floating_sheet_clock_edit_icon_size"
android:layout_height="@dimen/floating_sheet_clock_edit_icon_size"
android:layout_marginTop="@dimen/floating_sheet_clock_edit_icon_margin"
android:layout_marginEnd="@dimen/floating_sheet_clock_edit_icon_margin"
- android:src="@drawable/edit_icon"
app:layout_constraintEnd_toEndOf="@+id/background"
- app:layout_constraintTop_toTopOf="@+id/background"
- android:importantForAccessibility="no" />
+ app:layout_constraintTop_toTopOf="@+id/background" >
+ <ImageView
+ android:id="@+id/edit_icon_background"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:src="@drawable/edit_icon_background"
+ android:importantForAccessibility="no" />
+
+ <ImageView
+ android:id="@+id/edit_icon_foreground"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:src="@drawable/edit_icon_foreground"
+ android:importantForAccessibility="no" />
+ </FrameLayout>
+
+
</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/src/com/android/wallpaper/customization/ui/binder/ClockFloatingSheetBinder.kt b/src/com/android/wallpaper/customization/ui/binder/ClockFloatingSheetBinder.kt
index 18a4c53..a5dd89a 100644
--- a/src/com/android/wallpaper/customization/ui/binder/ClockFloatingSheetBinder.kt
+++ b/src/com/android/wallpaper/customization/ui/binder/ClockFloatingSheetBinder.kt
@@ -25,6 +25,7 @@
import android.view.View
import android.view.ViewGroup
import android.view.ViewTreeObserver.OnGlobalLayoutListener
+import android.widget.FrameLayout
import android.widget.ImageView
import android.widget.SeekBar
import android.widget.Switch
@@ -445,11 +446,25 @@
lifecycleOwner.lifecycleScope.launch {
lifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {
styleModel.showEditButton.collect {
- view.findViewById<ImageView>(R.id.edit_icon)?.isVisible = it
+ view.findViewById<FrameLayout>(R.id.edit_icon)?.isVisible = it
}
}
}
- return@OptionItemAdapter2 DisposableHandle { job.cancel() }
+ val binding =
+ ColorUpdateBinder.bind(
+ setColor = { color ->
+ view.findViewById<ImageView>(R.id.edit_icon_background)?.drawable?.let {
+ DrawableCompat.setTint(DrawableCompat.wrap(it), color)
+ }
+ },
+ color = colorUpdateViewModel.colorOnPrimaryFixedVariant,
+ shouldAnimate = shouldAnimateColor,
+ lifecycleOwner = lifecycleOwner,
+ )
+ return@OptionItemAdapter2 DisposableHandle {
+ job.cancel()
+ binding.destroy()
+ }
},
colorUpdateViewModel = WeakReference(colorUpdateViewModel),
shouldAnimateColor = shouldAnimateColor,