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

Commit 4d6d7220 authored by John Spurlock's avatar John Spurlock Committed by Android (Google) Code Review
Browse files

Merge "Zen: Return of the alarm warning." into lmp-dev

parents 78fd9d6b 89f060a1
Loading
Loading
Loading
Loading
+7 −0
Original line number Diff line number Diff line
@@ -78,4 +78,11 @@
        android:orientation="vertical"
        android:paddingTop="3dp" />

    <TextView
        android:id="@+id/zen_alarm_warning"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:paddingTop="@dimen/qs_panel_padding"
        android:gravity="center"
        android:textAppearance="@style/TextAppearance.QS.DetailItemPrimary" />
</com.android.systemui.volume.ZenModePanel>
 No newline at end of file
+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@
    <color name="system_secondary_color">#ff384248</color>
    <color name="system_accent_color">#ff80CBC4</color><!-- deep teal 200 -->
    <color name="system_warning_color">#fff4511e</color><!-- deep orange 600 -->
    <color name="qs_text">#FFFFFFFF</color>
    <color name="qs_tile_divider">#29ffffff</color><!-- 16% white -->
    <color name="qs_tile_text">#B3FFFFFF</color><!-- 70% white -->
    <color name="qs_subhead">#66FFFFFF</color><!-- 40% white -->
+11 −2
Original line number Diff line number Diff line
@@ -617,8 +617,8 @@
    <!-- Description of the left direction in which one can to slide the handle in the Slide unlock screen. [CHAR LIMIT=NONE] -->
    <string name="description_direction_left">"Slide left for <xliff:g id="target_description" example="Unlock">%s</xliff:g>.</string>

    <!-- Zen mode: No interruptions title, with a warning about alarms and timers. [CHAR LIMIT=60] -->
    <string name="zen_no_interruptions_with_warning">No interruptions, including alarms and timers</string>
    <!-- Zen mode: No interruptions title, with a warning about alarms. [CHAR LIMIT=60] -->
    <string name="zen_no_interruptions_with_warning">No interruptions, including alarms</string>

    <!-- Zen mode: No interruptions. [CHAR LIMIT=40] -->
    <string name="zen_no_interruptions">No interruptions</string>
@@ -626,6 +626,15 @@
    <!-- Zen mode: Only important interruptions. [CHAR LIMIT=40] -->
    <string name="zen_important_interruptions">Priority interruptions only</string>

    <!-- Zen mode: Next alarm information - just a time. [CHAR LIMIT=40] -->
    <string name="zen_alarm_information_time">Your next alarm is at <xliff:g id="alarm_time" example="5:00 PM">%s</xliff:g></string>

    <!-- Zen mode: Next alarm information - day and time. [CHAR LIMIT=40] -->
    <string name="zen_alarm_information_day_time">Your next alarm is <xliff:g id="alarm_day_and_time" example="Fri 5:00 PM">%s</xliff:g></string>

    <!-- Zen mode: Next alarm warning. [CHAR LIMIT=40] -->
    <string name="zen_alarm_warning">You won\'t hear your alarm at <xliff:g id="alarm_time" example="5:00 PM">%s</xliff:g></string>

    <!-- Text for overflow card on Keyguard when there is not enough space for all notifications on Keyguard. [CHAR LIMIT=1] -->
    <string name="keyguard_more_overflow_text">+<xliff:g id="number_of_notifications" example="5">%d</xliff:g></string>

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@

    <style name="TextAppearance.QS">
        <item name="android:textStyle">normal</item>
        <item name="android:textColor">#ffffff</item>
        <item name="android:textColor">@color/qs_text</item>
        <item name="android:fontFamily">sans-serif</item>
    </style>

+9 −0
Original line number Diff line number Diff line
@@ -549,6 +549,8 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,

        mDozeServiceHost = new DozeServiceHost();
        putComponent(DozeService.Host.class, mDozeServiceHost);

        setControllerUsers();
    }

    // ================================================================================
@@ -2797,6 +2799,13 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
        animateCollapsePanels();
        updateNotifications();
        resetUserSetupObserver();
        setControllerUsers();
    }

    private void setControllerUsers() {
        if (mZenModeController != null) {
            mZenModeController.setUserId(mCurrentUserId);
        }
    }

    private void resetUserSetupObserver() {
Loading