aboutsummaryrefslogtreecommitdiffstats
path: root/java/res/layout
diff options
context:
space:
mode:
Diffstat (limited to 'java/res/layout')
-rw-r--r--java/res/layout/research_feedback_fragment_layout.xml5
-rw-r--r--java/res/layout/setup_welcome_video.xml6
2 files changed, 6 insertions, 5 deletions
diff --git a/java/res/layout/research_feedback_fragment_layout.xml b/java/res/layout/research_feedback_fragment_layout.xml
index 2915a770d..505a1e8d9 100644
--- a/java/res/layout/research_feedback_fragment_layout.xml
+++ b/java/res/layout/research_feedback_fragment_layout.xml
@@ -18,11 +18,10 @@
want a dialog, but it must be its own activity so we can launch the soft
keyboard on it. A regular dialog will not work since it would be launched from
the IME. -->
-<ScrollView>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android">
<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="match_parent"
+ android:layout_height="wrap_content"
android:layout_marginStart="8dip"
android:layout_marginEnd="8dip"
android:orientation="vertical">
diff --git a/java/res/layout/setup_welcome_video.xml b/java/res/layout/setup_welcome_video.xml
index 751773211..01c25ea8e 100644
--- a/java/res/layout/setup_welcome_video.xml
+++ b/java/res/layout/setup_welcome_video.xml
@@ -36,13 +36,15 @@
android:id="@+id/setup_welcome_video"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="@color/setup_background" />
+ android:background="@color/setup_background"
+ android:contentDescription="@string/setup_welcome_additional_description"/>
<ImageView
android:id="@+id/setup_welcome_image"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:adjustViewBounds="true"
- android:visibility="gone" />
+ android:visibility="gone"
+ android:contentDescription="@string/setup_welcome_additional_description"/>
</LinearLayout>
<View
android:layout_weight="@integer/setup_welcome_video_end_padding_weight_in_screen"