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

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

Merge "Volume: Promote alarm warning to title."

parents 5a4e0111 86d04fda

packages/SystemUI/res/layout/zen_mode_panel.xml

+0 −11
Original line number Diff line number Diff line
@@ -79,15 +79,4 @@ 
        android:orientation="vertical"

        android:paddingTop="3dp" />



    <TextView

        android:id="@+id/zen_alarm_warning"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:paddingBottom="8dp"

        android:paddingLeft="@dimen/qs_panel_padding"

        android:paddingRight="@dimen/qs_panel_padding"

        android:paddingTop="8dp"

        android:text="@string/zen_alarm_warning"

        android:textAppearance="@style/TextAppearance.QS.Warning" />



</com.android.systemui.volume.ZenModePanel>
 
 No newline at end of file

packages/SystemUI/res/values/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -595,8 +595,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: Alarm warning. [CHAR LIMIT=40] -->

    <string name="zen_alarm_warning">You won\'t hear alarms or timers</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. [CHAR LIMIT=40] -->

    <string name="zen_no_interruptions">No interruptions</string>

packages/SystemUI/res/values/styles.xml

+0 −5
Original line number Diff line number Diff line
@@ -185,11 +185,6 @@ 
        <item name="android:textColor">@color/qs_subhead</item>

    </style>



    <style name="TextAppearance.QS.Warning">

        <item name="android:textSize">12sp</item>

        <item name="android:textColor">@color/qs_subhead</item>

    </style>



    <style name="TextAppearance.QS.SegmentedButton">

        <item name="android:textSize">12sp</item>

        <item name="android:textAllCaps">true</item>

packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java

+1 −5
Original line number Diff line number Diff line
@@ -85,7 +85,6 @@ public class ZenModePanel extends LinearLayout { 
    private TextView mZenSubheadExpanded;

    private View mMoreSettings;

    private LinearLayout mZenConditions;

    private View mAlarmWarning;



    private Callback mCallback;

    private ZenModeController mController;
@@ -152,8 +151,6 @@ public class ZenModePanel extends LinearLayout { 
        });



        mZenConditions = (LinearLayout) findViewById(R.id.zen_conditions);



        mAlarmWarning = findViewById(R.id.zen_alarm_warning);

    }



    @Override
@@ -279,10 +276,9 @@ public class ZenModePanel extends LinearLayout { 
        mZenSubheadCollapsed.setVisibility(!mExpanded ? VISIBLE : GONE);

        mMoreSettings.setVisibility(zenImportant && mExpanded ? VISIBLE : GONE);

        mZenConditions.setVisibility(!zenOff && mExpanded ? VISIBLE : GONE);

        mAlarmWarning.setVisibility(zenNone && mExpanded ? VISIBLE : GONE);



        if (zenNone) {

            mZenSubheadExpanded.setText(R.string.zen_no_interruptions);

            mZenSubheadExpanded.setText(R.string.zen_no_interruptions_with_warning);

            mZenSubheadCollapsed.setText(mExitConditionText);

        } else if (zenImportant) {

            mZenSubheadExpanded.setText(R.string.zen_important_interruptions);