Merge "Keyguard: Fix date capitalization context" into oc-dev

This commit is contained in:
Adrian Roos
2017-06-01 19:44:42 +00:00
committed by Android (Google) Code Review
3 changed files with 19 additions and 9 deletions

View File

@@ -25,7 +25,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
android:gravity="center"> android:gravity="center">
<TextClock android:id="@+id/date_view" <com.android.systemui.statusbar.policy.DateView
android:id="@+id/date_view"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="@color/clock_white" android:textColor="@color/clock_white"

View File

@@ -37,6 +37,7 @@ import android.widget.TextView;
import com.android.internal.util.ArrayUtils; import com.android.internal.util.ArrayUtils;
import com.android.internal.widget.LockPatternUtils; import com.android.internal.widget.LockPatternUtils;
import com.android.systemui.ChargingView; import com.android.systemui.ChargingView;
import com.android.systemui.statusbar.policy.DateView;
import java.util.Locale; import java.util.Locale;
@@ -48,7 +49,7 @@ public class KeyguardStatusView extends GridLayout {
private final AlarmManager mAlarmManager; private final AlarmManager mAlarmManager;
private TextView mAlarmStatusView; private TextView mAlarmStatusView;
private TextClock mDateView; private DateView mDateView;
private TextClock mClockView; private TextClock mClockView;
private TextView mOwnerInfo; private TextView mOwnerInfo;
private ViewGroup mClockContainer; private ViewGroup mClockContainer;
@@ -118,7 +119,6 @@ public class KeyguardStatusView extends GridLayout {
mAlarmStatusView = findViewById(R.id.alarm_status); mAlarmStatusView = findViewById(R.id.alarm_status);
mDateView = findViewById(R.id.date_view); mDateView = findViewById(R.id.date_view);
mClockView = findViewById(R.id.clock_view); mClockView = findViewById(R.id.clock_view);
mDateView.setShowCurrentUserTime(true);
mClockView.setShowCurrentUserTime(true); mClockView.setShowCurrentUserTime(true);
mClockView.setAccessibilityDelegate(new KeyguardClockAccessibilityDelegate(mContext)); mClockView.setAccessibilityDelegate(new KeyguardClockAccessibilityDelegate(mContext));
mOwnerInfo = findViewById(R.id.owner_info); mOwnerInfo = findViewById(R.id.owner_info);
@@ -154,8 +154,7 @@ public class KeyguardStatusView extends GridLayout {
} }
public void refreshTime() { public void refreshTime() {
mDateView.setFormat24Hour(Patterns.dateView); mDateView.setDatePattern(Patterns.dateViewSkel);
mDateView.setFormat12Hour(Patterns.dateView);
mClockView.setFormat12Hour(Patterns.clockView12); mClockView.setFormat12Hour(Patterns.clockView12);
mClockView.setFormat24Hour(Patterns.clockView24); mClockView.setFormat24Hour(Patterns.clockView24);
@@ -246,7 +245,7 @@ public class KeyguardStatusView extends GridLayout {
// DateFormat.getBestDateTimePattern is extremely expensive, and refresh is called often. // DateFormat.getBestDateTimePattern is extremely expensive, and refresh is called often.
// This is an optimization to ensure we only recompute the patterns when the inputs change. // This is an optimization to ensure we only recompute the patterns when the inputs change.
private static final class Patterns { private static final class Patterns {
static String dateView; static String dateViewSkel;
static String clockView12; static String clockView12;
static String clockView24; static String clockView24;
static String cacheKey; static String cacheKey;
@@ -254,7 +253,7 @@ public class KeyguardStatusView extends GridLayout {
static void update(Context context, boolean hasAlarm) { static void update(Context context, boolean hasAlarm) {
final Locale locale = Locale.getDefault(); final Locale locale = Locale.getDefault();
final Resources res = context.getResources(); final Resources res = context.getResources();
final String dateViewSkel = res.getString(hasAlarm dateViewSkel = res.getString(hasAlarm
? R.string.abbrev_wday_month_day_no_year_alarm ? R.string.abbrev_wday_month_day_no_year_alarm
: R.string.abbrev_wday_month_day_no_year); : R.string.abbrev_wday_month_day_no_year);
final String clockView12Skel = res.getString(R.string.clock_12hr_format); final String clockView12Skel = res.getString(R.string.clock_12hr_format);
@@ -262,8 +261,6 @@ public class KeyguardStatusView extends GridLayout {
final String key = locale.toString() + dateViewSkel + clockView12Skel + clockView24Skel; final String key = locale.toString() + dateViewSkel + clockView12Skel + clockView24Skel;
if (key.equals(cacheKey)) return; if (key.equals(cacheKey)) return;
dateView = DateFormat.getBestDateTimePattern(locale, dateViewSkel);
clockView12 = DateFormat.getBestDateTimePattern(locale, clockView12Skel); clockView12 = DateFormat.getBestDateTimePattern(locale, clockView12Skel);
// CLDR insists on adding an AM/PM indicator even though it wasn't in the skeleton // CLDR insists on adding an AM/PM indicator even though it wasn't in the skeleton
// format. The following code removes the AM/PM indicator if we didn't want it. // format. The following code removes the AM/PM indicator if we didn't want it.

View File

@@ -23,6 +23,7 @@ import android.content.IntentFilter;
import android.content.res.TypedArray; import android.content.res.TypedArray;
import android.icu.text.DateFormat; import android.icu.text.DateFormat;
import android.icu.text.DisplayContext; import android.icu.text.DisplayContext;
import android.text.TextUtils;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.widget.TextView; import android.widget.TextView;
@@ -115,4 +116,15 @@ public class DateView extends TextView {
mLastText = text; mLastText = text;
} }
} }
public void setDatePattern(String pattern) {
if (TextUtils.equals(pattern, mDatePattern)) {
return;
}
mDatePattern = pattern;
mDateFormat = null;
if (isAttachedToWindow()) {
updateClock();
}
}
} }