Add taskbarIconSize to GridOption/DisplayOptions
- Renamed variables to make it more clear what they represent
- DeviceProfile will be source of truth for taskbar
sizes
Bug: 265144213
Test: phone, multi-display, tablet
Change-Id: Id9c19d15a65894fd7645e0f876a4b6527b713c34
Flag: ENABLE_TRANSIENT_TASKBAR=true
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 96938ca..682153f 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -380,6 +380,15 @@
<!-- defaults to hotseatQsbSpace, if not specified -->
<attr name="hotseatQsbSpaceTwoPanelPortrait" format="float" />
+ <!-- defaults to res.taskbar_icon_size, if not specified -->
+ <attr name="transientTaskbarIconSize" format="float" />
+ <!-- defaults to transientTaskbarIconSize, if not specified -->
+ <attr name="transientTaskbarIconSizeLandscape" format="float" />
+ <!-- defaults to transientTaskbarIconSize, if not specified -->
+ <attr name="transientTaskbarIconSizeTwoPanelLandscape" format="float" />
+ <!-- defaults to transientTaskbarIconSize, if not specified -->
+ <attr name="transientTaskbarIconSizeTwoPanelPortrait" format="float" />
+
<attr name="iconImageSize" format="float" />
<!-- defaults to iconImageSize, if not specified -->
<attr name="iconSizeLandscape" format="float" />
diff --git a/res/values/config.xml b/res/values/config.xml
index e13b51c..5a6698b 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -164,6 +164,10 @@
<item name="swipe_up_rect_xy_damping_ratio" type="dimen" format="float">0.8</item>
<item name="swipe_up_rect_xy_stiffness" type="dimen" format="float">200</item>
+ <!-- Taskbar -->
+ <!-- This is a float because it is converted to dp later in DeviceProfile -->
+ <item name="taskbar_icon_size" type="dimen" format="float">0</item>
+
<!-- These params are only used for hotseat items on devices that have a taskbar. -->
<item name="taskbar_swipe_up_rect_x_stiffness" type="dimen" format="float">350</item>
<item name="taskbar_swipe_up_rect_x_damping" type="dimen" format="float">0.9</item>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index e62cff5..cd41baf 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -371,14 +371,13 @@
<dimen name="min_hotseat_icon_space">18dp</dimen>
<dimen name="max_hotseat_icon_space">50dp</dimen>
<dimen name="min_hotseat_qsb_width">0dp</dimen>
- <dimen name="taskbar_icon_size">0dp</dimen>
- <dimen name="transient_taskbar_icon_size">0dp</dimen>
+
<!-- Transient taskbar (placeholders to compile in Launcher3 without Quickstep) -->
- <dimen name="transient_taskbar_size">0dp</dimen>
- <dimen name="transient_taskbar_margin">0dp</dimen>
+ <dimen name="transient_taskbar_padding">0dp</dimen>
+ <dimen name="transient_taskbar_bottom_margin">0dp</dimen>
<dimen name="transient_taskbar_shadow_blur">0dp</dimen>
<dimen name="transient_taskbar_key_shadow_distance">0dp</dimen>
- <dimen name="transient_taskbar_stashed_size">0dp</dimen>
+ <dimen name="transient_taskbar_stashed_height">0dp</dimen>
<dimen name="transient_taskbar_clamped_offset_bound">0dp</dimen>
<dimen name="taskbar_icon_spacing">0dp</dimen>
<dimen name="taskbar_nav_buttons_size">0dp</dimen>