PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Material theme updates for Bluetooth Device picker." into lmp-dev

Browse Source
This commit is contained in:
PauloftheWest
2014-09-04 17:50:00 +00:00
committed by Android (Google) Code Review
parent 92de681ec3 e32220eedc
commit 0e73c521bd
4 changed files with 32 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
res/layout/bluetooth_device_picker.xml
View File

@@ -20,33 +20,9 @@
android:layout_height="wrap_content"
android:orientation="vertical">
<LinearLayout android:id="@+id/dialog_layout"
<fragment android:id="@+id/bluetooth_fragment_settings"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingBottom="@dimen/bluetooth_dialog_padding"
style="@style/wifi_item" >
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/bluetooth_preference_paired_dialog_name_label"
android:textDirection="locale"
style="@style/wifi_item_label" />
<EditText android:id="@+id/name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textNoSuggestions"
android:maxLength="@integer/bluetooth_name_length"
android:singleLine="true"
style="@style/wifi_item_edit_content" />
<fragment android:id="@+id/bluetooth_fragment_settings"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
class="com.android.settings.bluetooth.DevicePickerFragment" />
</LinearLayout>
class="com.android.settings.bluetooth.DevicePickerFragment" />
</LinearLayout>

4
res/values/strings.xml
View File

@@ -315,8 +315,8 @@
<!-- Bluetooth settings screen, menu to show the list of received files [CHAR LIMIT=30] -->
<string name="bluetooth_show_received_files">Show received files</string>
<!-- Strings for BluetoothDevicePicker -->
<string name="device_picker">Bluetooth device chooser</string>
<!-- Strings for BluetoothDevicePicker [CHAR LIMIT=40]-->
<string name="device_picker">Choose Bluetooth device</string>
<!-- Strings for dialog title when asking to the user whether to allow an app to enable discovery mode -->
<string name="bluetooth_permission_request">"Bluetooth permission request"</string>

5
res/xml/device_picker.xml
View File

@@ -17,13 +17,8 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android">
<Preference
android:key="bt_scan"
android:title="@string/bluetooth_preference_scan_title" />
<com.android.settings.bluetooth.BluetoothProgressCategory
android:key="bt_device_list"
android:title="@string/bluetooth_preference_found_devices"
android:orderingFromXml="false" />
</PreferenceScreen>