Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e4964118 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 6c0f8dc0 3db65438

packages/CompanionDeviceManager/res/layout/buttons.xml

+2 −2
Original line number Diff line number Diff line
@@ -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

packages/CompanionDeviceManager/res/values/strings.xml

+2 −8
Original line number Diff line number Diff line
@@ -20,15 +20,9 @@ 
    <string name="app_label">Companion Device Manager</string>



    <!-- 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. -->

    <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>



    <!-- 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 &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>



</resources>