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

Commit 73940638 authored by Fabian Kozynski's avatar Fabian Kozynski
Browse files

Implement correct dimens for new footer 

Bug: 215686414
Test: manual in different devices and configs
Test: atest SystemUITests
Change-Id: If9cc89dff3225e57d92a930aab0cad0f3985c962
parent 24c3cf75

packages/SystemUI/res-keyguard/layout/new_footer_actions.xml

+11 −8
Original line number Diff line number Diff line
@@ -20,7 +20,11 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

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

    android:layout_width="match_parent"

    android:layout_height="@dimen/qs_footer_height"

    android:layout_height="@dimen/new_footer_height"

    android:elevation="@dimen/qs_panel_elevation"

    android:paddingTop="8dp"

    android:paddingBottom="4dp"

    android:background="@drawable/qs_footer_actions_background"

    android:gravity="center_vertical"

    android:layout_gravity="bottom"

>
@@ -31,23 +35,24 @@ 
        android:layout_weight="1"

        />



    <!-- Negative margin equal to -->

    <LinearLayout

        android:layout_height="match_parent"

        android:layout_width="wrap_content"

        android:layout_marginEnd="@dimen/new_qs_footer_action_inset_negative"

        >



        <com.android.systemui.statusbar.phone.MultiUserSwitch

            android:id="@+id/multi_user_switch"

            android:layout_width="@dimen/qs_footer_action_button_size"

            android:layout_height="@dimen/qs_footer_action_button_size"

            android:layout_marginEnd="@dimen/qs_tile_margin_horizontal"

            android:background="@drawable/qs_footer_action_circle"

            android:focusable="true">



            <ImageView

                android:id="@+id/multi_user_avatar"

                android:layout_width="@dimen/multi_user_avatar_expanded_size"

                android:layout_height="@dimen/multi_user_avatar_expanded_size"

                android:layout_width="@dimen/qs_footer_icon_size"

                android:layout_height="@dimen/qs_footer_icon_size"

                android:layout_gravity="center"

                android:scaleType="centerInside" />

        </com.android.systemui.statusbar.phone.MultiUserSwitch>
@@ -56,19 +61,17 @@ 
            android:id="@+id/settings_button_container"

            android:layout_width="@dimen/qs_footer_action_button_size"

            android:layout_height="@dimen/qs_footer_action_button_size"

            android:layout_marginEnd="@dimen/qs_tile_margin_horizontal"

            android:background="@drawable/qs_footer_action_circle"

            android:clipChildren="false"

            android:clipToPadding="false">



            <com.android.systemui.statusbar.phone.SettingsButton

                android:id="@+id/settings_button"

                android:layout_width="match_parent"

                android:layout_height="@dimen/qs_footer_action_button_size"

                android:layout_width="@dimen/qs_footer_icon_size"

                android:layout_height="@dimen/qs_footer_icon_size"

                android:layout_gravity="center"

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

                android:contentDescription="@string/accessibility_quick_settings_settings"

                android:padding="@dimen/qs_footer_icon_padding"

                android:scaleType="centerInside"

                android:src="@drawable/ic_settings"

                android:tint="?android:attr/textColorPrimary" />

packages/SystemUI/res/drawable/qs_footer_action_circle.xml

+1 −4
Original line number Diff line number Diff line
@@ -15,10 +15,7 @@ 
  ~ limitations under the License.

  -->

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

    android:insetTop="@dimen/qs_footer_action_inset"

    android:insetBottom="@dimen/qs_footer_action_inset"

    android:insetLeft="@dimen/qs_footer_action_inset"

    android:insetRight="@dimen/qs_footer_action_inset">

       android:inset="@dimen/new_qs_footer_action_inset">

    <ripple

        android:color="?android:attr/colorControlHighlight">

        <item android:id="@android:id/mask">

packages/SystemUI/res/drawable/qs_footer_action_circle_color.xml

+1 −4
Original line number Diff line number Diff line
@@ -15,10 +15,7 @@ 
  ~ limitations under the License.

  -->

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

    android:insetTop="@dimen/qs_footer_action_inset"

    android:insetBottom="@dimen/qs_footer_action_inset"

    android:insetLeft="@dimen/qs_footer_action_inset"

    android:insetRight="@dimen/qs_footer_action_inset">

    android:inset="@dimen/new_qs_footer_action_inset">

    <ripple

        android:color="?android:attr/colorControlHighlight">

        <item android:id="@android:id/mask">

packages/SystemUI/res/drawable/qs_footer_actions_background.xml

0 → 100644
+22 −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.

-->

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

    <shape>

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

        <corners android:topLeftRadius="@dimen/qs_corner_radius"

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

    </shape>

</inset>

packages/SystemUI/res/layout/qs_panel.xml

+2 −2
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
        android:id="@+id/expanded_qs_scroll_view"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:elevation="4dp"

        android:elevation="@dimen/qs_panel_elevation"

        android:importantForAccessibility="no"

        android:scrollbars="none"

        android:clipChildren="false"
@@ -55,7 +55,7 @@ 
        android:id="@+id/container_stub"

        android:inflatedId="@+id/qs_footer_actions"

        android:layout="@layout/new_footer_actions"

        android:layout_height="@dimen/qs_footer_height"

        android:layout_height="@dimen/new_footer_height"

        android:layout_width="match_parent"

        android:layout_gravity="bottom"

        />