- show profile on bt detailed page
- allow change of bt device name
- bt bug fixes
Test: manually verified.
Change-Id: Ia8e8a119942fd324f21aefd7ab26f05b745e0ddd
diff --git a/res/layout/action_bar_with_button.xml b/res/layout/action_bar_with_button.xml
index 8291a16..175b688 100644
--- a/res/layout/action_bar_with_button.xml
+++ b/res/layout/action_bar_with_button.xml
@@ -53,6 +53,6 @@
android:layout_gravity="center_vertical"
android:background="@null"
android:textSize="@dimen/medium_text_size"
- android:layout_marginEnd="@dimen/stream_content_keyline_1"/>
+ android:layout_marginEnd="@dimen/stream_content_keyline_1" />
</LinearLayout>
</RelativeLayout>
diff --git a/res/layout/add_wifi.xml b/res/layout/add_wifi.xml
index 5761a51..760b0de 100644
--- a/res/layout/add_wifi.xml
+++ b/res/layout/add_wifi.xml
@@ -29,7 +29,6 @@
android:layout_height="wrap_content"
android:textSize="@dimen/medium_text_size" />
<android.support.design.widget.TextInputLayout
- android:id="@+id/wifi_name_input_wrapper"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/Theme.AppCompat.Light">
diff --git a/res/layout/bluetooth_details.xml b/res/layout/bluetooth_details.xml
index 99c6500..e67729d 100644
--- a/res/layout/bluetooth_details.xml
+++ b/res/layout/bluetooth_details.xml
@@ -19,15 +19,27 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical" >
+ <android.support.design.widget.TextInputLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:theme="@style/Theme.AppCompat.Light">
+ <EditText
+ android:id="@+id/bt_name"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:focusableInTouchMode="true"
+ android:textSize="@dimen/medium_text_size"
+ android:hint="@string/bluetooth_preference_paired_dialog_name_label" />
+ </android.support.design.widget.TextInputLayout>
<TextView
- android:id="@+id/bt_name"
- android:layout_width="wrap_content"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:text="@string/bluetooth_device_advanced_profile_header_title"
android:textSize="@dimen/medium_text_size"/>
- <Button
- android:id="@+id/bt_forget"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/forget"
- />
+ <android.support.car.ui.PagedListView
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/list"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="1"/>
</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/bluetooth_list.xml b/res/layout/bluetooth_list.xml
index 16bb47f..1e1d42f 100644
--- a/res/layout/bluetooth_list.xml
+++ b/res/layout/bluetooth_list.xml
@@ -31,7 +31,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<android.support.car.ui.PagedListView
- android:id="@android:id/list"
+ android:id="@+id/list"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<TextView
diff --git a/res/layout/list.xml b/res/layout/list.xml
index bdd7f13..ea7d1a6 100644
--- a/res/layout/list.xml
+++ b/res/layout/list.xml
@@ -17,6 +17,6 @@
<android.support.car.ui.PagedListView
xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@android:id/list"
+ android:id="@+id/list"
android:layout_width="match_parent"
android:layout_height="match_parent" />
\ No newline at end of file
diff --git a/res/layout/paged_list.xml b/res/layout/paged_list.xml
index c3f421e..9450761 100644
--- a/res/layout/paged_list.xml
+++ b/res/layout/paged_list.xml
@@ -20,7 +20,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent" >
<android.support.car.ui.PagedListView
- android:id="@android:id/list"
+ android:id="@+id/list"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</FrameLayout>
\ No newline at end of file
diff --git a/res/layout/toggle_line_item.xml b/res/layout/toggle_line_item.xml
index 56f15a0..2d29a2f 100644
--- a/res/layout/toggle_line_item.xml
+++ b/res/layout/toggle_line_item.xml
@@ -15,7 +15,10 @@
~ limitations under the License
-->
-<RelativeLayout
+<!-- The whole line item is clickable and will handle the logic change and update the switch
+ contained inside. We can't take the touch focus away from Switch due to how touch was handled in
+ that widget -->
+<com.android.car.settings.common.InterceptTouchRelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content">
@@ -40,5 +43,5 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
- android:layout_alignParentEnd="true"/>
-</RelativeLayout>
\ No newline at end of file
+ android:layout_alignParentEnd="true" />
+</com.android.car.settings.common.InterceptTouchRelativeLayout>
\ No newline at end of file
diff --git a/res/layout/wifi_list.xml b/res/layout/wifi_list.xml
index 97ac0e8..93886cc 100644
--- a/res/layout/wifi_list.xml
+++ b/res/layout/wifi_list.xml
@@ -48,7 +48,7 @@
android:layout_height="@dimen/car_divider_height"
android:background="@color/car_list_divider"/>
<android.support.car.ui.PagedListView
- android:id="@android:id/list"
+ android:id="@+id/list"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</LinearLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index fc577e1..c5d392d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -123,6 +123,19 @@
<string name="bluetooth_preference_paired_devices">Paired devices</string>
<!-- Bluetooth settings: The sub heading for available devices during and after scanning. [CHAR LIMIT=40] -->
<string name="bluetooth_preference_found_devices">Available devices</string>
+ <!-- Bluetooth settings: The sub heading for no bluetooth device has been paired with this device. [CHAR LIMIT=40] -->
+ <string name="bluetooth_preference_no_paired_devices">No paired devices</string>
+ <!-- Bluetooth settings: The sub heading for no available bluetooth devices during and after scanning. [CHAR LIMIT=40] -->
+ <string name="bluetooth_preference_no_found_devices">No available devices</string>
+ <!-- Bluetooth settings: Paired dialog title [CHAR LIMIT=40] -->
+ <string name="bluetooth_preference_paired_dialog_title">Paired device</string>
+ <!-- Bluetooth settings: Name label [CHAR LIMIT=40] -->
+ <string name="bluetooth_preference_paired_dialog_name_label">Name</string>
+ <!-- Bluetooth settings. Connection options screen. The title of the header that is above all of the profiles.
+ When a user decides what Bluetooth capabilities to use with the device. -->
+ <string name="bluetooth_device_advanced_profile_header_title">Use for</string>
+ <!-- Hint for a text field to change the name of the Bluetooth device. [CHAR LIMIT=35] -->
+ <string name="wifi_ssid_hint">Change the name of the Bluetooth device</string>
<!-- sound settings --><skip />
<!-- Sound settings screen heading -->