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

Commit 4327ce40 authored by Jordan Demeulenaere's avatar Jordan Demeulenaere
Browse files

Wire the new FooterActions implementation behind a flag 

This CL wires the new footer actions implementation from ag/19678215
behind a new SysUI flag. This flag will be enabled by default in a
follow-up CL.

Bug: 242040009
Test: atest FooterActionsViewModelTest
Test: atest FooterActionsScreenshotTest
Change-Id: If23711e400a86ad247666a1532cb17616c01ed85
parent 6fb22d4b

ktfmt_includes.txt

+9 −1
Original line number Diff line number Diff line
@@ -7,3 +7,11 @@ packages/SystemUI/src/com/android/systemui/keyguard/dagger 
packages/SystemUI/src/com/android/systemui/keyguard/domain

packages/SystemUI/src/com/android/systemui/keyguard/shared

packages/SystemUI/src/com/android/systemui/keyguard/ui

packages/SystemUI/src/com/android/systemui/qs/footer

packages/SystemUI/src/com/android/systemui/security

packages/SystemUI/src/com/android/systemui/common/

packages/SystemUI/tests/utils/src/com/android/systemui/qs/

packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/policy/FakeSecurityController.kt

packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/policy/FakeUserInfoController.kt

packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/policy/MockUserSwitcherControllerWrapper.kt

packages/SystemUI/tests/src/com/android/systemui/qs/footer/
 
 No newline at end of file

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

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

<!-- TODO(b/242040009): Remove this file. -->

<FrameLayout

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

    android:layout_width="0dp"

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

+2 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
-->



<!-- Action buttons for footer in QS/QQS, containing settings button, power off button etc -->

<!-- TODO(b/242040009): Clean up this file. -->

<com.android.systemui.qs.FooterActionsView

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

    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
@@ -25,7 +26,7 @@ 
    android:paddingTop="8dp"

    android:paddingBottom="@dimen/qs_footer_actions_bottom_padding"

    android:background="@drawable/qs_footer_actions_background"

    android:gravity="center_vertical"

    android:gravity="center_vertical|end"

    android:layout_gravity="bottom"

>

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

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

-->

<com.android.systemui.statusbar.AlphaOptimizedFrameLayout

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

    android:layout_width="@dimen/qs_footer_action_button_size"

    android:layout_height="@dimen/qs_footer_action_button_size"

    android:visibility="gone">

    <ImageView

        android:id="@+id/icon"

        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.AlphaOptimizedFrameLayout>
 
 No newline at end of file

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

0 → 100644
+39 −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="@dimen/qs_footer_action_button_size"

    android:layout_height="@dimen/qs_footer_action_button_size"

    android:background="@drawable/qs_footer_action_circle"

    android:visibility="gone">

    <TextView

        android:id="@+id/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/new_dot"

        android:layout_width="12dp"

        android:layout_height="12dp"

        android:scaleType="fitCenter"

        android:layout_gravity="bottom|end"

        android:src="@drawable/fgs_dot"

        android:contentDescription="@string/fgs_dot_content_description" />

</FrameLayout>
 
 No newline at end of file