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

This commit is contained in:
PauloftheWest
2014-09-04 17:50:00 +00:00
committed by Android (Google) Code Review
4 changed files with 32 additions and 34 deletions

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>