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

Commit f7b79151 authored by Joe Onorato's avatar Joe Onorato Committed by Android Git Automerger
Browse files

am ae706c10: Merge changes... 

am ae706c10: Merge changes Ia5884ef4,Ie495a41d,I3f7066c2,If5faf446,I6ae0740f,I57b2d296,Iea78a637 into kraken
parents b5f9b4f1 ae706c10

core/java/com/android/internal/statusbar/IStatusBarService.aidl

+3 −1
Original line number Diff line number Diff line
@@ -32,9 +32,11 @@ interface IStatusBarService 
    void removeIcon(String slot);



    // ---- Methods below are for use by the status bar policy services ----

    // You need the STATUS_BAR_SERVICE permission

    void registerStatusBar(IStatusBar callbacks, out StatusBarIconList iconList,

            out List<IBinder> notificationKeys, out List<StatusBarNotification> notifications);

    void visibilityChanged(boolean visible);

    void onPanelRevealed();

    void onNotificationClick(String pkg, String tag, int id);

    void onNotificationError(String pkg, String tag, int id, String message);

    void onClearAllNotifications();

}

core/res/AndroidManifest.xml

+7 −0
Original line number Diff line number Diff line
@@ -908,6 +908,13 @@ 
        android:description="@string/permdesc_statusBar"

        android:protectionLevel="signatureOrSystem" />



    <!-- Allows an application to be the status bar.  Currently used only by SystemUI.apk

    @hide -->

    <permission android:name="android.permission.STATUS_BAR_SERVICE"

        android:label="@string/permlab_statusBarService"

        android:description="@string/permdesc_statusBarService"

        android:protectionLevel="signature" />



    <!-- Allows an application to force a BACK operation on whatever is the

         top activity. -->

    <permission android:name="android.permission.FORCE_BACK"

core/res/res/values/arrays.xml

+0 −24
Original line number Diff line number Diff line
@@ -117,28 +117,4 @@ 
        <item>3</item>

    </integer-array>



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

         icons in the status bar that are not notifications. -->

    <string-array name="status_bar_icon_order">

       <item><xliff:g id="id">ime</xliff:g></item>

       <item><xliff:g id="id">sync_failing</xliff:g></item>

       <item><xliff:g id="id">sync_active</xliff:g></item>

       <item><xliff:g id="id">gps</xliff:g></item>

       <item><xliff:g id="id">bluetooth</xliff:g></item>

       <item><xliff:g id="id">tty</xliff:g></item>

       <item><xliff:g id="id">speakerphone</xliff:g></item>

       <item><xliff:g id="id">mute</xliff:g></item>

       <item><xliff:g id="id">volume</xliff:g></item>

       <item><xliff:g id="id">tty</xliff:g></item>

       <item><xliff:g id="id">wifi</xliff:g></item>

       <item><xliff:g id="id">cdma_eri</xliff:g></item>

       <item><xliff:g id="id">data_connection</xliff:g></item>

       <item><xliff:g id="id">phone_evdo_signal</xliff:g></item>

       <item><xliff:g id="id">phone_signal</xliff:g></item>

       <item><xliff:g id="id">battery</xliff:g></item>

       <item><xliff:g id="id">alarm_clock</xliff:g></item>

       <item><xliff:g id="id">secure</xliff:g></item>

       <item><xliff:g id="id">clock</xliff:g></item>

    </string-array>



</resources>

core/res/res/values/config.xml

+29 −1
Original line number Diff line number Diff line
@@ -19,7 +19,35 @@ 


<!-- These resources are around just to allow their values to be customized

     for different hardware and product builds. -->

<resources>

<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>



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

         icons in the status bar that are not notifications. -->

    <string-array name="config_statusBarIcons">

       <item><xliff:g id="id">ime</xliff:g></item>

       <item><xliff:g id="id">sync_failing</xliff:g></item>

       <item><xliff:g id="id">sync_active</xliff:g></item>

       <item><xliff:g id="id">gps</xliff:g></item>

       <item><xliff:g id="id">bluetooth</xliff:g></item>

       <item><xliff:g id="id">tty</xliff:g></item>

       <item><xliff:g id="id">speakerphone</xliff:g></item>

       <item><xliff:g id="id">mute</xliff:g></item>

       <item><xliff:g id="id">volume</xliff:g></item>

       <item><xliff:g id="id">tty</xliff:g></item>

       <item><xliff:g id="id">wifi</xliff:g></item>

       <item><xliff:g id="id">cdma_eri</xliff:g></item>

       <item><xliff:g id="id">data_connection</xliff:g></item>

       <item><xliff:g id="id">phone_evdo_signal</xliff:g></item>

       <item><xliff:g id="id">phone_signal</xliff:g></item>

       <item><xliff:g id="id">battery</xliff:g></item>

       <item><xliff:g id="id">alarm_clock</xliff:g></item>

       <item><xliff:g id="id">secure</xliff:g></item>

       <item><xliff:g id="id">clock</xliff:g></item>

    </string-array>



    <!-- Flag indicating whether the surface flinger has limited

         alpha compositing functionality in hardware.  If set, the window

         manager will disable alpha trasformation in animations where not

core/res/res/values/strings.xml

+5 −0
Original line number Diff line number Diff line
@@ -392,6 +392,11 @@ 
    <string name="permdesc_statusBar">Allows application to disable

        the status bar or add and remove system icons.</string>



    <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->

    <string name="permlab_statusBarService">status bar</string>

    <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->

    <string name="permdesc_statusBarService">Allows the application to be the status bar.</string>



    <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->

    <string name="permlab_expandStatusBar">expand/collapse status bar</string>

    <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->