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

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

Merge "Volume footer uglification." into mnc-dev

parents e247cdec 023544f7

core/res/res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -4104,6 +4104,9 @@ 
    <!-- Zen mode condition: no exit criteria. [CHAR LIMIT=NONE] -->

    <string name="zen_mode_forever">Until you turn this off</string>



    <!-- Zen mode condition: no exit criteria, includes the name of the feature for emphasis. [CHAR LIMIT=NONE] -->

    <string name="zen_mode_forever_dnd">Until you turn off Do Not Disturb</string>



    <!-- Zen mode active automatic rule name separator. [CHAR LIMIT=NONE] -->

    <string name="zen_mode_rule_name_combination"><xliff:g id="first" example="Weeknights">%1$s</xliff:g> / <xliff:g id="rest" example="Meetings">%2$s</xliff:g></string>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -2054,6 +2054,7 @@ 
  <java-symbol type="dimen" name="timepicker_text_size_inner" />

  <java-symbol type="string" name="battery_saver_description" />

  <java-symbol type="string" name="zen_mode_forever" />

  <java-symbol type="string" name="zen_mode_forever_dnd" />

  <java-symbol type="string" name="zen_mode_rule_name_combination" />

  <java-symbol type="plurals" name="zen_mode_duration_minutes" />

  <java-symbol type="plurals" name="zen_mode_duration_hours" />

packages/SystemUI/res/layout/volume_zen_footer.xml

+20 −12
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
        android:id="@+id/zen_embedded_divider"

        android:layout_width="match_parent"

        android:layout_height="1dp"

        android:layout_marginBottom="8dp"

        android:layout_marginBottom="12dp"

        android:layout_marginTop="8dp"

        android:background="@color/qs_tile_divider" />
@@ -53,13 +53,19 @@ 
                android:id="@+id/volume_zen_summary_line_1"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:textDirection="locale"

                android:textAppearance="@style/TextAppearance.Volume.ZenSummary" />



            <TextView

                android:id="@+id/volume_zen_summary_line_2"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_marginTop="1dp"

                android:textDirection="locale"

                android:textAppearance="@style/TextAppearance.Volume.ZenDetail" />



        </LinearLayout>



    </LinearLayout>



    <TextView
@@ -67,12 +73,14 @@ 
        style="@style/QSBorderlessButton"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="end"

        android:layout_marginEnd="8dp"

        android:clickable="true"

        android:focusable="true"

            android:minWidth="91dp"

        android:paddingStart="15dp"

        android:paddingEnd="15dp"

        android:text="@string/volume_zen_end_now"

        android:textColor="@color/system_accent_color"

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

    </LinearLayout>



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

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

+6 −2
Original line number Diff line number Diff line
@@ -126,8 +126,12 @@ public class ZenFooter extends LinearLayout { 
                : null;

        Util.setText(mSummaryLine1, line1);



        final String line2 = ZenModeConfig.getConditionSummary(mContext, mConfig,

                mController.getCurrentUser(), true /*shortVersion*/);

        final boolean isForever = mConfig != null && mConfig.manualRule != null

                && mConfig.manualRule.conditionId == null;

        final String line2 =

                isForever ? mContext.getString(com.android.internal.R.string.zen_mode_forever_dnd)

                : ZenModeConfig.getConditionSummary(mContext, mConfig, mController.getCurrentUser(),

                        true /*shortVersion*/);

        Util.setText(mSummaryLine2, line2);

    }