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

Commit 75144ea3 authored by Joe Onorato's avatar Joe Onorato
Browse files

Move the status bar icon list, hopefully for the last time. 

Change-Id: Ie495a41dac03e1fe5ddccefcbd2a0673090a6db1
parent f1f25916

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

+25 −1
Original line number Diff line number Diff line
@@ -19,11 +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

packages/SystemUI/res/values/arrays.xml

deleted100644 → 0
+0 −28
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/* //device/apps/common/assets/res/any/colors.xml

**

** Copyright 2006, The Android Open Source Project

**

** Licensed under the Apache License, Version 2.0 (the "License");

** you may not use this file except in compliance with the License.

** You may obtain a copy of the License at

**

**     http://www.apache.org/licenses/LICENSE-2.0

**

** Unless required by applicable law or agreed to in writing, software

** distributed under the License is distributed on an "AS IS" BASIS,

** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

** See the License for the specific language governing permissions and

** limitations under the License.

*/

-->

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



    <!-- 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">TODO: Remove; not used.</xliff:g></item>

    </string-array>



</resources>

packages/SystemUI/src/com/android/systemui/statusbar/PhoneStatusBarService.java

+0 −2
Original line number Diff line number Diff line
@@ -116,7 +116,6 @@ public class PhoneStatusBarService extends StatusBarService { 
    Object mQueueLock = new Object();

    

    // icons

    String[] mRightIconSlots;

    LinearLayout mIcons;

    IconMerger mNotificationIcons;

    LinearLayout mStatusIcons;
@@ -202,7 +201,6 @@ public class PhoneStatusBarService extends StatusBarService { 
    // ================================================================================

    private void makeStatusBarView(Context context) {

        Resources res = context.getResources();

        mRightIconSlots = res.getStringArray(R.array.status_bar_icon_order);



        mHeight = res.getDimensionPixelSize(com.android.internal.R.dimen.status_bar_height);

        mIconWidth = mHeight;

services/java/com/android/server/StatusBarManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ public class StatusBarManagerService extends IStatusBarService.Stub 
        mContext = context;



        final Resources res = context.getResources();

        mIcons.defineSlots(res.getStringArray(com.android.internal.R.array.status_bar_icon_order));

        mIcons.defineSlots(res.getStringArray(com.android.internal.R.array.config_statusBarIcons));

    }



    public void setNotificationCallbacks(NotificationCallbacks listener) {