From fb4bae8cdadf697b6f66b048c34295be6f0d2b56 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sat, 2 Nov 2019 07:52:36 +0000 Subject: [PATCH] Keyguard: Revert date and clock to Lollipop style Also ported dynamic date format based on alarm presence from Oreo Change-Id: I0f61c641ffb2a3e1e6b4da738792ee4ac1d77434 --- .../layout/keyguard_clock_switch.xml | 3 --- .../layout/keyguard_status_view.xml | 1 - .../res-keyguard/values-h560dp/dimens.xml | 2 +- .../res-keyguard/values-h650dp/dimens.xml | 2 +- .../SystemUI/res-keyguard/values/dimens.xml | 6 ++--- .../SystemUI/res-keyguard/values/strings.xml | 4 ++-- .../SystemUI/res-keyguard/values/styles.xml | 18 ++++----------- .../res/layout/keyguard_status_bar.xml | 2 +- .../android/keyguard/KeyguardSliceView.java | 2 +- .../keyguard/KeyguardSliceProvider.java | 22 +++++++++++-------- 10 files changed, 26 insertions(+), 36 deletions(-) diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_clock_switch.xml b/packages/SystemUI/res-keyguard/layout/keyguard_clock_switch.xml index bf2963cd0b7..5fb06f38bd4 100644 --- a/packages/SystemUI/res-keyguard/layout/keyguard_clock_switch.xml +++ b/packages/SystemUI/res-keyguard/layout/keyguard_clock_switch.xml @@ -36,8 +36,6 @@ android:layout_height="wrap_content" android:layout_gravity="center_horizontal" android:gravity="center_horizontal" - android:paddingBottom="@dimen/title_clock_padding" - android:letterSpacing="0.02" android:textColor="?attr/wallpaperTextColor" android:singleLine="true" style="@style/widget_big" @@ -51,7 +49,6 @@ android:layout_height="wrap_content" android:layout_gravity="bottom|center_horizontal" android:gravity="center_horizontal" - android:letterSpacing="0.03" android:textColor="?attr/wallpaperTextColor" android:singleLine="true" style="@style/widget_title_bold" diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_status_view.xml b/packages/SystemUI/res-keyguard/layout/keyguard_status_view.xml index 10cd3cba713..9845a02399b 100644 --- a/packages/SystemUI/res-keyguard/layout/keyguard_status_view.xml +++ b/packages/SystemUI/res-keyguard/layout/keyguard_status_view.xml @@ -67,7 +67,6 @@ android:layout_centerHorizontal="true" android:textColor="?attr/wallpaperTextColorSecondary" android:textSize="@dimen/widget_label_font_size" - android:letterSpacing="0.05" android:ellipsize="marquee" android:singleLine="true" /> - 54dp + 88dp diff --git a/packages/SystemUI/res-keyguard/values-h650dp/dimens.xml b/packages/SystemUI/res-keyguard/values-h650dp/dimens.xml index 669f8fb642d..345b3d9c707 100644 --- a/packages/SystemUI/res-keyguard/values-h650dp/dimens.xml +++ b/packages/SystemUI/res-keyguard/values-h650dp/dimens.xml @@ -16,5 +16,5 @@ --> - 54dp + 88dp diff --git a/packages/SystemUI/res-keyguard/values/dimens.xml b/packages/SystemUI/res-keyguard/values/dimens.xml index f9389ce24d9..cf3a8d79712 100644 --- a/packages/SystemUI/res-keyguard/values/dimens.xml +++ b/packages/SystemUI/res-keyguard/values/dimens.xml @@ -42,13 +42,13 @@ -10dip - 24dp + 16dp 12dp 16dp - 18dp + 16dp - 54dp + 88dp 0dp 4dp diff --git a/packages/SystemUI/res-keyguard/values/strings.xml b/packages/SystemUI/res-keyguard/values/strings.xml index f7e9fedd5f6..8f829a81209 100644 --- a/packages/SystemUI/res-keyguard/values/strings.xml +++ b/packages/SystemUI/res-keyguard/values/strings.xml @@ -112,9 +112,9 @@ %s (%s) - h:mm + hh:mm - kk:mm + HH:mm diff --git a/packages/SystemUI/res-keyguard/values/styles.xml b/packages/SystemUI/res-keyguard/values/styles.xml index 5f2a946a1b6..63c1ab0a109 100644 --- a/packages/SystemUI/res-keyguard/values/styles.xml +++ b/packages/SystemUI/res-keyguard/values/styles.xml @@ -62,29 +62,23 @@ diff --git a/packages/SystemUI/res/layout/keyguard_status_bar.xml b/packages/SystemUI/res/layout/keyguard_status_bar.xml index 416ee8147e3..1e364b4fc3b 100644 --- a/packages/SystemUI/res/layout/keyguard_status_bar.xml +++ b/packages/SystemUI/res/layout/keyguard_status_bar.xml @@ -73,7 +73,7 @@ android:gravity="center_vertical" android:ellipsize="marquee" android:textDirection="locale" - android:textAppearance="@style/TextAppearance.StatusBar.Clock" + android:textAppearance="?android:attr/textAppearanceSmall" android:textColor="?attr/wallpaperTextColorSecondary" android:singleLine="true" systemui:showMissingSim="true" diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java index f639c880c97..5c42937eb6a 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java @@ -502,7 +502,7 @@ public class KeyguardSliceView extends LinearLayout implements View.OnClickListe for (int i = 0; i < childCount; i++) { View child = getChildAt(i); if (child instanceof KeyguardSliceTextView) { - ((KeyguardSliceTextView) child).setMaxWidth(width / 3); + ((KeyguardSliceTextView) child).setMaxWidth(width); } } super.onMeasure(widthMeasureSpec, heightMeasureSpec); diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardSliceProvider.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardSliceProvider.java index 3a37c0fd463..70b7e5354e2 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardSliceProvider.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardSliceProvider.java @@ -95,7 +95,7 @@ public class KeyguardSliceProvider extends SliceProvider implements * Only show alarms that will ring within N hours. */ @VisibleForTesting - static final int ALARM_VISIBILITY_HOURS = 12; + static final int ALARM_VISIBILITY_HOURS = 24; private static final Object sInstanceLock = new Object(); private static KeyguardSliceProvider sInstance; @@ -304,7 +304,10 @@ public class KeyguardSliceProvider extends SliceProvider implements if (oldInstance != null) { oldInstance.onDestroy(); } - mDatePattern = getContext().getString(R.string.system_ui_aod_date_pattern); + boolean isNextAlarmPresent = withinNHoursLocked(mNextAlarmInfo, ALARM_VISIBILITY_HOURS); + mDatePattern = getContext().getString(isNextAlarmPresent + ? R.string.abbrev_wday_month_day_no_year_alarm + : R.string.abbrev_wday_month_day_no_year); mPendingIntent = PendingIntent.getActivity(getContext(), 0, new Intent(getContext(), KeyguardSliceProvider.class), 0); mMediaManager.addCallback(this); @@ -355,14 +358,17 @@ public class KeyguardSliceProvider extends SliceProvider implements synchronized (this) { if (withinNHoursLocked(mNextAlarmInfo, ALARM_VISIBILITY_HOURS)) { String pattern = android.text.format.DateFormat.is24HourFormat(getContext(), - ActivityManager.getCurrentUser()) ? "HH:mm" : "h:mm"; + ActivityManager.getCurrentUser()) ? "E HH:mm" : "E hh:mm"; mNextAlarm = android.text.format.DateFormat.format(pattern, mNextAlarmInfo.getTriggerTime()).toString(); + mDatePattern = getContext().getString(R.string.abbrev_wday_month_day_no_year_alarm); } else { mNextAlarm = ""; + mDatePattern = getContext().getString(R.string.abbrev_wday_month_day_no_year); } } notifyChange(); + updateClockLocked(); } private boolean withinNHoursLocked(AlarmManager.AlarmClockInfo alarmClockInfo, int hours) { @@ -411,12 +417,10 @@ public class KeyguardSliceProvider extends SliceProvider implements } protected String getFormattedDateLocked() { - if (mDateFormat == null) { - final Locale l = Locale.getDefault(); - DateFormat format = DateFormat.getInstanceForSkeleton(mDatePattern, l); - format.setContext(DisplayContext.CAPITALIZATION_FOR_STANDALONE); - mDateFormat = format; - } + final Locale l = Locale.getDefault(); + DateFormat format = DateFormat.getInstanceForSkeleton(mDatePattern, l); + format.setContext(DisplayContext.CAPITALIZATION_FOR_STANDALONE); + mDateFormat = format; mCurrentTime.setTime(System.currentTimeMillis()); return mDateFormat.format(mCurrentTime); } -- 2.25.1