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

Commit 1677b3e3 authored by Maurice Lam's avatar Maurice Lam
Browse files

[WifiSetup] Tablet portrait layout 

Bug: 17134016
Change-Id: I376797ceeeb467af52f6e0a2e45ad6e2523c7b26
parent 8a983e43

res/drawable/setup_wizard_card_bg.xml

0 → 100644
+13 −0
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-sw600dp-land/setup_preference.xml

+5 −2
Original line number Diff line number Diff line
@@ -37,14 +37,17 @@ 
            <TextView

                android:id="@+id/title"

                style="@style/SetupCardTitle"

                android:layout_width="0dp"

                android:layout_height="wrap_content"

                android:layout_weight="6"

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



            <LinearLayout

                android:layout_width="0dp"

                android:layout_height="match_parent"

                android:layout_marginTop="@dimen/setup_wizard_card_margin_top"

                android:layout_marginTop="@dimen/setup_wizard_card_land_margin_top"

                android:layout_weight="8"

                android:background="?android:attr/colorBackground"

                android:background="@drawable/setup_wizard_card_bg"

                android:elevation="@dimen/setup_wizard_card_elevation"

                android:orientation="vertical">

res/layout-sw720dp-port/setup_preference.xml

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

<!--

    Copyright (C) 2014 Google Inc.



    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"

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical">



    <com.android.settings.widget.SetupWizardIllustration

        android:id="@+id/title_area"

        android:layout_width="match_parent"

        android:layout_height="0dp"

        android:layout_weight="1"

        android:background="@drawable/setup_illustration_bg"

        android:foreground="@drawable/setup_illustration_wifi_wide"

        settings:aspectRatio="4.0">



        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:orientation="vertical"

            android:paddingLeft="@dimen/setup_wizard_card_port_margin_sides"

            android:paddingRight="@dimen/setup_wizard_card_port_margin_sides">



            <TextView

                android:id="@+id/title"

                style="@style/SetupCardTitle"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

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



            <LinearLayout

                android:layout_width="match_parent"

                android:layout_height="0dp"

                android:layout_weight="1"

                android:background="@drawable/setup_wizard_card_bg"

                android:elevation="@dimen/setup_wizard_card_elevation"

                android:orientation="vertical">



                <TextView

                    android:id="@+id/wifi_required_info"

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    android:layout_marginBottom="6dp"

                    android:text="@string/wifi_required_info_text"

                    android:textAppearance="?android:attr/textAppearanceMedium"

                    android:visibility="gone" />



                <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:id="@+id/navigation_bar"

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

        style="@style/setup_wizard_navbar_style" />



</LinearLayout>

res/values-land/dimens.xml

+6 −0
Original line number Diff line number Diff line
@@ -45,4 +45,10 @@ 
    <!-- Dashboard tile image margin start / end -->

    <dimen name="dashboard_tile_image_margin_start">12dp</dimen>



    <dimen name="setup_wizard_card_title_margin_top">256dp</dimen>

    <dimen name="setup_wizard_card_title_padding_end">32dp</dimen>

    <dimen name="setup_wizard_card_title_padding_start">56dp</dimen>

    <dimen name="setup_wizard_card_title_padding_top">24dp</dimen>

    <dimen name="setup_wizard_card_title_padding_bottom">0dp</dimen>



</resources>

res/values/dimens.xml

+8 −5
Original line number Diff line number Diff line
@@ -48,12 +48,15 @@ 
    <!-- Size of padding to give in the wifi list when there is no icon -->

    <dimen name="setup_list_no_icon_padding">56dp</dimen>

    <dimen name="setup_add_network_item_height">56dp</dimen>

    <dimen name="setup_wizard_card_corner_radius">2dp</dimen>

    <dimen name="setup_wizard_card_elevation">5dp</dimen>

    <dimen name="setup_wizard_card_margin_top">128dp</dimen>

    <dimen name="setup_wizard_card_title_margin_top">256dp</dimen>

    <dimen name="setup_wizard_card_title_padding_end">32dp</dimen>

    <dimen name="setup_wizard_card_title_padding_start">56dp</dimen>

    <dimen name="setup_wizard_card_title_padding_top">24dp</dimen>

    <dimen name="setup_wizard_card_title_margin_top">0dp</dimen>

    <dimen name="setup_wizard_card_title_padding_end">0dp</dimen>

    <dimen name="setup_wizard_card_title_padding_start">0dp</dimen>

    <dimen name="setup_wizard_card_title_padding_top">16dp</dimen>

    <dimen name="setup_wizard_card_title_padding_bottom">28dp</dimen>

    <dimen name="setup_wizard_card_port_margin_sides">56dp</dimen>

    <dimen name="setup_wizard_card_land_margin_top">128dp</dimen>

    <dimen name="setup_wizard_margin_sides">40dp</dimen>



    <dimen name="divider_height">3dip</dimen>