diff options
| author | Eugene Susla <eugenesusla@google.com> | 2017-04-18 12:36:25 -0700 |
|---|---|---|
| committer | Eugene Susla <eugenesusla@google.com> | 2017-04-18 12:41:20 -0700 |
| commit | 3db65438ec5c4c8e867eb3afc4dfb36e5fa2efe9 (patch) | |
| tree | 67e16d0a19878e4c4f14876cbe139317767767aa | |
| parent | 5b06dbd12bcd28fbc051c88c3ea7f31bcf20d1f8 (diff) | |
Change companion languare from 'pair' to 'link'/'ok'
Test: Ensure the chooset dialog still works and reflects the changes.
Change-Id: If687affb47cbf3fee2c589e1a5f8ab98c72e27d2
| -rw-r--r-- | packages/CompanionDeviceManager/res/layout/buttons.xml | 4 | ||||
| -rw-r--r-- | packages/CompanionDeviceManager/res/values/strings.xml | 10 |
2 files changed, 4 insertions, 10 deletions
diff --git a/packages/CompanionDeviceManager/res/layout/buttons.xml b/packages/CompanionDeviceManager/res/layout/buttons.xml index 350a791ac30e..7de0035d0cc9 100644 --- a/packages/CompanionDeviceManager/res/layout/buttons.xml +++ b/packages/CompanionDeviceManager/res/layout/buttons.xml @@ -29,14 +29,14 @@ android:id="@+id/button_cancel" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/cancel" + android:text="@android:string/cancel" style="@android:style/Widget.Material.Light.Button.Borderless.Colored" /> <Button android:id="@+id/button_pair" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/pair" + android:text="@android:string/ok" style="@android:style/Widget.Material.Light.Button.Borderless.Colored" /> </LinearLayout>
\ No newline at end of file diff --git a/packages/CompanionDeviceManager/res/values/strings.xml b/packages/CompanionDeviceManager/res/values/strings.xml index 469c1fbf22ad..43a92b6020dd 100644 --- a/packages/CompanionDeviceManager/res/values/strings.xml +++ b/packages/CompanionDeviceManager/res/values/strings.xml @@ -20,15 +20,9 @@ <string name="app_label">Companion Device Manager</string> <!-- Title of the device selection dialog. --> - <string name="chooser_title">Pair with <strong><xliff:g id="app_name" example="Android Wear">%1$s</xliff:g></strong> via Bluetooth?</string> + <string name="chooser_title">Link with <strong><xliff:g id="app_name" example="Android Wear">%1$s</xliff:g></strong> via Bluetooth?</string> <!-- Title of the device pairing confirmation dialog. --> - <string name="confirmation_title">Pair <strong><xliff:g id="app_name" example="Android Wear">%1$s</xliff:g></strong> with <strong><xliff:g id="device_name" example="ASUS ZenWatch 2">%2$s</xliff:g></strong> via Bluetooth?</string> - - <!-- Label on the pair button in a companion device chooser/confirmation dialog --> - <string name="pair">Pair</string> - - <!-- Label on the cancel button in a companion device chooser/confirmation dialog --> - <string name="cancel">Cancel</string> + <string name="confirmation_title">Link <strong><xliff:g id="app_name" example="Android Wear">%1$s</xliff:g></strong> with <strong><xliff:g id="device_name" example="ASUS ZenWatch 2">%2$s</xliff:g></strong> via Bluetooth?</string> </resources> |