Merge "Import translations. DO NOT MERGE ANYWHERE" into main
diff --git a/res/layout/customization_option_entry_show_notifications.xml b/res/layout/customization_option_entry_lock_screen_notifications.xml
similarity index 69%
rename from res/layout/customization_option_entry_show_notifications.xml
rename to res/layout/customization_option_entry_lock_screen_notifications.xml
index b067131..e095b59 100644
--- a/res/layout/customization_option_entry_show_notifications.xml
+++ b/res/layout/customization_option_entry_lock_screen_notifications.xml
@@ -17,7 +17,6 @@
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
- xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="@dimen/customization_option_entry_horizontal_padding"
@@ -25,26 +24,25 @@
android:clickable="true">
<TextView
+ android:id="@+id/option_entry_lock_screen_notification_title"
style="@style/CustomizationOptionEntryTitleTextStyle"
android:layout_width="0dp"
android:layout_height="wrap_content"
- android:text="@string/show_notifications_on_lock_screen"
- android:layout_marginEnd="@dimen/customization_option_entry_text_margin_end"
+ android:text="@string/lock_screen_notifications_section_title"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintEnd_toStartOf="@+id/option_entry_show_notifications_switch"
- app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintBottom_toTopOf="@+id/option_entry_lock_screen_notification_description"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_chainStyle="packed" />
- <Switch
- android:id="@+id/option_entry_show_notifications_switch"
- android:layout_width="wrap_content"
+ <TextView
+ android:id="@+id/option_entry_lock_screen_notification_description"
+ style="@style/CustomizationOptionEntrySubtitleTextStyle"
+ android:layout_width="0dp"
android:layout_height="wrap_content"
- android:focusable="false"
- android:clickable="false"
- app:layout_constraintTop_toTopOf="parent"
+ android:text="@string/lock_screen_notifications_section_description"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
- style="@style/Switch.SettingsLib"
- tools:ignore="UseSwitchCompatOrMaterialXml" />
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/option_entry_lock_screen_notification_title" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1b284bc..b2ff8ac 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -492,6 +492,22 @@
<string name="show_notifications_on_lock_screen">Show notifications on the lock screen</string>
<!--
+ Title for a section in a list of sections that leads to notifications on lock screen settings.
+
+ [CHAR LIMIT=32].
+ -->
+ <string name="lock_screen_notifications_section_title">Notifications on lock screen</string>
+
+
+ <!--
+ Description for a section in a list of sections that leads to notifications on lock screen
+ settings.
+
+ [CHAR LIMIT=64].
+ -->
+ <string name="lock_screen_notifications_section_description">Manage how notifications appear and what to show</string>
+
+ <!--
Title for a section in a list of sections in the settings app that allows the user to access
additional settings related to lock screen behaviour.
diff --git a/src/com/android/wallpaper/customization/ui/binder/ThemePickerCustomizationOptionBinder.kt b/src/com/android/wallpaper/customization/ui/binder/ThemePickerCustomizationOptionBinder.kt
index 95ed233..efa922b 100644
--- a/src/com/android/wallpaper/customization/ui/binder/ThemePickerCustomizationOptionBinder.kt
+++ b/src/com/android/wallpaper/customization/ui/binder/ThemePickerCustomizationOptionBinder.kt
@@ -77,6 +77,7 @@
navigateToWallpaperCategoriesScreen: (screen: Screen) -> Unit,
navigateToMoreLockScreenSettingsActivity: () -> Unit,
navigateToColorContrastSettingsActivity: () -> Unit,
+ navigateToLockScreenNotificationsSettingsActivity: () -> Unit,
) {
defaultCustomizationOptionsBinder.bind(
view,
@@ -89,6 +90,7 @@
navigateToWallpaperCategoriesScreen,
navigateToMoreLockScreenSettingsActivity,
navigateToColorContrastSettingsActivity,
+ navigateToLockScreenNotificationsSettingsActivity,
)
val optionClock: View =
@@ -108,6 +110,14 @@
val optionShortcutIcon2: ImageView =
optionShortcut.requireViewById(R.id.option_entry_keyguard_quick_affordance_icon_2)
+ val optionLockScreenNotificationsSettings: View =
+ lockScreenCustomizationOptionEntries
+ .first { it.first == ThemePickerLockCustomizationOption.LOCK_SCREEN_NOTIFICATIONS }
+ .second
+ optionLockScreenNotificationsSettings.setOnClickListener {
+ navigateToLockScreenNotificationsSettingsActivity.invoke()
+ }
+
val optionMoreLockScreenSettings: View =
lockScreenCustomizationOptionEntries
.first { it.first == ThemePickerLockCustomizationOption.MORE_LOCK_SCREEN_SETTINGS }
diff --git a/src/com/android/wallpaper/customization/ui/util/ThemePickerCustomizationOptionUtil.kt b/src/com/android/wallpaper/customization/ui/util/ThemePickerCustomizationOptionUtil.kt
index 16d53f3..ec38af5 100644
--- a/src/com/android/wallpaper/customization/ui/util/ThemePickerCustomizationOptionUtil.kt
+++ b/src/com/android/wallpaper/customization/ui/util/ThemePickerCustomizationOptionUtil.kt
@@ -43,7 +43,7 @@
enum class ThemePickerLockCustomizationOption : CustomizationOptionUtil.CustomizationOption {
CLOCK,
SHORTCUTS,
- SHOW_NOTIFICATIONS,
+ LOCK_SCREEN_NOTIFICATIONS,
MORE_LOCK_SCREEN_SETTINGS,
}
@@ -82,9 +82,9 @@
)
)
add(
- ThemePickerLockCustomizationOption.SHOW_NOTIFICATIONS to
+ ThemePickerLockCustomizationOption.LOCK_SCREEN_NOTIFICATIONS to
layoutInflater.inflate(
- R.layout.customization_option_entry_show_notifications,
+ R.layout.customization_option_entry_lock_screen_notifications,
optionContainer,
false,
)