Kaartic has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/376324 )
Change subject: Onboarding: center position the text in landscape mode ...................................................................... Onboarding: center position the text in landscape mode While at it, use fully qualified name to specify the parent tag of a merge element. Bug: T174561 Change-Id: If4024285f180d2c07c8b0be91676653beade1410 --- M app/src/main/res/layout-land/view_onboarding_page.xml M app/src/main/res/layout/view_onboarding_page.xml 2 files changed, 12 insertions(+), 17 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/24/376324/1 diff --git a/app/src/main/res/layout-land/view_onboarding_page.xml b/app/src/main/res/layout-land/view_onboarding_page.xml index b5f4011..7a7a2d5 100644 --- a/app/src/main/res/layout-land/view_onboarding_page.xml +++ b/app/src/main/res/layout-land/view_onboarding_page.xml @@ -2,11 +2,12 @@ <merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" - tools:parentTag="LinearLayout" + tools:parentTag="android.widget.LinearLayout" tools:orientation="horizontal" tools:background="@drawable/onboarding_gradient_background_135" tools:layout_width="match_parent" tools:layout_height="match_parent"> + <FrameLayout android:layout_width="0dp" @@ -24,21 +25,16 @@ </FrameLayout> - <ScrollView + <LinearLayout android:layout_width="0dp" - android:layout_height="match_parent" - android:layout_weight="1"> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:gravity="center_horizontal"> + android:layout_height="wrap_content" + android:orientation="vertical" + android:layout_weight="1" + android:layout_gravity="center"> <LinearLayout android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_weight="1" + android:layout_height="wrap_content" android:orientation="vertical" android:gravity="center_horizontal" android:paddingTop="24dp" @@ -96,6 +92,7 @@ android:layout_width="wrap_content" android:layout_height="0.5dp" android:background="@color/white_translucent_40"/> + </LinearLayout> </LinearLayout> @@ -105,14 +102,12 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" + android:layout_gravity="center_horizontal" android:text="@string/description_edit_tutorial_promise" - android:gravity="center" android:textAlignment="center" android:textSize="12sp" android:textColor="@android:color/white" /> - </LinearLayout> - - </ScrollView> + </LinearLayout> </merge> \ No newline at end of file diff --git a/app/src/main/res/layout/view_onboarding_page.xml b/app/src/main/res/layout/view_onboarding_page.xml index 6d90c68..69a01e0 100644 --- a/app/src/main/res/layout/view_onboarding_page.xml +++ b/app/src/main/res/layout/view_onboarding_page.xml @@ -2,7 +2,7 @@ <merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" - tools:parentTag="LinearLayout" + tools:parentTag="android.widget.LinearLayout" tools:orientation="vertical" tools:background="@drawable/onboarding_gradient_background_135" tools:layout_width="match_parent" -- To view, visit https://gerrit.wikimedia.org/r/376324 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If4024285f180d2c07c8b0be91676653beade1410 Gerrit-PatchSet: 1 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Kaartic <kaarticsivaraam91...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits