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

am: 96bc7b5d03

Change-Id: I70717e53ebdc47a658092743e31dc8db0a70d811
This commit is contained in:
Fan Zhang
2016-07-07 21:01:56 +00:00
committed by android-build-merger

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
@@ -52,6 +57,7 @@
android:textAppearance="@android:style/TextAppearance.Material.Body1"
android:textColor="?android:attr/textColorSecondary"/>
<LinearLayout
android:id="@+id/profiles_section"
android:orientation="vertical"
@@ -59,3 +65,5 @@
android:layout_height="wrap_content"/>
</LinearLayout>
</ScrollView>