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

Commit bbd891d1 authored by Jake Hamby's avatar Jake Hamby Committed by Android (Google) Code Review
Browse files

Merge "Fix multiple BT settings bugs."

parents 18e05d43 79be0b3e

res/layout/preference_bluetooth.xml

+0 −7
Original line number Diff line number Diff line
@@ -19,13 +19,6 @@ 
    android:layout_height="wrap_content"

    android:gravity="center_vertical">



    <LinearLayout android:id="@+id/profileIcons"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_centerVertical="true"

        android:layout_alignParentRight="true"

        />



    <!-- Divider -->

    <ImageView

        android:id="@+id/divider"

res/values/arrays.xml

+4 −4
Original line number Diff line number Diff line
@@ -350,10 +350,10 @@ 


    <!-- Discoverable mode timeout options -->

    <string-array name="bluetooth_visibility_timeout_entries">

        <item>2 Minutes</item>

        <item>5 Minutes</item>

        <item>1 Hour</item>

        <item>Never</item>

        <item>2 minutes</item>

        <item>5 minutes</item>

        <item>1 hour</item>

        <item>Never time out</item>

    </string-array>



    <!-- Match this with drawable.wifi_signal. --> <skip />

res/values/strings.xml

+23 −17
Original line number Diff line number Diff line
@@ -230,10 +230,20 @@ 
    <string name="bluetooth_disconnect_title">Disconnect?</string>

    <!-- Bluetooth settings.  Message for disconnecting from all profiles of a bluetooth device. [CHAR LIMIT=NONE] -->

    <string name="bluetooth_disconnect_all_profiles">This will end your connection with:&lt;br>&lt;b><xliff:g id="device_name">%1$s</xliff:g>&lt;/b></string>

    <!-- Bluetooth settings.  Message for disconnecting from all profiles of a bluetooth device. [CHAR LIMIT=NONE] -->

    <string name="bluetooth_disconnect_blank">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> will be disconnected."</string>

    <!-- Bluetooth settings.  Message when connected to a device -->



    <!-- Bluetooth settings.  Dialog title to disable a single profile of a device. [CHAR LIMIT=40] -->

    <string name="bluetooth_disable_profile_title">Disable profile?</string>

    <!-- Bluetooth settings.  Message for disabling a profile of a bluetooth device. [CHAR LIMIT=NONE] -->

    <string name="bluetooth_disable_profile_message">This will disable:&lt;br>&lt;b><xliff:g id="profile_name">%1$s</xliff:g>&lt;/b>&lt;br>&lt;br>From:&lt;br>&lt;b><xliff:g id="device_name">%2$s</xliff:g>&lt;/b></string>



    <!-- Bluetooth settings.  Message when connected to a device. [CHAR LIMIT=40] -->

    <string name="bluetooth_connected">Connected</string>

    <!-- Bluetooth settings.  Message when connected to a device, except for phone audio. [CHAR LIMIT=40] -->

    <string name="bluetooth_connected_no_headset">Connected (no phone)</string>

    <!-- Bluetooth settings.  Message when connected to a device, except for media audio. [CHAR LIMIT=40] -->

    <string name="bluetooth_connected_no_a2dp">Connected (no media)</string>

    <!-- Bluetooth settings.  Message when connected to a device, except for phone/media audio. [CHAR LIMIT=40] -->

    <string name="bluetooth_connected_no_headset_no_a2dp">Connected (no phone or media)</string>

    <!-- Bluetooth settings.  Message when a device is disconnected -->

    <string name="bluetooth_disconnected">Disconnected</string>

    <!-- Bluetooth settings.  Message when disconnecting from a device -->
@@ -242,12 +252,8 @@ 
    <string name="bluetooth_connecting">Connecting\u2026</string>

    <!-- Bluetooth settings.  Message when the device state is unknown -->

    <string name="bluetooth_unknown" />

    <!--Bluetooth settings screen, summary text under individual Bluetooth devices when not paired yet -->

    <string name="bluetooth_not_connected">Pair with this device</string>

    <!--Bluetooth settings screen, summary text under individual Bluetooth devices when pairing -->

    <string name="bluetooth_pairing">Pairing\u2026</string>

    <!--Bluetooth settings screen, summary text under individual Bluetooth devices when paired with one -->

    <string name="bluetooth_paired">Paired but not connected</string>

    <!--Bluetooth settings screen, summary text for Bluetooth device with no name -->

    <string name="bluetooth_device">Unnamed Bluetooth device</string>

    <!--Bluetooth settings screen, text that appears in heading bar when scanning for devices -->
@@ -1011,15 +1017,17 @@ 
    <string name="bluetooth_connect_specific_profiles_title">Connect to\u2026</string>



    <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the A2DP profile. -->

    <string name="bluetooth_profile_a2dp">Media</string>

    <string name="bluetooth_profile_a2dp">Media audio</string>

    <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the headset or handsfree profile. -->

    <string name="bluetooth_profile_headset">Handsfree</string>

    <string name="bluetooth_profile_headset">Phone audio</string>

    <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the OPP profile. -->

    <string name="bluetooth_profile_opp">Transfer</string>

    <string name="bluetooth_profile_opp">File transfer</string>

    <!-- Bluetooth settings. The user-visible string that is used whenever referring to the HID profile. -->

    <string name="bluetooth_profile_hid">Input Device</string>

    <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PAN profile. [CHAR LIMIT=25]-->

    <string name="bluetooth_profile_hid">Input device</string>

    <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PAN profile (accessing Internet through remote device). [CHAR LIMIT=40]-->

    <string name="bluetooth_profile_pan">Internet access</string>

    <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PAN profile (sharing this device's Internet connection). [CHAR LIMIT=40]-->

    <string name="bluetooth_profile_pan_nap">Internet connection sharing</string>



    <!-- Bluetooth settings.  Message for disconnecting from the A2DP profile. [CHAR LIMIT=80] -->

    <string name="bluetooth_disconnect_a2dp_profile"><xliff:g id="device_name">%1$s</xliff:g> will be disconnected from media audio.</string>
@@ -1034,10 +1042,8 @@ 
    <!-- Bluetooth settings.  Message for disconnecting from the PAN profile (NAP role). [CHAR LIMIT=80] -->

    <string name="bluetooth_disconnect_pan_nap_profile" product="default"><xliff:g id="device_name">%1$s</xliff:g> will be disconnected from sharing this phone\'s Internet connection.</string>



    <!-- Bluetooth settings.  Connection options screen.  The title of the screen. -->

    <string name="bluetooth_device_advanced_title"><xliff:g id="device_name">%1$s</xliff:g> options</string>

    <!-- Bluetooth settings. Connection options screen. Title of device actions section. [CHAR LIMIT=30] -->

    <string name="bluetooth_device_advanced_device_actions_title">Device actions</string>

    <!-- Bluetooth settings.  Connection options screen.  The title of the screen. [CHAR LIMIT=40] -->

    <string name="bluetooth_device_advanced_title">Paired Bluetooth device</string>

    <!-- Bluetooth settings.  Connection options screen.  The title of the checkbox that controls whether the device is in "online" mode or "offline" mode.  This essentially is the checkbox that controls whether any checks / unchecks on a profile should be applied immediately, or next time the device is connected. -->

    <string name="bluetooth_device_advanced_online_mode_title">Connect</string>

    <!-- Bluetooth settings.  Connection options screen.  The summary of the online mode checkbox.  This describes what the setting does in the context of the screen. -->
@@ -1045,7 +1051,7 @@ 
    <!-- Bluetooth settings.  Connection options screen.  The title of the header that is above all of the profiles. -->

    <string name="bluetooth_device_advanced_profile_header_title">Profiles</string>

    <!-- Bluetooth settings. Connection options screen. Title for option to rename the device. [CHAR LIMIT=30] -->

    <string name="bluetooth_device_advanced_rename_device">Rename device</string>

    <string name="bluetooth_device_advanced_rename_device">Rename</string>

    <!-- Bluetooth settings. Connection options screen. Title for checkbox to enable incoming file transfers [CHAR LIMIT=30] -->

    <string name="bluetooth_device_advanced_enable_opp_title">Allow incoming file transfers</string>

    <!-- Bluetooth settings.  Connection options screen.  The summary for the A2DP checkbox preference when A2DP is connected. -->

res/xml/bluetooth_device_advanced.xml

+2 −6
Original line number Diff line number Diff line
@@ -15,12 +15,8 @@ 
-->



<PreferenceScreen

        xmlns:android="http://schemas.android.com/apk/res/android">



    <PreferenceCategory

            android:key="title"

            android:order="10"

            android:title="@string/bluetooth_device_advanced_device_actions_title" />

        xmlns:android="http://schemas.android.com/apk/res/android"

        android:title="@string/bluetooth_device_advanced_title">



    <EditTextPreference

            android:key="rename_device"

src/com/android/settings/bluetooth/A2dpProfile.java

+1 −5
Original line number Diff line number Diff line
@@ -138,14 +138,10 @@ final class A2dpProfile implements LocalBluetoothProfile { 
        return ORDINAL;

    }



    public int getNameResource() {

    public int getNameResource(BluetoothDevice device) {

        return R.string.bluetooth_profile_a2dp;

    }



    public int getDisconnectResource(BluetoothDevice device) {

        return R.string.bluetooth_disconnect_a2dp_profile;

    }



    public int getSummaryResourceForDevice(BluetoothDevice device) {

        int state = mService.getConnectionState(device);

        switch (state) {