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

Merge "Smartspace padding for AOD/LS" into sc-dev am: 2e281d0225

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

Change-Id: I05be555962a249ed0e2a47d708394b2eb8ea408d
This commit is contained in:
TreeHugger Robot
2021-05-27 21:37:45 +00:00
committed by Automerger Merge Worker
parent 42a04d2f4d 2e281d0225
commit b5f4c72ee9
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -80,7 +80,7 @@
android:layout_width="match_parent"
android:layout_height="@dimen/notification_shelf_height"
android:layout_below="@id/keyguard_status_area"
android:paddingStart="@dimen/below_clock_padding_start_extra"
android:paddingStart="@dimen/below_clock_padding_start_icons"
android:visibility="invisible"
/>
</com.android.keyguard.KeyguardClockSwitch>

3
packages/SystemUI/res-keyguard/values/dimens.xml
View File

@@ -94,5 +94,6 @@
<!-- additional offset for clock switch area items -->
<dimen name="clock_padding_start">28dp</dimen>
<dimen name="below_clock_padding_start">32dp</dimen>
<dimen name="below_clock_padding_start_extra">36dp</dimen>
<dimen name="below_clock_padding_end">16dp</dimen>
<dimen name="below_clock_padding_start_icons">28dp</dimen>
</resources>

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

@@ -183,9 +183,11 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS
lp.addRule(RelativeLayout.BELOW, R.id.lockscreen_clock_view);
mView.addView(mSmartspaceView, ksaIndex, lp);
int padding = getContext().getResources()
int startPadding = getContext().getResources()
.getDimensionPixelSize(R.dimen.below_clock_padding_start);
mSmartspaceView.setPadding(padding, 0, padding, 0);
int endPadding = getContext().getResources()
.getDimensionPixelSize(R.dimen.below_clock_padding_end);
mSmartspaceView.setPaddingRelative(startPadding, 0, endPadding, 0);
// ... but above the large clock
lp = new RelativeLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT);