Merge "Made Bluetooth device dialog fully scrollable." into lmp-dev

This commit is contained in:
PauloftheWest
2014-09-10 22:11:56 +00:00
committed by Android (Google) Code Review
4 changed files with 14 additions and 27 deletions

View File

@@ -20,35 +20,9 @@
android:orientation="vertical"
android:gravity="center">
<LinearLayout android:id="@+id/dialog_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingBottom="@dimen/bluetooth_dialog_padding"
style="@style/bt_item" >
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/bluetooth_preference_paired_dialog_name_label"
android:textAppearance="@android:style/TextAppearance.Material.Body1"
android:textColor="?android:attr/textColorSecondary"
android:textDirection="locale"
style="@style/bt_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/bt_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.DeviceProfilesSettings" />
</LinearLayout>
</LinearLayout>

View File

@@ -22,4 +22,5 @@
android:textAppearance="@android:style/TextAppearance.Material.Body1"
android:textColor="?android:attr/textColorSecondary"
android:paddingTop="16dip"
android:paddingStart="16dip"
android:paddingBottom="16dip" />

View File

@@ -31,6 +31,7 @@
android:background="@null"
android:id="@+android:id/title"
android:paddingStart="0dp"
android:paddingTop="6dp"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
@@ -40,6 +41,7 @@
<ProgressBar
android:id="@+id/scanning_progress"
android:text="@string/progress_scanning"
android:paddingTop="6dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"