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

Commit 314393c3 authored by Alex Johnston's avatar Alex Johnston Committed by Automerger Merge Worker
Browse files

Merge "Make WorkLockActivity theme translucent" into tm-dev am: 916e42bd 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18929026



Change-Id: I33e95af83fb2189be5f7a221f183299a892b0ff1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9d428d5a 916e42bd

packages/SystemUI/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -723,7 +723,7 @@ 
                  android:excludeFromRecents="true"

                  android:stateNotNeeded="true"

                  android:resumeWhilePausing="true"

                  android:theme="@style/Theme.AppCompat.DayNight.NoActionBar">

                  android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen">

            <intent-filter>

                <action android:name="android.app.action.CONFIRM_DEVICE_CREDENTIAL_WITH_USER" />

                <category android:name="android.intent.category.DEFAULT" />

packages/SystemUI/res/layout/auth_biometric_background.xml

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 
  -->

<LinearLayout

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

    android:theme="@style/Theme.AppCompat.DayNight"

    android:background="?android:colorBackground"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:gravity="center"