Android11Launcher3桌面文件夹背景透明

diff --git a/packages/apps/Launcher3/res/layout/folder_application.xml b/packages/apps/Launcher3/res/layout/folder_application.xml

old mode 100644

new mode 100755

index 32a5419b8ea..55897bc0d15

--- a/packages/apps/Launcher3/res/layout/folder_application.xml

+++ b/packages/apps/Launcher3/res/layout/folder_application.xml

@@ -18,7 +18,7 @@

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

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

style="@style/BaseIcon"

- android:textColor="?attr/folderTextColor"

+ android:textColor="@android:color/white"

android:includeFontPadding="false"

android:hapticFeedbackEnabled="false"

launcher:iconDisplay="folder" />

diff --git a/packages/apps/Launcher3/src/com/android/launcher3/folder/Folder.java b/packages/apps/Launcher3/src/com/android/launcher3/folder/Folder.java

old mode 100644

new mode 100755

index d01e189f7e7..220794ddd1d

--- a/packages/apps/Launcher3/src/com/android/launcher3/folder/Folder.java

+++ b/packages/apps/Launcher3/src/com/android/launcher3/folder/Folder.java

@@ -100,6 +100,7 @@ import java.util.Objects;

import java.util.StringJoiner;

import java.util.stream.Collectors;

import java.util.stream.Stream;

+import android.graphics.Color;

/**

* Represents a set of icons chosen by the user or generated by the system.

@@ -244,6 +245,8 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo

& ~InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS

| InputType.TYPE_TEXT_FLAG_CAP_WORDS);

mFolderName.forceDisableSuggestions(!FeatureFlags.FOLDER_NAME_SUGGEST.get());

+

+ mFolderName.setTextColor(Color.WHITE);

mFooter = findViewById(R.id.folder_footer);

diff --git a/packages/apps/Launcher3/src/com/android/launcher3/folder/FolderAnimationManager.java b/packages/apps/Launcher3/src/com/android/launcher3/folder/FolderAnimationManager.java

old mode 100644

new mode 100755

index 3d72b49b44e..ab8664af626

--- a/packages/apps/Launcher3/src/com/android/launcher3/folder/FolderAnimationManager.java

+++ b/packages/apps/Launcher3/src/com/android/launcher3/folder/FolderAnimationManager.java

@@ -165,12 +165,21 @@ public class FolderAnimationManager {

final float yDistance = initialY - lp.y;

// Set up the Folder background.

- final int finalColor = ColorUtils.setAlphaComponent(

- Themes.getAttrColor(mContext, R.attr.folderFillColor), 255);

- final int initialColor = setColorAlphaBound(

- finalColor, mPreviewBackground.getBackgroundAlpha());

+ //swl add

+ final int finalColor = 0x00FFFFFF;

+ int folderFillColor = Themes.getAttrColor(mContext, R.attr.folderFillColor);

+ if (mIsOpening){

+ //finalColor = folderFillColor;

+ }else{

+ //finalColor = mFolderBackground.getColor().getDefaultColor();

+ }

+

+ //final int initialColor = setColorAlphaBound( //andy

+ // folderFillColor, mPreviewBackground.getBackgroundAlpha());

+ final int initialColor = 0x00FFFFFF;

mFolderBackground.mutate();

- mFolderBackground.setColor(mIsOpening ? initialColor : finalColor);

+ mFolderBackground.setColor(finalColor);

+ //end

// Set up the reveal animation that clips the Folder.

int totalOffsetX = paddingOffsetX + previewItemOffsetX;