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

Commit a60652a9 authored by Fan Zhang's avatar Fan Zhang
Browse files

Visual update: remove card elevation for homepage cards.

- Replace CardView with MaterialCardView
- Add strokeColor and strokeWidth to MaterialCardView
- Set cardElevation to 0dp.

And remove a few unused layout, clean up color lint whitelist.

Test: rebuild, visual
Change-Id: I34a4b9a985cb85c212e123b8af5353d8c548923a
parent 8bda3a59
Loading
Loading
Loading
Loading
+69 −133
Original line number Diff line number Diff line
@@ -929,22 +929,6 @@
            column="5"/>
    </issue>

    <issue
        id="HardCodedColor"
        severity="Error"
        message="Avoid using hardcoded color"
        category="Correctness"
        priority="4"
        summary="Using hardcoded color"
        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
        errorLine1="    &lt;color name=&quot;status_bar_color&quot;>#3c3c3c&lt;/color>"
        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
        <location
            file="res/values/colors.xml"
            line="99"
            column="5"/>
    </issue>

    <issue
        id="HardCodedColor"
        severity="Error"
@@ -957,7 +941,7 @@
        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
        <location
            file="res/values/colors.xml"
            line="102"
            line="100"
            column="5"/>
    </issue>

@@ -973,23 +957,7 @@
        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
        <location
            file="res/values/colors.xml"
            line="105"
            column="5"/>
    </issue>

    <issue
        id="HardCodedColor"
        severity="Error"
        message="Avoid using hardcoded color"
        category="Correctness"
        priority="4"
        summary="Using hardcoded color"
        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
        errorLine1="    &lt;color name=&quot;fallback_tintColor&quot;>#89000000&lt;/color>"
        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
        <location
            file="res/values/colors.xml"
            line="108"
            line="103"
            column="5"/>
    </issue>

@@ -1005,7 +973,7 @@
        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
        <location
            file="res/values/colors.xml"
            line="111"
            line="106"
            column="5"/>
    </issue>

@@ -1021,7 +989,7 @@
        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
        <location
            file="res/values/colors.xml"
            line="112"
            line="107"
            column="5"/>
    </issue>

@@ -1037,7 +1005,7 @@
        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
        <location
            file="res/values/colors.xml"
            line="115"
            line="110"
            column="5"/>
    </issue>

@@ -1053,7 +1021,7 @@
        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
        <location
            file="res/values/colors.xml"
            line="116"
            line="111"
            column="5"/>
    </issue>

@@ -1069,7 +1037,7 @@
        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
        <location
            file="res/values/colors.xml"
            line="117"
            line="112"
            column="5"/>
    </issue>

@@ -1085,7 +1053,7 @@
        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
        <location
            file="res/values/colors.xml"
            line="118"
            line="113"
            column="5"/>
    </issue>

@@ -1101,7 +1069,7 @@
        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
        <location
            file="res/values/colors.xml"
            line="119"
            line="114"
            column="5"/>
    </issue>

@@ -1117,7 +1085,7 @@
        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
        <location
            file="res/values/colors.xml"
            line="120"
            line="115"
            column="5"/>
    </issue>

@@ -1133,7 +1101,7 @@
        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
        <location
            file="res/values/colors.xml"
            line="121"
            line="116"
            column="5"/>
    </issue>

@@ -1149,7 +1117,7 @@
        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
        <location
            file="res/values/colors.xml"
            line="122"
            line="117"
            column="5"/>
    </issue>

@@ -1165,7 +1133,7 @@
        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
        <location
            file="res/values/colors.xml"
            line="123"
            line="118"
            column="5"/>
    </issue>

@@ -1181,7 +1149,7 @@
        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
        <location
            file="res/values/colors.xml"
            line="124"
            line="119"
            column="5"/>
    </issue>

@@ -1197,7 +1165,7 @@
        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
        <location
            file="res/values/colors.xml"
            line="125"
            line="120"
            column="5"/>
    </issue>

@@ -1213,7 +1181,7 @@
        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
        <location
            file="res/values/colors.xml"
            line="126"
            line="121"
            column="5"/>
    </issue>

@@ -1229,7 +1197,7 @@
        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
        <location
            file="res/values/colors.xml"
            line="127"
            line="122"
            column="5"/>
    </issue>

@@ -1245,7 +1213,7 @@
        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
        <location
            file="res/values/colors.xml"
            line="128"
            line="123"
            column="5"/>
    </issue>

@@ -1261,7 +1229,7 @@
        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
        <location
            file="res/values/colors.xml"
            line="129"
            line="124"
            column="5"/>
    </issue>

@@ -1277,7 +1245,23 @@
        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
        <location
            file="res/values/colors.xml"
            line="130"
            line="125"
            column="5"/>
    </issue>

    <issue
        id="HardCodedColor"
        severity="Error"
        message="Avoid using hardcoded color"
        category="Correctness"
        priority="4"
        summary="Using hardcoded color"
        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
        errorLine1="    &lt;color name=&quot;homepage_card_stroke_color&quot;>#1f000000&lt;/color>"
        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
        <location
            file="res/values/colors.xml"
            line="126"
            column="5"/>
    </issue>

@@ -1293,7 +1277,7 @@
        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
        <location
            file="res/values/colors.xml"
            line="134"
            line="130"
            column="5"/>
    </issue>

@@ -1309,7 +1293,7 @@
        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
        <location
            file="res/values/colors.xml"
            line="139"
            line="135"
            column="5"/>
    </issue>

@@ -1325,7 +1309,7 @@
        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
        <location
            file="res/values/colors.xml"
            line="140"
            line="136"
            column="5"/>
    </issue>

@@ -1341,7 +1325,7 @@
        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
        <location
            file="res/values/colors.xml"
            line="141"
            line="137"
            column="5"/>
    </issue>

@@ -1357,7 +1341,7 @@
        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
        <location
            file="res/values/colors.xml"
            line="142"
            line="138"
            column="5"/>
    </issue>

@@ -1373,7 +1357,7 @@
        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
        <location
            file="res/values/colors.xml"
            line="143"
            line="139"
            column="5"/>
    </issue>

@@ -1389,7 +1373,7 @@
        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
        <location
            file="res/values/colors.xml"
            line="144"
            line="140"
            column="5"/>
    </issue>

@@ -1405,7 +1389,7 @@
        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
        <location
            file="res/values/colors.xml"
            line="147"
            line="143"
            column="5"/>
    </issue>

@@ -1421,7 +1405,7 @@
        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
        <location
            file="res/values/colors.xml"
            line="148"
            line="144"
            column="5"/>
    </issue>

@@ -1437,7 +1421,7 @@
        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
        <location
            file="res/values/colors.xml"
            line="149"
            line="145"
            column="5"/>
    </issue>

@@ -1453,7 +1437,7 @@
        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
        <location
            file="res/values/colors.xml"
            line="150"
            line="146"
            column="5"/>
    </issue>

@@ -1469,7 +1453,7 @@
        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
        <location
            file="res/values/colors.xml"
            line="151"
            line="147"
            column="5"/>
    </issue>

@@ -2621,7 +2605,7 @@
        errorLine2="                                   ~~~~~~~~~~~~~~~~~~~">
        <location
            file="res/values/strings.xml"
            line="5902"
            line="5806"
            column="36"/>
    </issue>

@@ -2637,7 +2621,7 @@
        errorLine2="                                        ^">
        <location
            file="res/values/styles.xml"
            line="179"
            line="174"
            column="41"/>
    </issue>

@@ -2653,7 +2637,7 @@
        errorLine2="                                           ^">
        <location
            file="res/values/styles.xml"
            line="448"
            line="419"
            column="44"/>
    </issue>

@@ -2669,7 +2653,7 @@
        errorLine2="                                           ^">
        <location
            file="res/values/styles.xml"
            line="454"
            line="425"
            column="44"/>
    </issue>

@@ -2685,10 +2669,26 @@
        errorLine2="                                           ^">
        <location
            file="res/values/styles.xml"
            line="455"
            line="426"
            column="44"/>
    </issue>

    <issue
        id="HardCodedColor"
        severity="Error"
        message="Avoid using hardcoded color"
        category="Correctness"
        priority="4"
        summary="Using hardcoded color"
        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
        errorLine1="        &lt;item name=&quot;strokeColor&quot;>@color/homepage_card_stroke_color&lt;/item>"
        errorLine2="                                 ^">
        <location
            file="res/values/styles.xml"
            line="461"
            column="34"/>
    </issue>

    <issue
        id="HardCodedColor"
        severity="Error"
@@ -3089,68 +3089,4 @@
            column="5"/>
    </issue>

    <issue
        id="HardCodedColor"
        severity="Error"
        message="Avoid using hardcoded color"
        category="Correctness"
        priority="4"
        summary="Using hardcoded color"
        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
        errorLine1="            android:background=&quot;@color/divider_color&quot;"
        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
        <location
            file="res/layout-sw600dp-land/wifi_settings_for_setup_wizard_xl.xml"
            line="71"
            column="13"/>
    </issue>

    <issue
        id="HardCodedColor"
        severity="Error"
        message="Avoid using hardcoded color"
        category="Correctness"
        priority="4"
        summary="Using hardcoded color"
        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
        errorLine1="            android:background=&quot;@color/divider_color&quot;"
        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
        <location
            file="res/layout-sw600dp/wifi_settings_for_setup_wizard_xl.xml"
            line="71"
            column="13"/>
    </issue>

    <issue
        id="HardCodedColor"
        severity="Error"
        message="Avoid using hardcoded color"
        category="Correctness"
        priority="4"
        summary="Using hardcoded color"
        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
        errorLine1="        android:background=&quot;@color/divider_color&quot; />  &lt;!-- TODO: fix this -->"
        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
        <location
            file="res/layout-sw600dp-land/wifi_settings_for_setup_wizard_xl.xml"
            line="178"
            column="9"/>
    </issue>

    <issue
        id="HardCodedColor"
        severity="Error"
        message="Avoid using hardcoded color"
        category="Correctness"
        priority="4"
        summary="Using hardcoded color"
        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
        errorLine1="        android:background=&quot;@color/divider_color&quot; />  &lt;!-- TODO: fix this -->"
        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
        <location
            file="res/layout-sw600dp/wifi_settings_for_setup_wizard_xl.xml"
            line="178"
            column="9"/>
    </issue>

</issues>
+0 −228
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2010 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.
  -->

<RelativeLayout
    android:id="@+id/layout_root"
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:orientation="horizontal"
    android:layout_width="fill_parent"
    android:layout_height="fill_parent"
    android:paddingTop="60dip"
    android:paddingStart="@dimen/screen_margin_sides"
    android:paddingEnd="@dimen/screen_margin_sides"
    android:paddingBottom="0dip" >

    <FrameLayout
        android:id="@+id/top_padding_layout"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_alignParentTop="true">
        <!-- Set to gone when software keyboard appears -->
        <View
             android:id="@+id/top_padding"
             android:layout_width="match_parent"
             android:layout_height="94dip" />
    </FrameLayout>

    <TextView
        android:id="@+id/wifi_setup_title"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:minHeight="48dip"
        android:layout_alignParentStart="true"
        android:layout_centerVertical="true"
        android:layout_marginStart="16dip"
        android:layout_below="@id/top_padding_layout"
        android:textSize="32dip"
        android:textColor="@color/title_color"
        android:text="@string/wifi_setup_title"
        android:gravity="bottom"/>

    <!-- Divider -->
    <FrameLayout
        android:id="@+id/top_divider"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_below="@id/wifi_setup_title">
        <ProgressBar
            android:id="@+id/scanning_progress_bar"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            style="?android:attr/progressBarStyleHorizontal" />
        <View
            android:id="@+id/top_divider_no_progress"
            android:layout_width="match_parent"
            android:layout_height="3dip"
            android:layout_marginTop="6dip"
            android:layout_marginBottom="0dip"
            android:background="@color/divider_color"
            android:visibility="gone" />
    </FrameLayout>

    <!-- Dummy view to have the left edge of following Views.
         @id/content needs to have layout_width="match_parent" to accommodate
         every views inside @id/wifi_config_ui while sometimes config ui becomes
         very wide. -->
    <View
        android:id="@+id/dummy_for_left_edge"
        android:layout_width="716dip"
        android:layout_height="0dip"
        android:layout_below="@id/top_divider"
        android:layout_centerHorizontal="true" />

    <RelativeLayout
        android:id="@+id/content"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_below="@id/top_divider"
        android:layout_alignStart="@id/dummy_for_left_edge"
        android:layout_centerHorizontal="true">

        <!-- Padding for @id/content shown when keyboard isn't available -->
        <View
            android:id="@+id/content_padding"
            android:layout_width="match_parent"
            android:layout_height="370dip"
            android:visibility="gone" />

        <FrameLayout
            android:id="@+id/wifi_settings_fragment_layout"
            android:layout_width="716dip"
            android:layout_height="370dip">
            <fragment
                class="com.android.settings.wifi.WifiSettings"
                android:id="@+id/wifi_setup_fragment"
                android:layout_width="match_parent"
                android:layout_height="wrap_content" />
        </FrameLayout>
        <FrameLayout
            android:id="@+id/wifi_config_ui"
            android:layout_width="wrap_content"
            android:minWidth="406dip"
            android:layout_height="wrap_content"
            android:minHeight="160dip"
            android:layout_marginTop="10dip"
            android:layout_alignParentStart="true"
            android:visibility="gone" />
        <LinearLayout
            android:id="@+id/connecting_status_layout"
            android:layout_width="716dip"
            android:layout_height="360dip"
            android:layout_marginTop="10dip"
            android:visibility="gone">
            <TextView
                android:id="@+id/connecting_status"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:lineSpacingExtra="10dip"
                android:textAppearance="?android:attr/textAppearanceMedium"
                android:textSize="20sp" />
        </LinearLayout>

    </RelativeLayout>

    <!-- Shown when @id/top_divider is using View instead of ProgressBar.
         We need this padding to place @id/bottom_divider at the same position
         regardless of @id/top_divider state.

         Detail:
         When ProgressBar is used in @id/top_divider, we have 7dip implicit
         padding inside the ProgressBar object, while we don't have the
         padding when View is used. As a result, all the objects below it
         including @id/bottom_divider moves up/down in 7dip between those
         two states. It is WAI for @id/content, but not for the others.

         Note that we cannot let bottom dividers/buttons align with parent's
         bottom edge using layout_alignParentBottom="true", since we'd like
         to control bottom margin between @id/bottom_buttons and the edge
         depending on software keyboard is shown/hidden.

         We need to enclose @id/bottom_padding with @id/bottom_padding_layout
         to let @id/bottom_divider use android:layout_below.
         android:visibility="gone" really let the object go away,
         causing @id/bottom_divider to lose the target for android:layout_below.
      -->
    <FrameLayout
        android:id="@+id/bottom_padding_layout"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_below="@id/content">
        <View
             android:id="@+id/bottom_padding"
             android:layout_width="match_parent"
             android:layout_height="7dip"
             android:visibility="gone" />
    </FrameLayout>

    <!-- Divider -->
    <View
        android:id="@+id/bottom_divider"
        android:layout_width="match_parent"
        android:layout_height="3dip"
        android:layout_marginBottom="16dip"
        android:layout_below="@id/bottom_padding_layout"
        android:layout_alignStart="@id/content"
        android:background="@color/divider_color" />  <!-- TODO: fix this -->

    <RelativeLayout
        android:id="@+id/bottom_buttons"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_below="@id/bottom_divider"
        android:layout_alignStart="@id/bottom_divider"
        android:layout_alignParentEnd="true"
        android:layout_alignParentBottom="true">

        <Button
            android:id="@+id/wifi_setup_add_network"
            style="@style/setup_wizard_button"
            android:layout_alignParentStart="true"
            android:text="@string/wifi_setup_add_network"
            android:enabled="false" />

        <LinearLayout
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_alignParentEnd="true"
            android:orientation="horizontal">

            <!-- This misleading name is for keeping consistency between non-XL
                 layouts -->
            <Button android:id="@+id/wifi_setup_cancel"
                    style="@style/setup_wizard_button"
                    android:text="@string/wifi_setup_back"
                    android:visibility="gone" />

            <Button android:id="@+id/wifi_setup_connect"
                    style="@style/setup_wizard_button"
                    android:layout_marginStart="16dip"
                    android:text="@string/wifi_setup_connect"
                    android:enabled="false"
                    android:visibility="gone" />

            <Button android:id="@+id/wifi_setup_refresh_list"
                    style="@style/setup_wizard_button"
                    android:layout_marginStart="16dip"
                    android:text="@string/wifi_setup_refresh_list"
                    android:enabled="false" />

            <Button android:id="@+id/wifi_setup_skip_or_next"
                    style="@style/setup_wizard_button"
                    android:layout_marginStart="16dip"
                    android:text="@string/wifi_setup_skip" />
        </LinearLayout>
    </RelativeLayout>
</RelativeLayout>
+0 −238

File deleted.

Preview size limit exceeded, changes collapsed.

+2 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@
     limitations under the License.
-->

<androidx.cardview.widget.CardView
<com.google.android.material.card.MaterialCardView
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
@@ -71,4 +71,4 @@

    </LinearLayout>

</androidx.cardview.widget.CardView>
</com.google.android.material.card.MaterialCardView>
+2 −2

File changed.

Preview size limit exceeded, changes collapsed.

Loading