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

Commit 13f31bd0 authored by Julia Reynolds's avatar Julia Reynolds
Browse files

Display volume dialog for longer... 

If the alarms only introduction is visible. Also fix the spacing
of the intro message.

Change-Id: I63c0b992ed0b7aad707a92eb1b451192af71aeae
Fixes: 65188805
Test: manual
parent 4562eceb

packages/SystemUI/res/layout/volume_zen_footer.xml

+0 −3
Original line number Diff line number Diff line
@@ -25,18 +25,15 @@ 
        android:id="@+id/zen_embedded_divider"

        android:layout_width="match_parent"

        android:layout_height="1dp"

        android:layout_marginBottom="12dp"

        android:layout_marginTop="8dp"

        android:background="@color/qs_tile_divider" />





    <RelativeLayout

        android:id="@+id/zen_introduction"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginStart="16dp"

        android:layout_marginEnd="16dp"

        android:paddingTop="8dp"

        android:paddingBottom="8dp"

        android:background="@drawable/zen_introduction_message_background"

        android:theme="@*android:style/ThemeOverlay.DeviceDefault.Accent.Light">

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

+4 −0
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ import android.widget.TextView; 
import com.android.settingslib.Utils;

import com.android.systemui.Dependency;

import com.android.systemui.Interpolators;

import com.android.systemui.Prefs;

import com.android.systemui.R;

import com.android.systemui.plugins.VolumeDialog;

import com.android.systemui.plugins.VolumeDialogController;
@@ -514,6 +515,9 @@ public class VolumeDialogImpl implements VolumeDialog, TunerService.Tunable { 
        if (mSafetyWarning != null) return 5000;

        if (mExpanded || mExpandButtonAnimationRunning) return 5000;

        if (mActiveStream == AudioManager.STREAM_MUSIC) return 1500;

        if (mZenFooter.shouldShowIntroduction()) {

            return 6000;

        }

        return 3000;

    }

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

+1 −0
Original line number Diff line number Diff line
@@ -152,6 +152,7 @@ public class ZenFooter extends LinearLayout { 
                                mController.getCurrentUser(), true /*shortVersion*/);

        Util.setText(mSummaryLine2, line2);

    }



    public boolean shouldShowIntroduction() {

        final boolean confirmed =  Prefs.getBoolean(mContext,

                Prefs.Key.DND_CONFIRMED_ALARM_INTRODUCTION, false);