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

Merge "Update taskbar to spec" into tm-qpr-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2023-01-03 17:42:41 +00:00
committed by Android (Google) Code Review
parent d96be3ebb4 2a058f5be1
commit 39688d2d61
6 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
quickstep/res/layout/taskbar_all_apps_button.xml
View File

@@ -13,10 +13,12 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- Note: The actual size will match the taskbar icon sizes in TaskbarView#onLayout(). -->
<com.android.launcher3.views.IconButtonView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="@dimen/taskbar_icon_touch_size"
android:layout_height="@dimen/taskbar_icon_touch_size"
android:layout_width="@dimen/taskbar_icon_min_touch_size"
android:layout_height="@dimen/taskbar_icon_min_touch_size"
android:contentDescription="@string/all_apps_button_label"
android:backgroundTint="@android:color/transparent"
android:icon="@drawable/ic_all_apps_button"

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

@@ -40,4 +40,5 @@
<!-- Transient taskbar -->
<dimen name="transient_taskbar_size">76dp</dimen>
<dimen name="transient_taskbar_icon_size">52dp</dimen>
</resources>

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

@@ -255,7 +255,10 @@
<!-- Taskbar -->
<dimen name="taskbar_size">@*android:dimen/taskbar_frame_height</dimen>
<dimen name="taskbar_ime_size">48dp</dimen>
<dimen name="taskbar_icon_touch_size">48dp</dimen>
<dimen name="taskbar_icon_size">44dp</dimen>
<dimen name="taskbar_icon_min_touch_size">48dp</dimen>
<!-- Note that this applies to both sides of all icons, so visible space is double this. -->
<dimen name="taskbar_icon_spacing">12dp</dimen>
<dimen name="taskbar_icon_drag_icon_size">54dp</dimen>
<dimen name="taskbar_folder_margin">16dp</dimen>
<dimen name="taskbar_contextual_button_padding">16dp</dimen>
@@ -282,11 +285,11 @@
<!-- Transient taskbar -->
<dimen name="transient_taskbar_size">72dp</dimen>
<dimen name="transient_taskbar_icon_size">48dp</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>
<dimen name="transient_taskbar_stashed_size">32dp</dimen>
<dimen name="transient_taskbar_icon_spacing">10dp</dimen>
<!-- An additional touch slop to prevent x-axis movement during the swipe up to show taskbar -->
<dimen name="transient_taskbar_clamped_offset_bound">16dp</dimen>
<!-- Taskbar swipe up thresholds -->

11
quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
View File

@@ -101,16 +101,15 @@ public class TaskbarView extends FrameLayout implements FolderIcon.FolderIconPar
super(context, attrs, defStyleAttr, defStyleRes);
mActivityContext = ActivityContext.lookupContext(context);
mIconLayoutBounds = mActivityContext.getTransientTaskbarBounds();
mIsRtl = Utilities.isRtl(getResources());
Resources resources = getResources();
mIconTouchSize = resources.getDimensionPixelSize(R.dimen.taskbar_icon_touch_size);
mIsRtl = Utilities.isRtl(resources);
int actualMargin = DisplayController.isTransientTaskbar(mActivityContext)
? resources.getDimensionPixelSize(R.dimen.transient_taskbar_icon_spacing)
: resources.getDimensionPixelSize(R.dimen.taskbar_icon_spacing);
int actualMargin = resources.getDimensionPixelSize(R.dimen.taskbar_icon_spacing);
int actualIconSize = mActivityContext.getDeviceProfile().iconSizePx;
mIconTouchSize = Math.max(actualIconSize,
resources.getDimensionPixelSize(R.dimen.taskbar_icon_min_touch_size));
// We layout the icons to be of mIconTouchSize in width and height
mItemMarginLeftRight = actualMargin - (mIconTouchSize - actualIconSize) / 2;
mItemPadding = (mIconTouchSize - actualIconSize) / 2;

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

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

9
res/values/dimens.xml
View File

@@ -365,8 +365,8 @@
<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">44dp</dimen>
<dimen name="transient_taskbar_icon_size">50dp</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>
@@ -374,10 +374,7 @@
<dimen name="transient_taskbar_key_shadow_distance">0dp</dimen>
<dimen name="transient_taskbar_stashed_size">0dp</dimen>
<dimen name="transient_taskbar_clamped_offset_bound">0dp</dimen>
<!-- Note that this applies to both sides of all icons, so visible space is double this. -->
<dimen name="transient_taskbar_icon_spacing">0dp</dimen>
<!-- Note that this applies to both sides of all icons, so visible space is double this. -->
<dimen name="taskbar_icon_spacing">8dp</dimen>
<dimen name="taskbar_icon_spacing">0dp</dimen>
<dimen name="taskbar_nav_buttons_size">0dp</dimen>
<dimen name="taskbar_contextual_button_margin">0dp</dimen>
<dimen name="taskbar_hotseat_nav_spacing">0dp</dimen>