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

Commit ae641c9c authored by John Spurlock's avatar John Spurlock
Browse files

Implement new volume UI design. 

- Add segmented zen-mode picker to the rocker UI.
- Add a new "no interruptions" value to the zen setting.
- Implement expandable condition subpanel on the rocker UI.
- Remove the old circle&slash icons.
- Suppress alarm sounds if in "no interruptions" mode.
- Add warning re: alarms to the condition UI.
- Allow rocker UI to display over the keyguard.
- Remove Notifications QS tile.
- Realign volume rocker to the top of the screen.
- Add support for new "days" sleepMode.
- New icon policy rules for "volume" slot.
- New important icon (star).

Associated Settings change:
  I6ed56791784968adfbd684f490dbbebed285a2dd

Bug:15831713
Change-Id: I35afe38646f04d2ba0dbac11c2c6356120a33694
parent 070d6677

core/java/android/provider/Settings.java

+7 −4
Original line number Diff line number Diff line
@@ -6190,18 +6190,21 @@ public final class Settings { 
                "lock_screen_show_notifications";



        /**

         * Defines global zen mode.  ZEN_MODE_OFF or ZEN_MODE_ON.

         * Defines global zen mode.  ZEN_MODE_OFF, ZEN_MODE_IMPORTANT_INTERRUPTIONS,

         * or ZEN_MODE_NO_INTERRUPTIONS.

         *

         * @hide

         */

        public static final String ZEN_MODE = "zen_mode";



        /** @hide */ public static final int ZEN_MODE_OFF = 0;

        /** @hide */ public static final int ZEN_MODE_ON = 1;

        /** @hide */ public static final int ZEN_MODE_IMPORTANT_INTERRUPTIONS = 1;

        /** @hide */ public static final int ZEN_MODE_NO_INTERRUPTIONS = 2;



        /** @hide */ public static String zenModeToString(int mode) {

            if (mode == ZEN_MODE_OFF) return "ZEN_MODE_OFF";

            return "ZEN_MODE_ON";

            if (mode == ZEN_MODE_IMPORTANT_INTERRUPTIONS) return "ZEN_MODE_IMPORTANT_INTERRUPTIONS";

            if (mode == ZEN_MODE_NO_INTERRUPTIONS) return "ZEN_MODE_NO_INTERRUPTIONS";

            return "ZEN_MODE_OFF";

        }



        /**

core/java/android/service/notification/ZenModeConfig.java

+43 −7
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import org.xmlpull.v1.XmlSerializer; 
import java.io.IOException;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.Calendar;

import java.util.Objects;



/**
@@ -42,12 +43,18 @@ public class ZenModeConfig implements Parcelable { 


    public static final String SLEEP_MODE_NIGHTS = "nights";

    public static final String SLEEP_MODE_WEEKNIGHTS = "weeknights";

    public static final String SLEEP_MODE_DAYS_PREFIX = "days:";



    public static final int SOURCE_ANYONE = 0;

    public static final int SOURCE_CONTACT = 1;

    public static final int SOURCE_STAR = 2;

    public static final int MAX_SOURCE = SOURCE_STAR;



    public static final int[] ALL_DAYS = { Calendar.SUNDAY, Calendar.MONDAY, Calendar.TUESDAY,

            Calendar.WEDNESDAY, Calendar.THURSDAY, Calendar.FRIDAY, Calendar.SATURDAY };

    public static final int[] WEEKNIGHT_DAYS = { Calendar.SUNDAY, Calendar.MONDAY, Calendar.TUESDAY,

            Calendar.WEDNESDAY, Calendar.THURSDAY };



    private static final int XML_VERSION = 1;

    private static final String ZEN_TAG = "zen";

    private static final String ZEN_ATT_VERSION = "version";
@@ -198,8 +205,39 @@ public class ZenModeConfig implements Parcelable { 
    public boolean isValid() {

        return isValidHour(sleepStartHour) && isValidMinute(sleepStartMinute)

                && isValidHour(sleepEndHour) && isValidMinute(sleepEndMinute)

                && (sleepMode == null || sleepMode.equals(SLEEP_MODE_NIGHTS)

                    || sleepMode.equals(SLEEP_MODE_WEEKNIGHTS));

                && isValidSleepMode(sleepMode);

    }



    public static boolean isValidSleepMode(String sleepMode) {

        return sleepMode == null || sleepMode.equals(SLEEP_MODE_NIGHTS)

                || sleepMode.equals(SLEEP_MODE_WEEKNIGHTS) || tryParseDays(sleepMode) != null;

    }



    public static int[] tryParseDays(String sleepMode) {

        if (sleepMode == null) return null;

        sleepMode = sleepMode.trim();

        if (SLEEP_MODE_NIGHTS.equals(sleepMode)) return ALL_DAYS;

        if (SLEEP_MODE_WEEKNIGHTS.equals(sleepMode)) return WEEKNIGHT_DAYS;

        if (!sleepMode.startsWith(SLEEP_MODE_DAYS_PREFIX)) return null;

        if (sleepMode.equals(SLEEP_MODE_DAYS_PREFIX)) return null;

        final String[] tokens = sleepMode.substring(SLEEP_MODE_DAYS_PREFIX.length()).split(",");

        if (tokens.length == 0) return null;

        final int[] rt = new int[tokens.length];

        for (int i = 0; i < tokens.length; i++) {

            final int day = tryParseInt(tokens[i], -1);

            if (day == -1) return null;

            rt[i] = day;

        }

        return rt;

    }



    private static int tryParseInt(String value, int defValue) {

        if (TextUtils.isEmpty(value)) return defValue;

        try {

            return Integer.valueOf(value);

        } catch (NumberFormatException e) {

            return defValue;

        }

    }



    public static ZenModeConfig readXml(XmlPullParser parser)
@@ -209,7 +247,7 @@ public class ZenModeConfig implements Parcelable { 
        String tag = parser.getName();

        if (!ZEN_TAG.equals(tag)) return null;

        final ZenModeConfig rt = new ZenModeConfig();

        final int version = Integer.parseInt(parser.getAttributeValue(null, ZEN_ATT_VERSION));

        final int version = safeInt(parser, ZEN_ATT_VERSION, XML_VERSION);

        final ArrayList<ComponentName> conditionComponents = new ArrayList<ComponentName>();

        final ArrayList<Uri> conditionIds = new ArrayList<Uri>();

        while ((type = parser.next()) != XmlPullParser.END_DOCUMENT) {
@@ -232,8 +270,7 @@ public class ZenModeConfig implements Parcelable { 
                    }

                } else if (SLEEP_TAG.equals(tag)) {

                    final String mode = parser.getAttributeValue(null, SLEEP_ATT_MODE);

                    rt.sleepMode = (SLEEP_MODE_NIGHTS.equals(mode)

                            || SLEEP_MODE_WEEKNIGHTS.equals(mode)) ? mode : null;

                    rt.sleepMode = isValidSleepMode(mode)? mode : null;

                    final int startHour = safeInt(parser, SLEEP_ATT_START_HR, 0);

                    final int startMinute = safeInt(parser, SLEEP_ATT_START_MIN, 0);

                    final int endHour = safeInt(parser, SLEEP_ATT_END_HR, 0);
@@ -312,8 +349,7 @@ public class ZenModeConfig implements Parcelable { 


    private static int safeInt(XmlPullParser parser, String att, int defValue) {

        final String val = parser.getAttributeValue(null, att);

        if (TextUtils.isEmpty(val)) return defValue;

        return Integer.valueOf(val);

        return tryParseInt(val, defValue);

    }



    private static ComponentName safeComponentName(XmlPullParser parser, String att) {

media/java/android/media/AudioService.java

+7 −5
Original line number Diff line number Diff line
@@ -109,12 +109,12 @@ public class AudioService extends IAudioService.Stub { 
    private static final String TAG = "AudioService";



    /** Debug remote control client/display feature */

    protected static final boolean DEBUG_RC = false;

    protected static final boolean DEBUG_RC = Log.isLoggable(TAG + ".RC", Log.DEBUG);

    /** Debug volumes */

    protected static final boolean DEBUG_VOL = false;

    protected static final boolean DEBUG_VOL = Log.isLoggable(TAG + ".VOL", Log.DEBUG);



    /** debug calls to media session apis */

    private static final boolean DEBUG_SESSIONS = true;

    private static final boolean DEBUG_SESSIONS = Log.isLoggable(TAG + ".SESSIONS", Log.DEBUG);



    /** Allow volume changes to set ringer mode to silent? */

    private static final boolean VOLUME_SETS_RINGER_MODE_SILENT = false;
@@ -841,7 +841,8 @@ public class AudioService extends IAudioService.Stub { 
    /** @see AudioManager#adjustVolume(int, int) */

    public void adjustSuggestedStreamVolume(int direction, int suggestedStreamType, int flags,

            String callingPackage) {

        if (DEBUG_VOL) Log.d(TAG, "adjustSuggestedStreamVolume() stream="+suggestedStreamType);

        if (DEBUG_VOL) Log.d(TAG, "adjustSuggestedStreamVolume() stream="+suggestedStreamType

                + ", flags=" + flags);

        int streamType;

        if (mVolumeControlStream != -1) {

            streamType = mVolumeControlStream;
@@ -871,7 +872,8 @@ public class AudioService extends IAudioService.Stub { 
        if (mUseFixedVolume) {

            return;

        }

        if (DEBUG_VOL) Log.d(TAG, "adjustStreamVolume() stream="+streamType+", dir="+direction);

        if (DEBUG_VOL) Log.d(TAG, "adjustStreamVolume() stream="+streamType+", dir="+direction

                + ", flags="+flags);



        ensureValidDirection(direction);

        ensureValidStreamType(streamType);

packages/Keyguard/src/com/android/keyguard/KeyguardViewBase.java

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ public abstract class KeyguardViewBase extends FrameLayout implements SecurityCa 
    // Whether the volume keys should be handled by keyguard. If true, then

    // they will be handled here for specific media types such as music, otherwise

    // the audio service will bring up the volume dialog.

    private static final boolean KEYGUARD_MANAGES_VOLUME = true;

    private static final boolean KEYGUARD_MANAGES_VOLUME = false;

    public static final boolean DEBUG = KeyguardConstants.DEBUG;

    private static final String TAG = "KeyguardViewBase";

packages/SystemUI/res/color/segmented_button_text_selector.xml

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

<!--

     Copyright (C) 2014 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. ?android:attr/colorControlHighlight"

-->



<selector xmlns:android="http://schemas.android.com/apk/res/android">



    <item android:state_selected="true" android:color="@android:color/white"/>

    <item android:color="@color/segmented_button_text_inactive"/>



</selector>
 
 No newline at end of file