Merge "Change the "Restore" button to "Reset"" into udc-dev am: 600261a484

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22304967

Change-Id: I763e28e86add3c01cf308d34626167db49e70ee4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2023-03-28 09:51:48 +00:00
committed by Automerger Merge Worker
2 changed files with 2 additions and 2 deletions

View File

@@ -80,7 +80,7 @@
android:drawablePadding="9dp" android:drawablePadding="9dp"
style="@style/ModifierKeyButtonCancel" style="@style/ModifierKeyButtonCancel"
android:textColor="?android:attr/textColorPrimary" android:textColor="?android:attr/textColorPrimary"
android:text="@string/modifier_keys_restore"/> android:text="@string/modifier_keys_reset"/>
</RelativeLayout> </RelativeLayout>
</LinearLayout> </LinearLayout>

View File

@@ -4008,7 +4008,7 @@
<!-- Text of the cancel button. [CHAR LIMIT=15] --> <!-- Text of the cancel button. [CHAR LIMIT=15] -->
<string name="modifier_keys_cancel">Cancel</string> <string name="modifier_keys_cancel">Cancel</string>
<!-- Text of the restore button. [CHAR LIMIT=15] --> <!-- Text of the restore button. [CHAR LIMIT=15] -->
<string name="modifier_keys_restore">Restore</string> <string name="modifier_keys_reset">Reset</string>
<!-- Title for the modifier key picker dialog page [CHAR LIMIT=35] --> <!-- Title for the modifier key picker dialog page [CHAR LIMIT=35] -->
<string name="modifier_keys_picker_title">Choose modifier key</string> <string name="modifier_keys_picker_title">Choose modifier key</string>
<!-- Summary for the modifier key picker dialog page [CHAR LIMIT=35] --> <!-- Summary for the modifier key picker dialog page [CHAR LIMIT=35] -->