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

Commit 6676fcd3 authored by David van Tonder's avatar David van Tonder Committed by Gerrit Code Review
Browse files

Merge "Revert "SystemUI: show date on 2 lines in status bar"" into cm-10.2

parents aa656bae 2b2004bc
Loading
Loading
Loading
Loading
+4 −2
Original line number Diff line number Diff line
@@ -48,10 +48,12 @@

        <com.android.systemui.statusbar.policy.DateView android:id="@+id/date"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_height="match_parent"
            android:singleLine="true"
            android:textAppearance="@style/TextAppearance.StatusBar.Expanded.Date"
            android:layout_toEndOf="@id/clock"
            android:layout_centerVertical="true"
            android:layout_alignBaseline="@id/clock"
            android:gravity="bottom"
            />
    </RelativeLayout>

+1 −1
Original line number Diff line number Diff line
@@ -18,5 +18,5 @@
-->
<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/full_wday_month_day_no_year_split</string>
    <string name="system_ui_date_pattern">@*android:string/system_ui_date_pattern</string>
</resources>
+2 −1
Original line number Diff line number Diff line
@@ -122,7 +122,8 @@ public class DateView extends TextView implements OnClickListener, OnLongClickLi
    protected void updateClock() {
        final String dateFormat = getContext().getString(R.string.system_ui_date_pattern);
        final Locale l = Locale.getDefault();
        SimpleDateFormat sdf = new SimpleDateFormat(dateFormat, l);
        String fmt = ICU.getBestDateTimePattern(dateFormat, l.toString());
        SimpleDateFormat sdf = new SimpleDateFormat(fmt, l);
        setText(sdf.format(new Date()));
    }