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

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

Put security footers in new footer 

This CL puts the security footer and fgs disclaimer in the new footer
(based on flag) instead of QSPanel.

The FGS disclaimer has two modes. A text mode (when security footer is
not visible) or just a number with maybe an update dot (when security
footer is visible).

Also, use DialogLaunchAnimator for QSSecurityFooter

Test: manual
Test: atest SystemUITests
Fixes: 217908230
Change-Id: Id9289826de3256ea6fdfea3ca6f8bf1976364e61
parent 73940638

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

+5 −3
Original line number Diff line number Diff line
@@ -29,8 +29,10 @@ 
    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"

    />

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_security_footer_background.xml

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

  -->

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

    android:insetTop="@dimen/qs_security_footer_background_inset"

    android:insetBottom="@dimen/qs_security_footer_background_inset"

    android:insetTop="@dimen/qs_footer_action_inset"

    android:insetBottom="@dimen/qs_footer_action_inset"

    >

    <ripple

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

packages/SystemUI/res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -2375,6 +2375,9 @@ 
        <item quantity="one"><xliff:g id="count" example="1">%s</xliff:g> active app</item>

        <item quantity="other"><xliff:g id="count" example="2">%s</xliff:g> active apps</item>

    </plurals>

    <!-- Content description for a dot indicator in the running application indicating that there

    is new information [CHAR LIMIT=NONE] -->

    <string name="fgs_dot_content_description">New information</string>

    <!-- Title for dialog listing applications currently running [CHAR LIMIT=NONE]-->

    <string name="fgs_manager_dialog_title">Active apps</string>

    <!-- Label of the button to stop an app from running [CHAR LIMIT=12]-->