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

Commit 9ea643e8 authored by Jerry Chang's avatar Jerry Chang Committed by android-build-merger
Browse files

Merge "Extract keyguard indication view overlay" into qt-qpr1-dev 

am: dff17fc1

Change-Id: I46e857e306998504a79e2f839b3955f4e0621340
parents d69ea794 dff17fc1

packages/SystemUI/res/layout/keyguard_bottom_area.xml

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

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



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



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



        <LinearLayout

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_weight="1"

            android:layout_gravity="center_vertical|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>



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



    </LinearLayout>

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



    <FrameLayout

        android:id="@+id/preview_container"

packages/SystemUI/res/layout/keyguard_indication_area_overlay.xml

0 → 100644
+13 −0
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

0 → 100644
+24 −0
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

packages/SystemUI/res/layout/left_docked_overlay.xml

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

<!--

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

  -->



<!-- empty stub -->

<merge />

packages/SystemUI/res/layout/right_docked_overlay.xml

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

<!--

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

  -->



<!-- empty stub -->

<merge />