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

Unverified Commit cfc74263 authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-14.0.0_r20' into staging/lineage-21.0_merge-android-14.0.0_r20 

Android 14.0.0 release 20

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZZXyGAAKCRDorT+BmrEO
# eHaWAJ4yLGno+VePiqzdezRhOIv1tu+O4QCfRstsDTy2KY4PllQNgSqiR+ZRud0=
# =jW3L
# -----END PGP SIGNATURE-----
# gpg: Signature made Thu Jan  4 01:47:36 2024 EET
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [marginal]
# gpg: initial-contribution@android.com: Verified 2221 signatures in the past
#      2 years.  Encrypted 4 messages in the past 24 months.
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 4340 D135 70EF 945E 8381  0964 E8AD 3F81 9AB1 0E78

# By Anushree Ganjam (1) and Tony Wickham (1)
# Via Android Build Coastguard Worker
* tag 'android-14.0.0_r20':
  [DO NOT MERGE] Change the LPNH flag to read from server flag "ENABLE_LONG_PRESS_NAV_HANDLE_MPR".
  Fix 3 button mode issues in AllSetActivity

Change-Id: I5f354788d4758445191d5bd500d3b81320f73d34
parents e0ec0d2a bcf36a18

quickstep/src/com/android/quickstep/interaction/AllSetActivity.java

+19 −1
Original line number Diff line number Diff line
@@ -15,6 +15,9 @@ 
 */

package com.android.quickstep.interaction;



import static android.view.WindowInsetsController.APPEARANCE_LIGHT_NAVIGATION_BARS;

import static android.view.WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS;



import static com.android.app.animation.Interpolators.FAST_OUT_SLOW_IN;

import static com.android.app.animation.Interpolators.LINEAR;

import static com.android.launcher3.Utilities.mapBoundToRange;
@@ -47,6 +50,8 @@ import android.text.TextUtils; 
import android.util.Log;

import android.view.View;

import android.view.View.AccessibilityDelegate;

import android.view.Window;

import android.view.WindowInsetsController;

import android.view.accessibility.AccessibilityNodeInfo;

import android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction;

import android.widget.ImageView;
@@ -121,6 +126,17 @@ public class AllSetActivity extends Activity { 
        Resources resources = getResources();

        int mode = resources.getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;

        boolean isDarkTheme = mode == Configuration.UI_MODE_NIGHT_YES;



        int systemBarsMask = APPEARANCE_LIGHT_STATUS_BARS | APPEARANCE_LIGHT_NAVIGATION_BARS;

        int systemBarsAppearance = isDarkTheme ? 0 : systemBarsMask;

        Window window = getWindow();

        WindowInsetsController insetsController = window == null

                ? null

                : window.getInsetsController();

        if (insetsController != null) {

            insetsController.setSystemBarsAppearance(systemBarsAppearance, systemBarsMask);

        }



        Intent intent = getIntent();

        int accentColor = intent.getIntExtra(

                isDarkTheme ? EXTRA_ACCENT_COLOR_DARK_MODE : EXTRA_ACCENT_COLOR_LIGHT_MODE,
@@ -299,8 +315,10 @@ public class AllSetActivity extends Activity { 
        if (mBackgroundAnimatorListener != null) {

            mAnimatedBackground.removeAnimatorListener(mBackgroundAnimatorListener);

        }

        if (!isChangingConfigurations()) {

            dispatchLauncherAnimStartEnd();

        }

    }



    private AnimatedFloat createSwipeUpProxy(GestureState state) {

        if (state.getTopRunningTaskId() != getTaskId()) {

src/com/android/launcher3/config/FeatureFlags.java

+1 −1
Original line number Diff line number Diff line
@@ -248,7 +248,7 @@ public final class FeatureFlags { 
            "Inject fallback app corpus result when AiAi fails to return it.");



    public static final BooleanFlag ENABLE_LONG_PRESS_NAV_HANDLE =

            getReleaseFlag(282993230, "ENABLE_LONG_PRESS_NAV_HANDLE", TEAMFOOD,

            getReleaseFlag(282993230, "ENABLE_LONG_PRESS_NAV_HANDLE_MPR", TEAMFOOD,

                    "Enables long pressing on the bottom bar nav handle to trigger events.");



    // TODO(Block 17): Clean up flags