Merge tag 'android-14.0.0_r28' into android-14.0.0_r28

Android 14.0.0 Release 28 (UP1A.231105.001.B2)

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZcKIlAAKCRDorT+BmrEO
# eBpvAJ4nxs3kcAIk4V/imBoX2pQFBOJYCACfUgnHI+9dgPBM5yKFzN/Hm/DhrDs=
# =avdO
# -----END PGP SIGNATURE-----
# gpg: Signature made Wed Feb  7 03:29:24 2024 CST
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Can't check signature: No public key

# Conflicts:
#	lawnchair/res/color/widgets_picker_scrim.xml
#	quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
#	quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java
#	quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java
#	quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
#	quickstep/src/com/android/quickstep/TaskAnimationManager.java
#	quickstep/src/com/android/quickstep/TaskViewUtils.java
#	quickstep/src/com/android/quickstep/interaction/AllSetActivity.java
#	src/com/android/launcher3/config/FeatureFlags.java
#	src/com/android/launcher3/folder/LauncherDelegate.java
This commit is contained in:
Goooler
2024-02-08 22:44:10 +08:00
12 changed files with 361 additions and 281 deletions

View File

@@ -47,7 +47,6 @@ import android.util.AttributeSet;
import android.util.FloatProperty;
import android.util.Log;
import android.util.SparseArray;
import android.util.TypedValue;
import android.view.KeyEvent;
import android.view.LayoutInflater;
import android.view.MotionEvent;
@@ -302,9 +301,8 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext>
0,
0 // Bottom left
};
final TypedValue value = new TypedValue();
getContext().getTheme().resolveAttribute(android.R.attr.colorBackground, value, true);
mBottomSheetBackgroundColor = value.data;
mBottomSheetBackgroundColor =
Themes.getAttrColor(getContext(), R.attr.materialColorSurfaceDim);
updateBackgroundVisibility(mActivityContext.getDeviceProfile());
mSearchUiManager.initializeSearch(this);
}