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

Commit bb5b42ee authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix strings for QS header status." into pi-dev

parents d33b958c e4d25a95

packages/SystemUI/res/layout/quick_settings_header_info.xml

+5 −5
Original line number Diff line number Diff line
@@ -41,14 +41,13 @@ 
        android:visibility="invisible">



        <ImageView

            android:id="@+id/next_alarm_icon"

            android:id="@+id/ringer_mode_icon"

            android:layout_width="@dimen/qs_header_alarm_icon_size"

            android:layout_height="@dimen/qs_header_alarm_icon_size"

            android:src="@drawable/stat_sys_alarm"

            android:tint="?android:attr/textColorPrimary" />



        <TextView

            android:id="@+id/next_alarm_text"

            android:id="@+id/ringer_mode_text"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginStart="@dimen/qs_header_alarm_text_margin_start"
@@ -64,13 +63,14 @@ 
            android:backgroundTint="?android:attr/textColorPrimary" />



        <ImageView

            android:id="@+id/ringer_mode_icon"

            android:id="@+id/next_alarm_icon"

            android:layout_width="@dimen/qs_header_alarm_icon_size"

            android:layout_height="@dimen/qs_header_alarm_icon_size"

            android:src="@drawable/stat_sys_alarm"

            android:tint="?android:attr/textColorPrimary" />



        <TextView

            android:id="@+id/ringer_mode_text"

            android:id="@+id/next_alarm_text"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginStart="@dimen/qs_header_alarm_text_margin_start"

packages/SystemUI/res/values/strings.xml

+5 −0
Original line number Diff line number Diff line
@@ -1335,6 +1335,11 @@ 
    <string name="volume_ringer_status_vibrate">Vibrate</string>

    <string name="volume_ringer_status_silent">Mute</string>



    <!-- Shown in the header of quick settings to indicate to the user that their phone ringer is on vibrate. [CHAR_LIMIT=NONE] -->

    <string name="qs_status_phone_vibrate">Phone on vibrate</string>

    <!-- Shown in the header of quick settings to indicate to the user that their phone ringer is on silent (muted). [CHAR_LIMIT=NONE] -->

    <string name="qs_status_phone_muted">Phone muted</string>



    <string name="volume_stream_muted" translatable="false">%s silent</string>

    <string name="volume_stream_vibrate" translatable="false">%s vibrate</string>

    <string name="volume_stream_suppressed" translatable="false">%1$s silent — %2$s</string>

packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java

+2 −2
Original line number Diff line number Diff line
@@ -172,11 +172,11 @@ public class QuickStatusBarHeader extends RelativeLayout implements CommandQueue 
        boolean ringerVisible = false;

        if (mRingerMode == AudioManager.RINGER_MODE_VIBRATE) {

            mRingerModeIcon.setImageResource(R.drawable.stat_sys_ringer_vibrate);

            mRingerModeTextView.setText(R.string.volume_ringer_status_vibrate);

            mRingerModeTextView.setText(R.string.qs_status_phone_vibrate);

            ringerVisible = true;

        } else if (mRingerMode == AudioManager.RINGER_MODE_SILENT) {

            mRingerModeIcon.setImageResource(R.drawable.stat_sys_ringer_silent);

            mRingerModeTextView.setText(R.string.volume_ringer_status_silent);

            mRingerModeTextView.setText(R.string.qs_status_phone_muted);

            ringerVisible = true;

        }

        mRingerModeIcon.setVisibility(ringerVisible ? View.VISIBLE : View.GONE);