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

Commit 18cb49bb authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Adds the keyguard indication area overlays" into qt-dev

parents 6e52f838 985c3f0d

packages/SystemUI/res/layout/keyguard_bottom_area.xml

+27 −14
Original line number Diff line number Diff line
@@ -31,6 +31,15 @@ 
        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
@@ -51,6 +60,10 @@ 


        </LinearLayout>



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



    </LinearLayout>



    <FrameLayout

        android:id="@+id/preview_container"

        android:layout_width="match_parent"

packages/SystemUI/res/layout/left_docked_overlay.xml

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

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