Adds a ScrollView to enable display of long text
Change-Id: I7ca1a015da7a7b1097d9310b64afc07b250e4a8c
diff --git a/templates/SimpleView/_MODULE_/src/template/res/layout-sw600dp-land/activity_main.xml b/templates/SimpleView/_MODULE_/src/template/res/layout-sw600dp-land/activity_main.xml
index 653454b..8fed5f7 100644
--- a/templates/SimpleView/_MODULE_/src/template/res/layout-sw600dp-land/activity_main.xml
+++ b/templates/SimpleView/_MODULE_/src/template/res/layout-sw600dp-land/activity_main.xml
@@ -13,25 +13,30 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<LinearLayout
+<ScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="horizontal"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:fillViewport="true"
android:id="@+id/sample_main_layout">
- <TextView android:id="@+id/sample_output"
- style="@style/Widget.SampleMessage"
- android:background="@android:color/white"
- android:layout_weight="1"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:text="@string/intro_message"
- android:layout_margin="16dp" />
- <fragment
- android:name="com.example.android.common.logger.LogFragment"
- android:id="@+id/log_fragment"
- android:layout_weight="1"
+ <LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_margin="16dp" />
-</LinearLayout>
+ android:orientation="vertical">
+ <TextView android:id="@+id/sample_output"
+ style="@style/Widget.SampleMessage"
+ android:background="@android:color/white"
+ android:layout_weight="1"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:text="@string/intro_message"
+ android:layout_margin="16dp" />
+ <fragment
+ android:name="com.example.android.common.logger.LogFragment"
+ android:id="@+id/log_fragment"
+ android:layout_weight="1"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_margin="16dp" />
+ </LinearLayout>
+</ScrollView>
diff --git a/templates/SimpleView/_MODULE_/src/template/res/layout-sw600dp/activity_main.xml b/templates/SimpleView/_MODULE_/src/template/res/layout-sw600dp/activity_main.xml
index 11cd71b..c59fcbc 100644
--- a/templates/SimpleView/_MODULE_/src/template/res/layout-sw600dp/activity_main.xml
+++ b/templates/SimpleView/_MODULE_/src/template/res/layout-sw600dp/activity_main.xml
@@ -13,24 +13,29 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<LinearLayout
+<ScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="vertical"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:fillViewport="true"
android:id="@+id/sample_main_layout">
- <TextView android:id="@+id/sample_output"
- style="@style/Widget.SampleMessage"
- android:background="@android:color/white"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/intro_message"
- android:padding="16dp"
- android:layout_margin="16dp"/>
- <fragment
- android:name="com.example.android.common.logger.LogFragment"
- android:id="@+id/log_fragment"
+ <LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_margin="16dp" />
-</LinearLayout>
+ android:orientation="vertical">
+ <TextView android:id="@+id/sample_output"
+ style="@style/Widget.SampleMessage"
+ android:background="@android:color/white"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/intro_message"
+ android:padding="16dp"
+ android:layout_margin="16dp"/>
+ <fragment
+ android:name="com.example.android.common.logger.LogFragment"
+ android:id="@+id/log_fragment"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_margin="16dp" />
+ </LinearLayout>
+</ScrollView>
diff --git a/templates/SimpleView/_MODULE_/src/template/res/layout/activity_main.xml b/templates/SimpleView/_MODULE_/src/template/res/layout/activity_main.xml
index 6f41369..89b689b 100644
--- a/templates/SimpleView/_MODULE_/src/template/res/layout/activity_main.xml
+++ b/templates/SimpleView/_MODULE_/src/template/res/layout/activity_main.xml
@@ -13,27 +13,32 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<LinearLayout
+<ScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="vertical"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:fillViewport="true"
android:id="@+id/sample_main_layout">
- <TextView android:id="@+id/sample_output"
- style="@style/Widget.SampleMessage"
- android:layout_weight="1"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:text="@string/intro_message"
- android:padding="16dp" />
- <View
- android:layout_width="fill_parent"
- android:layout_height="1dp"
- android:background="@android:color/darker_gray"/>
- <fragment
- android:name="com.example.android.common.logger.LogFragment"
- android:id="@+id/log_fragment"
- android:layout_weight="1"
+ <LinearLayout
android:layout_width="match_parent"
- android:layout_height="match_parent" />
-</LinearLayout>
+ android:layout_height="match_parent"
+ android:orientation="vertical">
+ <TextView android:id="@+id/sample_output"
+ style="@style/Widget.SampleMessage"
+ android:layout_weight="1"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:text="@string/intro_message"
+ android:padding="16dp" />
+ <View
+ android:layout_width="fill_parent"
+ android:layout_height="1dp"
+ android:background="@android:color/darker_gray"/>
+ <fragment
+ android:name="com.example.android.common.logger.LogFragment"
+ android:id="@+id/log_fragment"
+ android:layout_weight="1"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" />
+ </LinearLayout>
+</ScrollView>
