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

Commit ce5a0633 authored by DvTonder's avatar DvTonder Committed by Gerrit Code Review
Browse files

Merge "Framework: Enable multi-user support for Quiet Hours" into cm-10.1

parents 177c046e db77aa1e

services/java/com/android/server/BatteryService.java

+8 −8
Original line number Diff line number Diff line
@@ -873,14 +873,14 @@ public final class BatteryService extends Binder { 
                    res.getInteger(com.android.internal.R.integer.config_notificationsBatteryFullARGB));



            // Quiet Hours

            mQuietHoursEnabled = Settings.System.getInt(resolver,

                    Settings.System.QUIET_HOURS_ENABLED, 0) != 0;

            mQuietHoursStart = Settings.System.getInt(resolver,

                    Settings.System.QUIET_HOURS_START, 0);

            mQuietHoursEnd = Settings.System.getInt(resolver,

                    Settings.System.QUIET_HOURS_END, 0);

            mQuietHoursDim = Settings.System.getInt(resolver,

                    Settings.System.QUIET_HOURS_DIM, 0) != 0; 

            mQuietHoursEnabled = Settings.System.getIntForUser(resolver,

                    Settings.System.QUIET_HOURS_ENABLED, 0, UserHandle.USER_CURRENT) != 0;

            mQuietHoursStart = Settings.System.getIntForUser(resolver,

                    Settings.System.QUIET_HOURS_START, 0, UserHandle.USER_CURRENT);

            mQuietHoursEnd = Settings.System.getIntForUser(resolver,

                    Settings.System.QUIET_HOURS_END, 0, UserHandle.USER_CURRENT);

            mQuietHoursDim = Settings.System.getIntForUser(resolver,

                    Settings.System.QUIET_HOURS_DIM, 0, UserHandle.USER_CURRENT) != 0;



            updateLedPulse();

        }

services/java/com/android/server/NotificationManagerService.java

+12 −12
Original line number Diff line number Diff line
@@ -684,18 +684,18 @@ public class NotificationManagerService extends INotificationManager.Stub 


        public void update() {

            ContentResolver resolver = mContext.getContentResolver();

            mQuietHoursEnabled = Settings.System.getInt(resolver,

                    Settings.System.QUIET_HOURS_ENABLED, 0) != 0;

            mQuietHoursStart = Settings.System.getInt(resolver,

                    Settings.System.QUIET_HOURS_START, 0);

            mQuietHoursEnd = Settings.System.getInt(resolver,

                    Settings.System.QUIET_HOURS_END, 0);

            mQuietHoursMute = Settings.System.getInt(resolver,

                    Settings.System.QUIET_HOURS_MUTE, 0) != 0;

            mQuietHoursStill = Settings.System.getInt(resolver,

                    Settings.System.QUIET_HOURS_STILL, 0) != 0;

            mQuietHoursDim = Settings.System.getInt(resolver,

                    Settings.System.QUIET_HOURS_DIM, 0) != 0;

            mQuietHoursEnabled = Settings.System.getIntForUser(resolver,

                    Settings.System.QUIET_HOURS_ENABLED, 0, UserHandle.USER_CURRENT) != 0;

            mQuietHoursStart = Settings.System.getIntForUser(resolver,

                    Settings.System.QUIET_HOURS_START, 0, UserHandle.USER_CURRENT);

            mQuietHoursEnd = Settings.System.getIntForUser(resolver,

                    Settings.System.QUIET_HOURS_END, 0, UserHandle.USER_CURRENT);

            mQuietHoursMute = Settings.System.getIntForUser(resolver,

                    Settings.System.QUIET_HOURS_MUTE, 0, UserHandle.USER_CURRENT) != 0;

            mQuietHoursStill = Settings.System.getIntForUser(resolver,

                    Settings.System.QUIET_HOURS_STILL, 0, UserHandle.USER_CURRENT) != 0;

            mQuietHoursDim = Settings.System.getIntForUser(resolver,

                    Settings.System.QUIET_HOURS_DIM, 0, UserHandle.USER_CURRENT) != 0;

        }

    }

services/java/com/android/server/VibratorService.java

+8 −8
Original line number Diff line number Diff line
@@ -166,14 +166,14 @@ public class VibratorService extends IVibratorService.Stub 
    }



    private boolean inQuietHours() {

        boolean quietHoursEnabled = Settings.System.getInt(mContext.getContentResolver(),

                Settings.System.QUIET_HOURS_ENABLED, 0) != 0;

        int quietHoursStart = Settings.System.getInt(mContext.getContentResolver(),

                Settings.System.QUIET_HOURS_START, 0);

        int quietHoursEnd = Settings.System.getInt(mContext.getContentResolver(),

                Settings.System.QUIET_HOURS_END, 0);

        boolean quietHoursHaptic = Settings.System.getInt(mContext.getContentResolver(),

                Settings.System.QUIET_HOURS_HAPTIC, 0) != 0;

        boolean quietHoursEnabled = Settings.System.getIntForUser(mContext.getContentResolver(),

                Settings.System.QUIET_HOURS_ENABLED, 0, UserHandle.USER_CURRENT) != 0;

        int quietHoursStart = Settings.System.getIntForUser(mContext.getContentResolver(),

                Settings.System.QUIET_HOURS_START, 0, UserHandle.USER_CURRENT);

        int quietHoursEnd = Settings.System.getIntForUser(mContext.getContentResolver(),

                Settings.System.QUIET_HOURS_END, 0, UserHandle.USER_CURRENT);

        boolean quietHoursHaptic = Settings.System.getIntForUser(mContext.getContentResolver(),

                Settings.System.QUIET_HOURS_HAPTIC, 0, UserHandle.USER_CURRENT) != 0;

        if (quietHoursEnabled && quietHoursHaptic && (quietHoursStart != quietHoursEnd)) {

            // Get the date in "quiet hours" format.

            Calendar calendar = Calendar.getInstance();