am 6bbe6858: am 0f07935e: Centering setup wizard welcome video

* commit '6bbe68589318a808c0eade6a62ffb0986a894ae0':
  Centering setup wizard welcome video
main
Tadashi G. Takaoka 2013-05-15 10:52:54 -07:00 committed by Android Git Automerger
commit 962c245c00
2 changed files with 23 additions and 6 deletions

View File

@ -19,12 +19,26 @@
--> -->
<merge xmlns:android="http://schemas.android.com/apk/res/android"> <merge xmlns:android="http://schemas.android.com/apk/res/android">
<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 <VideoView
android:id="@+id/setup_welcome_video" android:id="@+id/setup_welcome_video"
android:layout_margin="36dp" android:layout_weight="@integer/setup_welcome_video_weight_in_screen"
android:layout_width="240dp" android:layout_marginTop="24dp"
android:layout_height="150dp" android:layout_marginBottom="24dp"
android:layout_centerHorizontal="true" /> 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 <com.android.inputmethod.latin.setup.SetupStartIndicatorView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />

View File

@ -20,4 +20,7 @@
<dimen name="setup_horizontal_padding">16dp</dimen> <dimen name="setup_horizontal_padding">16dp</dimen>
<integer name="setup_title_weight_in_screen">40</integer> <integer name="setup_title_weight_in_screen">40</integer>
<integer name="setup_body_weight_in_screen">60</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> </resources>