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

Commit 153d0c36 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Remove keyguard_indication_area_overlay" into qt-qpr1-dev am: ad00dc04 

Change-Id: Idc63743f4b924b9132062956f62e5ec4d62770af
parents 01ace121 ad00dc04

packages/SystemUI/res/layout/keyguard_bottom_area.xml

+29 −1
Original line number Diff line number Diff line
@@ -24,7 +24,35 @@ 
    android:outlineProvider="none"

    android:elevation="5dp" > <!-- Put it above the status bar header -->



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

    <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_enterprise_disclosure"

            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:visibility="gone"/>



        <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"/>



    </LinearLayout>



    <FrameLayout

        android:id="@+id/preview_container"

packages/SystemUI/res/layout/keyguard_indication_area_overlay.xml

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



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

    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">



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



</LinearLayout>
 
 No newline at end of file

packages/SystemUI/res/layout/keyguard_indication_text_view.xml

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



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



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

        android:id="@+id/keyguard_indication_enterprise_disclosure"

        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:visibility="gone"/>



    <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"/>

</merge>
 
 No newline at end of file