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

Commit 63f0bf80 authored by Matt Pietal's avatar Matt Pietal Committed by Automerger Merge Worker
Browse files

Merge "Keyguard - Migrate indication area" into udc-qpr-dev am: 7fbd2d37 am: d46ee7e7 

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



Change-Id: I7b56ed61dfffe3c83f3f4511302e38eea29f9799
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 10b822e9 d46ee7e7

packages/SystemUI/res/layout/keyguard_bottom_area.xml

+4 −5
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
    android:outlineProvider="none" >



    <LinearLayout

        android:id="@+id/keyguard_indication_area"

        android:id="@id/keyguard_indication_area"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginBottom="@dimen/keyguard_indication_margin_bottom"
@@ -31,7 +31,7 @@ 
        android:orientation="vertical">



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

            android:id="@+id/keyguard_indication_text"

            android:id="@id/keyguard_indication_text"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:gravity="center"
@@ -41,13 +41,12 @@ 
            android:accessibilityLiveRegion="polite"/>



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

            android:id="@+id/keyguard_indication_text_bottom"

            android:id="@id/keyguard_indication_text_bottom"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:gravity="center"

            android:minHeight="48dp"

            android:minHeight="@dimen/keyguard_indication_text_min_height"

            android:layout_gravity="center_horizontal"

            android:layout_centerHorizontal="true"

            android:paddingStart="@dimen/keyguard_indication_text_padding"

            android:paddingEnd="@dimen/keyguard_indication_text_padding"

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

packages/SystemUI/res/layout/super_notification_shade.xml

+6 −0
Original line number Diff line number Diff line
@@ -70,6 +70,12 @@ 
             android:layout_height="match_parent"

             android:visibility="invisible" />



    <!-- Root for all keyguard content. It was previously located within the shade. -->

    <com.android.systemui.keyguard.ui.view.KeyguardRootView

        android:id="@id/keyguard_root_view"

        android:layout_width="match_parent"

        android:layout_height="match_parent" />



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



    <com.android.systemui.scrim.ScrimView

packages/SystemUI/res/values/dimens.xml

+3 −0
Original line number Diff line number Diff line
@@ -275,6 +275,9 @@ 
    <!-- The padding at start and end of indication text shown on AOD -->

    <dimen name="keyguard_indication_text_padding">16dp</dimen>



    <!-- The min height on the indication text shown on AOD -->

    <dimen name="keyguard_indication_text_min_height">48dp</dimen>



    <!-- Shadows under the clock, date and other keyguard text fields -->

    <dimen name="keyguard_shadow_radius">5</dimen>

packages/SystemUI/res/values/ids.xml

+5 −1
Original line number Diff line number Diff line
@@ -206,5 +206,9 @@ 


    <!-- keyboard backlight indicator-->

    <item type="id" name="backlight_icon" />

</resources>



    <item type="id" name="keyguard_root_view" />

    <item type="id" name="keyguard_indication_area" />

    <item type="id" name="keyguard_indication_text" />

    <item type="id" name="keyguard_indication_text_bottom" />

</resources>

packages/SystemUI/src/com/android/systemui/dagger/SystemUICoreStartableModule.kt

+6 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import com.android.systemui.globalactions.GlobalActionsComponent 
import com.android.systemui.keyboard.KeyboardUI

import com.android.systemui.keyboard.PhysicalKeyboardCoreStartable

import com.android.systemui.keyguard.KeyguardViewMediator

import com.android.systemui.keyguard.KeyguardViewConfigurator

import com.android.systemui.keyguard.data.quickaffordance.MuteQuickAffordanceCoreStartable

import com.android.systemui.log.SessionTracker

import com.android.systemui.media.RingtonePlayer
@@ -295,4 +296,9 @@ abstract class SystemUICoreStartableModule { 
    @IntoMap

    @ClassKey(AssistantAttentionMonitor::class)

    abstract fun bindAssistantAttentionMonitor(sysui: AssistantAttentionMonitor): CoreStartable



    @Binds

    @IntoMap

    @ClassKey(KeyguardViewConfigurator::class)

    abstract fun bindKeyguardViewConfigurator(impl: KeyguardViewConfigurator): CoreStartable

}