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

Merge "Update clock location" into sc-v2-dev am: bda966d4d0

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16457712

Change-Id: I6bc28d87aa10f47552996a8bce4f3492368fee1b
This commit is contained in:
TreeHugger Robot
2021-12-14 00:42:36 +00:00
committed by Automerger Merge Worker
parent b89bd85054 bda966d4d0
commit b4f39650a9
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/res/values-h800dp/dimens.xml
View File

@@ -22,5 +22,5 @@
<dimen name="large_clock_text_size">200dp</dimen> <dimen name="large_clock_text_size">200dp</dimen>
<!-- With the large clock, move up slightly from the center --> <!-- With the large clock, move up slightly from the center -->
<dimen name="keyguard_large_clock_top_margin">-104dp</dimen> <dimen name="keyguard_large_clock_top_margin">-112dp</dimen>
</resources> </resources>

2
packages/SystemUI/res/values/dimens.xml
View File

@@ -601,7 +601,7 @@
<!-- When large clock is showing, offset the smartspace by this amount --> <!-- When large clock is showing, offset the smartspace by this amount -->
<dimen name="keyguard_smartspace_top_offset">12dp</dimen> <dimen name="keyguard_smartspace_top_offset">12dp</dimen>
<!-- With the large clock, move up slightly from the center --> <!-- With the large clock, move up slightly from the center -->
<dimen name="keyguard_large_clock_top_margin">-52dp</dimen> <dimen name="keyguard_large_clock_top_margin">-60dp</dimen>
<!-- Default line spacing multiplier between hours and minutes of the keyguard clock --> <!-- Default line spacing multiplier between hours and minutes of the keyguard clock -->
<item name="keyguard_clock_line_spacing_scale" type="dimen" format="float">.7</item> <item name="keyguard_clock_line_spacing_scale" type="dimen" format="float">.7</item>

8
packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java
View File

@@ -275,11 +275,9 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS
} }
private void updateClockLayout() { private void updateClockLayout() {
int largeClockTopMargin = 0; int largeClockTopMargin = getContext().getResources().getDimensionPixelSize(
if (mSmartspaceController.isEnabled()) { R.dimen.keyguard_large_clock_top_margin);
largeClockTopMargin = getContext().getResources().getDimensionPixelSize(
R.dimen.keyguard_large_clock_top_margin);
}
RelativeLayout.LayoutParams lp = new RelativeLayout.LayoutParams(MATCH_PARENT, RelativeLayout.LayoutParams lp = new RelativeLayout.LayoutParams(MATCH_PARENT,
MATCH_PARENT); MATCH_PARENT);
lp.topMargin = largeClockTopMargin; lp.topMargin = largeClockTopMargin;