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

Commit 46a088e4 authored by Julia Reynolds's avatar Julia Reynolds Committed by Android Git Automerger
Browse files

am e0746d32: am 3368e69e: Merge "Remove focusablilty of the status bar." into mnc-dev 

* commit 'e0746d32':
  Remove focusablilty of the status bar.
parents 6b098bfe e0746d32

packages/SystemUI/res/layout/status_bar.xml

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
    android:id="@+id/status_bar"

    android:background="@drawable/system_bar_background"

    android:orientation="vertical"

    android:focusable="true"

    android:focusable="false"

    android:descendantFocusability="afterDescendants"

    >

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

+0 −2
Original line number Diff line number Diff line
@@ -2070,7 +2070,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
        // Expand the window to encompass the full screen in anticipation of the drag.

        // This is only possible to do atomically because the status bar is at the top of the screen!

        mStatusBarWindowManager.setPanelVisible(true);

        mStatusBarView.setFocusable(false);



        visibilityChanged(true);

        mWaitingForKeyguardExit = false;
@@ -2202,7 +2201,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
        // Shrink the window to the size of the status bar only

        mStatusBarWindowManager.setPanelVisible(false);

        mStatusBarWindowManager.setForceStatusBarVisible(false);

        mStatusBarView.setFocusable(true);



        // Close any "App info" popups that might have snuck on-screen

        dismissPopups();