Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b56ad78 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android (Google) Code Review
Browse files

Merge "Revise welcome screen video and still image"

parents d78c776b 7348d9fb

java/res/layout-land/setup_steps_screen.xml

+3 −1
Original line number Diff line number Diff line
@@ -27,7 +27,9 @@ 
        android:layout_width="0dp"

        android:layout_height="match_parent"

        android:layout_weight="@integer/setup_title_weight_in_screen"

        android:orientation="vertical">

        android:orientation="vertical"

        android:layout_marginEnd="@dimen/setup_title_end_margin"

        android:layout_marginRight="@dimen/setup_title_end_margin">

        <include layout="@layout/setup_steps_title" />

    </LinearLayout>

    <LinearLayout

java/res/layout-land/setup_welcome_screen.xml

+3 −1
Original line number Diff line number Diff line
@@ -27,7 +27,9 @@ 
        android:layout_width="0dp"

        android:layout_height="match_parent"

        android:layout_weight="@integer/setup_title_weight_in_screen"

        android:orientation="vertical">

        android:orientation="vertical"

        android:layout_marginEnd="@dimen/setup_title_end_margin"

        android:layout_marginRight="@dimen/setup_title_end_margin">

        <include layout="@layout/setup_welcome_title" />

    </LinearLayout>

    <LinearLayout

java/res/layout/setup_welcome_video.xml

+18 −15
Original line number Diff line number Diff line
@@ -25,24 +25,27 @@ 
        android:orientation="horizontal"

        android:paddingTop="@dimen/setup_welcome_video_vertical_margin"

        android:paddingBottom="@dimen/setup_welcome_video_vertical_margin">

        <View

            android:layout_weight="@integer/setup_welcome_video_left_padding_weight_in_screen"

        <LinearLayout

            android:id="@+id/setup_welcome_video_frame"

            android:layout_weight="@integer/setup_welcome_video_weight_in_screen"

            android:layout_width="0dp"

            android:layout_height="0dp" />

            android:layout_height="wrap_content"

            android:orientation="horizontal"

            android:padding="1dp"

            android:background="@color/setup_welcome_video_margin_color" >

            <VideoView

                android:id="@+id/setup_welcome_video"

            android:background="@color/setup_background"

            android:layout_weight="@integer/setup_welcome_video_weight_in_screen"

            android:layout_width="0dp"

            android:layout_height="wrap_content" />

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:background="@color/setup_background" />

            <ImageView

                android:id="@+id/setup_welcome_image"

            android:visibility="gone"

            android:layout_weight="@integer/setup_welcome_video_weight_in_screen"

            android:layout_width="0dp"

            android:layout_height="wrap_content" />

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:visibility="gone" />

        </LinearLayout>

        <View

            android:layout_weight="@integer/setup_welcome_video_right_padding_weight_in_screen"

            android:layout_weight="@integer/setup_welcome_video_end_padding_weight_in_screen"

            android:layout_width="0dp"

            android:layout_height="0dp" />

    </LinearLayout>

java/res/raw/setup_welcome_image.png

−2.43 KiB (45.5 KiB)
Loading image diff...

java/res/raw/setup_welcome_video.mp4

−453 KiB (448 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file