From 8924756a2b7b4d55458dc3559b231a51dc5e14a5 Mon Sep 17 00:00:00 2001
From: Fan Zhang <zhfan@google.com>
Date: Wed, 6 Jul 2016 16:40:34 -0700
Subject: [PATCH] Wrap bluetooth edit content in a scrollview.

Bug: 28914094

In split screen the dialog content is too tall to fit in viewport. Wrap
content in a scrollview so user can scroll vertically for different
options, and have a visual indication that content is scrollable.

Change-Id: Ia304dca6747cec6f31e86ccf89003ef6890e0640
---
 res/layout/device_profiles_settings.xml | 82 ++++++++++++++-----------
 1 file changed, 45 insertions(+), 37 deletions(-)

diff --git a/res/layout/device_profiles_settings.xml b/res/layout/device_profiles_settings.xml
index bd78bea1c6e..260fa0587be 100644
--- a/res/layout/device_profiles_settings.xml
+++ b/res/layout/device_profiles_settings.xml
@@ -14,48 +14,56 @@
      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:orientation="vertical">
-
-    <TextView
-        android:layout_width="match_parent"
-        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"
-        android:paddingTop="16dp"
-        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"
-        android:paddingBottom="@dimen/bluetooth_dialog_padding"
-        android:textDirection="locale"
-        style="@style/bt_item_edit_content" />
-
-    <TextView
-        android:id="@+id/profiles_label"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingTop="16dp"
-        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:paddingEnd="25dp">
 
     <LinearLayout
-        android:id="@+id/profiles_section"
-        android:orientation="vertical"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
 
-</LinearLayout>
+        <TextView
+            android:layout_width="match_parent"
+            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"
+            android:paddingTop="16dp"
+            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"
+            android:paddingBottom="@dimen/bluetooth_dialog_padding"
+            android:textDirection="locale"
+            style="@style/bt_item_edit_content"/>
+
+        <TextView
+            android:id="@+id/profiles_label"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingTop="16dp"
+            android:paddingBottom="4dp"
+            android:text="@string/bluetooth_device_advanced_profile_header_title"
+            android:textAppearance="@android:style/TextAppearance.Material.Body1"
+            android:textColor="?android:attr/textColorSecondary"/>
+
+
+        <LinearLayout
+            android:id="@+id/profiles_section"
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"/>
+
+    </LinearLayout>
+
+</ScrollView>