Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Change companion languare from 'pair' to 'link'/'ok'" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-04-24 20:31:03 +00:00
committed by Android (Google) Code Review
parent 6c0f8dc0b0 3db65438ec
commit e4964118c6
2 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/CompanionDeviceManager/res/layout/buttons.xml
View File

@@ -29,14 +29,14 @@
android:id="@+id/button_cancel" android:id="@+id/button_cancel"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="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" style="@android:style/Widget.Material.Light.Button.Borderless.Colored"
/> />
<Button <Button
android:id="@+id/button_pair" android:id="@+id/button_pair"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="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" style="@android:style/Widget.Material.Light.Button.Borderless.Colored"
/> />
</LinearLayout> </LinearLayout>

10
packages/CompanionDeviceManager/res/values/strings.xml
View File

@@ -20,15 +20,9 @@
<string name="app_label">Companion Device Manager</string> <string name="app_label">Companion Device Manager</string>
<!-- Title of the device selection dialog. --> <!-- Title of the device selection dialog. -->
<string name="chooser_title">Pair with &lt;strong&gt;<xliff:g id="app_name" example="Android Wear">%1$s</xliff:g>&lt;/strong&gt; via Bluetooth?</string> <string name="chooser_title">Link with &lt;strong&gt;<xliff:g id="app_name" example="Android Wear">%1$s</xliff:g>&lt;/strong&gt; via Bluetooth?</string>
<!-- Title of the device pairing confirmation dialog. --> <!-- Title of the device pairing confirmation dialog. -->
<string name="confirmation_title">Pair &lt;strong&gt;<xliff:g id="app_name" example="Android Wear">%1$s</xliff:g>&lt;/strong&gt; with &lt;strong&gt;<xliff:g id="device_name" example="ASUS ZenWatch 2">%2$s</xliff:g>&lt;/strong&gt; via Bluetooth?</string> <string name="confirmation_title">Link &lt;strong&gt;<xliff:g id="app_name" example="Android Wear">%1$s</xliff:g>&lt;/strong&gt; with &lt;strong&gt;<xliff:g id="device_name" example="ASUS ZenWatch 2">%2$s</xliff:g>&lt;/strong&gt; 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>
</resources> </resources>