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

Browse Source
This commit is contained in:
TreeHugger Robot
2021-05-27 21:27:43 +00:00
committed by Android (Google) Code Review
parent 6e76e995c1 ba57dba13b
commit 2e281d0225
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_width="match_parent"
android:layout_height="@dimen/notification_shelf_height" android:layout_height="@dimen/notification_shelf_height"
android:layout_below="@id/keyguard_status_area" 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" android:visibility="invisible"
/> />
</com.android.keyguard.KeyguardClockSwitch> </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 --> <!-- additional offset for clock switch area items -->
<dimen name="clock_padding_start">28dp</dimen> <dimen name="clock_padding_start">28dp</dimen>
<dimen name="below_clock_padding_start">32dp</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> </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); lp.addRule(RelativeLayout.BELOW, R.id.lockscreen_clock_view);
mView.addView(mSmartspaceView, ksaIndex, lp); mView.addView(mSmartspaceView, ksaIndex, lp);
int padding = getContext().getResources() int startPadding = getContext().getResources()
.getDimensionPixelSize(R.dimen.below_clock_padding_start); .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 // ... but above the large clock
lp = new RelativeLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT); lp = new RelativeLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT);