Merge "Change the "Restore" button to "Reset"" into udc-dev
diff --git a/res/layout/modifier_key_reset_dialog.xml b/res/layout/modifier_key_reset_dialog.xml
index fd38b11..11712bf 100644
--- a/res/layout/modifier_key_reset_dialog.xml
+++ b/res/layout/modifier_key_reset_dialog.xml
@@ -80,7 +80,7 @@
android:drawablePadding="9dp"
style="@style/ModifierKeyButtonCancel"
android:textColor="?android:attr/textColorPrimary"
- android:text="@string/modifier_keys_restore"/>
+ android:text="@string/modifier_keys_reset"/>
</RelativeLayout>
</LinearLayout>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6062046..f593db9 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4008,7 +4008,7 @@
<!-- Text of the cancel button. [CHAR LIMIT=15] -->
<string name="modifier_keys_cancel">Cancel</string>
<!-- 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] -->
<string name="modifier_keys_picker_title">Choose modifier key</string>
<!-- Summary for the modifier key picker dialog page [CHAR LIMIT=35] -->