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

Commit f07a7bd6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "status_bar_80%_white" 

* changes:
  Fine tune items position of homepage
  Make status bar become 80% of white in homepage.
parents df495130 191bde1b

color-check-baseline.xml

+52 −8
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<issues format="4">



    <issue

        id="LintError"

        severity="Error"

        message="No `.class` files were found in project &quot;.&quot;, so none of the classfile based checks could be run. Does the project need to be built first?"

        category="Lint"

        priority="10"

        summary="Lint Failure"

        explanation="This issue type represents a problem running lint itself. Examples include failure to find bytecode for source files (which means certain detectors could not be run), parsing errors in lint configuration files, etc.&#xA;These errors are not errors in your own code, but they are shown to make it clear that some checks were not completed.">

        <location

            file="."/>

    </issue>



    <issue

        id="HardCodedColor"

        severity="Error"
@@ -225,6 +237,22 @@ 
            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_status_bar_color&quot;>#cc000000&lt;/color>"

        errorLine2="  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">

        <location

            file="res/values-night/colors.xml"

            line="25"

            column="3"/>

    </issue>



    <issue

        id="HardCodedColor"

        severity="Error"
@@ -1281,6 +1309,22 @@ 
            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_status_bar_color&quot;>#ccFFFFFF&lt;/color>"

        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">

        <location

            file="res/values/colors.xml"

            line="133"

            column="5"/>

    </issue>



    <issue

        id="HardCodedColor"

        severity="Error"
@@ -1293,7 +1337,7 @@ 
        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">

        <location

            file="res/values/colors.xml"

            line="133"

            line="136"

            column="5"/>

    </issue>
@@ -1309,7 +1353,7 @@ 
        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">

        <location

            file="res/values/colors.xml"

            line="134"

            line="137"

            column="5"/>

    </issue>
@@ -1325,7 +1369,7 @@ 
        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">

        <location

            file="res/values/colors.xml"

            line="135"

            line="138"

            column="5"/>

    </issue>
@@ -2477,7 +2521,7 @@ 
        errorLine2="                                   ~~~~~~~~~~~~~~~~~~~">

        <location

            file="res/values/strings.xml"

            line="5883"

            line="5885"

            column="36"/>

    </issue>
@@ -2509,7 +2553,7 @@ 
        errorLine2="                                           ^">

        <location

            file="res/values/styles.xml"

            line="415"

            line="388"

            column="44"/>

    </issue>
@@ -2525,7 +2569,7 @@ 
        errorLine2="                                           ^">

        <location

            file="res/values/styles.xml"

            line="421"

            line="394"

            column="44"/>

    </issue>
@@ -2541,7 +2585,7 @@ 
        errorLine2="                                           ^">

        <location

            file="res/values/styles.xml"

            line="422"

            line="395"

            column="44"/>

    </issue>
@@ -2557,7 +2601,7 @@ 
        errorLine2="                                 ^">

        <location

            file="res/values/styles.xml"

            line="457"

            line="430"

            column="34"/>

    </issue>

res/layout/settings_homepage_container.xml

+10 −2
Original line number Diff line number Diff line
@@ -31,8 +31,9 @@ 
            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="vertical"

            android:paddingTop="@dimen/app_bar_height"

            android:descendantFocusability="blocksDescendants">

            android:descendantFocusability="blocksDescendants"

            android:paddingTop="104dp">

            <!-- height of status bar(24dp) + height of action bar(48dp) + top/bottom margins(16dp) -->



            <FrameLayout

                android:id="@+id/contextual_cards_content"
@@ -52,6 +53,13 @@ 
    <com.google.android.material.appbar.AppBarLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content">



        <Space

            android:layout_width="match_parent"

            android:layout_height="@*android:dimen/status_bar_height"

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

            app:layout_scrollFlags="scroll|enterAlways"/>



        <include layout="@layout/search_bar"/>

    </com.google.android.material.appbar.AppBarLayout>

</androidx.coordinatorlayout.widget.CoordinatorLayout>

res/values-night/colors.xml

+2 −0
Original line number Diff line number Diff line
@@ -21,5 +21,7 @@ 
  <color name="switchbar_switch_thumb_tint">@android:color/black</color>

  <color name="homepage_accessibility_background">#783BE5</color>

  <color name="homepage_support_background">#3F5FBD</color>

  <!-- 80% black for status bar of homepage -->

  <color name="homepage_status_bar_color">#cc000000</color>

</resources>

res/values/colors.xml

+3 −0
Original line number Diff line number Diff line
@@ -129,6 +129,9 @@ 
    <!-- launcher icon color -->

    <color name="icon_launcher_setting_color">@*android:color/accent_device_default_light</color>



    <!-- 80% white for status bar of homepage -->

    <color name="homepage_status_bar_color">#ccFFFFFF</color>



    <!-- QR code scanner colors -->

    <color name="qr_corner_line_color">#ffdadce0</color>

    <color name="qr_focused_corner_line_color">#ff1a73e8</color>

res/values/dimens.xml

+0 −2
Original line number Diff line number Diff line
@@ -105,8 +105,6 @@ 
    <dimen name="search_bar_avatar_size">32dp</dimen>

    <dimen name="search_bar_avatar_start_margin">4dp</dimen>

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

    <!-- appbar height is equal search bar height (48dp) plus search bar top and bottom margin  -->

    <dimen name="app_bar_height">80dp</dimen>



    <!-- Dimensions for Wifi Assistant Card -->

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