Merge "Update custom clock string" into main
diff --git a/res/menu/bottom_navigation_menu.xml b/res/menu/bottom_navigation_menu.xml
deleted file mode 100644
index b64bf8d..0000000
--- a/res/menu/bottom_navigation_menu.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2018 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
- <!-- TODO (santie): replace icons with real ones when available -->
- <item
- android:id="@+id/nav_wallpaper"
- android:title="@string/wallpaper_title"
- android:icon="@drawable/ic_nav_wallpaper" />
- <item
- android:id="@+id/nav_theme"
- android:title="@string/theme_title"
- android:icon="@drawable/ic_nav_theme" />
- <item
- android:id="@+id/nav_grid"
- android:title="@string/grid_title"
- android:icon="@drawable/ic_nav_grid" />
- <item
- android:id="@+id/nav_clock"
- android:title="@string/clock_title"
- android:icon="@drawable/ic_nav_clock" />
-</menu>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2eb3b4d..1b284bc 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -22,9 +22,9 @@
device. [CHAR LIMIT=15] -->
<string name="theme_title">Style</string>
- <!-- Title of a section of the customization picker where the user can select a Clock face.
+ <!-- Title of a customization picker section where the user can customize lock screen clock.
[CHAR LIMIT=15] -->
- <string name="clock_title">Custom Clock</string>
+ <string name="clock_title">Clock</string>
<!-- Description of a section of the customization picker where the user can select a Clock
face. [CHAR LIMIT=15] -->
diff --git a/src/com/android/wallpaper/customization/ui/binder/ThemePickerToolbarBinder.kt b/src/com/android/wallpaper/customization/ui/binder/ThemePickerToolbarBinder.kt
index 0ed5ff1..9974b96 100644
--- a/src/com/android/wallpaper/customization/ui/binder/ThemePickerToolbarBinder.kt
+++ b/src/com/android/wallpaper/customization/ui/binder/ThemePickerToolbarBinder.kt
@@ -171,7 +171,7 @@
when (it) {
COLORS -> ThemePickerR.string.system_colors_title
APP_SHAPE_GRID -> ThemePickerR.string.shape_and_grid_title
- CLOCK -> ThemePickerR.string.custom_clocks_label
+ CLOCK -> ThemePickerR.string.clock_title
SHORTCUTS ->
ThemePickerR.string.keyguard_quick_affordance_section_title
else -> R.string.app_name