aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-03 01:16:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Add transient taskbar sizing for twoPanel devices." into tm-qpr-dev am: 01e90b7787

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20613321

Change-Id: Id47761c23154fe04e0cb1a5c1e7807ad02c22f1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jon Miranda
2022-12-02 19:29:06 +00:00
committed by Automerger Merge Worker
parent d48a078c78 01e90b7787
commit 9c053594e9
5 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
quickstep/res/values/dimens.xml
View File

@@ -282,6 +282,7 @@
<!-- Transient taskbar -->
<dimen name="transient_taskbar_size">76dp</dimen>
<dimen name="transient_taskbar_two_panels_size">72dp</dimen>
<dimen name="transient_taskbar_margin">24dp</dimen>
<dimen name="transient_taskbar_shadow_blur">40dp</dimen>
<dimen name="transient_taskbar_key_shadow_distance">10dp</dimen>

13
quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java
View File

@@ -270,9 +270,11 @@ public class TaskbarActivityContext extends BaseTaskbarContext {
}
private void updateIconSize(Resources resources) {
float taskbarIconSize = DisplayController.isTransientTaskbar(this)
? resources.getDimension(R.dimen.transient_taskbar_icon_size)
: resources.getDimension(R.dimen.taskbar_icon_size);
float taskbarIconSize = resources.getDimension(DisplayController.isTransientTaskbar(this)
? mDeviceProfile.isTwoPanels
? R.dimen.transient_taskbar_two_panels_icon_size
: R.dimen.transient_taskbar_icon_size
: R.dimen.taskbar_icon_size);
mDeviceProfile.updateIconSize(1, resources);
float iconScale = taskbarIconSize / mDeviceProfile.iconSizePx;
mDeviceProfile.updateIconSize(iconScale, resources);
@@ -681,7 +683,10 @@ public class TaskbarActivityContext extends BaseTaskbarContext {
}
if (DisplayController.isTransientTaskbar(this)) {
return resources.getDimensionPixelSize(R.dimen.transient_taskbar_size)
int taskbarSize = resources.getDimensionPixelSize(mDeviceProfile.isTwoPanels
? R.dimen.transient_taskbar_two_panels_size
: R.dimen.transient_taskbar_size);
return taskbarSize
+ (2 * resources.getDimensionPixelSize(R.dimen.transient_taskbar_margin))
+ resources.getDimensionPixelSize(R.dimen.transient_taskbar_shadow_blur);
}

4
quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java
View File

@@ -203,7 +203,9 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba
Resources resources = mActivity.getResources();
boolean isTransientTaskbar = DisplayController.isTransientTaskbar(mActivity);
mUnstashedHeight = resources.getDimensionPixelSize(isTransientTaskbar
? R.dimen.transient_taskbar_size
? (mActivity.getDeviceProfile().isTwoPanels
? R.dimen.transient_taskbar_two_panels_size
: R.dimen.transient_taskbar_size)
: R.dimen.taskbar_size);
mStashedHeight = resources.getDimensionPixelSize(isTransientTaskbar
? R.dimen.transient_taskbar_stashed_size

2
res/values/dimens.xml
View File

@@ -362,8 +362,10 @@
<dimen name="min_hotseat_qsb_width">0dp</dimen>
<dimen name="taskbar_icon_size">44dp</dimen>
<dimen name="transient_taskbar_icon_size">57dp</dimen>
<dimen name="transient_taskbar_two_panels_icon_size">50dp</dimen>
<!-- Transient taskbar (placeholders to compile in Launcher3 without Quickstep) -->
<dimen name="transient_taskbar_size">0dp</dimen>
<dimen name="transient_taskbar_two_panels_size">0dp</dimen>
<dimen name="transient_taskbar_margin">0dp</dimen>
<dimen name="transient_taskbar_shadow_blur">0dp</dimen>
<dimen name="transient_taskbar_key_shadow_distance">0dp</dimen>

4
src/com/android/launcher3/DeviceProfile.java
View File

@@ -319,7 +319,9 @@ public class DeviceProfile {
if (isTaskbarPresent) {
if (DisplayController.isTransientTaskbar(context)) {
taskbarSize = res.getDimensionPixelSize(R.dimen.transient_taskbar_size);
taskbarSize = res.getDimensionPixelSize(isTwoPanels
? R.dimen.transient_taskbar_two_panels_size
: R.dimen.transient_taskbar_size);
stashedTaskbarSize =
res.getDimensionPixelSize(R.dimen.transient_taskbar_stashed_size);
transientTaskbarMargin =