Merge "Wrap bluetooth edit content in a scrollview." into nyc-mr1-dev

This commit is contained in:
Fan Zhang
2016-07-07 20:30:00 +00:00
committed by Android (Google) Code Review

View File

@@ -14,11 +14,16 @@
limitations under the License.
-->
<LinearLayout
<ScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="25dp"
android:paddingEnd="25dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
@@ -29,7 +34,7 @@
android:textColor="?android:attr/textColorSecondary"
android:textDirection="locale"
android:paddingTop="16dp"
style="@style/bt_item_label" />
style="@style/bt_item_label"/>
<EditText
android:id="@+id/name"
@@ -40,7 +45,7 @@
android:singleLine="true"
android:paddingBottom="@dimen/bluetooth_dialog_padding"
android:textDirection="locale"
style="@style/bt_item_edit_content" />
style="@style/bt_item_edit_content"/>
<TextView
android:id="@+id/profiles_label"
@@ -50,12 +55,15 @@
android:paddingBottom="4dp"
android:text="@string/bluetooth_device_advanced_profile_header_title"
android:textAppearance="@android:style/TextAppearance.Material.Body1"
android:textColor="?android:attr/textColorSecondary" />
android:textColor="?android:attr/textColorSecondary"/>
<LinearLayout
android:id="@+id/profiles_section"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
android:layout_height="wrap_content"/>
</LinearLayout>
</LinearLayout>
</ScrollView>