Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a5aeb35 authored by Jagrut Desai's avatar Jagrut Desai Committed by Android (Google) Code Review
Browse files

Merge "Customize BubbleTextView for Taskbar Icon Size" into 24D1-dev

parents 979cc8c8 2f8baab4

quickstep/res/layout/taskbar_all_apps_button.xml

+4 −6
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2022 The Android Open Source Project

<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2022 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.
@@ -15,10 +14,9 @@ 
-->



<!-- 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"

<com.android.launcher3.views.IconButtonView xmlns:android="http://schemas.android.com/apk/res/android"

    style="@style/BaseIcon.Workspace.Taskbar"

    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:contentDescription="@string/all_apps_button_label" />

quickstep/res/layout/taskbar_divider.xml

+5 −6
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2023 The Android Open Source Project

<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2023 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.
@@ -13,9 +12,9 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

<com.android.launcher3.views.IconButtonView

    xmlns:android="http://schemas.android.com/apk/res/android"

<com.android.launcher3.views.IconButtonView xmlns:android="http://schemas.android.com/apk/res/android"

    style="@style/BaseIcon.Workspace.Taskbar"

    android:layout_width="@dimen/taskbar_icon_min_touch_size"

    android:layout_height="@dimen/taskbar_icon_min_touch_size"

    android:contentDescription="@string/taskbar_divider_a11y_title"

    android:backgroundTint="@android:color/transparent" />
 
 No newline at end of file
 
    android:backgroundTint="@android:color/transparent"

    android:contentDescription="@string/taskbar_divider_a11y_title" />
 
 No newline at end of file

src/com/android/launcher3/BubbleTextView.java

+1 −1
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver, 
            defaultIconSize = getResources().getDimensionPixelSize(

                    R.dimen.search_row_small_icon_size);

        } else if (mDisplay == DISPLAY_TASKBAR) {

            defaultIconSize = mDeviceProfile.iconSizePx;

            defaultIconSize = mDeviceProfile.taskbarIconSize;

        } else {

            // widget_selection or shortcut_popup

            defaultIconSize = mDeviceProfile.iconSizePx;