Merge "UI refresh on bluetooth list page" into oc-dr1-dev

am: c0ca084622

Change-Id: I92846eec6bcbb67862b8ad1cf6447623a2dc3ab0

res/layout/dialog_edittext.xml

@@ -4,9 +4,9 @@
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
-  
+
           http://www.apache.org/licenses/LICENSE-2.0
-  
+
      Unless required by applicable law or agreed to in writing, software
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -14,20 +14,20 @@
      limitations under the License.
 -->
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:paddingStart="20dp"
     android:paddingEnd="20dp"
     android:paddingTop="16dp"
-    android:paddingBottom="12dp"
-    >
+    android:paddingBottom="12dp">
 
     <EditText
         android:id="@+id/edittext"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:inputType="textCapSentences"
         android:maxLength="50"
-        android:singleLine="true"
-    />
+        android:singleLine="true" />
 </LinearLayout>

res/xml/bluetooth_settings.xml

@@ -16,22 +16,28 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
     android:title="@string/bluetooth_settings">
 
     <Preference
-        android:key="device_name"/>
+        android:key="device_name" />
 
     <PreferenceCategory
         android:key="paired_devices"
-        android:title="@string/bluetooth_paired_device_title"/>
+        android:title="@string/bluetooth_paired_device_title" />
 
-    <com.android.settings.DividerPreference
-        android:key="bt_received_files"
-        android:title="@string/bluetooth_show_received_files"
-        settings:allowDividerAbove="true"
-        settings:allowDividerBelow="true"/>
+    <PreferenceCategory>
 
-    <com.android.settingslib.widget.FooterPreference/>
+        <Preference
+            android:key="bt_rename_device"
+            android:title="@string/bluetooth_device_name"
+            android:summary="@string/summary_placeholder" />
+
+        <Preference
+            android:key="bt_received_files"
+            android:title="@string/bluetooth_show_received_files" />
+
+    </PreferenceCategory>
+
+    <com.android.settingslib.widget.FooterPreference />
 
 </PreferenceScreen>