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

Commit 7bfca5e9 authored by Austin Wang's avatar Austin Wang Committed by Automerger Merge Worker
Browse files

Merge "Add dock_info_bottom_area_overlay" into sc-dev am: b6edb9b8

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

Change-Id: I3bc4ddcaaa90f99b5d38df3d3de1ec2b093ec1ab
parents bed0930d b6edb9b8
Loading
Loading
Loading
Loading
+19 −0
Original line number Original line Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
  ~ Copyright (C) 2021 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 />
+2 −0
Original line number Original line Diff line number Diff line
@@ -101,6 +101,8 @@


    </com.android.systemui.statusbar.phone.NotificationsQuickSettingsContainer>
    </com.android.systemui.statusbar.phone.NotificationsQuickSettingsContainer>


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

    <include
    <include
        layout="@layout/keyguard_bottom_area"
        layout="@layout/keyguard_bottom_area"
        android:visibility="gone" />
        android:visibility="gone" />
+6 −2
Original line number Original line Diff line number Diff line
@@ -492,8 +492,12 @@ public class KeyguardIndicationController implements KeyguardStateController.Cal
        return UserHandle.USER_NULL;
        return UserHandle.USER_NULL;
    }
    }


    @VisibleForTesting
    /**
    protected void setVisible(boolean visible) {
     * Sets the visibility of keyguard bottom area, and if the indications are updatable.
     *
     * @param visible true to make the area visible and update the indication, false otherwise.
     */
    public void setVisible(boolean visible) {
        mVisible = visible;
        mVisible = visible;
        mIndicationArea.setVisibility(visible ? VISIBLE : GONE);
        mIndicationArea.setVisibility(visible ? VISIBLE : GONE);
        if (visible) {
        if (visible) {