aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2013-04-22 00:31:24 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-04-22 00:31:24 -0700
commit6bbe68589318a808c0eade6a62ffb0986a894ae0 (patch)
tree12ef45565304647e8689d05e00d307138111a629 /java
parent727975009fe5537393379a2cbac38552bb6de836 (diff)
parent0f07935e5165b33d512d7d594e5fec7a2f210013 (diff)
downloadlatinime-6bbe68589318a808c0eade6a62ffb0986a894ae0.tar.gz
latinime-6bbe68589318a808c0eade6a62ffb0986a894ae0.tar.xz
latinime-6bbe68589318a808c0eade6a62ffb0986a894ae0.zip
am 0f07935e: Centering setup wizard welcome video
* commit '0f07935e5165b33d512d7d594e5fec7a2f210013': Centering setup wizard welcome video
Diffstat (limited to 'java')
-rw-r--r--java/res/layout/setup_welcome_video.xml26
-rw-r--r--java/res/values/setup-dimens.xml3
2 files changed, 23 insertions, 6 deletions
diff --git a/java/res/layout/setup_welcome_video.xml b/java/res/layout/setup_welcome_video.xml
index a72fbd72f..3aa4f3ca8 100644
--- a/java/res/layout/setup_welcome_video.xml
+++ b/java/res/layout/setup_welcome_video.xml
@@ -19,12 +19,26 @@
-->
<merge xmlns:android="http://schemas.android.com/apk/res/android">
- <VideoView
- android:id="@+id/setup_welcome_video"
- android:layout_margin="36dp"
- android:layout_width="240dp"
- android:layout_height="150dp"
- android:layout_centerHorizontal="true" />
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal">
+ <View
+ android:layout_weight="@integer/setup_welcome_video_left_padding_weight_in_screen"
+ android:layout_width="0dp"
+ android:layout_height="0dp" />
+ <VideoView
+ android:id="@+id/setup_welcome_video"
+ android:layout_weight="@integer/setup_welcome_video_weight_in_screen"
+ android:layout_marginTop="24dp"
+ android:layout_marginBottom="24dp"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content" />
+ <View
+ android:layout_weight="@integer/setup_welcome_video_right_padding_weight_in_screen"
+ android:layout_width="0dp"
+ android:layout_height="0dp" />
+ </LinearLayout>
<com.android.inputmethod.latin.setup.SetupStartIndicatorView
android:layout_width="match_parent"
android:layout_height="wrap_content" />
diff --git a/java/res/values/setup-dimens.xml b/java/res/values/setup-dimens.xml
index 1c6811f73..1634777f9 100644
--- a/java/res/values/setup-dimens.xml
+++ b/java/res/values/setup-dimens.xml
@@ -20,4 +20,7 @@
<dimen name="setup_horizontal_padding">16dp</dimen>
<integer name="setup_title_weight_in_screen">40</integer>
<integer name="setup_body_weight_in_screen">60</integer>
+ <integer name="setup_welcome_video_weight_in_screen">80</integer>
+ <integer name="setup_welcome_video_left_padding_weight_in_screen">10</integer>
+ <integer name="setup_welcome_video_right_padding_weight_in_screen">10</integer>
</resources>