Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update LS/AOD clock"

Browse Source
This commit is contained in:
TreeHugger Robot
2021-01-14 14:22:32 +00:00
committed by Android (Google) Code Review
parent b828b75cc9 81affc1f1f
commit be815f05ec
3 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/SystemUI/res-keyguard/layout/keyguard_clock_switch.xml
View File

@@ -51,7 +51,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"
@@ -72,12 +71,12 @@
android:id="@+id/animatable_clock_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="right"
android:layout_gravity="center_horizontal"
android:gravity="center_horizontal"
android:textSize="100dp"
android:letterSpacing="0.02"
android:lineSpacingMultiplier=".8"
android:includeFontPadding="false"
android:fontFamily="@font/clock"
android:lineSpacingMultiplier=".65"
android:typeface="monospace"
android:elegantTextHeight="false"
dozeWeight="200"
@@ -97,9 +96,8 @@
android:layout_gravity="center_horizontal"
android:gravity="center_horizontal"
android:textSize="@dimen/large_clock_text_size"
android:letterSpacing="0.02"
android:lineSpacingMultiplier=".8"
android:includeFontPadding="false"
android:lineSpacingMultiplier=".65"
android:fontFamily="@font/clock"
android:typeface="monospace"
android:elegantTextHeight="false"

7
packages/SystemUI/src/com/android/keyguard/AnimatableClockController.java
View File

@@ -85,10 +85,9 @@ public class AnimatableClockController extends ViewController<AnimatableClockVie
}
private void initColors() {
mLockScreenColors[0] = Utils.getColorAttrDefaultColor(getContext(),
com.android.systemui.R.attr.wallpaperTextColor);
mLockScreenColors[1] = Utils.getColorAttrDefaultColor(getContext(),
com.android.systemui.R.attr.wallpaperTextColorSecondary);
mLockScreenColors[0] = Utils.getColorAttr(getContext(),
android.R.attr.textColorPrimary).getDefaultColor();
mLockScreenColors[1] = mLockScreenColors[0]; // same color
mView.setColors(mDozingColors, mLockScreenColors);
mView.animateDoze(mIsDozing, false);
}

2
packages/SystemUI/src/com/android/keyguard/AnimatableClockView.java
View File

@@ -38,7 +38,7 @@ import kotlin.Unit;
* The time's text color is a gradient that changes its colors based on its controller.
*/
public class AnimatableClockView extends TextView {
private static final CharSequence FORMAT_12_HOUR = "hh\nmm";
private static final CharSequence FORMAT_12_HOUR = "h\nmm";
private static final CharSequence FORMAT_24_HOUR = "HH\nmm";
private static final long ANIM_DURATION = 300;