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

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

Merge "Move the alarm status icon to the first position." into pi-dev

parents bcccb1af ef06dc26

core/res/res/values/config.xml

+1 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
    <!-- Do not translate. Defines the slots for the right-hand side icons.  That is to say, the

         icons in the status bar that are not notifications. -->

    <string-array name="config_statusBarIcons">

        <item><xliff:g id="id">@string/status_bar_alarm_clock</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_rotate</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_headset</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_data_saver</xliff:g></item>
@@ -44,7 +45,6 @@ 
        <item><xliff:g id="id">@string/status_bar_phone_evdo_signal</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_phone_signal</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_secure</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_alarm_clock</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_bluetooth</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_managed_profile</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_cast</xliff:g></item>

packages/SystemUI/res/layout/quick_settings_header_info.xml

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



        <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"
@@ -63,14 +64,13 @@ 
            android:backgroundTint="?android:attr/textColorPrimary" />



        <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"