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

Commit 85809215 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Force persistent taskbar all apps icon to light version." into tm-qpr-dev

parents 94434031 748094b1

quickstep/src/com/android/launcher3/taskbar/TaskbarView.java

+7 −2
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ import com.android.launcher3.util.DisplayController; 
import com.android.launcher3.util.LauncherBindableItemsContainer;

import com.android.launcher3.views.ActivityContext;

import com.android.launcher3.views.DoubleShadowBubbleTextView;

import com.android.launcher3.views.IconButtonView;



import java.util.function.Predicate;
@@ -80,7 +81,7 @@ public class TaskbarView extends FrameLayout implements FolderIcon.FolderIconPar 
    private @Nullable FolderIcon mLeaveBehindFolderIcon;



    // Only non-null when device supports having an All Apps button.

    private @Nullable View mAllAppsButton;

    private @Nullable IconButtonView mAllAppsButton;



    // Only non-null when device supports having an All Apps button.

    private @Nullable View mTaskbarDivider;
@@ -125,10 +126,14 @@ public class TaskbarView extends FrameLayout implements FolderIcon.FolderIconPar 


        if (FeatureFlags.ENABLE_ALL_APPS_IN_TASKBAR.get()

                && !mActivityContext.getPackageManager().hasSystemFeature(FEATURE_PC)) {

            mAllAppsButton = LayoutInflater.from(context)

            mAllAppsButton = (IconButtonView) LayoutInflater.from(context)

                    .inflate(R.layout.taskbar_all_apps_button, this, false);

            mAllAppsButton.setPadding(mItemPadding, mItemPadding, mItemPadding, mItemPadding);

            mAllAppsButton.setScaleX(mIsRtl ? -1 : 1);

            mAllAppsButton.setForegroundTint(mActivityContext.getColor(

                    DisplayController.isTransientTaskbar(mActivityContext)

                            ? R.color.all_apps_button_color

                            : R.color.all_apps_button_color_dark));



            if (FeatureFlags.ENABLE_TASKBAR_PINNING.get()) {

                mTaskbarDivider = LayoutInflater.from(context).inflate(R.layout.taskbar_divider,

res/values-night-v31/colors.xml

+0 −2
Original line number Diff line number Diff line
@@ -24,6 +24,4 @@ 
    <color name="home_settings_thumb_off_color">@android:color/system_neutral2_300</color>

    <color name="home_settings_track_on_color">@android:color/system_accent2_700</color>

    <color name="home_settings_track_off_color">@android:color/system_neutral1_700</color>



    <color name="all_apps_button_color">?android:attr/textColorSecondary</color>

</resources>
 
 No newline at end of file

res/values-night/colors.xml

+1 −1
Original line number Diff line number Diff line
@@ -17,5 +17,5 @@ 
-->



<resources>

    <color name="all_apps_button_color">#BFC8CC</color>

    <color name="all_apps_button_color">@color/all_apps_button_color_dark</color>

</resources>
 
 No newline at end of file

res/values-v31/colors.xml

+2 −1
Original line number Diff line number Diff line
@@ -62,5 +62,6 @@ 
    <color name="preload_icon_accent_color_dark">@android:color/system_accent1_300</color>

    <color name="preload_icon_background_color_dark">@android:color/system_neutral2_700</color>



    <color name="all_apps_button_color">?android:attr/textColorSecondary</color>

    <color name="all_apps_button_color_light">@android:color/system_neutral2_700</color>

    <color name="all_apps_button_color_dark">@android:color/system_neutral2_200</color>

</resources>

res/values/colors.xml

+3 −1
Original line number Diff line number Diff line
@@ -80,7 +80,9 @@ 
    <color name="workspace_accent_color_light">#ff8df5e3</color>

    <color name="workspace_accent_color_dark">#ff3d665f</color>



    <color name="all_apps_button_color">#40484B</color>

    <color name="all_apps_button_color">@color/all_apps_button_color_light</color>

    <color name="all_apps_button_color_light">#40484B</color>

    <color name="all_apps_button_color_dark">#BFC8CC</color>



    <color name="preload_icon_accent_color_light">#00668B</color>

    <color name="preload_icon_background_color_light">#B5CAD7</color>