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

Commit 9c7f1199 authored by Chandru S's avatar Chandru S Committed by Android (Google) Code Review
Browse files

Merge changes I04f6a54e,Ifb505f6d,Ia9ec3ce2,I97b201c6,Ia12e8cd6, ... into udc-dev 

* changes:
  Add an audit logger for bouncer messages
  Add BouncerMessageRepository and BouncerMessageInteractor
  Make current user strong auth flags available in BiometricSettingsRepository
  Hide existing bouncer message area if the feature flag is enabled.
  Create BouncerMessageFactory to easily create BouncerMessage data model.
  Add views for displaying the new bouncer messages
parents 3d5ad7b9 08a1a11d

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

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

  ~ Copyright (C) 2023 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

  -->

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



    <com.android.keyguard.BouncerKeyguardMessageArea

        android:id="@+id/bouncer_primary_message_area"

        style="@style/Keyguard.Bouncer.PrimaryMessage"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginTop="@dimen/keyguard_lock_padding"

        android:focusable="true"

         />



    <com.android.keyguard.BouncerKeyguardMessageArea

        android:id="@+id/bouncer_secondary_message_area"

        style="@style/Keyguard.Bouncer.SecondaryMessage"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginTop="@dimen/secondary_message_padding"

        android:focusable="true" />



</merge>

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

+7 −0
Original line number Diff line number Diff line
@@ -29,6 +29,13 @@ 
    >

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



    <com.android.systemui.keyguard.bouncer.ui.BouncerMessageView

        android:id="@+id/bouncer_message_view"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="vertical"

    />



    <Space

        android:layout_width="match_parent"

        android:layout_height="0dp"

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

+6 −0
Original line number Diff line number Diff line
@@ -33,6 +33,12 @@ 
    android:clipToPadding="false">

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



    <com.android.systemui.keyguard.bouncer.ui.BouncerMessageView

        android:id="@+id/bouncer_message_view"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="vertical" />



    <androidx.constraintlayout.widget.ConstraintLayout

        android:id="@+id/pattern_container"

        android:layout_width="match_parent"

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

+6 −0
Original line number Diff line number Diff line
@@ -29,6 +29,12 @@ 
    androidprv:layout_maxWidth="@dimen/keyguard_security_width">

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



<com.android.systemui.keyguard.bouncer.ui.BouncerMessageView

    android:id="@+id/bouncer_message_view"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:orientation="vertical" />



<androidx.constraintlayout.widget.ConstraintLayout

        android:id="@+id/pin_container"

        android:layout_width="match_parent"

packages/SystemUI/res-keyguard/values/styles.xml

+20 −0
Original line number Diff line number Diff line
@@ -23,6 +23,26 @@ 
    <style name="Keyguard.TextView" parent="@android:style/Widget.DeviceDefault.TextView">

        <item name="android:textSize">@dimen/kg_status_line_font_size</item>

        <item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>

        <item name="android:textColor">?androidprv:attr/materialColorOnSurface</item>

    </style>

    <style name="Keyguard.Bouncer.PrimaryMessage" parent="Theme.SystemUI">

        <item name="android:textSize">18sp</item>

        <item name="android:lineHeight">24dp</item>

        <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>

        <item name="android:textColor">?androidprv:attr/materialColorOnSurface</item>

        <item name="android:singleLine">true</item>

        <item name="android:textAlignment">center</item>

        <item name="android:ellipsize">marquee</item>

    </style>

    <style name="Keyguard.Bouncer.SecondaryMessage" parent="Theme.SystemUI">

        <item name="android:textSize">14sp</item>

        <item name="android:lineHeight">20dp</item>

        <item name="android:maxLines">@integer/bouncer_secondary_message_lines</item>

        <item name="android:lines">@integer/bouncer_secondary_message_lines</item>

        <item name="android:textAlignment">center</item>

        <item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>

        <item name="android:ellipsize">end</item>

        <item name="android:textColor">?androidprv:attr/materialColorOnSurfaceVariant</item>

    </style>

    <style name="Keyguard.TextView.EmergencyButton" parent="Theme.SystemUI">

        <item name="android:textColor">?androidprv:attr/materialColorOnTertiaryFixed</item>