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

Commit ca94c5b3 authored by Brad Hinegardner's avatar Brad Hinegardner Committed by Automerger Merge Worker
Browse files

Merge "Fix issue of indication area over top of customize lockscreen button"... 

Merge "Fix issue of indication area over top of customize lockscreen button" into udc-qpr-dev am: fba608d8 am: b92b4425

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



Change-Id: I7dec2cfc7ffce0b75b2d81091be450090abe397e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 59301be9 b92b4425

packages/SystemUI/res/layout/keyguard_bottom_area.xml

+36 −0
Original line number Diff line number Diff line
@@ -22,6 +22,42 @@ 
    android:layout_width="match_parent"

    android:outlineProvider="none" >



    <LinearLayout

        android:id="@id/keyguard_indication_area"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginBottom="@dimen/keyguard_indication_margin_bottom"

        android:layout_gravity="bottom|center_horizontal"

        android:orientation="vertical">



        <com.android.systemui.statusbar.phone.KeyguardIndicationTextView

            android:id="@id/keyguard_indication_text"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:gravity="center"

            android:paddingStart="@dimen/keyguard_indication_text_padding"

            android:paddingEnd="@dimen/keyguard_indication_text_padding"

            android:textAppearance="@style/TextAppearance.Keyguard.BottomArea"

            android:accessibilityLiveRegion="polite"/>



        <com.android.systemui.statusbar.phone.KeyguardIndicationTextView

            android:id="@id/keyguard_indication_text_bottom"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:gravity="center"

            android:minHeight="@dimen/keyguard_indication_text_min_height"

            android:layout_gravity="center_horizontal"

            android:paddingStart="@dimen/keyguard_indication_text_padding"

            android:paddingEnd="@dimen/keyguard_indication_text_padding"

            android:textAppearance="@style/TextAppearance.Keyguard.BottomArea"

            android:maxLines="2"

            android:ellipsize="end"

            android:alpha=".8"

            android:accessibilityLiveRegion="polite"

            android:visibility="gone"/>



    </LinearLayout>



    <com.android.systemui.animation.view.LaunchableImageView

        android:id="@+id/start_button"

        android:layout_height="@dimen/keyguard_affordance_fixed_height"

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewConfigurator.kt

+6 −0
Original line number Diff line number Diff line
@@ -137,6 +137,12 @@ constructor( 
    fun bindIndicationArea() {

        indicationAreaHandle?.dispose()



        if (!featureFlags.isEnabled(Flags.MIGRATE_SPLIT_KEYGUARD_BOTTOM_AREA)) {

            keyguardRootView.findViewById<View?>(R.id.keyguard_indication_area)?.let {

                keyguardRootView.removeView(it)

            }

        }



        indicationAreaHandle =

            KeyguardIndicationAreaBinder.bind(

                notificationShadeWindowView,