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

Commit 2a6ea9c2 authored by Jason Monk's avatar Jason Monk
Browse files

Delete BaseStatusBar 

It is a relic of a more complex time, but has passed out of all
knowledge for too long.

Test: manual testing on phones and TV
Change-Id: I62a15d9413ea4bda3ac82bf6f7d22c096e2c1cdc
parent 1f2df9af

packages/SystemUI/plugin/src/com/android/systemui/plugins/Plugin.java

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ import android.content.Context; 
 *        new PluginListener<OverlayPlugin>() {

 *        @Override

 *        public void onPluginConnected(OverlayPlugin plugin) {

 *            PhoneStatusBar phoneStatusBar = getComponent(PhoneStatusBar.class);

 *            StatusBar phoneStatusBar = getComponent(StatusBar.class);

 *            if (phoneStatusBar != null) {

 *                plugin.setup(phoneStatusBar.getStatusBarWindow(),

 *                phoneStatusBar.getNavigationBarView());

packages/SystemUI/proguard.flags

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
}



-keep class com.android.systemui.statusbar.car.CarStatusBar

-keep class com.android.systemui.statusbar.phone.PhoneStatusBar

-keep class com.android.systemui.statusbar.phone.StatusBar

-keep class com.android.systemui.statusbar.tv.TvStatusBar

-keep class com.android.systemui.car.CarSystemUIFactory

-keep class com.android.systemui.SystemUIFactory

packages/SystemUI/res/values/config.xml

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 


    <!-- Component to be used as the status bar service.  Must implement the IStatusBar

     interface.  This name is in the ComponentName flattened format (package/class)  -->

    <string name="config_statusBarComponent" translatable="false">com.android.systemui.statusbar.phone.PhoneStatusBar</string>

    <string name="config_statusBarComponent" translatable="false">com.android.systemui.statusbar.phone.StatusBar</string>



    <!-- Whether or not we show the number in the bar. -->

    <bool name="config_statusBarShowNumber">false</bool>

packages/SystemUI/src/com/android/systemui/ActivityStarterDelegate.java

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ import android.content.Intent; 


/**

 * Single common instance of ActivityStarter that can be gotten and referenced from anywhere, but

 * delegates to an actual implementation such as PhoneStatusBar, assuming it exists.

 * delegates to an actual implementation such as StatusBar, assuming it exists.

 */

public class ActivityStarterDelegate implements ActivityStarter {

packages/SystemUI/src/com/android/systemui/LatencyTester.java

+2 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ import android.os.SystemClock; 
import com.android.keyguard.KeyguardUpdateMonitor;

import com.android.keyguard.LatencyTracker;

import com.android.systemui.statusbar.phone.FingerprintUnlockController;

import com.android.systemui.statusbar.phone.PhoneStatusBar;

import com.android.systemui.statusbar.phone.StatusBar;



/**

 * Class that only runs on debuggable builds that listens to broadcasts that simulate actions in the
@@ -72,7 +72,7 @@ public class LatencyTester extends SystemUI { 
    }



    private void fakeWakeAndUnlock() {

        FingerprintUnlockController fingerprintUnlockController = getComponent(PhoneStatusBar.class)

        FingerprintUnlockController fingerprintUnlockController = getComponent(StatusBar.class)

                .getFingerprintUnlockController();

        fingerprintUnlockController.onFingerprintAcquired();

        fingerprintUnlockController.onFingerprintAuthenticated(