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

Commit 56d781b3 authored by Maurice Lam's avatar Maurice Lam Committed by Android (Google) Code Review
Browse files

Merge "[WifiSetup] Tablet landscape layout" into lmp-dev

parents 56fc6a75 068354a1

res/drawable-nodpi/illustration_wifi_wide.jpg

0 → 100644
+142 KiB
Loading image diff...

res/layout-sw600dp-land/setup_preference.xml

0 → 100644
+82 −0
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:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_weight="1"

        android:foreground="@drawable/illustration_wifi_wide"

        android:background="@drawable/grass">



        <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: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_weight="8"

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

                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:name="com.android.setupwizard.navigationbar.SetupWizardNavBar"

        android:id="@+id/navigation_bar"

        style="@style/setup_wizard_navbar_style" />



</LinearLayout>

res/layout/setup_wizard_header.xml

+5 −3
Original line number Diff line number Diff line
@@ -15,14 +15,16 @@ 
     limitations under the License.

-->



<com.android.settings.widget.SetupWizardHeader

<com.android.settings.widget.SetupWizardIllustration

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

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

    android:id="@+id/title_area"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:background="@drawable/grass"

    android:foreground="@drawable/illustration_wifi"

    android:tag="stickyContainer">

    android:tag="stickyContainer"

    settings:aspectRatio="2.0">



    <TextView

        android:id="@+id/title"
@@ -32,4 +34,4 @@ 
        android:tag="sticky"

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



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

res/values/attrs.xml

+5 −1
Original line number Diff line number Diff line
@@ -22,6 +22,10 @@ 
        <attr name="icon" format="reference" />

    </declare-styleable>



    <declare-styleable name="SetupWizardIllustration">

        <attr name="aspectRatio" format="float" />

    </declare-styleable>



    <declare-styleable name="BatteryHistoryChart">

        <!-- Base text color, typeface, size, and style. -->

        <attr name="android:textAppearance" />

res/values/dimens.xml

+6 −0
Original line number Diff line number Diff line
@@ -48,6 +48,12 @@ 
    <!-- 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_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_margin_sides">40dp</dimen>



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