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

Commit 68e4de1e authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka
Browse files

Add welcome screen to setup wizard

This is a preliminary implementation because the welcome screen video
is just a placeholder.

Bug: 8159728
Change-Id: I6a2459a266babec2f078fc393b18c77b0b7992a8
parent fcefabf9
Loading
Loading
Loading
Loading
+27 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2013, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
**
**     http://www.apache.org/licenses/LICENSE-2.0
**
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
*/
-->

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:orientation="vertical">
    <include layout="@layout/setup_welcome_title" />
    <include layout="@layout/setup_welcome_video" />
</LinearLayout>
+32 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2013, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
**
**     http://www.apache.org/licenses/LICENSE-2.0
**
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
*/
-->

<merge xmlns:android="http://schemas.android.com/apk/res/android">
    <TextView
        android:id="@+id/setup_welcome_title"
        style="@style/setupTitleStyle"
        android:layout_alignParentLeft="true"
        android:layout_alignParentTop="true" />
    <TextView
        android:id="@+id/setup_welcome_description"
        android:text="@string/setup_welcome_additional_description"
        android:layout_marginTop="12dp"
        style="@style/setupWelcomeDescritpionStyle" />
</merge>
+31 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2013, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
**
**     http://www.apache.org/licenses/LICENSE-2.0
**
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
*/
-->

<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" />
    <com.android.inputmethod.latin.setup.SetupStartIndicatorView
        android:layout_width="match_parent"
        android:layout_height="wrap_content" />
</merge>
+3 −0
Original line number Diff line number Diff line
@@ -26,6 +26,9 @@
    android:paddingRight="@dimen/setup_horizontal_padding"
    android:paddingTop="16dp"
    android:paddingBottom="16dp">
    <include
        android:id="@+id/setup_welcome_screen"
        layout="@layout/setup_welcome_screen" />
    <include
        android:id="@+id/setup_steps_screen"
        layout="@layout/setup_steps_screen" />
+902 KiB

File added.

No diff preview for this file type.

Loading