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

Commit 83301b52 authored by Maurice Lam's avatar Maurice Lam
Browse files

[Setup] Use SetupWizardLayout 

Use SetupWizardLayout for the screens that show in Settings to get
better visual consistency and new features like showing a progress
bar in list view.

Bug: 19594252
Change-Id: I53ab17a4c2d922a362e3762f1cdccb512f7d8f6e
parent c3385dc1

res/drawable/setup_illustration.xml

deleted100644 → 0
+0 −26
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

     Copyright (C) 2014 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.

-->



<layer-list xmlns:android="http://schemas.android.com/apk/res/android"

    android:autoMirrored="true">



    <item android:id="@+id/illustration_image">

        <bitmap android:src="@drawable/setup_illustration_wifi"

            android:gravity="fill" />

    </item>



</layer-list>

res/drawable/setup_illustration_bg.xml

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

     Copyright (C) 2014 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.

-->



<bitmap xmlns:android="http://schemas.android.com/apk/res/android"

    android:src="@drawable/setup_illustration_tile"

    android:tileMode="repeat" />

res/drawable/setup_wizard_card_bg.xml

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>



<shape xmlns:android="http://schemas.android.com/apk/res/android"

    android:shape="rectangle">



    <corners

        android:topLeftRadius="@dimen/setup_wizard_card_corner_radius"

        android:topRightRadius="@dimen/setup_wizard_card_corner_radius" />



    <solid android:color="?android:attr/colorBackground" />



</shape>

res/layout-land/setup_preference.xml

deleted100644 → 0
+0 −56
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

     Copyright (c) 2014 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:id="@+id/fragment"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical">



    <FrameLayout

        android:id="@+id/title_area"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:background="@drawable/setup_illustration_bg"

        android:elevation="@dimen/setup_wizard_title_area_elevation">



        <TextView

            android:id="@+id/title"

            style="@style/SetupTitle"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:text="@string/wifi_setup_wizard_title" />



    </FrameLayout>



    <ListView

        android:id="@android:id/list"

        android:layout_width="match_parent"

        android:layout_height="0dp"

        android:layout_weight="1"

        android:cacheColorHint="@android:color/transparent"

        android:clipToPadding="false"

        android:drawSelectorOnTop="false"

        android:headerDividersEnabled="false"

        android:scrollbarAlwaysDrawVerticalTrack="true" />



    <fragment android:name="com.android.setupwizard.navigationbar.SetupWizardNavBar"

        android:id="@+id/navigation_bar"

        style="@style/setup_wizard_navbar_style" />



</LinearLayout>

res/layout-sw600dp-land/setup_preference.xml

deleted100644 → 0
+0 −78
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

     Copyright (c) 2014 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:id="@+id/fragment"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical">



    <com.android.settings.widget.SetupWizardIllustration

        android:id="@+id/setup_illustration"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_weight="1"

        android:foreground="@drawable/setup_illustration"

        android:background="@drawable/setup_illustration_bg">



        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:gravity="start|top"

            android:weightSum="16">



            <TextView

                android:id="@+id/title"

                style="@style/SetupCardTitle"

                android:layout_width="1dp"

                android:layout_height="wrap_content"

                android:layout_marginTop="@dimen/setup_wizard_tablet_illustration_height"

                android:layout_weight="6"

                android:text="@string/wifi_setup_wizard_title"/>



            <LinearLayout

                android:layout_width="1dp"

                android:layout_height="match_parent"

                android:layout_marginTop="@dimen/setup_wizard_card_land_margin_top"

                android:layout_weight="8"

                android:background="@drawable/setup_wizard_card_bg"

                android:elevation="@dimen/setup_wizard_card_elevation"

                android:orientation="vertical">



                <ListView

                    android:id="@android:id/list"

                    android:layout_width="match_parent"

                    android:layout_height="0dp"

                    android:layout_weight="1"

                    android:cacheColorHint="@android:color/transparent"

                    android:clipToPadding="false"

                    android:drawSelectorOnTop="false"

                    android:headerDividersEnabled="false"

                    android:scrollbarAlwaysDrawVerticalTrack="true" />



            </LinearLayout>



        </LinearLayout>



    </com.android.settings.widget.SetupWizardIllustration>



    <fragment android:name="com.android.setupwizard.navigationbar.SetupWizardNavBar"

        android:id="@+id/navigation_bar"

        style="@style/setup_wizard_navbar_style" />



</LinearLayout>