Merge "Remove getToolbarColorId" into main
diff --git a/src/com/android/customization/picker/clock/ui/fragment/ClockSettingsFragment.kt b/src/com/android/customization/picker/clock/ui/fragment/ClockSettingsFragment.kt
index b8bd2f3..262b522 100644
--- a/src/com/android/customization/picker/clock/ui/fragment/ClockSettingsFragment.kt
+++ b/src/com/android/customization/picker/clock/ui/fragment/ClockSettingsFragment.kt
@@ -144,10 +144,6 @@
return requireContext().getString(R.string.clock_color_and_size_title)
}
- override fun getToolbarColorId(): Int {
- return android.R.color.transparent
- }
-
override fun getToolbarTextColor(): Int {
return ContextCompat.getColor(
requireContext(),
diff --git a/src/com/android/customization/picker/color/ui/fragment/ColorPickerFragment.kt b/src/com/android/customization/picker/color/ui/fragment/ColorPickerFragment.kt
index c898bc7..d8b417a 100644
--- a/src/com/android/customization/picker/color/ui/fragment/ColorPickerFragment.kt
+++ b/src/com/android/customization/picker/color/ui/fragment/ColorPickerFragment.kt
@@ -252,10 +252,6 @@
return requireContext().getString(R.string.color_picker_title)
}
- override fun getToolbarColorId(): Int {
- return android.R.color.transparent
- }
-
override fun getToolbarTextColor(): Int {
return ContextCompat.getColor(
requireContext(),
diff --git a/src/com/android/customization/picker/grid/ui/fragment/GridFragment.kt b/src/com/android/customization/picker/grid/ui/fragment/GridFragment.kt
index 74b88db..8f7d7e5 100644
--- a/src/com/android/customization/picker/grid/ui/fragment/GridFragment.kt
+++ b/src/com/android/customization/picker/grid/ui/fragment/GridFragment.kt
@@ -149,10 +149,6 @@
return getString(R.string.grid_title)
}
- override fun getToolbarColorId(): Int {
- return android.R.color.transparent
- }
-
override fun getToolbarTextColor(): Int {
return ContextCompat.getColor(
requireContext(),
diff --git a/src/com/android/customization/picker/quickaffordance/ui/fragment/KeyguardQuickAffordancePickerFragment.kt b/src/com/android/customization/picker/quickaffordance/ui/fragment/KeyguardQuickAffordancePickerFragment.kt
index fd79ca5..8b1c44a 100644
--- a/src/com/android/customization/picker/quickaffordance/ui/fragment/KeyguardQuickAffordancePickerFragment.kt
+++ b/src/com/android/customization/picker/quickaffordance/ui/fragment/KeyguardQuickAffordancePickerFragment.kt
@@ -92,10 +92,6 @@
return requireContext().getString(R.string.keyguard_quick_affordance_title)
}
- override fun getToolbarColorId(): Int {
- return android.R.color.transparent
- }
-
override fun getToolbarTextColor(): Int {
return ContextCompat.getColor(
requireContext(),