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

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

Merge changes Id9289826,If9cc89df 

* changes:
  Put security footers in new footer
  Implement correct dimens for new footer
parents 26af93c9 d68c626b

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

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

<!--

     Copyright (C) 2022 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.

-->

<FrameLayout

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

    android:layout_width="0dp"

    android:layout_height="@dimen/qs_security_footer_single_line_height"

    android:layout_weight="1"

    android:gravity="center"

    android:clickable="true"

    android:visibility="gone">



    <LinearLayout

        android:id="@+id/fgs_text_container"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_marginEnd="@dimen/new_qs_footer_action_inset"

        android:background="@drawable/qs_security_footer_background"

        android:layout_gravity="center"

        android:gravity="center"

        android:paddingHorizontal="@dimen/qs_footer_padding"

        >



        <ImageView

            android:id="@+id/primary_footer_icon"

            android:layout_width="@dimen/qs_footer_icon_size"

            android:layout_height="@dimen/qs_footer_icon_size"

            android:gravity="start"

            android:layout_marginEnd="12dp"

            android:contentDescription="@null"

            android:src="@drawable/ic_info_outline"

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



        <TextView

            android:id="@+id/footer_text"

            android:layout_width="0dp"

            android:layout_height="wrap_content"

            android:layout_weight="1"

            android:maxLines="1"

            android:ellipsize="end"

            android:textAppearance="@style/TextAppearance.QS.SecurityFooter"

            android:textColor="?android:attr/textColorSecondary"/>



        <ImageView

            android:id="@+id/footer_icon"

            android:layout_width="@dimen/qs_footer_icon_size"

            android:layout_height="@dimen/qs_footer_icon_size"

            android:layout_marginStart="8dp"

            android:contentDescription="@null"

            android:src="@*android:drawable/ic_chevron_end"

            android:autoMirrored="true"

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

    </LinearLayout>



    <FrameLayout

        android:id="@+id/fgs_number_container"

        android:layout_width="@dimen/qs_footer_action_button_size"

        android:layout_height="@dimen/qs_footer_action_button_size"

        android:background="@drawable/qs_footer_action_circle"

        android:focusable="true"

        android:visibility="gone">



        <TextView

            android:id="@+id/fgs_number"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:textAppearance="@style/TextAppearance.QS.SecurityFooter"

            android:layout_gravity="center"

            android:textColor="?android:attr/textColorPrimary"

            android:textSize="18sp"/>

        <ImageView

            android:id="@+id/fgs_new"

            android:layout_width="12dp"

            android:layout_height="12dp"

            android:scaleType="fitCenter"

            android:layout_gravity="bottom|end"

            android:src="@drawable/new_fgs_dot"

            android:contentDescription="@string/fgs_dot_content_description"

            />

    </FrameLayout>



</FrameLayout>
 
 No newline at end of file

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

+16 −11
Original line number Diff line number Diff line
@@ -20,34 +20,41 @@ 
    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"

>



    <View

        android:layout_height="1dp"

    <LinearLayout

        android:id="@+id/security_footers_container"

        android:orientation="horizontal"

        android:layout_height="@dimen/qs_footer_action_button_size"

        android:layout_width="0dp"

        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 +63,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/new_fgs_dot.xml

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

<!--

** Copyright 2022, 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.

-->

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

    android:shape="oval"

    android:width="12dp"

    android:height="12dp">

    <solid android:color="@*android:color/red" />

</shape>
 
 No newline at end of file

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">