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

Commit f3c3c4fd authored by Joe Onorato's avatar Joe Onorato
Browse files

Refactor SystemUI so the status bar isn't a Service of its own. 

There is now one SystemUIService, which starts the status bar service.
Pretty soon there will be other things running in here too.  This way
we don't need to have each of them started by something individually.

This also moves the choice between tablet and phone status bar into
SystemUI.apk, which seems like a much better place for it.

Change-Id: Ib69ef2f43d648764f8dbb52008f5d036a1ee07d9
parent 10e370c6

core/res/res/values-xlarge/config.xml

+0 −3
Original line number Diff line number Diff line
@@ -20,9 +20,6 @@ 
<!-- These resources are around just to allow their values to be customized

     for different hardware and product builds. -->

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <!-- 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">com.android.systemui/com.android.systemui.statusbar.tablet.TabletStatusBarService</string>

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



    <!-- see comment in values/config.xml -->

core/res/res/values/config.xml

+0 −3
Original line number Diff line number Diff line
@@ -20,9 +20,6 @@ 
<!-- These resources are around just to allow their values to be customized

     for different hardware and product builds. -->

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <!-- 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">com.android.systemui/com.android.systemui.statusbar.PhoneStatusBarService</string>

    <bool name="config_statusBarCanHide">true</bool>



    <!-- Do not translate. Defines the slots for the right-hand side icons.  That is to say, the

packages/SystemUI/AndroidManifest.xml

+6 −8
Original line number Diff line number Diff line
@@ -15,14 +15,12 @@ 
        android:label="@string/app_label"

        android:icon="@drawable/ic_launcher_settings">



        <service

            android:name=".statusbar.PhoneStatusBarService"

            android:exported="false"

            />



        <service

            android:name=".statusbar.tablet.TabletStatusBarService"

            android:exported="false"

        <!-- Broadcast receiver that gets the broadcast at boot time and starts

             up everything else.

             TODO: Should have an android:permission attribute

             -->

        <service android:name="SystemUIService"

            android:exported="true"

            />



        <activity android:name=".usb.UsbStorageActivity"

packages/SystemUI/res/layout-xlarge/status_bar.xml

+0 −2
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ 
            android:src="@drawable/ic_sysbar_open"

            android:background="@drawable/ic_sysbar_icon_bg"

            android:paddingLeft="6dip"

            android:onClick="notificationIconsClicked"

            />



        <LinearLayout
@@ -174,7 +173,6 @@ 
                android:background="@drawable/ic_sysbar_icon_bg"

                android:paddingLeft="4dip"

                android:paddingRight="4dip"

                android:onClick="recentButtonClicked"

                />

            <com.android.systemui.statusbar.KeyButtonView android:id="@+id/home"

                android:layout_width="wrap_content"

packages/SystemUI/res/layout-xlarge/status_bar_center.xml

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
    android:layout_height="match_parent"

    android:layout_centerInParent="true"

    android:clickable="true"

    android:onClick="systemInfoClicked"

    >

    <com.android.systemui.statusbar.Clock

        style="@*android:style/TextAppearance.StatusBar.Icon"