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

Commit 2ff37206 authored by Juan Flores's avatar Juan Flores Committed by Yoshinori Hirano
Browse files

Alarm icon is not shown for secondary users 

The alarm icon is not shown in the status bar
when switching to a secondary user and setting an alarm.

Bug: 27688859
Change-Id: I9731e6772560853282b6c0348d647024d3424190
parent d21b6420

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -622,7 +622,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 




        // Lastly, call to the icon policy to install/update all the icons.

        // Lastly, call to the icon policy to install/update all the icons.

        mIconPolicy = new PhoneStatusBarPolicy(mContext, mCastController, mHotspotController,

        mIconPolicy = new PhoneStatusBarPolicy(mContext, mCastController, mHotspotController,

                mUserInfoController, mBluetoothController);

                mUserInfoController, mBluetoothController, mNextAlarmController);

        mIconPolicy.setCurrentUserSetup(mUserSetup);

        mIconPolicy.setCurrentUserSetup(mUserSetup);

        mSettingsObserver.onChange(false); // set up

        mSettingsObserver.onChange(false); // set up

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

+16 −7
Original line number Original line Diff line number Diff line
@@ -45,6 +45,8 @@ import com.android.systemui.statusbar.policy.BluetoothController.Callback; 
import com.android.systemui.statusbar.policy.CastController;

import com.android.systemui.statusbar.policy.CastController;

import com.android.systemui.statusbar.policy.CastController.CastDevice;

import com.android.systemui.statusbar.policy.CastController.CastDevice;

import com.android.systemui.statusbar.policy.HotspotController;

import com.android.systemui.statusbar.policy.HotspotController;

import com.android.systemui.statusbar.policy.NextAlarmController;

import com.android.systemui.statusbar.policy.NextAlarmController.NextAlarmChangeCallback;

import com.android.systemui.statusbar.policy.UserInfoController;

import com.android.systemui.statusbar.policy.UserInfoController;





/**

/**
@@ -70,6 +72,7 @@ public class PhoneStatusBarPolicy implements Callback { 
    private final Handler mHandler = new Handler();

    private final Handler mHandler = new Handler();

    private final CastController mCast;

    private final CastController mCast;

    private final HotspotController mHotspot;

    private final HotspotController mHotspot;

    private final NextAlarmController mNextAlarm;

    private final AlarmManager mAlarmManager;

    private final AlarmManager mAlarmManager;

    private final UserInfoController mUserInfoController;

    private final UserInfoController mUserInfoController;
@@ -93,10 +96,7 @@ public class PhoneStatusBarPolicy implements Callback { 
        @Override

        @Override

        public void onReceive(Context context, Intent intent) {

        public void onReceive(Context context, Intent intent) {

            String action = intent.getAction();

            String action = intent.getAction();

            if (action.equals(AlarmManager.ACTION_NEXT_ALARM_CLOCK_CHANGED)) {

            if (action.equals(AudioManager.RINGER_MODE_CHANGED_ACTION) ||

                updateAlarm();

            }

            else if (action.equals(AudioManager.RINGER_MODE_CHANGED_ACTION) ||

                    action.equals(AudioManager.INTERNAL_RINGER_MODE_CHANGED_ACTION)) {

                    action.equals(AudioManager.INTERNAL_RINGER_MODE_CHANGED_ACTION)) {

                updateVolumeZen();

                updateVolumeZen();

            }

            }
@@ -118,19 +118,20 @@ public class PhoneStatusBarPolicy implements Callback { 
    };

    };





    public PhoneStatusBarPolicy(Context context, CastController cast, HotspotController hotspot,

    public PhoneStatusBarPolicy(Context context, CastController cast, HotspotController hotspot,

            UserInfoController userInfoController, BluetoothController bluetooth) {

            UserInfoController userInfoController, BluetoothController bluetooth,

            NextAlarmController nextAlarm) {

        mContext = context;

        mContext = context;

        mCast = cast;

        mCast = cast;

        mHotspot = hotspot;

        mHotspot = hotspot;

        mBluetooth = bluetooth;

        mBluetooth = bluetooth;

        mBluetooth.addStateChangedCallback(this);

        mBluetooth.addStateChangedCallback(this);

        mService = (StatusBarManager) context.getSystemService(Context.STATUS_BAR_SERVICE);

        mService = (StatusBarManager) context.getSystemService(Context.STATUS_BAR_SERVICE);

        mNextAlarm = nextAlarm;

        mAlarmManager = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);

        mAlarmManager = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);

        mUserInfoController = userInfoController;

        mUserInfoController = userInfoController;





        // listen for broadcasts

        // listen for broadcasts

        IntentFilter filter = new IntentFilter();

        IntentFilter filter = new IntentFilter();

        filter.addAction(AlarmManager.ACTION_NEXT_ALARM_CLOCK_CHANGED);

        filter.addAction(AudioManager.RINGER_MODE_CHANGED_ACTION);

        filter.addAction(AudioManager.RINGER_MODE_CHANGED_ACTION);

        filter.addAction(AudioManager.INTERNAL_RINGER_MODE_CHANGED_ACTION);

        filter.addAction(AudioManager.INTERNAL_RINGER_MODE_CHANGED_ACTION);

        filter.addAction(TelephonyIntents.ACTION_SIM_STATE_CHANGED);

        filter.addAction(TelephonyIntents.ACTION_SIM_STATE_CHANGED);
@@ -154,6 +155,7 @@ public class PhoneStatusBarPolicy implements Callback { 
        // Alarm clock

        // Alarm clock

        mService.setIcon(SLOT_ALARM_CLOCK, R.drawable.stat_sys_alarm, 0, null);

        mService.setIcon(SLOT_ALARM_CLOCK, R.drawable.stat_sys_alarm, 0, null);

        mService.setIconVisibility(SLOT_ALARM_CLOCK, false);

        mService.setIconVisibility(SLOT_ALARM_CLOCK, false);

        mNextAlarm.addStateChangedCallback(mNextAlarmCallback);





        // zen

        // zen

        mService.setIcon(SLOT_ZEN, R.drawable.stat_sys_zen_important, 0, null);

        mService.setIcon(SLOT_ZEN, R.drawable.stat_sys_zen_important, 0, null);
@@ -387,7 +389,6 @@ public class PhoneStatusBarPolicy implements Callback { 




                @Override

                @Override

                public void onUserSwitchComplete(int newUserId) throws RemoteException {

                public void onUserSwitchComplete(int newUserId) throws RemoteException {

                    updateAlarm();

                    profileChanged(newUserId);

                    profileChanged(newUserId);

                }

                }
@@ -411,6 +412,14 @@ public class PhoneStatusBarPolicy implements Callback { 
        }

        }

    };

    };





    private final NextAlarmController.NextAlarmChangeCallback mNextAlarmCallback =

            new NextAlarmController.NextAlarmChangeCallback() {

        @Override

        public void onNextAlarmChanged(AlarmManager.AlarmClockInfo nextAlarm) {

            updateAlarm();

        }

    };



    public void appTransitionStarting(long startTime, long duration) {

    public void appTransitionStarting(long startTime, long duration) {

        updateManagedProfile();

        updateManagedProfile();

    }

    }