aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-19 10:48:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Add transientTaskbarMargin above taskbar in overview" into tm-qpr-dev

Browse Source
This commit is contained in:
Alex Chau
2022-12-20 18:40:48 +00:00
committed by Android (Google) Code Review
parent eae7e58b20 1b276a1ba7
commit d79e53a5c8
8 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
quickstep/res/values-sw720dp/dimens.xml
View File

@@ -37,4 +37,7 @@
<!-- All Set page-->
<dimen name="allset_page_allset_text_size">42sp</dimen>
<dimen name="allset_page_swipe_up_text_size">16sp</dimen>
<!-- Transient taskbar -->
<dimen name="transient_taskbar_size">76dp</dimen>
</resources>

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

@@ -281,8 +281,7 @@
<dimen name="taskbar_icon_size_kids">32dp</dimen>
<!-- Transient taskbar -->
<dimen name="transient_taskbar_size">76dp</dimen>
<dimen name="transient_taskbar_two_panels_size">72dp</dimen>
<dimen name="transient_taskbar_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>

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

@@ -284,9 +284,7 @@ public class TaskbarActivityContext extends BaseTaskbarContext {
private void updateIconSize(Resources resources) {
mDeviceProfile.iconSizePx = resources.getDimensionPixelSize(
DisplayController.isTransientTaskbar(this)
? mDeviceProfile.isTwoPanels
? R.dimen.transient_taskbar_two_panels_icon_size
: R.dimen.transient_taskbar_icon_size
? R.dimen.transient_taskbar_icon_size
: R.dimen.taskbar_icon_size);
mDeviceProfile.updateIconSize(1f, resources);
}
@@ -694,9 +692,7 @@ public class TaskbarActivityContext extends BaseTaskbarContext {
}
if (DisplayController.isTransientTaskbar(this)) {
int taskbarSize = resources.getDimensionPixelSize(mDeviceProfile.isTwoPanels
? R.dimen.transient_taskbar_two_panels_size
: R.dimen.transient_taskbar_size);
int taskbarSize = resources.getDimensionPixelSize(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

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

3
res/values-sw720dp/dimens.xml
View File

@@ -46,4 +46,7 @@
<!-- Folder spaces -->
<dimen name="folder_footer_horiz_padding">24dp</dimen>
<!-- Transient taskbar -->
<dimen name="transient_taskbar_icon_size">57dp</dimen>
</resources>

4
res/values/dimens.xml
View File

@@ -364,11 +364,9 @@
<dimen name="max_hotseat_icon_space">50dp</dimen>
<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>
<dimen name="transient_taskbar_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>

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

@@ -325,9 +325,7 @@ public class DeviceProfile {
if (isTaskbarPresent) {
if (DisplayController.isTransientTaskbar(context)) {
taskbarSize = res.getDimensionPixelSize(isTwoPanels
? R.dimen.transient_taskbar_two_panels_size
: R.dimen.transient_taskbar_size);
taskbarSize = res.getDimensionPixelSize(R.dimen.transient_taskbar_size);
stashedTaskbarSize =
res.getDimensionPixelSize(R.dimen.transient_taskbar_stashed_size);
transientTaskbarMargin =
@@ -1376,7 +1374,7 @@ public class DeviceProfile {
public int getOverviewActionsClaimedSpaceBelow() {
if (isTaskbarPresent) {
if (FeatureFlags.ENABLE_TASKBAR_IN_OVERVIEW.get()) {
return taskbarSize + transientTaskbarMargin;
return taskbarSize + transientTaskbarMargin * 2;
}
return isGestureMode
@@ -1647,6 +1645,8 @@ public class DeviceProfile {
overviewActionsTopMarginPx));
writer.println(prefix + pxToDpStr("overviewActionsHeight",
overviewActionsHeight));
writer.println(prefix + pxToDpStr("overviewActionsClaimedSpaceBelow",
getOverviewActionsClaimedSpaceBelow()));
writer.println(prefix + pxToDpStr("overviewActionsButtonSpacing",
overviewActionsButtonSpacing));
writer.println(prefix + pxToDpStr("overviewPageSpacing", overviewPageSpacing));

9
src/com/android/launcher3/util/DisplayController.java
View File

@@ -131,13 +131,20 @@ public class DisplayController implements ComponentCallbacks, SafeCloseable {
* Returns whether taskbar is transient.
*/
public static boolean isTransientTaskbar(Context context) {
return INSTANCE.get(context).isTransientTaskbar();
}
/**
* Returns whether taskbar is transient.
*/
public boolean isTransientTaskbar() {
// TODO(b/258604917): When running in test harness, use !sTransientTaskbarStatusForTests
// once tests are updated to expect new persistent behavior such as not allowing long press
// to stash.
if (!Utilities.IS_RUNNING_IN_TEST_HARNESS && FORCE_PERSISTENT_TASKBAR.get()) {
return false;
}
return getNavigationMode(context) == NavigationMode.NO_BUTTON
return getInfo().navigationMode == NavigationMode.NO_BUTTON
&& (Utilities.IS_RUNNING_IN_TEST_HARNESS
? sTransientTaskbarStatusForTests
: ENABLE_TRANSIENT_TASKBAR.get());