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

Commit 54982311 authored by Danny Baumann's avatar Danny Baumann
Browse files

Bring back two-line layout for status bar date. 

Change-Id: I4bf7ce61b22da89b3b8c1a3f00e077461061f7b9
parent 6676fcd3

packages/SystemUI/res/layout/status_bar_expanded_header.xml

+2 −4
Original line number Diff line number Diff line
@@ -48,12 +48,10 @@ 


        <com.android.systemui.statusbar.policy.DateView android:id="@+id/date"

            android:layout_width="wrap_content"

            android:layout_height="match_parent"

            android:singleLine="true"

            android:layout_height="wrap_content"

            android:textAppearance="@style/TextAppearance.StatusBar.Expanded.Date"

            android:layout_toEndOf="@id/clock"

            android:layout_alignBaseline="@id/clock"

            android:gravity="bottom"

            android:layout_centerVertical="true"

            />

    </RelativeLayout>

packages/SystemUI/res/values/donottranslate.xml

+4 −2
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 
 */

-->

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <!-- Date format for display: should match the lockscreen in /policy.  -->

    <string name="system_ui_date_pattern">@*android:string/system_ui_date_pattern</string>

    <!-- DO NOT TRANSLATE. ICU date format for display.  -->

    <string name="system_ui_date_pattern" translatable="false">MMMMd</string>

    <!-- DO NOT TRANSLATE. ICU weekday format for display -->

    <string name="system_ui_weekday_pattern" translatable="false">eeee</string>

</resources>

packages/SystemUI/src/com/android/systemui/statusbar/policy/DateView.java

+11 −3
Original line number Diff line number Diff line
@@ -120,11 +120,19 @@ public class DateView extends TextView implements OnClickListener, OnLongClickLi 
    }



    protected void updateClock() {

        final String weekdayFormat = getContext().getString(R.string.system_ui_weekday_pattern);

        final String dateFormat = getContext().getString(R.string.system_ui_date_pattern);

        final Locale l = Locale.getDefault();

        String fmt = ICU.getBestDateTimePattern(dateFormat, l.toString());

        SimpleDateFormat sdf = new SimpleDateFormat(fmt, l);

        setText(sdf.format(new Date()));

        final Date now = new Date();

        String weekdayFmt = ICU.getBestDateTimePattern(weekdayFormat, l.toString());

        String dateFmt = ICU.getBestDateTimePattern(dateFormat, l.toString());



        StringBuilder builder = new StringBuilder();

        builder.append(new SimpleDateFormat(weekdayFmt, l).format(now));

        builder.append("\n");

        builder.append(new SimpleDateFormat(dateFmt, l).format(now));



        setText(builder.toString());

    }



    private boolean isVisible() {