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

Commit a4164f06 authored by Robin Lee's avatar Robin Lee Committed by Automerger Merge Worker
Browse files

Merge "SystemUI: add GlobalActionsComponent for tv [1/1]" into sc-dev am: 8766e5c1 am: 2c5b3639 

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

Change-Id: Ib510df5d8d9962c6d0044be20fc21905d4e37331
parents 48e1c8c1 2c5b3639

packages/SystemUI/res/values-television/config.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -33,6 +33,7 @@ 
        <item>com.android.systemui.statusbar.tv.notifications.TvNotificationPanel</item>

        <item>com.android.systemui.statusbar.tv.notifications.TvNotificationPanel</item>

        <item>com.android.systemui.statusbar.tv.notifications.TvNotificationHandler</item>

        <item>com.android.systemui.statusbar.tv.notifications.TvNotificationHandler</item>

        <item>com.android.systemui.statusbar.tv.VpnStatusObserver</item>

        <item>com.android.systemui.statusbar.tv.VpnStatusObserver</item>

        <item>com.android.systemui.globalactions.GlobalActionsComponent</item>

        <item>com.android.systemui.usb.StorageNotification</item>

        <item>com.android.systemui.usb.StorageNotification</item>

        <item>com.android.systemui.power.PowerUI</item>

        <item>com.android.systemui.power.PowerUI</item>

        <item>com.android.systemui.media.RingtonePlayer</item>

        <item>com.android.systemui.media.RingtonePlayer</item>

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java

+3 −0
Original line number Original line Diff line number Diff line
@@ -899,6 +899,9 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
    };

    };





    protected void updateStates() {

    protected void updateStates() {

        if (mContainer == null ) {

            return;

        }

        int vis = mContainer.getSystemUiVisibility();

        int vis = mContainer.getSystemUiVisibility();

        boolean showing = mShowing;

        boolean showing = mShowing;

        boolean occluded = mOccluded;

        boolean occluded = mOccluded;