Rename bottom sheet to floating sheet (1/2)
Test: Manually tested.
Bug: 337941334
Flag: com.android.wallpaper.new_picker_ui_flag
Change-Id: I9e69bbb968fa193dac8164603a1f378b808a9338
diff --git a/res/layout/bottom_sheet_clock.xml b/res/layout/floating_sheet_clock.xml
similarity index 100%
rename from res/layout/bottom_sheet_clock.xml
rename to res/layout/floating_sheet_clock.xml
diff --git a/res/layout/bottom_sheet_shortcut.xml b/res/layout/floating_sheet_shortcut.xml
similarity index 75%
rename from res/layout/bottom_sheet_shortcut.xml
rename to res/layout/floating_sheet_shortcut.xml
index 29222d3..0c5c1eb 100644
--- a/res/layout/bottom_sheet_shortcut.xml
+++ b/res/layout/floating_sheet_shortcut.xml
@@ -17,14 +17,19 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingHorizontal="16dp"
+ android:paddingHorizontal="@dimen/shortcut_floating_sheet_horizontal_padding"
android:paddingBottom="16dp"
- android:orientation="vertical">
+ android:orientation="vertical"
+ android:clipToPadding="false"
+ android:clipChildren="false">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="@drawable/floating_sheet_background2">
+ android:paddingVertical="@dimen/shortcut_floating_sheet_list_vertical_padding"
+ android:background="@drawable/floating_sheet_content_background"
+ android:clipToPadding="false"
+ android:clipChildren="false">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/quick_affordance_horizontal_list"
@@ -39,5 +44,5 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
- android:paddingVertical="8dp" />
+ android:layout_marginVertical="@dimen/shortcut_floating_sheet_tab_toolbar_vertical_margin" />
</LinearLayout>
\ No newline at end of file
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 2f9daae..2d6fedd 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -175,4 +175,8 @@
<!-- Notification item dimensions -->
<dimen name="notification_section_title_padding">8dp</dimen>
+ <!-- Shortcut floating sheet dimensions -->
+ <dimen name="shortcut_floating_sheet_list_vertical_padding">20dp</dimen>
+ <dimen name="shortcut_floating_sheet_horizontal_padding">16dp</dimen>
+ <dimen name="shortcut_floating_sheet_tab_toolbar_vertical_margin">8dp</dimen>
</resources>
diff --git a/src/com/android/customization/picker/common/ui/view/KeyguardQuickAffordanceItemSpacing.kt b/src/com/android/customization/picker/common/ui/view/KeyguardQuickAffordanceItemSpacing.kt
index c056d33..c88a819 100644
--- a/src/com/android/customization/picker/common/ui/view/KeyguardQuickAffordanceItemSpacing.kt
+++ b/src/com/android/customization/picker/common/ui/view/KeyguardQuickAffordanceItemSpacing.kt
@@ -62,10 +62,7 @@
}
if (itemIndex % 2 == 0) {
- outRect.top = FIRST_ROW_TOP_SPACING_DP.toPx(density)
outRect.bottom = FIRST_ROW_BOTTOM_SPACING_DP.toPx(density)
- } else {
- outRect.bottom = SECOND_ROW_BOTTOM_SPACING_DP.toPx(density)
}
}
@@ -76,8 +73,6 @@
companion object {
const val EDGE_ITEM_HORIZONTAL_SPACING_DP = 20
const val COMMON_HORIZONTAL_SPACING_DP = 9
- const val FIRST_ROW_TOP_SPACING_DP = 20
const val FIRST_ROW_BOTTOM_SPACING_DP = 8
- const val SECOND_ROW_BOTTOM_SPACING_DP = 24
}
}
diff --git a/src/com/android/wallpaper/customization/ui/binder/ShortcutBottomSheetBinder.kt b/src/com/android/wallpaper/customization/ui/binder/ShortcutFloatingSheetBinder.kt
similarity index 99%
rename from src/com/android/wallpaper/customization/ui/binder/ShortcutBottomSheetBinder.kt
rename to src/com/android/wallpaper/customization/ui/binder/ShortcutFloatingSheetBinder.kt
index f9cb688..962278a 100644
--- a/src/com/android/wallpaper/customization/ui/binder/ShortcutBottomSheetBinder.kt
+++ b/src/com/android/wallpaper/customization/ui/binder/ShortcutFloatingSheetBinder.kt
@@ -48,7 +48,7 @@
import kotlinx.coroutines.launch
@OptIn(ExperimentalCoroutinesApi::class)
-object ShortcutBottomSheetBinder {
+object ShortcutFloatingSheetBinder {
fun bind(
view: View,
diff --git a/src/com/android/wallpaper/customization/ui/binder/ThemePickerCustomizationOptionBinder.kt b/src/com/android/wallpaper/customization/ui/binder/ThemePickerCustomizationOptionBinder.kt
index 06374fc..0fa1283 100644
--- a/src/com/android/wallpaper/customization/ui/binder/ThemePickerCustomizationOptionBinder.kt
+++ b/src/com/android/wallpaper/customization/ui/binder/ThemePickerCustomizationOptionBinder.kt
@@ -80,7 +80,7 @@
}
}
- ShortcutBottomSheetBinder.bind(
+ ShortcutFloatingSheetBinder.bind(
view,
viewModel.keyguardQuickAffordancePickerViewModel2,
lifecycleOwner,
diff --git a/src/com/android/wallpaper/customization/ui/util/ThemePickerCustomizationOptionUtil.kt b/src/com/android/wallpaper/customization/ui/util/ThemePickerCustomizationOptionUtil.kt
index e8bac6a..83c4154 100644
--- a/src/com/android/wallpaper/customization/ui/util/ThemePickerCustomizationOptionUtil.kt
+++ b/src/com/android/wallpaper/customization/ui/util/ThemePickerCustomizationOptionUtil.kt
@@ -136,20 +136,17 @@
}
}
- override fun initBottomSheetContent(
+ override fun initFloatingSheet(
bottomSheetContainer: FrameLayout,
layoutInflater: LayoutInflater
): Map<CustomizationOptionUtil.CustomizationOption, View> {
val map =
- defaultCustomizationOptionUtil.initBottomSheetContent(
- bottomSheetContainer,
- layoutInflater
- )
+ defaultCustomizationOptionUtil.initFloatingSheet(bottomSheetContainer, layoutInflater)
return buildMap {
putAll(map)
put(
ThemePickerLockCustomizationOption.CLOCK,
- createCustomizationPickerBottomSheetView(
+ inflateFloatingSheet(
ThemePickerLockCustomizationOption.CLOCK,
bottomSheetContainer,
layoutInflater,
@@ -158,7 +155,7 @@
)
put(
ThemePickerLockCustomizationOption.SHORTCUTS,
- createCustomizationPickerBottomSheetView(
+ inflateFloatingSheet(
ThemePickerLockCustomizationOption.SHORTCUTS,
bottomSheetContainer,
layoutInflater,
@@ -168,14 +165,14 @@
}
}
- private fun createCustomizationPickerBottomSheetView(
+ private fun inflateFloatingSheet(
option: ThemePickerLockCustomizationOption,
bottomSheetContainer: FrameLayout,
layoutInflater: LayoutInflater,
): View =
when (option) {
- ThemePickerLockCustomizationOption.CLOCK -> R.layout.bottom_sheet_clock
- ThemePickerLockCustomizationOption.SHORTCUTS -> R.layout.bottom_sheet_shortcut
+ ThemePickerLockCustomizationOption.CLOCK -> R.layout.floating_sheet_clock
+ ThemePickerLockCustomizationOption.SHORTCUTS -> R.layout.floating_sheet_shortcut
else ->
throw IllegalStateException(
"Customization option $option does not have a bottom sheet view"